diff --git a/build.gradle b/build.gradle
index e1c581324..c34070dbc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'idea'
 }
 
-version = "1.9.4-beta1"
+version = "1.9.4-beta2.7"
 group= "kamkeel.customnpc-plus"
 archivesBaseName = "CustomNPC-Plus"
 
diff --git a/src/main/java/foxz/command/CmdClone.java b/src/main/java/foxz/command/CmdClone.java
index 75627a9f1..9a6cd1923 100644
--- a/src/main/java/foxz/command/CmdClone.java
+++ b/src/main/java/foxz/command/CmdClone.java
@@ -172,7 +172,7 @@ public class CmdClone extends ChMcLogger {
         entity.setPosition(posX + 0.5, posY + 1, posZ + 0.5);
         if(entity instanceof EntityNPCInterface){
         	EntityNPCInterface npc = (EntityNPCInterface) entity;
-        	npc.ai.startPos = new int[]{MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ)};
+        	npc.ais.startPos = new int[]{MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ)};
         	if(newname != null && !newname.isEmpty())
         		npc.display.name = newname.replaceAll("%", " "); // like name, newname must use % in place of space to keep a logical way
         }
@@ -274,7 +274,7 @@ public class CmdClone extends ChMcLogger {
                 entity.setPosition(posX + 0.5 + x, yy + 1, posZ + 0.5 + z);
                 if(entity instanceof EntityNPCInterface){
                 	EntityNPCInterface npc = (EntityNPCInterface) entity;
-                	npc.ai.startPos = new int[]{xx, yy, zz};
+                	npc.ais.startPos = new int[]{xx, yy, zz};
                 	if(newname != null && !newname.isEmpty())
                 		npc.display.name = newname.replaceAll("%", " "); // like name, newname must use % in place of space to keep a logical way
                 }
diff --git a/src/main/java/foxz/command/CmdConfig.java b/src/main/java/foxz/command/CmdConfig.java
index d947513b0..597db83a1 100644
--- a/src/main/java/foxz/command/CmdConfig.java
+++ b/src/main/java/foxz/command/CmdConfig.java
@@ -5,15 +5,16 @@ import foxz.commandhelper.annotations.Command;
 import foxz.commandhelper.annotations.SubCommand;
 import foxz.commandhelper.permissions.OpOnly;
 import foxz.commandhelper.permissions.PlayerOnly;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumConfigOperation;
+import kamkeel.npcs.network.packets.data.ConfigCommandPacket;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockIce;
 import net.minecraft.block.BlockLeavesBase;
 import net.minecraft.block.BlockVine;
 import net.minecraft.entity.player.EntityPlayerMP;
 import noppes.npcs.CustomNpcs;
-import noppes.npcs.Server;
 import noppes.npcs.config.ConfigMain;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.controllers.ChunkController;
 
 import java.util.Arrays;
@@ -207,6 +208,6 @@ public class CmdConfig extends ChMcLogger {
 		for(int i = 0; i < args.length; i++){
 			font += " " + args[i];
 		}
-    	Server.sendData((EntityPlayerMP)this.pcParam, EnumPacketClient.CONFIG, 0, font.trim(), size);
+        PacketHandler.Instance.sendToPlayer(new ConfigCommandPacket(EnumConfigOperation.FONT, font.trim(), size), (EntityPlayerMP)this.pcParam);
     }
 }
diff --git a/src/main/java/foxz/command/CmdDialog.java b/src/main/java/foxz/command/CmdDialog.java
index 250717dd4..3b6a3e857 100644
--- a/src/main/java/foxz/command/CmdDialog.java
+++ b/src/main/java/foxz/command/CmdDialog.java
@@ -5,12 +5,12 @@ import foxz.commandhelper.annotations.Command;
 import foxz.commandhelper.annotations.SubCommand;
 import foxz.commandhelper.permissions.OpOnly;
 import foxz.commandhelper.permissions.ParamCheck;
+import kamkeel.npcs.controllers.SyncController;
 import net.minecraft.command.CommandBase;
 import net.minecraft.entity.player.EntityPlayer;
 import noppes.npcs.NoppesUtilServer;
 import noppes.npcs.client.EntityUtil;
 import noppes.npcs.controllers.DialogController;
-import noppes.npcs.controllers.SyncController;
 import noppes.npcs.controllers.data.Dialog;
 import noppes.npcs.controllers.data.DialogOption;
 import noppes.npcs.controllers.data.PlayerData;
diff --git a/src/main/java/foxz/command/CmdNpc.java b/src/main/java/foxz/command/CmdNpc.java
index a4cffbc4e..aaec029a4 100644
--- a/src/main/java/foxz/command/CmdNpc.java
+++ b/src/main/java/foxz/command/CmdNpc.java
@@ -50,7 +50,7 @@ public class CmdNpc extends ChMcLogger {
             posZ = CommandBase.func_110666_a(pcParam, selectedNpc.posZ, args[2]);
         }
 
-        selectedNpc.ai.startPos = new int[]{MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ)};
+        selectedNpc.ais.startPos = new int[]{MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ)};
     }
 
     @SubCommand(
@@ -144,7 +144,7 @@ public class CmdNpc extends ChMcLogger {
         if(args.length > 0)
         	npc.display.name = args[0];
         npc.setPositionAndRotation(player.posX, player.posY, player.posZ, player.cameraYaw, player.cameraPitch);
-        npc.ai.startPos = new int[]{MathHelper.floor_double(player.posX),MathHelper.floor_double(player.posY),MathHelper.floor_double(player.posZ)};
+        npc.ais.startPos = new int[]{MathHelper.floor_double(player.posX),MathHelper.floor_double(player.posY),MathHelper.floor_double(player.posZ)};
         pw.spawnEntityInWorld(npc);
         npc.setHealth(npc.getMaxHealth());
         NoppesUtilServer.sendOpenGui(player, EnumGuiType.MainMenuDisplay, npc);
diff --git a/src/main/java/foxz/command/CmdQuest.java b/src/main/java/foxz/command/CmdQuest.java
index e0500f3e1..78cce2830 100644
--- a/src/main/java/foxz/command/CmdQuest.java
+++ b/src/main/java/foxz/command/CmdQuest.java
@@ -5,11 +5,11 @@ import foxz.commandhelper.annotations.Command;
 import foxz.commandhelper.annotations.SubCommand;
 import foxz.commandhelper.permissions.OpOnly;
 import foxz.commandhelper.permissions.ParamCheck;
+import kamkeel.npcs.controllers.SyncController;
+import kamkeel.npcs.network.packets.data.AchievementPacket;
+import kamkeel.npcs.network.packets.data.ChatAlertPacket;
 import net.minecraft.entity.player.EntityPlayerMP;
-import noppes.npcs.Server;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.controllers.QuestController;
-import noppes.npcs.controllers.SyncController;
 import noppes.npcs.controllers.data.PlayerData;
 import noppes.npcs.controllers.data.Quest;
 import noppes.npcs.controllers.data.QuestData;
@@ -58,8 +58,8 @@ public class CmdQuest extends ChMcLogger{
 	        playerdata.questData.activeQuests.put(questid, questdata);
 	        playerdata.save();
 	        if(playerdata.player != null){
-				Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.MESSAGE, "quest.newquest", quest.title);
-				Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.CHAT, "quest.newquest", ": ", quest.title);
+                AchievementPacket.sendAchievement((EntityPlayerMP) playerdata.player, false, "quest.newquest", quest.title);
+                ChatAlertPacket.sendChatAlert((EntityPlayerMP) playerdata.player, "quest.newquest", ": ", quest.title);
 	        }
             playerdata.updateClient = true;
         }
diff --git a/src/main/java/kamkeel/addon/AddonManager.java b/src/main/java/kamkeel/npcs/addon/AddonManager.java
similarity index 78%
rename from src/main/java/kamkeel/addon/AddonManager.java
rename to src/main/java/kamkeel/npcs/addon/AddonManager.java
index 52aabb0f6..24b58dc3e 100644
--- a/src/main/java/kamkeel/addon/AddonManager.java
+++ b/src/main/java/kamkeel/npcs/addon/AddonManager.java
@@ -1,7 +1,7 @@
-package kamkeel.addon;
+package kamkeel.npcs.addon;
 
-import kamkeel.addon.client.DBCClient;
-import kamkeel.addon.client.GeckoAddonClient;
+import kamkeel.npcs.addon.client.DBCClient;
+import kamkeel.npcs.addon.client.GeckoAddonClient;
 
 public class AddonManager {
     public static AddonManager Instance;
diff --git a/src/main/java/kamkeel/addon/DBCAddon.java b/src/main/java/kamkeel/npcs/addon/DBCAddon.java
similarity index 96%
rename from src/main/java/kamkeel/addon/DBCAddon.java
rename to src/main/java/kamkeel/npcs/addon/DBCAddon.java
index e8f446143..d109d2393 100644
--- a/src/main/java/kamkeel/addon/DBCAddon.java
+++ b/src/main/java/kamkeel/npcs/addon/DBCAddon.java
@@ -1,6 +1,5 @@
-package kamkeel.addon;
+package kamkeel.npcs.addon;
 
-import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/kamkeel/addon/GeckoAddon.java b/src/main/java/kamkeel/npcs/addon/GeckoAddon.java
similarity index 94%
rename from src/main/java/kamkeel/addon/GeckoAddon.java
rename to src/main/java/kamkeel/npcs/addon/GeckoAddon.java
index 97c7a50c2..ee0f72141 100644
--- a/src/main/java/kamkeel/addon/GeckoAddon.java
+++ b/src/main/java/kamkeel/npcs/addon/GeckoAddon.java
@@ -1,4 +1,4 @@
-package kamkeel.addon;
+package kamkeel.npcs.addon;
 
 import net.minecraft.entity.EntityLivingBase;
 
@@ -17,4 +17,4 @@ public class GeckoAddon {
 
     public void geckoCopyData(EntityLivingBase copied, EntityLivingBase entity){}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/kamkeel/addon/client/DBCClient.java b/src/main/java/kamkeel/npcs/addon/client/DBCClient.java
similarity index 84%
rename from src/main/java/kamkeel/addon/client/DBCClient.java
rename to src/main/java/kamkeel/npcs/addon/client/DBCClient.java
index f148439d6..5fdc75d7e 100644
--- a/src/main/java/kamkeel/addon/client/DBCClient.java
+++ b/src/main/java/kamkeel/npcs/addon/client/DBCClient.java
@@ -1,15 +1,10 @@
-package kamkeel.addon.client;
+package kamkeel.npcs.addon.client;
 
-import io.netty.buffer.ByteBuf;
-import net.minecraft.client.model.ModelBase;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
 import noppes.npcs.client.gui.mainmenu.GuiNpcStats;
-import noppes.npcs.client.gui.model.GuiCreationScreen;
 import noppes.npcs.client.gui.player.inventory.GuiCNPCInventory;
 import noppes.npcs.client.gui.util.GuiNPCInterface2;
 import noppes.npcs.client.gui.util.GuiNpcButton;
-import noppes.npcs.client.model.ModelMPM;
 import noppes.npcs.entity.EntityNPCInterface;
 
 public class DBCClient {
diff --git a/src/main/java/kamkeel/addon/client/GeckoAddonClient.java b/src/main/java/kamkeel/npcs/addon/client/GeckoAddonClient.java
similarity index 97%
rename from src/main/java/kamkeel/addon/client/GeckoAddonClient.java
rename to src/main/java/kamkeel/npcs/addon/client/GeckoAddonClient.java
index 088488314..f014b07ad 100644
--- a/src/main/java/kamkeel/addon/client/GeckoAddonClient.java
+++ b/src/main/java/kamkeel/npcs/addon/client/GeckoAddonClient.java
@@ -1,4 +1,4 @@
-package kamkeel.addon.client;
+package kamkeel.npcs.addon.client;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.entity.EntityLivingBase;
diff --git a/src/main/java/kamkeel/command/AnimationCommand.java b/src/main/java/kamkeel/npcs/command/AnimationCommand.java
similarity index 99%
rename from src/main/java/kamkeel/command/AnimationCommand.java
rename to src/main/java/kamkeel/npcs/command/AnimationCommand.java
index 8a6beec18..05e5e517f 100644
--- a/src/main/java/kamkeel/command/AnimationCommand.java
+++ b/src/main/java/kamkeel/npcs/command/AnimationCommand.java
@@ -1,4 +1,4 @@
-package kamkeel.command;
+package kamkeel.npcs.command;
 
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
diff --git a/src/main/java/kamkeel/command/CloneCommand.java b/src/main/java/kamkeel/npcs/command/CloneCommand.java
similarity index 94%
rename from src/main/java/kamkeel/command/CloneCommand.java
rename to src/main/java/kamkeel/npcs/command/CloneCommand.java
index 174d1039a..b62308d30 100644
--- a/src/main/java/kamkeel/command/CloneCommand.java
+++ b/src/main/java/kamkeel/npcs/command/CloneCommand.java
@@ -1,8 +1,7 @@
-package kamkeel.command;
+package kamkeel.npcs.command;
 
 import foxz.utils.Utils;
 import net.minecraft.block.Block;
-import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.Entity;
@@ -180,9 +179,9 @@ public class CloneCommand extends CommandKamkeelBase {
                     return;
                 }
                 try{
-                    posX = CommandBase.func_110666_a(sender, posX, par[0]);
-                    posY = CommandBase.func_110665_a(sender, posY, par[1].trim(), 0, 0);
-                    posZ = CommandBase.func_110666_a(sender, posZ, par[2]);
+                    posX = func_110666_a(sender, posX, par[0]);
+                    posY = func_110665_a(sender, posY, par[1].trim(), 0, 0);
+                    posZ = func_110666_a(sender, posZ, par[2]);
                 }  catch(NumberFormatException ex){
                     sendError(sender, "Location should be in numbers");
                     return;
@@ -204,7 +203,7 @@ public class CloneCommand extends CommandKamkeelBase {
         entity.setPosition(posX + 0.5, posY + 1, posZ + 0.5);
         if(entity instanceof EntityNPCInterface){
             EntityNPCInterface npc = (EntityNPCInterface) entity;
-            npc.ai.startPos = new int[]{MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ)};
+            npc.ais.startPos = new int[]{MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ)};
             if(newname != null && !newname.isEmpty())
                 npc.display.name = newname.replaceAll("%", " "); // like name, newname must use % in place of space to keep a logical way
         }
@@ -272,9 +271,9 @@ public class CloneCommand extends CommandKamkeelBase {
                     return;
                 }
                 try{
-                    posX = CommandBase.func_110666_a(sender, posX, par[0]);
-                    posY = CommandBase.func_110665_a(sender, posY, par[1].trim(), 0, 0);
-                    posZ = CommandBase.func_110666_a(sender, posZ, par[2]);
+                    posX = func_110666_a(sender, posX, par[0]);
+                    posY = func_110665_a(sender, posY, par[1].trim(), 0, 0);
+                    posZ = func_110666_a(sender, posZ, par[2]);
                 }  catch(NumberFormatException ex){
                     sendError(sender, "Location should be in numbers");
                     return;
@@ -310,7 +309,7 @@ public class CloneCommand extends CommandKamkeelBase {
                 entity.setPosition(posX + 0.5 + x, yy + 1, posZ + 0.5 + z);
                 if(entity instanceof EntityNPCInterface){
                     EntityNPCInterface npc = (EntityNPCInterface) entity;
-                    npc.ai.startPos = new int[]{xx, yy, zz};
+                    npc.ais.startPos = new int[]{xx, yy, zz};
                     if(newname != null && !newname.isEmpty())
                         npc.display.name = newname.replaceAll("%", " "); // like name, newname must use % in place of space to keep a logical way
                 }
diff --git a/src/main/java/kamkeel/command/CommandCommand.java b/src/main/java/kamkeel/npcs/command/CommandCommand.java
similarity index 98%
rename from src/main/java/kamkeel/command/CommandCommand.java
rename to src/main/java/kamkeel/npcs/command/CommandCommand.java
index 80a41ec28..facac35f1 100644
--- a/src/main/java/kamkeel/command/CommandCommand.java
+++ b/src/main/java/kamkeel/npcs/command/CommandCommand.java
@@ -1,4 +1,4 @@
-package kamkeel.command;
+package kamkeel.npcs.command;
 
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
diff --git a/src/main/java/kamkeel/command/CommandKamkeel.java b/src/main/java/kamkeel/npcs/command/CommandKamkeel.java
similarity index 98%
rename from src/main/java/kamkeel/command/CommandKamkeel.java
rename to src/main/java/kamkeel/npcs/command/CommandKamkeel.java
index 86c192847..6c5bfd28d 100644
--- a/src/main/java/kamkeel/command/CommandKamkeel.java
+++ b/src/main/java/kamkeel/npcs/command/CommandKamkeel.java
@@ -1,4 +1,4 @@
-package kamkeel.command;
+package kamkeel.npcs.command;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
@@ -46,7 +46,7 @@ public class CommandKamkeel extends CommandBase{
 
 	@Override
 	public String getCommandName() {
-		return "kamkeel";
+		return "kamkeel/npcs";
 	}
 
 	@Override
diff --git a/src/main/java/kamkeel/command/CommandKamkeelBase.java b/src/main/java/kamkeel/npcs/command/CommandKamkeelBase.java
similarity index 99%
rename from src/main/java/kamkeel/command/CommandKamkeelBase.java
rename to src/main/java/kamkeel/npcs/command/CommandKamkeelBase.java
index 9c380f7c2..cf87c5d36 100644
--- a/src/main/java/kamkeel/command/CommandKamkeelBase.java
+++ b/src/main/java/kamkeel/npcs/command/CommandKamkeelBase.java
@@ -1,4 +1,4 @@
-package kamkeel.command;
+package kamkeel.npcs.command;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
diff --git a/src/main/java/kamkeel/command/ConfigCommand.java b/src/main/java/kamkeel/npcs/command/ConfigCommand.java
similarity index 96%
rename from src/main/java/kamkeel/command/ConfigCommand.java
rename to src/main/java/kamkeel/npcs/command/ConfigCommand.java
index 4be014417..f31a1dc18 100644
--- a/src/main/java/kamkeel/command/ConfigCommand.java
+++ b/src/main/java/kamkeel/npcs/command/ConfigCommand.java
@@ -1,6 +1,9 @@
-package kamkeel.command;
+package kamkeel.npcs.command;
 
 import foxz.utils.Market;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumConfigOperation;
+import kamkeel.npcs.network.packets.data.ConfigCommandPacket;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockIce;
 import net.minecraft.block.BlockLeavesBase;
@@ -10,9 +13,7 @@ import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.util.ResourceLocation;
 import noppes.npcs.CustomNpcs;
-import noppes.npcs.Server;
 import noppes.npcs.config.ConfigMain;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.controllers.ChunkController;
 import noppes.npcs.controllers.PlayerDataController;
 
@@ -291,8 +292,7 @@ public class ConfigCommand extends CommandKamkeelBase {
 		for(int i = 0; i < args.length; i++){
 			font += " " + args[i];
 		}
-    	Server.sendData((EntityPlayerMP)sender, EnumPacketClient.CONFIG, 0, font.trim(), size);
+        PacketHandler.Instance.sendToPlayer(new ConfigCommandPacket(EnumConfigOperation.FONT, font.trim(), size), (EntityPlayerMP)sender);
     }
-
 }
 
diff --git a/src/main/java/kamkeel/command/DialogCategoryCommand.java b/src/main/java/kamkeel/npcs/command/DialogCategoryCommand.java
similarity index 99%
rename from src/main/java/kamkeel/command/DialogCategoryCommand.java
rename to src/main/java/kamkeel/npcs/command/DialogCategoryCommand.java
index 648920e06..d149a15b7 100644
--- a/src/main/java/kamkeel/command/DialogCategoryCommand.java
+++ b/src/main/java/kamkeel/npcs/command/DialogCategoryCommand.java
@@ -1,4 +1,4 @@
-package kamkeel.command;
+package kamkeel.npcs.command;
 
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
diff --git a/src/main/java/kamkeel/command/DialogCommand.java b/src/main/java/kamkeel/npcs/command/DialogCommand.java
similarity index 99%
rename from src/main/java/kamkeel/command/DialogCommand.java
rename to src/main/java/kamkeel/npcs/command/DialogCommand.java
index ac9ecd543..4ad1e7e22 100644
--- a/src/main/java/kamkeel/command/DialogCommand.java
+++ b/src/main/java/kamkeel/npcs/command/DialogCommand.java
@@ -1,5 +1,6 @@
-package kamkeel.command;
+package kamkeel.npcs.command;
 
+import kamkeel.npcs.controllers.SyncController;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
@@ -10,7 +11,6 @@ import noppes.npcs.constants.EnumAvailabilityDialog;
 import noppes.npcs.constants.EnumAvailabilityQuest;
 import noppes.npcs.controllers.DialogController;
 import noppes.npcs.controllers.PlayerDataController;
-import noppes.npcs.controllers.SyncController;
 import noppes.npcs.controllers.data.Availability;
 import noppes.npcs.controllers.data.Dialog;
 import noppes.npcs.controllers.data.DialogOption;
diff --git a/src/main/java/kamkeel/npcs/command/EffectCommand.java b/src/main/java/kamkeel/npcs/command/EffectCommand.java
new file mode 100644
index 000000000..9286a30a9
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/command/EffectCommand.java
@@ -0,0 +1,139 @@
+package kamkeel.npcs.command;
+
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.data.CustomEffect;
+import noppes.npcs.controllers.data.PlayerData;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class EffectCommand extends CommandKamkeelBase {
+
+    @Override
+    public String getDescription() {
+        return "Custom Effect operations";
+    }
+
+    @Override
+    public String getCommandName() {
+        return "effect";
+    }
+
+    // info all
+    @SubCommand(desc = "Lists all effects")
+    public void infoAll(ICommandSender sender, String[] args) throws CommandException {
+        // TODO: FIX EFFECT COMMAND
+//        Set<Map.Entry<Integer, StatusEffect>> effects = DBCEffectController.getInstance().standardEffects.entrySet();
+//        Set<Map.Entry<Integer, CustomEffect>> customEffects = DBCEffectController.getInstance().customEffects.entrySet();
+//
+//        if (effects.isEmpty() && customEffects.isEmpty()) {
+//            sendError(sender, "No effects found.");
+//            return;
+//        }
+//
+//        sendResult(sender, "--------------------");
+//
+//        for (Map.Entry<Integer, StatusEffect> entry : effects) {
+//            sendResult(sender, String.format("\u00a7b%2$s \u00a77(ID%3$s: %1$s)", entry.getKey(), entry.getValue().getName(), entry.getValue().isCustom() ? " - CUSTOM" : " "));
+//        }
+//        for (Map.Entry<Integer, CustomEffect> entry : customEffects) {
+//            sendResult(sender, String.format("\u00a7b%2$s \u00a77(ID%3$s: %1$s)", entry.getKey(), entry.getValue().getName(), entry.getValue().isCustom() ? " - CUSTOM" : " "));
+//        }
+//
+//        sendResult(sender, "--------------------");
+    }
+
+    @SubCommand(desc = "Gives a effect to a player", usage = "<player> <time> <effectName>")
+    public void give(ICommandSender sender, String[] args) throws CommandException {
+//        String playername = args[0];
+//        int time = Integer.parseInt(args[1]);
+//        String name = "";
+//        for (int i = 2; i < args.length; i++) {
+//            name += args[i] + (i != args.length - 1 ? " " : "");
+//        }
+//
+//        List<PlayerData> data = PlayerDataController.Instance.getPlayersData(sender, playername);
+//        if (data.isEmpty()) {
+//            sendError(sender, "Unknown player: " + playername);
+//            return;
+//        }
+//
+//        StatusEffect statusEffect = DBCEffectController.getInstance().get(name);
+//        if (statusEffect == null) {
+//            sendError(sender, "Unknown effect: " + name);
+//            return;
+//        }
+//
+//        for (PlayerData playerdata : data) {
+//            DBCEffectController.getInstance().applyEffect(playerdata.player, statusEffect.getID(), time);
+//            sendResult(sender, String.format("%s §agiven to §7'§b%s§7'", statusEffect.getName(), playerdata.playername));
+//            if (sender != playerdata.player) {
+//                sendResult(playerdata.player, String.format("§Effect §7%s §aadded.", statusEffect.getName()));
+//            }
+//        }
+    }
+
+
+    @SubCommand(desc = "Removes a effect from a player", usage = "<player> <effectName>")
+    public void remove(ICommandSender sender, String[] args) throws CommandException {
+//        String playername = args[0];
+//        String name = "";
+//        for (int i = 1; i < args.length; i++) {
+//            name += args[i] + (i != args.length - 1 ? " " : "");
+//        }
+//
+//        List<PlayerData> data = PlayerDataController.Instance.getPlayersData(sender, playername);
+//        if (data.isEmpty()) {
+//            sendError(sender, "Unknown player: " + playername);
+//            return;
+//        }
+//
+//        StatusEffect statusEffect = DBCEffectController.getInstance().get(name);
+//        if (statusEffect == null) {
+//            sendError(sender, "Unknown effect: " + name);
+//            return;
+//        }
+//
+//        for (PlayerData playerData : data) {
+//            DBCEffectController.getInstance().removeEffect(playerData.player, statusEffect.getID(), DBCPlayerEvent.EffectEvent.ExpirationType.REMOVED);
+//            sendResult(sender, String.format("Effect %s removed from %s", statusEffect.getName(), playerData.playername));
+//        }
+    }
+
+    @SubCommand(desc = "Gives a effect to a player", usage = "<player> <time> <effectId>")
+    public void giveId(ICommandSender sender, String[] args) throws CommandException {
+//        String playername = args[0];
+//        int time = Integer.parseInt(args[1]);
+//
+//        List<PlayerData> data = PlayerDataController.Instance.getPlayersData(sender, playername);
+//        if (data.isEmpty()) {
+//            sendError(sender, "Unknown player: " + playername);
+//            return;
+//        }
+//
+//        for (PlayerData playerdata : data) {
+//            int statusEffectId = Integer.parseInt(args[2]);
+//            DBCEffectController.getInstance().applyEffect(playerdata.player, statusEffectId, time);
+//            sendResult(sender, String.format("Effect %d given to %s", statusEffectId, playerdata.playername));
+//        }
+    }
+
+    @SubCommand(desc = "Removes a effect from a player", usage = "<player> <effectId>")
+    public void removeId(ICommandSender sender, String[] args) throws CommandException {
+//        String playername = args[0];
+//        List<PlayerData> data = PlayerDataController.Instance.getPlayersData(sender, playername);
+//        if (data.isEmpty()) {
+//            sendError(sender, "Unknown player: " + playername);
+//            return;
+//        }
+//
+//        for (PlayerData playerData : data) {
+//            int statusEffectId = Integer.parseInt(args[1]);
+//            DBCEffectController.getInstance().removeEffect(playerData.player, statusEffectId, DBCPlayerEvent.EffectEvent.ExpirationType.REMOVED);
+//            sendResult(sender, String.format("Effect %d removed from %s", statusEffectId, playerData.playername));
+//        }
+    }
+}
diff --git a/src/main/java/kamkeel/command/FactionCommand.java b/src/main/java/kamkeel/npcs/command/FactionCommand.java
similarity index 96%
rename from src/main/java/kamkeel/command/FactionCommand.java
rename to src/main/java/kamkeel/npcs/command/FactionCommand.java
index c3874c325..f5de2f3b5 100644
--- a/src/main/java/kamkeel/command/FactionCommand.java
+++ b/src/main/java/kamkeel/npcs/command/FactionCommand.java
@@ -1,6 +1,5 @@
-package kamkeel.command;
+package kamkeel.npcs.command;
 
-import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
 import noppes.npcs.controllers.FactionController;
@@ -153,7 +152,7 @@ public class FactionCommand extends CommandKamkeelBase {
     @Override
 	public List addTabCompletionOptions(ICommandSender par1, String[] args) {
 		if(args.length == 3){
-			return CommandBase.getListOfStringsMatchingLastWord(args, new String[]{"add", "subtract", "set", "reset", "drop", "create"});
+			return getListOfStringsMatchingLastWord(args, new String[]{"add", "subtract", "set", "reset", "drop", "create"});
 		}
     	return null;
     }
diff --git a/src/main/java/kamkeel/command/HelpCommand.java b/src/main/java/kamkeel/npcs/command/HelpCommand.java
similarity index 98%
rename from src/main/java/kamkeel/command/HelpCommand.java
rename to src/main/java/kamkeel/npcs/command/HelpCommand.java
index 67b7d092a..f5e0828da 100644
--- a/src/main/java/kamkeel/command/HelpCommand.java
+++ b/src/main/java/kamkeel/npcs/command/HelpCommand.java
@@ -1,4 +1,4 @@
-package kamkeel.command;
+package kamkeel.npcs.command;
 
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
diff --git a/src/main/java/kamkeel/command/NpcCommand.java b/src/main/java/kamkeel/npcs/command/NpcCommand.java
similarity index 95%
rename from src/main/java/kamkeel/command/NpcCommand.java
rename to src/main/java/kamkeel/npcs/command/NpcCommand.java
index 0a19dda0d..fe775928c 100644
--- a/src/main/java/kamkeel/command/NpcCommand.java
+++ b/src/main/java/kamkeel/npcs/command/NpcCommand.java
@@ -1,4 +1,4 @@
-package kamkeel.command;
+package kamkeel.npcs.command;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
@@ -93,7 +93,7 @@ public class NpcCommand extends CommandKamkeelBase {
 			posZ = CommandBase.func_110666_a(sender, selectedNpc.posZ, args[2]);
 		}
 
-		selectedNpc.ai.startPos = new int[]{MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ)};
+		selectedNpc.ais.startPos = new int[]{MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ)};
 		sendResult(sender, String.format("Set NPC \u00A7e%s\u00A77 Home to \u00A7b[%.1f] [%.1f] [%.1f]\u00A77", selectedNpc.display.name, posX, posY, posZ));
 	}
 
@@ -199,7 +199,7 @@ public class NpcCommand extends CommandKamkeelBase {
 		if(args.length > 0)
 			npc.display.name = args[0];
 		npc.setPositionAndRotation(player.posX, player.posY, player.posZ, player.cameraYaw, player.cameraPitch);
-		npc.ai.startPos = new int[]{MathHelper.floor_double(player.posX),MathHelper.floor_double(player.posY),MathHelper.floor_double(player.posZ)};
+		npc.ais.startPos = new int[]{MathHelper.floor_double(player.posX),MathHelper.floor_double(player.posY),MathHelper.floor_double(player.posZ)};
 		pw.spawnEntityInWorld(npc);
 		npc.setHealth(npc.getMaxHealth());
 		NoppesUtilServer.sendOpenGui(player, EnumGuiType.MainMenuDisplay, npc);
diff --git a/src/main/java/kamkeel/command/OverlayCommand.java b/src/main/java/kamkeel/npcs/command/OverlayCommand.java
similarity index 99%
rename from src/main/java/kamkeel/command/OverlayCommand.java
rename to src/main/java/kamkeel/npcs/command/OverlayCommand.java
index 68c8f68c2..e740bc5e0 100644
--- a/src/main/java/kamkeel/command/OverlayCommand.java
+++ b/src/main/java/kamkeel/npcs/command/OverlayCommand.java
@@ -1,4 +1,4 @@
-package kamkeel.command;
+package kamkeel.npcs.command;
 
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
diff --git a/src/main/java/kamkeel/command/QuestCategoryCommand.java b/src/main/java/kamkeel/npcs/command/QuestCategoryCommand.java
similarity index 93%
rename from src/main/java/kamkeel/command/QuestCategoryCommand.java
rename to src/main/java/kamkeel/npcs/command/QuestCategoryCommand.java
index 2e9852a31..9e3e238fd 100644
--- a/src/main/java/kamkeel/command/QuestCategoryCommand.java
+++ b/src/main/java/kamkeel/npcs/command/QuestCategoryCommand.java
@@ -1,10 +1,10 @@
-package kamkeel.command;
+package kamkeel.npcs.command;
 
+import kamkeel.npcs.network.packets.data.AchievementPacket;
+import kamkeel.npcs.network.packets.data.ChatAlertPacket;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayerMP;
-import noppes.npcs.Server;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.constants.EnumQuestRepeat;
 import noppes.npcs.controllers.PlayerDataController;
 import noppes.npcs.controllers.QuestController;
@@ -93,8 +93,8 @@ public class QuestCategoryCommand extends CommandKamkeelBase {
                     playerdata.questData.finishedQuests.put(quest.id, sender.getEntityWorld().getTotalWorldTime());
 
                 if(playerdata.player != null){
-                    Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.MESSAGE, "quest.completed", quest.title);
-                    Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.CHAT, "quest.completed", ": ", quest.title);
+                    AchievementPacket.sendAchievement((EntityPlayerMP) playerdata.player, false, "quest.completed", quest.title);
+                    ChatAlertPacket.sendChatAlert((EntityPlayerMP) playerdata.player, "quest.completed", ": ", quest.title);
                 }
                 count++;
             }
@@ -185,8 +185,8 @@ public class QuestCategoryCommand extends CommandKamkeelBase {
                     count++;
 
                     if(playerdata.player != null && questData.sendAlerts){
-                        Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.MESSAGE, "quest.newquest", quest.title);
-                        Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.CHAT, "quest.newquest", ": ", quest.title);
+                        AchievementPacket.sendAchievement((EntityPlayerMP) playerdata.player, false, "quest.newquest", quest.title);
+                        ChatAlertPacket.sendChatAlert((EntityPlayerMP) playerdata.player, "quest.newquest", ": ", quest.title);
                     }
                 }
             }
diff --git a/src/main/java/kamkeel/command/QuestCommand.java b/src/main/java/kamkeel/npcs/command/QuestCommand.java
similarity index 94%
rename from src/main/java/kamkeel/command/QuestCommand.java
rename to src/main/java/kamkeel/npcs/command/QuestCommand.java
index 887b5e47b..7ac9b1fcd 100644
--- a/src/main/java/kamkeel/command/QuestCommand.java
+++ b/src/main/java/kamkeel/npcs/command/QuestCommand.java
@@ -1,19 +1,17 @@
-package kamkeel.command;
+package kamkeel.npcs.command;
 
-import net.minecraft.command.CommandBase;
+import kamkeel.npcs.controllers.SyncController;
+import kamkeel.npcs.network.packets.data.AchievementPacket;
+import kamkeel.npcs.network.packets.data.ChatAlertPacket;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.server.MinecraftServer;
-import noppes.npcs.Server;
 import noppes.npcs.api.handler.data.IQuestObjective;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.constants.EnumQuestCompletion;
 import noppes.npcs.constants.EnumQuestRepeat;
 import noppes.npcs.controllers.PlayerDataController;
 import noppes.npcs.controllers.QuestController;
-import noppes.npcs.controllers.SyncController;
 import noppes.npcs.controllers.data.Party;
 import noppes.npcs.controllers.data.PlayerData;
 import noppes.npcs.controllers.data.Quest;
@@ -67,8 +65,8 @@ public class QuestCommand extends CommandKamkeelBase {
 	        playerdata.questData.activeQuests.put(questid, questdata);
             playerdata.save();
             if(playerdata.player != null && questdata.sendAlerts){
-                Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.MESSAGE, "quest.newquest", quest.title);
-                Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.CHAT, "quest.newquest", ": ", quest.title);
+                AchievementPacket.sendAchievement((EntityPlayerMP) playerdata.player, false, "quest.newquest", quest.title);
+                ChatAlertPacket.sendChatAlert((EntityPlayerMP) playerdata.player, "quest.newquest", ": ", quest.title);
             }
             playerdata.updateClient = true;
             sendResult(sender, String.format("Started Quest \u00A7e%d\u00A77 for Player '\u00A7b%s\u00A77'", questid, playerdata.playername));
@@ -113,8 +111,8 @@ public class QuestCommand extends CommandKamkeelBase {
 
             playerdata.save();
             if(playerdata.player != null){
-                Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.MESSAGE, "quest.completed", quest.title);
-                Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.CHAT, "quest.completed", ": ", quest.title);
+                AchievementPacket.sendAchievement((EntityPlayerMP) playerdata.player, false, "quest.completed", quest.title);
+                ChatAlertPacket.sendChatAlert((EntityPlayerMP) playerdata.player, "quest.completed", ": ", quest.title);
             }
             playerdata.updateClient = true;
             sendResult(sender, String.format("Finished Quest \u00A7e%d\u00A77 for Player '\u00A7b%s\u00A77'", questid, playerdata.playername));
@@ -192,7 +190,7 @@ public class QuestCommand extends CommandKamkeelBase {
         usage = "<player> <quest> [objective] [value]"
     )
     public void objective(ICommandSender sender, String[] args) throws CommandException {
-        EntityPlayer player = CommandBase.getPlayer(sender, args[0]);
+        EntityPlayer player = getPlayer(sender, args[0]);
         int questid;
         try {
             questid = Integer.parseInt(args[1]);
diff --git a/src/main/java/kamkeel/command/ScriptCommand.java b/src/main/java/kamkeel/npcs/command/ScriptCommand.java
similarity index 97%
rename from src/main/java/kamkeel/command/ScriptCommand.java
rename to src/main/java/kamkeel/npcs/command/ScriptCommand.java
index 5edbfb904..bf62cc3fb 100644
--- a/src/main/java/kamkeel/command/ScriptCommand.java
+++ b/src/main/java/kamkeel/npcs/command/ScriptCommand.java
@@ -1,4 +1,4 @@
-package kamkeel.command;
+package kamkeel.npcs.command;
 
 import net.minecraft.command.ICommandSender;
 import noppes.npcs.controllers.ScriptController;
diff --git a/src/main/java/kamkeel/command/SlayCommand.java b/src/main/java/kamkeel/npcs/command/SlayCommand.java
similarity index 95%
rename from src/main/java/kamkeel/command/SlayCommand.java
rename to src/main/java/kamkeel/npcs/command/SlayCommand.java
index c4ebed36f..60af6d6cf 100644
--- a/src/main/java/kamkeel/command/SlayCommand.java
+++ b/src/main/java/kamkeel/npcs/command/SlayCommand.java
@@ -1,6 +1,5 @@
-package kamkeel.command;
+package kamkeel.npcs.command;
 
-import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.Entity;
@@ -134,6 +133,6 @@ public class SlayCommand extends CommandKamkeelBase {
 
 	@Override
     public List addTabCompletionOptions(ICommandSender sender, String[] args){
-		return CommandBase.getListOfStringsMatchingLastWord(args, SlayMap.keySet().toArray(new String[SlayMap.size()]));
+		return getListOfStringsMatchingLastWord(args, SlayMap.keySet().toArray(new String[SlayMap.size()]));
 	}
 }
diff --git a/src/main/java/kamkeel/npcs/command/profile/CommandHelpProfile.java b/src/main/java/kamkeel/npcs/command/profile/CommandHelpProfile.java
new file mode 100644
index 000000000..672e7886c
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/command/profile/CommandHelpProfile.java
@@ -0,0 +1,70 @@
+package kamkeel.npcs.command.profile;
+
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.util.ChatComponentTranslation;
+
+import java.lang.reflect.Method;
+import java.util.Map.Entry;
+
+public class CommandHelpProfile extends CommandProfileBase {
+	private CommandProfile parent;
+
+	public CommandHelpProfile(CommandProfile parent){
+		this.parent = parent;
+	}
+
+	@Override
+	public String getCommandName() {
+		return "help";
+	}
+
+	@Override
+	public String getDescription() {
+		return "help [command]";
+	}
+
+
+	@Override
+	public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+		if(args.length == 0){
+			sendMessage(sender, "\u00A78------ \u00A7aProfile Commands \u00A78------");
+			for(Entry<String, CommandProfileBase> entry : parent.map.entrySet()){
+				sendMessage(sender, "\u00A77> " + "\u00A7e" + entry.getKey() + "\u00A78: \u00A77" + entry.getValue().getCommandUsage(sender));
+			}
+			return;
+		}
+
+        CommandProfileBase command = parent.getCommand(args);
+		if(command == null){
+			sendError(sender, "Unknown command " + args[0]);
+			return;
+		}
+
+		if(command.subcommands.isEmpty()){
+			sender.addChatMessage(new ChatComponentTranslation(command.getCommandUsage(sender)));
+			return;
+		}
+
+		Method m = null;
+		if(args.length > 1){
+			m = command.subcommands.get(args[1].toLowerCase());
+		}
+		if(m == null){
+			sendMessage(sender, "\u00A78------ \u00A7a" + command.getCommandName().toUpperCase() + " SubCommands \u00A78------");
+			sendMessage(sender, "\u00A77Usage: \u00A76" + command.getUsage());
+			for(Entry<String, Method> entry : command.subcommands.entrySet()){
+				sender.addChatMessage(new ChatComponentTranslation("\u00A77> " + "\u00A7e" + entry.getKey() + "\u00A78: \u00A77" + entry.getValue().getAnnotation(SubCommand.class).desc()));
+			}
+			sender.addChatMessage(new ChatComponentTranslation("\u00A78Permission:\u00A77 " + CommandProfile.getCommandPermission(command.getCommandName())));
+		}
+		else{
+			sendMessage(sender, "\u00A78------ \u00A7b" + command.getCommandName().toUpperCase() + "." + args[1].toUpperCase() + " Command \u00A78------");
+			SubCommand sc = m.getAnnotation(SubCommand.class);
+			sender.addChatMessage(new ChatComponentTranslation("\u00A77" + sc.desc()));
+			if(!sc.usage().isEmpty())
+				sender.addChatMessage(new ChatComponentTranslation("\u00A77Usage: \u00A76" + sc.usage()));
+			sender.addChatMessage(new ChatComponentTranslation("\u00A78Permission:\u00A77 " + getSubCommandPermission(args[1])));
+		}
+	}
+}
diff --git a/src/main/java/kamkeel/npcs/command/profile/CommandProfile.java b/src/main/java/kamkeel/npcs/command/profile/CommandProfile.java
new file mode 100644
index 000000000..33d853d91
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/command/profile/CommandProfile.java
@@ -0,0 +1,141 @@
+package kamkeel.npcs.command.profile;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.server.MinecraftServer;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.scripted.CustomNPCsException;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class CommandProfile extends CommandBase {
+
+	public Map<String, CommandProfileBase> map = new HashMap<String, CommandProfileBase>();
+	public CommandHelpProfile help = new CommandHelpProfile(this);
+	public String[] alias = {"profile"};
+
+	public CommandProfile(){
+		registerCommand(help);
+        registerCommand(new CommandProfileChange());
+	}
+
+	public void registerCommand(CommandProfileBase command){
+		String name = command.getCommandName().toLowerCase();
+		if(map.containsKey(name))
+			throw new CustomNPCsException("Already a subcommand with the name: " + name);
+		map.put(name, command);
+	}
+
+	@Override
+	public String getCommandName() {
+		return "profile";
+	}
+
+	@Override
+	public List getCommandAliases()
+	{
+		return Arrays.asList(alias);
+	}
+
+	@Override
+	public String getCommandUsage(ICommandSender sender) {
+		return "Use as /profile subcommand";
+	}
+
+	@Override
+	public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+		if(args.length == 0){
+			help.processCommand(sender, args);
+			return;
+		}
+
+		CommandProfileBase command = getCommand(args);
+		if(command == null)
+			throw new CommandException("Unknown command " + args[0]);
+
+		args = Arrays.copyOfRange(args, 1, args.length);
+		if(command.subcommands.isEmpty() || !command.runSubCommands()){
+			if(!canSendCommand(sender, command))
+				throw new CommandException("You are not allowed to use this command: " + command);
+			command.canRun(sender, command.getUsage(), args);
+			command.processCommand(sender, args);
+			return;
+		}
+
+		if(args.length == 0){
+			help.processCommand(sender, new String[]{command.getCommandName()});
+			return;
+		}
+
+		command.processSubCommand(sender, args[0], Arrays.copyOfRange(args, 1, args.length));
+	}
+
+	@Override
+    public List addTabCompletionOptions(ICommandSender sender, String[] args){
+		if(args.length == 1)
+			return CommandBase.getListOfStringsMatchingLastWord(args, map.keySet().toArray(new String[map.size()]));
+    	CommandProfileBase command = getCommand(args);
+		if(command == null)
+			return null;
+		if(args.length == 2 && command.runSubCommands())
+			return getListOfStringsMatchingLastWord(args, command.subcommands.keySet().toArray(new String[command.subcommands.keySet().size()]));
+		String[] useArgs = command.getUsage().split(" ");
+		if(command.runSubCommands()) {
+			Method m = command.subcommands.get(args[1].toLowerCase());
+			if(m != null) {
+				useArgs = m.getAnnotation(CommandProfileBase.SubCommand.class).usage().split(" ");
+			}
+		}
+		if(args.length <= useArgs.length + 2) {
+			if(args.length - 3 >= 0){
+				String usage = useArgs[args.length - 3];
+				if(usage.equals("<player>") || usage.equals("[player]")) {
+					return CommandBase.getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames());
+				}
+			}
+		}
+		return command.addTabCompletionOptions(sender, Arrays.copyOfRange(args, 1, args.length));
+    }
+
+    public CommandProfileBase getCommand(String[] args){
+    	if(args.length == 0)
+    		return null;
+    	return map.get(args[0].toLowerCase());
+    }
+
+    @Override
+    public int getRequiredPermissionLevel(){
+        return 0;
+    }
+
+	public static String getCommandPermission(String command){
+		return "profile.kamkeel." + command.toLowerCase();
+	}
+
+	public static String getUniversalPermission(){
+		return "profile.kamkeel.*";
+	}
+
+	public static boolean canSendCommand(ICommandSender sender, CommandProfileBase command){
+		if(sender.canCommandSenderUseCommand(command.getRequiredPermissionLevel(), getUniversalPermission())){
+			return true;
+		}
+
+		if(sender.canCommandSenderUseCommand(command.getRequiredPermissionLevel(), getCommandPermission(command.getCommandName()))){
+			return true;
+		}
+
+		if(sender instanceof EntityPlayer){
+			return CustomNpcsPermissions.hasCustomPermission((EntityPlayer) sender, getCommandPermission(command.getCommandName()));
+		}
+
+		return false;
+	}
+}
+
diff --git a/src/main/java/kamkeel/npcs/command/profile/CommandProfileBase.java b/src/main/java/kamkeel/npcs/command/profile/CommandProfileBase.java
new file mode 100644
index 000000000..18c06ad4f
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/command/profile/CommandProfileBase.java
@@ -0,0 +1,148 @@
+package kamkeel.npcs.command.profile;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ChatComponentTranslation;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public abstract class CommandProfileBase extends CommandBase{
+	public Map<String, Method> subcommands = new HashMap<String, Method>();
+
+	public CommandProfileBase(){
+        for (Method m : this.getClass().getDeclaredMethods()) {
+            SubCommand sc = m.getAnnotation(SubCommand.class);
+            if (sc != null) {
+                String name = sc.name();
+                if (name.equals(""))
+                    name = m.getName();
+                subcommands.put(name.toLowerCase(), m);
+            }
+        }
+	}
+
+	@Override
+	public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+
+	}
+
+	@Override
+	public String getCommandUsage(ICommandSender sender) {
+		return getDescription();
+	}
+
+	public abstract String getDescription();
+
+	/**
+	 * @return Should return a string in the format of <arg> <arg2> <arg3> [arg4] where <> is a required parameter and [] optional
+	 */
+	public String getUsage(){
+		return "";
+	}
+
+	public boolean runSubCommands(){
+		return !subcommands.isEmpty();
+	}
+
+	protected static void sendMessage(ICommandSender sender, String message, Object... obs) {
+		sender.addChatMessage(new ChatComponentTranslation(message, obs));
+	}
+
+	protected static void sendResult(ICommandSender sender, String message, Object... obs) {
+		sender.addChatMessage(new ChatComponentTranslation("\u00A76[\u00A7eCNPC+\u00A76]\u00A77 " + message, obs));
+	}
+
+	protected static void sendError(ICommandSender sender, String message, Object... obs) {
+		sender.addChatMessage(new ChatComponentTranslation("\u00A76[\u00A7eCNPC+\u00A76]\u00A74 Error:\u00A7c " + message, obs));
+	}
+
+	@Retention(value = RetentionPolicy.RUNTIME)
+	@Target(ElementType.METHOD)
+	public @interface SubCommand {
+
+	    String name() default "";
+
+	    /**
+	     * @return Should return a string in the format of <arg> <arg2> <arg3> [arg4] where <> is a required parameter and [] optional
+	     */
+	    String usage() default "";
+
+	    String desc();
+
+		int permission() default 2;
+	}
+
+	public void processSubCommand(ICommandSender sender, String command, String[] args) throws CommandException {
+		Method m = subcommands.get(command.toLowerCase());
+		if(m == null)
+			throw new CommandException("Unknown subcommand " + command);
+
+		SubCommand sc = m.getAnnotation(SubCommand.class);
+		if(!canSendCommand(sender, sc, command))
+			throw new CommandException("You are not allowed to use this command: " + command);
+
+		canRun(sender, sc.usage(), args);
+		try {
+			m.invoke(this, sender, args);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void canRun(ICommandSender sender, String usage, String[] args) throws CommandException{
+		String[] np = usage.split(" ");
+		List<String> required = new ArrayList<String>();
+		for(int i = 0; i < np.length; i++){
+			String command = np[i];
+			if(command.startsWith("<")){
+				required.add(command);
+			}
+			if(command.equals("<player>") && args.length > i){
+				CommandBase.getPlayer(sender, args[i]); //throws PlayerNotFoundException if no player is found
+			}
+
+		}
+		if (args.length < required.size()) {
+			throw new CommandException("Missing parameter: " + required.get(args.length));
+		}
+	}
+
+    public int getRequiredPermissionLevel(){
+        return 2;
+    }
+
+	public String getSubCommandPermission(String subCommand){
+		return "profile.kamkeel." + getCommandName().toLowerCase() + "." + subCommand.toLowerCase();
+	}
+
+	public String getSubUniversalPermission(){
+		return "profile.kamkeel." + getCommandName().toLowerCase() + "*";
+	}
+
+	public boolean canSendCommand(ICommandSender sender, SubCommand command, String subCommand){
+		if(sender.canCommandSenderUseCommand(command.permission(), getSubUniversalPermission())){
+			return true;
+		}
+
+		if(sender.canCommandSenderUseCommand(command.permission(), getSubCommandPermission(subCommand))){
+			return true;
+		}
+
+		if(sender instanceof EntityPlayer){
+			return CustomNpcsPermissions.hasCustomPermission((EntityPlayer) sender, getSubCommandPermission(subCommand));
+		}
+
+		return false;
+	}
+}
diff --git a/src/main/java/kamkeel/npcs/command/profile/CommandProfileChange.java b/src/main/java/kamkeel/npcs/command/profile/CommandProfileChange.java
new file mode 100644
index 000000000..1e38da197
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/command/profile/CommandProfileChange.java
@@ -0,0 +1,61 @@
+package kamkeel.npcs.command.profile;
+
+import kamkeel.npcs.controllers.ProfileController;
+import kamkeel.npcs.controllers.data.Profile;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+
+public class CommandProfileChange extends CommandProfileBase {
+
+
+	@Override
+	public String getCommandName() {
+		return "change";
+	}
+
+	@Override
+	public String getDescription() {
+		return "change profiles";
+	}
+
+	@Override
+	public String getUsage() {
+		return "<number>";
+	}
+
+	@Override
+	public boolean runSubCommands(){
+		return false;
+	}
+
+	@Override
+	public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+        if(!(sender instanceof EntityPlayer)){
+            sendError(sender, "This command can only be sent by a player");
+            return;
+        }
+
+        int slotID;
+        try {
+            slotID = Integer.parseInt(args[0]);
+        } catch (NumberFormatException ex) {
+            sendError(sender, "Slot ID must be a number: " + args[1]);
+            return;
+        }
+
+        // TODO: Check if the player has permission to switch to this slot
+        EntityPlayerMP player = (EntityPlayerMP) sender;
+
+        Profile profile = ProfileController.activeProfiles.get(player.getUniqueID());
+        if(profile == null){
+            sendError(sender, "Could not find a valid profile file");
+            return;
+        }
+
+        ProfileController.changePlayerSlot(player, slotID);
+        // TODO: Add Cooldown to successful operation
+        sendResult(sender, String.format("Switched to Slot \u00A7b%d\u00A77", slotID));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/controllers/ProfileController.java b/src/main/java/kamkeel/npcs/controllers/ProfileController.java
new file mode 100644
index 000000000..6cde49199
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/controllers/ProfileController.java
@@ -0,0 +1,176 @@
+package kamkeel.npcs.controllers;
+
+import kamkeel.npcs.controllers.data.IProfileData;
+import kamkeel.npcs.controllers.data.Profile;
+import kamkeel.npcs.controllers.data.Slot;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.CompressedStreamTools;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcs;
+import noppes.npcs.LogWriter;
+import noppes.npcs.util.CustomNPCsThreader;
+import noppes.npcs.util.NBTJsonUtil;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.HashMap;
+import java.util.UUID;
+
+public class ProfileController {
+
+    public static HashMap<String, IProfileData> profileTypes;
+    public static HashMap<UUID, Profile> activeProfiles;
+
+    public static String profile_directory = "profiles";
+
+    public ProfileController(){
+        profileTypes = new HashMap<>();
+        activeProfiles = new HashMap<>();
+    }
+
+    /**
+     * Register during ServerStartEvent()
+     *
+     * @param type - IProfile Type to always Save/Load
+     * @return true/false if profile was successfully added
+     */
+    public static boolean registerProfileType(IProfileData type){
+        if(profileTypes.containsKey(type.getTagName()))
+            return false;
+
+        profileTypes.put(type.getTagName(), type);
+        return true;
+    }
+
+    public static File getProfileDir(){
+        try{
+            File file = new File(CustomNpcs.getWorldSaveDirectory(), profile_directory);
+            if(!file.exists())
+                file.mkdir();
+            return file;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static synchronized void login(EntityPlayer player){
+        if(player == null)
+            return;
+
+        Profile profile;
+        if(activeProfiles.containsKey(player.getUniqueID())){
+            profile = activeProfiles.get(player.getUniqueID());
+            profile.player = player;
+        } else {
+            NBTTagCompound profileCompound = load(player);
+            profile = new Profile(player, profileCompound);
+            activeProfiles.put(player.getUniqueID(), profile);
+        }
+    }
+
+    public static synchronized NBTTagCompound load(EntityPlayer player) {
+        File saveDir = getProfileDir();
+        String filename = player.getUniqueID().toString();
+        filename += ".dat";
+        try {
+            File file = new File(saveDir, filename);
+            if(file.exists()){
+                return NBTJsonUtil.loadNBTData(file);
+            }
+        } catch (Exception e) {
+            LogWriter.error("Error loading profile file: " + filename, e);
+        }
+        return new NBTTagCompound();
+    }
+
+    public static synchronized void save(EntityPlayer player, Profile profile) {
+        CustomNPCsThreader.customNPCThread.execute(() -> {
+            final NBTTagCompound compound = profile.writeToNBT();
+            final String filename = player.getUniqueID() + ".dat";
+            try {
+                File saveDir = getProfileDir();
+                File file = new File(saveDir, filename + "_new");
+                File file1 = new File(saveDir, filename);
+                CompressedStreamTools.writeCompressed(compound, new FileOutputStream(file));
+                if(file1.exists()){
+                    file1.delete();
+                }
+                file.renameTo(file1);
+            } catch (Exception e) {
+                LogWriter.except(e);
+            }
+        });
+    }
+
+    public static void changeSlot(EntityPlayer player, int slotNumber){
+        if(!activeProfiles.containsKey(player.getUniqueID()))
+            return;
+
+        Profile profile = activeProfiles.get(player.getUniqueID());
+        if(profile.currentID == slotNumber)
+            return;
+
+        // Saves Current Slot Data
+        saveSlotData(player);
+
+        // Sets Player to New Slot
+        changePlayerSlot(player, slotNumber);
+
+        // Save Slot File
+        save(player, profile);
+    }
+
+    public static void saveSlotData(EntityPlayer player){
+        if(!activeProfiles.containsKey(player.getUniqueID()))
+            return;
+
+        NBTTagCompound dataCompound;
+        Slot slot;
+
+        Profile profile = activeProfiles.get(player.getUniqueID());
+        if(!profile.slots.isEmpty() && profile.slots.containsKey(profile.currentID)){
+            slot = profile.slots.get(profile.currentID);
+            dataCompound = (NBTTagCompound) slot.getCompound().copy();
+        } else {
+            slot = new Slot(profile.currentID, "Slot " + profile.currentID);
+            dataCompound = new NBTTagCompound();
+            slot.setCompound(dataCompound);
+        }
+
+        for(IProfileData profileData : profileTypes.values()){
+            NBTTagCompound cloned = (NBTTagCompound) profileData.getCurrentNBT(player).copy();
+            dataCompound.setTag(profileData.getTagName(), cloned);
+        }
+
+        slot.setCompound(dataCompound);
+    }
+
+    public static void changePlayerSlot(EntityPlayer player, int id){
+        if(!activeProfiles.containsKey(player.getUniqueID()))
+            return;
+
+        NBTTagCompound slotCompound;
+        Slot slot;
+        Profile profile = activeProfiles.get(player.getUniqueID());
+        if(!profile.slots.isEmpty() && profile.slots.containsKey(id)){
+            slot = profile.slots.get(id);
+            slotCompound = (NBTTagCompound) slot.getCompound().copy();
+        } else {
+            slot = new Slot(id, "Slot " + id);
+            slotCompound = new NBTTagCompound();
+            slot.setCompound(slotCompound);
+        }
+
+        slot.setLastLoaded(System.currentTimeMillis());
+        profile.slots.put(id, slot);
+
+        for(IProfileData profileData : profileTypes.values()){
+            profileData.setNBT(player, slotCompound.getCompoundTag(profileData.getTagName()));
+            profileData.save(player);
+        }
+
+        profile.currentID = id;
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/controllers/SyncController.java b/src/main/java/kamkeel/npcs/controllers/SyncController.java
new file mode 100644
index 000000000..faa8329fa
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/controllers/SyncController.java
@@ -0,0 +1,582 @@
+package kamkeel.npcs.controllers;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import kamkeel.npcs.addon.DBCAddon;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.packets.data.large.SyncEffectPacket;
+import kamkeel.npcs.network.packets.data.large.SyncPacket;
+import kamkeel.npcs.network.enums.EnumSyncAction;
+import kamkeel.npcs.network.enums.EnumSyncType;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import noppes.npcs.client.ClientCacheHandler;
+import noppes.npcs.controllers.*;
+import noppes.npcs.controllers.data.*;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class SyncController {
+
+    public static void syncPlayer(EntityPlayerMP player){
+        // 1) Factions
+        PacketHandler.Instance.sendToPlayer(new SyncPacket(
+            EnumSyncType.FACTION,
+            EnumSyncAction.RELOAD,
+            -1,
+            factionsNBT()
+        ), player);
+
+        // 2) Dialog Categories
+        PacketHandler.Instance.sendToPlayer(new SyncPacket(
+            EnumSyncType.DIALOG_CATEGORY,
+            EnumSyncAction.RELOAD,
+            -1,
+            dialogCategoriesNBT()
+        ), player);
+
+        // 3) Quest Categories
+        PacketHandler.Instance.sendToPlayer(new SyncPacket(
+            EnumSyncType.QUEST_CATEGORY,
+            EnumSyncAction.RELOAD,
+            -1,
+            questCategoriesNBT()
+        ), player);
+
+        // 4) Workbench Recipes
+        PacketHandler.Instance.sendToPlayer(new SyncPacket(
+            EnumSyncType.WORKBENCH_RECIPES,
+            EnumSyncAction.RELOAD,
+            -1,
+            workbenchNBT()
+        ), player);
+
+        // 5) Carpentry Recipes
+        PacketHandler.Instance.sendToPlayer(new SyncPacket(
+            EnumSyncType.CARPENTRY_RECIPES,
+            EnumSyncAction.RELOAD,
+            -1,
+            carpentryNBT()
+        ), player);
+
+        PacketHandler.Instance.sendToPlayer(new SyncPacket(
+            EnumSyncType.ANVIL_RECIPES,
+            EnumSyncAction.RELOAD,
+            -1,
+            anvilNBT()
+        ), player);
+
+        PacketHandler.Instance.sendToPlayer(new SyncPacket(
+            EnumSyncType.CUSTOM_EFFECTS,
+            EnumSyncAction.RELOAD,
+            -1,
+            customEffectsNBT()
+        ), player);
+
+        DBCAddon.instance.syncPlayer(player);
+        syncPlayerData(player, false);
+    }
+
+    public static NBTTagCompound workbenchNBT(){
+        RecipeController controller = RecipeController.Instance;
+        NBTTagList list = new NBTTagList();
+        NBTTagCompound compound = new NBTTagCompound();
+        for(RecipeCarpentry recipe : controller.globalRecipes.values()){
+            list.appendTag(recipe.writeNBT());
+        }
+        compound.setTag("recipes", list);
+        return compound;
+    }
+
+    public static NBTTagCompound carpentryNBT(){
+        RecipeController controller = RecipeController.Instance;
+        NBTTagList list = new NBTTagList();
+        NBTTagCompound compound = new NBTTagCompound();
+        for(RecipeCarpentry recipe : controller.carpentryRecipes.values()){
+            list.appendTag(recipe.writeNBT());
+        }
+        compound.setTag("recipes", list);
+        return compound;
+    }
+
+    public static NBTTagCompound anvilNBT(){
+        RecipeController controller = RecipeController.Instance;
+        NBTTagList list = new NBTTagList();
+        NBTTagCompound compound = new NBTTagCompound();
+        for(RecipeAnvil recipe : controller.anvilRecipes.values()){
+            list.appendTag(recipe.writeNBT());
+        }
+        compound.setTag("recipes", list);
+        return compound;
+    }
+
+    public static NBTTagCompound factionsNBT(){
+        NBTTagList list = new NBTTagList();
+        NBTTagCompound compound = new NBTTagCompound();
+        for(Faction faction : FactionController.getInstance().factions.values()){
+            NBTTagCompound factioNBT = new NBTTagCompound();
+            faction.writeNBT(factioNBT);
+            list.appendTag(factioNBT);
+        }
+        compound.setTag("Factions", list);
+        return compound;
+    }
+
+    public static NBTTagCompound dialogCategoriesNBT(){
+        NBTTagCompound compound = new NBTTagCompound();
+        NBTTagList categoryList = new NBTTagList();
+        for(DialogCategory category : DialogController.Instance.categories.values()){
+            NBTTagCompound questCompound = new NBTTagCompound();
+            NBTTagList dialogList = new NBTTagList();
+            for(int dialogID : category.dialogs.keySet()){
+                Dialog quest = category.dialogs.get(dialogID);
+                dialogList.appendTag(quest.writeToNBT(new NBTTagCompound()));
+            }
+            questCompound.setTag("Data", dialogList);
+            questCompound.setTag("CatNBT", category.writeSmallNBT(new NBTTagCompound()));
+            categoryList.appendTag(questCompound);
+        }
+        compound.setTag("DialogCategories", categoryList);
+        return compound;
+    }
+
+    public static NBTTagCompound questCategoriesNBT(){
+        NBTTagCompound compound = new NBTTagCompound();
+        NBTTagList categoryList = new NBTTagList();
+        for(QuestCategory category : QuestController.Instance.categories.values()){
+            NBTTagCompound questCompound = new NBTTagCompound();;
+            NBTTagList questList = new NBTTagList();
+            for(int questID : category.quests.keySet()){
+                Quest quest = category.quests.get(questID);
+                questList.appendTag(quest.writeToNBT(new NBTTagCompound()));
+            }
+            questCompound.setTag("Data", questList);
+            questCompound.setTag("CatNBT", category.writeSmallNBT(new NBTTagCompound()));
+            categoryList.appendTag(questCompound);
+        }
+        compound.setTag("QuestCategories", categoryList);
+        return compound;
+    }
+
+    public static NBTTagCompound customEffectsNBT(){
+        NBTTagList list = new NBTTagList();
+        NBTTagCompound compound = new NBTTagCompound();
+        for (CustomEffect effect : CustomEffectController.getInstance().customEffects.values()) {
+            list.appendTag(effect.writeToNBT(false));
+        }
+        compound.setTag("Data", list);
+        return compound;
+    }
+
+    public static void syncPlayerData(EntityPlayerMP player, boolean update){
+        PlayerData data = PlayerData.get(player);
+        if(data != null){
+            if(update){
+                PacketHandler.Instance.sendToPlayer(new SyncPacket(
+                        EnumSyncType.PLAYERDATA,
+                        EnumSyncAction.UPDATE,
+                        -1,
+                        data.getSyncNBT())
+                    , player);
+            } else {
+                PacketHandler.Instance.sendToPlayer(new SyncPacket(
+                    EnumSyncType.PLAYERDATA,
+                    EnumSyncAction.RELOAD,
+                    -1,
+                    data.getSyncNBTFull()), player);
+            }
+        }
+    }
+
+    public static void syncRemove(EnumSyncType enumSyncType, int id){
+        PacketHandler.Instance.sendToAll(new SyncPacket(
+            enumSyncType,
+            EnumSyncAction.REMOVE,
+            id,
+            new NBTTagCompound()
+        ));
+    }
+
+    public static void syncAllDialogs() {
+        PacketHandler.Instance.sendToAll(new SyncPacket(
+            EnumSyncType.DIALOG_CATEGORY,
+            EnumSyncAction.RELOAD,
+            -1,
+            dialogCategoriesNBT()
+        ));
+    }
+
+    public static void syncAllQuests() {
+        PacketHandler.Instance.sendToAll(new SyncPacket(
+            EnumSyncType.QUEST_CATEGORY,
+            EnumSyncAction.RELOAD,
+            -1,
+            questCategoriesNBT()
+        ));
+    }
+
+    public static void syncAllWorkbenchRecipes() {
+        PacketHandler.Instance.sendToAll(new SyncPacket(
+            EnumSyncType.WORKBENCH_RECIPES,
+            EnumSyncAction.RELOAD,
+            -1,
+            workbenchNBT()
+        ));
+    }
+
+    public static void syncAllCarpentryRecipes() {
+        PacketHandler.Instance.sendToAll(new SyncPacket(
+            EnumSyncType.CARPENTRY_RECIPES,
+            EnumSyncAction.RELOAD,
+            -1,
+            carpentryNBT()
+        ));
+    }
+
+    public static void syncAllAnvilRecipes() {
+        PacketHandler.Instance.sendToAll(new SyncPacket(
+            EnumSyncType.ANVIL_RECIPES,
+            EnumSyncAction.RELOAD,
+            -1,
+            anvilNBT()
+        ));
+    }
+
+    public static void syncAllCustomEffects() {
+        PacketHandler.Instance.sendToAll(new SyncPacket(
+            EnumSyncType.CUSTOM_EFFECTS,
+            EnumSyncAction.RELOAD,
+            -1,
+            customEffectsNBT()
+        ));
+    }
+
+    @SideOnly(Side.CLIENT)
+    public static void clientSync(EnumSyncType enumSyncType, NBTTagCompound fullCompound) {
+        switch (enumSyncType){
+            case FACTION: {
+                NBTTagList list = fullCompound.getTagList("Factions", 10);
+                for (int i = 0; i < list.tagCount(); i++) {
+                    Faction faction = new Faction();
+                    faction.readNBT(list.getCompoundTagAt(i));
+                    FactionController.getInstance().factionsSync.put(faction.id, faction);
+                }
+                FactionController.getInstance().factions = FactionController.getInstance().factionsSync;
+                FactionController.getInstance().factionsSync = new HashMap<Integer, Faction>();
+                break;
+            }
+            case DIALOG_CATEGORY: {
+                if(!fullCompound.hasNoTags()){
+                    NBTTagList categories = fullCompound.getTagList("DialogCategories", 10);
+                    for(int j = 0; j < fullCompound.getTagList("DialogCategories", 10).tagCount(); j++) {
+                        NBTTagCompound categoryCompound = categories.getCompoundTagAt(j);
+                        if(categoryCompound.hasNoTags())
+                            continue;
+
+                        DialogCategory category = new DialogCategory();
+                        category.readSmallNBT(categoryCompound.getCompoundTag("CatNBT"));
+                        NBTTagList dialogList = categoryCompound.getTagList("Data", 10);
+                        if(DialogController.Instance.categoriesSync.containsKey(category.id)){
+                            category = DialogController.Instance.categoriesSync.get(category.id);
+                            category.readSmallNBT(categoryCompound.getCompoundTag("CatNBT"));
+                        }
+                        for(int i = 0; i < dialogList.tagCount(); i++)
+                        {
+                            Dialog dialog = new Dialog();
+                            dialog.readNBT(dialogList.getCompoundTagAt(i));
+                            dialog.category = category;
+                            category.dialogs.put(dialog.id, dialog);
+                        }
+                        DialogController.Instance.categoriesSync.put(category.id, category);
+                    }
+                }
+
+                HashMap<Integer, Dialog> dialogs = new HashMap<Integer, Dialog>();
+                for(DialogCategory category : DialogController.Instance.categoriesSync.values()){
+                    for(Dialog dialog : category.dialogs.values()){
+                        dialogs.put(dialog.id, dialog);
+                    }
+                }
+
+                DialogController.Instance.categories = DialogController.Instance.categoriesSync;
+                DialogController.Instance.dialogs = dialogs;
+                DialogController.Instance.categoriesSync = new HashMap<Integer, DialogCategory>();
+                break;
+            }
+            case QUEST_CATEGORY: {
+                if(!fullCompound.hasNoTags()){
+                    NBTTagList categories = fullCompound.getTagList("QuestCategories", 10);
+                    for(int j = 0; j < fullCompound.getTagList("QuestCategories", 10).tagCount(); j++) {
+                        NBTTagCompound categoryCompound = categories.getCompoundTagAt(j);
+                        if(categoryCompound.hasNoTags())
+                            continue;
+
+                        QuestCategory category = new QuestCategory();
+                        category.readSmallNBT(categoryCompound.getCompoundTag("CatNBT"));
+                        NBTTagList questList = categoryCompound.getTagList("Data", 10);
+                        if(QuestController.Instance.categoriesSync.containsKey(category.id)){
+                            category = QuestController.Instance.categoriesSync.get(category.id);
+                            category.readSmallNBT(categoryCompound.getCompoundTag("CatNBT"));
+                        }
+                        for(int i = 0; i < questList.tagCount(); i++)
+                        {
+                            Quest quest = new Quest();
+                            quest.readNBT(questList.getCompoundTagAt(i));
+                            quest.category = category;
+                            category.quests.put(quest.id, quest);
+                        }
+                        QuestController.Instance.categoriesSync.put(category.id, category);
+                    }
+                }
+
+                HashMap<Integer,Quest> quests = new HashMap<Integer, Quest>();
+                for(QuestCategory category : QuestController.Instance.categoriesSync.values()){
+                    for(Quest quest : category.quests.values()){
+                        quests.put(quest.id, quest);
+                    }
+                }
+
+                QuestController.Instance.categories = QuestController.Instance.categoriesSync;
+                QuestController.Instance.quests = quests;
+                QuestController.Instance.categoriesSync = new HashMap<Integer, QuestCategory>();
+                break;
+            }
+            case PLAYERDATA: {
+                ClientCacheHandler.playerData.setSyncNBTFull(fullCompound);
+                break;
+            }
+            case WORKBENCH_RECIPES: {
+                NBTTagList list = fullCompound.getTagList("recipes", 10);
+                if(list == null)
+                    return;
+
+                for(int i = 0; i < list.tagCount(); i++)
+                {
+                    RecipeCarpentry recipe = RecipeCarpentry.read(list.getCompoundTagAt(i));
+                    RecipeController.syncRecipes.put(recipe.id,recipe);
+                }
+
+                RecipeController.reloadGlobalRecipes(RecipeController.syncRecipes);
+                RecipeController.syncRecipes = new HashMap<Integer, RecipeCarpentry>();
+                break;
+            }
+            case CARPENTRY_RECIPES: {
+                NBTTagList list = fullCompound.getTagList("recipes", 10);
+                if(list == null)
+                    return;
+
+                for(int i = 0; i < list.tagCount(); i++)
+                {
+                    RecipeCarpentry recipe = RecipeCarpentry.read(list.getCompoundTagAt(i));
+                    RecipeController.syncRecipes.put(recipe.id,recipe);
+                }
+
+                RecipeController.Instance.carpentryRecipes = RecipeController.syncRecipes;
+                RecipeController.syncRecipes = new HashMap<Integer, RecipeCarpentry>();
+                break;
+            }
+            case ANVIL_RECIPES: {
+                NBTTagList list = fullCompound.getTagList("recipes", 10);
+                if(list == null)
+                    return;
+
+                for(int i = 0; i < list.tagCount(); i++)
+                {
+                    RecipeAnvil recipe = RecipeAnvil.read(list.getCompoundTagAt(i));
+                    RecipeController.syncAnvilRecipes.put(recipe.id, recipe);
+                }
+
+                RecipeController.Instance.anvilRecipes = RecipeController.syncAnvilRecipes;
+                RecipeController.syncAnvilRecipes = new HashMap<Integer, RecipeAnvil>();
+                break;
+            }
+            case CUSTOM_EFFECTS: {
+                NBTTagList list = fullCompound.getTagList("Data", 10);
+                for (int i = 0; i < list.tagCount(); i++) {
+                    CustomEffect effect = new CustomEffect();
+                    effect.readFromNBT(list.getCompoundTagAt(i));
+                    ClientCacheHandler.getImageData(effect.icon);
+                    CustomEffectController.getInstance().customEffectsSync.put(effect.id, effect);
+                }
+
+                CustomEffectController.getInstance().customEffects = CustomEffectController.getInstance().customEffectsSync;
+                CustomEffectController.getInstance().customEffectsSync = new HashMap<>();
+                break;
+            }
+        }
+    }
+
+    /**
+     * Update Related Tasks
+     */
+    @SideOnly(Side.CLIENT)
+    public static void clientUpdate(EnumSyncType enumSyncType, int category_id, NBTTagCompound compound) {
+        switch (enumSyncType){
+            case FACTION: {
+                Faction faction = new Faction();
+                faction.readNBT(compound);
+                FactionController.getInstance().factions.put(faction.id, faction);
+                break;
+            }
+            case DIALOG: {
+                DialogCategory category = DialogController.Instance.categories.get(category_id);
+                Dialog dialog = new Dialog();
+                dialog.category = category;
+                dialog.readNBT(compound);
+                DialogController.Instance.dialogs.put(dialog.id, dialog);
+                category.dialogs.put(dialog.id, dialog);
+                break;
+            }
+            case QUEST: {
+                QuestCategory category = QuestController.Instance.categories.get(category_id);
+                Quest quest = new Quest();
+                quest.category = category;
+                quest.readNBT(compound);
+                QuestController.Instance.quests.put(quest.id, quest);
+                category.quests.put(quest.id, quest);
+                break;
+            }
+            case QUEST_CATEGORY: {
+                QuestCategory category = new QuestCategory();
+                category.readSmallNBT(compound.getCompoundTag("CatNBT"));
+                NBTTagList list = compound.getTagList("Data", 10);
+                if(QuestController.Instance.categoriesSync.containsKey(category.id)){
+                    category = QuestController.Instance.categoriesSync.get(category.id);
+                    category.readSmallNBT(compound.getCompoundTag("CatNBT"));
+                }
+                for(int i = 0; i < list.tagCount(); i++)
+                {
+                    Quest quest = new Quest();
+                    quest.readNBT(list.getCompoundTagAt(i));
+                    quest.category = category;
+                    category.quests.put(quest.id, quest);
+                }
+                QuestController.Instance.categories.put(category.id, category);
+                break;
+            }
+            case DIALOG_CATEGORY: {
+                DialogCategory category = new DialogCategory();
+                category.readSmallNBT(compound.getCompoundTag("CatNBT"));
+                NBTTagList list = compound.getTagList("Data", 10);
+                if(DialogController.Instance.categoriesSync.containsKey(category.id)){
+                    category = DialogController.Instance.categoriesSync.get(category.id);
+                    category.readSmallNBT(compound.getCompoundTag("CatNBT"));
+                }
+                for(int i = 0; i < list.tagCount(); i++)
+                {
+                    Dialog dialog = new Dialog();
+                    dialog.readNBT(list.getCompoundTagAt(i));
+                    dialog.category = category;
+                    category.dialogs.put(dialog.id, dialog);
+                }
+                DialogController.Instance.categories.put(category.id, category);
+                break;
+            }
+            case PLAYERDATA: {
+                ClientCacheHandler.playerData.setSyncNBT(compound);
+                break;
+            }
+            case CUSTOM_EFFECTS: {
+                CustomEffect effect = new CustomEffect();
+                effect.readFromNBT(compound);
+                ClientCacheHandler.getImageData(effect.icon);
+
+                CustomEffectController.Instance.customEffects.put(effect.id, effect);
+                break;
+            }
+        }
+    }
+
+    public static void syncUpdate(EnumSyncType type, int cat, NBTTagCompound compound) {
+        PacketHandler.Instance.sendToAll(new SyncPacket(
+            type,
+            EnumSyncAction.UPDATE,
+            cat,
+            compound
+        ));
+    }
+
+
+    public static NBTTagCompound updateQuestCat(QuestCategory questCategory) {
+        NBTTagCompound questCompound = new NBTTagCompound();
+        NBTTagList questList = new NBTTagList();
+        for(int questID : questCategory.quests.keySet()){
+            Quest quest = questCategory.quests.get(questID);
+            questList.appendTag(quest.writeToNBT(new NBTTagCompound()));
+        }
+        questCompound.setTag("Data", questList);
+        questCompound.setTag("CatNBT", questCategory.writeSmallNBT(new NBTTagCompound()));
+        return questCompound;
+    }
+
+    public static NBTTagCompound updateDialogCat(DialogCategory dialogCategory) {
+        NBTTagCompound dialogCompound = new NBTTagCompound();
+        NBTTagList dialogList = new NBTTagList();
+        for(int questID : dialogCategory.dialogs.keySet()){
+            Dialog dialog = dialogCategory.dialogs.get(questID);
+            dialogList.appendTag(dialog.writeToNBT(new NBTTagCompound()));
+        }
+        dialogCompound.setTag("Data", dialogList);
+        dialogCompound.setTag("CatNBT", dialogCategory.writeSmallNBT(new NBTTagCompound()));
+        return dialogCompound;
+    }
+
+    @SideOnly(Side.CLIENT)
+    public static void clientSyncRemove(EnumSyncType enumSyncType, int id) {
+        switch (enumSyncType){
+            case FACTION:
+                FactionController.getInstance().factions.remove(id);
+                break;
+            case DIALOG:
+                Dialog dialog = DialogController.Instance.dialogs.remove(id);
+                if(dialog != null) {
+                    dialog.category.dialogs.remove(id);
+                }
+                break;
+            case DIALOG_CATEGORY:
+                DialogCategory dialogCategory = DialogController.Instance.categories.remove(id);
+                if(dialogCategory != null) {
+                    DialogController.Instance.dialogs.keySet().removeAll(dialogCategory.dialogs.keySet());
+                }
+                break;
+            case QUEST:
+                Quest quest = QuestController.Instance.quests.remove(id);
+                if(quest != null) {
+                    quest.category.quests.remove(id);
+                }
+                break;
+            case QUEST_CATEGORY:
+                QuestCategory questCategory = QuestController.Instance.categories.remove(id);
+                if(questCategory != null) {
+                    QuestController.Instance.quests.keySet().removeAll(questCategory.quests.keySet());
+                }
+                break;
+            case MAGIC:
+                break;
+            case CUSTOM_EFFECTS:
+                CustomEffectController.Instance.customEffects.remove(id);
+                break;
+        }
+    }
+
+    public static void syncEffects(EntityPlayerMP playerMP){
+        ConcurrentHashMap<EffectKey, PlayerEffect> playerEffects = CustomEffectController.getInstance().getPlayerEffects(playerMP);
+        PlayerData playerData = PlayerData.get(playerMP);
+        playerData.effectData.setEffects(playerEffects);
+
+        NBTTagCompound compound = playerData.getPlayerEffects();
+        PacketHandler.Instance.sendToPlayer(new SyncEffectPacket(compound), playerMP);
+    }
+
+    @SideOnly(Side.CLIENT)
+    public static void clientSyncEffects(NBTTagCompound compound) {
+        PlayerData playerData = PlayerData.get(Minecraft.getMinecraft().thePlayer);
+        if(playerData != null){
+            playerData.setPlayerEffects(compound);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/controllers/data/CNPCData.java b/src/main/java/kamkeel/npcs/controllers/data/CNPCData.java
new file mode 100644
index 000000000..9b0b0dece
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/controllers/data/CNPCData.java
@@ -0,0 +1,39 @@
+package kamkeel.npcs.controllers.data;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.controllers.data.PlayerData;
+
+public class CNPCData implements IProfileData {
+
+    @Override
+    public String getTagName() {
+        return "CustomNPC+";
+    }
+
+    @Override
+    public NBTTagCompound getCurrentNBT(EntityPlayer player) {
+        PlayerData customNPCData = PlayerData.get(player);
+        return customNPCData.getNBT();
+    }
+
+    @Override
+    public void save(EntityPlayer player) {
+        PlayerData customNPCData = PlayerData.get(player);
+        customNPCData.save();
+    }
+
+    @Override
+    public void setNBT(EntityPlayer player, NBTTagCompound replace) {
+        PlayerData customNPCData = PlayerData.get(player);
+        if(replace.hasNoTags()){
+            PlayerData newData = new PlayerData();
+            newData.player = player;
+            customNPCData.setNBT((NBTTagCompound) newData.getNBT().copy());
+        }
+        else {
+            customNPCData.setNBT(replace);
+        }
+        customNPCData.updateClient = true;
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/controllers/data/IProfileData.java b/src/main/java/kamkeel/npcs/controllers/data/IProfileData.java
new file mode 100644
index 000000000..a68abc597
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/controllers/data/IProfileData.java
@@ -0,0 +1,29 @@
+package kamkeel.npcs.controllers.data;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+
+public interface IProfileData {
+
+    /**
+     * Do not use the tag: - Name, lastLoaded, ID
+     *
+     * @return The Save Tag utilized in the Profile
+     */
+    public String getTagName();
+
+    /**
+     * @return NBTTagCompound of their Current Data for a given Entity Player
+     */
+    public NBTTagCompound getCurrentNBT(EntityPlayer player);
+
+    /**
+     * Called immediately after setNBT() Replaces existing NBT
+     */
+    public void save(EntityPlayer player);
+
+    /**
+     * Replaces their Current Data operation when changing Profiles
+     */
+    public void setNBT(EntityPlayer player, NBTTagCompound replace);
+}
diff --git a/src/main/java/kamkeel/npcs/controllers/data/Profile.java b/src/main/java/kamkeel/npcs/controllers/data/Profile.java
new file mode 100644
index 000000000..01002a470
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/controllers/data/Profile.java
@@ -0,0 +1,57 @@
+package kamkeel.npcs.controllers.data;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.HashMap;
+import java.util.Set;
+
+public class Profile {
+
+    public EntityPlayer player;
+    public int currentID;
+    public HashMap<Integer, Slot> slots = new HashMap<>();
+
+    public Profile(EntityPlayer player, NBTTagCompound compound){
+        this.player = player;
+        if(compound.hasKey("CurrentID")){
+            this.currentID = compound.getInteger("CurrentID");
+        } else {
+            this.currentID = 1;
+        }
+
+        if (compound.hasKey("Slots")) {
+            // Load Slots
+            NBTTagCompound slotsCompound = compound.getCompoundTag("Slots");
+            for (String key : (Set<String>) slotsCompound.func_150296_c()) {
+                int slotID = Integer.parseInt(key);
+                NBTTagCompound slotNBT = slotsCompound.getCompoundTag(key);
+                Slot slot = Slot.fromNBT(slotID, slotNBT);
+                slots.put(slotID, slot);
+            }
+        }
+    }
+
+    public NBTTagCompound writeToNBT() {
+        NBTTagCompound fullCompound = new NBTTagCompound();
+
+        if(this.player != null)
+            fullCompound.setString("Name", player.getCommandSenderName());
+        fullCompound.setInteger("CurrentID", currentID);
+
+        if(!slots.isEmpty()){
+            NBTTagCompound slotsCompound = new NBTTagCompound();
+            for (HashMap.Entry<Integer, Slot> entry : slots.entrySet()) {
+                int id = entry.getKey();
+                Slot slot = entry.getValue();
+                slot.setId(id);
+
+                NBTTagCompound slotTag = slot.toNBT();
+                slotsCompound.setTag(String.valueOf(id), slotTag);
+            }
+
+            fullCompound.setTag("Slots", slotsCompound);
+        }
+        return fullCompound;
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/controllers/data/Slot.java b/src/main/java/kamkeel/npcs/controllers/data/Slot.java
new file mode 100644
index 000000000..5e6f86869
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/controllers/data/Slot.java
@@ -0,0 +1,70 @@
+package kamkeel.npcs.controllers.data;
+
+import net.minecraft.nbt.NBTTagCompound;
+
+public class Slot {
+
+    private int id;
+    private String name;
+    private long lastLoaded;
+    private NBTTagCompound compound;
+
+    public Slot(int id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public Slot(int id, String name, NBTTagCompound compound, long last) {
+        this.id = id;
+        this.name = name;
+        this.compound = compound;
+        this.lastLoaded = last;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public long getLastLoaded() {
+        return lastLoaded;
+    }
+
+    public void setLastLoaded(long lastLoaded) {
+        this.lastLoaded = lastLoaded;
+    }
+
+    public NBTTagCompound getCompound() {
+        return compound;
+    }
+
+    public void setCompound(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    public NBTTagCompound toNBT() {
+        NBTTagCompound slotNBT = new NBTTagCompound();
+        slotNBT.setString("Name", name);
+        slotNBT.setLong("LastLoaded", lastLoaded);
+        slotNBT.setTag("Data", compound);
+        return slotNBT;
+    }
+
+    public static Slot fromNBT(int id, NBTTagCompound slotNBT) {
+        String name = slotNBT.getString("Name");
+        long lastLoaded = slotNBT.getLong("LastLoaded");
+        NBTTagCompound compound = slotNBT.getCompoundTag("Data");
+        return new Slot(id, name, compound, lastLoaded);
+    }
+}
diff --git a/src/main/java/kamkeel/developer/Developer.java b/src/main/java/kamkeel/npcs/developer/Developer.java
similarity index 97%
rename from src/main/java/kamkeel/developer/Developer.java
rename to src/main/java/kamkeel/npcs/developer/Developer.java
index fc321b9cc..2c89cfc50 100644
--- a/src/main/java/kamkeel/developer/Developer.java
+++ b/src/main/java/kamkeel/npcs/developer/Developer.java
@@ -1,4 +1,4 @@
-package kamkeel.developer;
+package kamkeel.npcs.developer;
 
 import java.util.HashSet;
 import java.util.UUID;
diff --git a/src/main/java/kamkeel/npcs/network/AbstractPacket.java b/src/main/java/kamkeel/npcs/network/AbstractPacket.java
new file mode 100644
index 000000000..9965ddd4b
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/AbstractPacket.java
@@ -0,0 +1,61 @@
+package kamkeel.npcs.network;
+
+import cpw.mods.fml.common.network.internal.FMLProxyPacket;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+public abstract class AbstractPacket {
+
+    public EntityNPCInterface npc;
+
+    public FMLProxyPacket generatePacket() {
+        PacketChannel packetChannel = getChannel();
+        ByteBuf buf = Unpooled.buffer();
+        try {
+            buf.writeInt(packetChannel.getChannelType().ordinal());
+            buf.writeInt(getType().ordinal());
+            sendData(buf);
+            return new FMLProxyPacket(buf, packetChannel.getChannelName());
+        } catch (Exception e) {
+            // For debugging, you might want to log it
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public List<FMLProxyPacket> generatePackets() {
+        FMLProxyPacket single = generatePacket();
+        if (single == null) {
+            return Collections.emptyList();
+        }
+        return Collections.singletonList(single);
+    }
+
+    public abstract Enum getType();
+    public abstract PacketChannel getChannel();
+
+    public CustomNpcsPermissions.Permission getPermission(){
+        return null;
+    }
+
+    public boolean needsNPC(){
+        return false;
+    }
+
+    public void setNPC(EntityNPCInterface npc){
+        this.npc = npc;
+    }
+
+    public abstract void sendData(ByteBuf out) throws IOException;
+
+    //"player" on the server side is the client who sent this packet
+    //"player" on the client side is the client player
+    public abstract void receiveData(ByteBuf in, EntityPlayer player) throws IOException;
+}
diff --git a/src/main/java/kamkeel/npcs/network/LargeAbstractPacket.java b/src/main/java/kamkeel/npcs/network/LargeAbstractPacket.java
new file mode 100644
index 000000000..30941b233
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/LargeAbstractPacket.java
@@ -0,0 +1,162 @@
+package kamkeel.npcs.network;
+
+import cpw.mods.fml.common.network.internal.FMLProxyPacket;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.LogWriter;
+import org.lwjgl.Sys;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+public abstract class LargeAbstractPacket extends AbstractPacket {
+
+    private static final Map<UUID, PacketStorage> packetChunks = new ConcurrentHashMap<>();
+    private static final int CHUNK_SIZE = 10000;
+
+    /**
+     * Create multiple FMLProxyPacket objects, each containing up to CHUNK_SIZE bytes.
+     */
+    @Override
+    public List<FMLProxyPacket> generatePackets() {
+        List<FMLProxyPacket> packets = new ArrayList<>();
+        PacketChannel packetChannel = getChannel();
+
+        byte[] fullData;
+        try {
+            fullData = getData();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return packets;
+        }
+
+        int totalSize = fullData.length;
+        UUID packetId = UUID.randomUUID();
+
+        // Break data into CHUNK_SIZE chunks
+        for (int offset = 0; offset < totalSize; offset += CHUNK_SIZE) {
+            int chunkSize = Math.min(CHUNK_SIZE, totalSize - offset);
+            ByteBuf chunkBuf = Unpooled.buffer();
+
+            chunkBuf.writeInt(packetChannel.getChannelType().ordinal());
+            chunkBuf.writeInt(getType().ordinal());
+
+            chunkBuf.writeLong(packetId.getMostSignificantBits());
+            chunkBuf.writeLong(packetId.getLeastSignificantBits());
+            chunkBuf.writeInt(totalSize);
+            chunkBuf.writeInt(offset);
+            chunkBuf.writeInt((totalSize + CHUNK_SIZE - 1) / CHUNK_SIZE);
+
+            chunkBuf.writeBytes(fullData, offset, chunkSize);
+
+            FMLProxyPacket proxyPacket = new FMLProxyPacket(chunkBuf, packetChannel.getChannelName());
+            packets.add(proxyPacket);
+        }
+        return packets;
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        UUID packetId = null;
+        PacketStorage storage = null;
+        ByteBuf chunk = null;
+        ByteBuf completeData = null;
+
+        try {
+            // Read UUID from the buffer
+            long mostSigBits = in.readLong();
+            long leastSigBits = in.readLong();
+            packetId = new UUID(mostSigBits, leastSigBits);
+
+            // Read packet metadata
+            int totalSize = in.readInt();
+            int offset = in.readInt();
+            int totalChunks = in.readInt(); // Debugging info
+            int chunkSize = Math.min(CHUNK_SIZE, totalSize - offset);
+
+            // Basic validation to ensure the chunk won't overwrite out of bounds
+            if (chunkSize <= 0 || offset < 0 || (offset + chunkSize) > totalSize) {
+                throw new IndexOutOfBoundsException("Invalid chunk size/offset: chunkSize="
+                    + chunkSize + ", offset=" + offset + ", totalSize=" + totalSize);
+            }
+
+            // Read the exact chunk data
+            chunk = in.readBytes(chunkSize);
+
+            // Store the received chunk in a PacketStorage
+            storage = packetChunks.computeIfAbsent(packetId, k -> new PacketStorage(Unpooled.buffer(totalSize), 0, totalSize));
+
+            // Write this chunk into the buffer at the correct offset
+            storage.data.setBytes(offset, chunk);
+            storage.receivedSoFar += chunkSize;
+
+            // If we've received all bytes, finalize
+            if (storage.receivedSoFar >= totalSize) {
+                packetChunks.remove(packetId);
+                completeData = storage.data.copy(0, totalSize);
+
+                try {
+                    handleCompleteData(completeData, player);
+                } finally {
+                    completeData.release();
+                }
+
+                storage.data.release();
+            }
+        } catch (Exception e) {
+            // Log the exception with contextual information
+            LogWriter.error("Error in receiveData for packetId " + (packetId != null ? packetId.toString() : "null") + ": " + e.getMessage());
+            e.printStackTrace();
+
+            // If storage was created but the packet is incomplete, release storage.data
+            if (storage != null && storage.receivedSoFar < storage.totalSize) {
+                storage.data.release();
+                if (packetId != null) {
+                    packetChunks.remove(packetId);
+                }
+            }
+
+            throw e; // Rethrow the exception after logging
+        } finally {
+            // Ensure that 'chunk' is released if it was allocated
+            if (chunk != null && chunk.refCnt() > 0) {
+                chunk.release();
+            }
+
+            // Ensure that 'completeData' is released if it was created and not yet released
+            if (completeData != null && completeData.refCnt() > 0) {
+                completeData.release();
+            }
+        }
+    }
+
+    protected abstract byte[] getData() throws IOException;
+
+    protected abstract void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException;
+
+    @Override
+    public final FMLProxyPacket generatePacket() {return null;}
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {}
+
+    /**
+     * Simple storage class to keep track of partial data and how many bytes we've received so far.
+     */
+    private static class PacketStorage {
+        final ByteBuf data;
+        int receivedSoFar;
+        final int totalSize;
+
+        PacketStorage(ByteBuf data, int receivedSoFar, int totalSize) {
+            this.data = data;
+            this.receivedSoFar = receivedSoFar;
+            this.totalSize = totalSize;
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/PacketChannel.java b/src/main/java/kamkeel/npcs/network/PacketChannel.java
new file mode 100644
index 000000000..d080f1239
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/PacketChannel.java
@@ -0,0 +1,43 @@
+package kamkeel.npcs.network;
+
+import kamkeel.npcs.network.enums.EnumChannelType;
+
+import java.util.Hashtable;
+import java.util.Map;
+
+public class PacketChannel {
+
+    private String channelName;
+    private EnumChannelType channelType;
+
+    public Map<Integer, AbstractPacket> packets = new Hashtable<>();
+
+    public PacketChannel(String channelName, EnumChannelType channelType) {
+        this.channelName = channelName;
+        this.channelType = channelType;
+    }
+
+    public String getChannelName() {
+        return channelName;
+    }
+
+    public void setChannelName(String channelName) {
+        this.channelName = channelName;
+    }
+
+    public EnumChannelType getChannelType() {
+        return channelType;
+    }
+
+    public void setChannelType(EnumChannelType channelType) {
+        this.channelType = channelType;
+    }
+
+    public void registerPacket(AbstractPacket packet) {
+        if(packets.containsKey(packet.getType().ordinal())){
+            System.out.println("Packet ID: " + packet.getType().ordinal() + " is already registered in " + this.channelName);
+            return;
+        }
+        this.packets.put(packet.getType().ordinal(), packet);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/PacketClient.java b/src/main/java/kamkeel/npcs/network/PacketClient.java
new file mode 100644
index 000000000..45aa91e2b
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/PacketClient.java
@@ -0,0 +1,8 @@
+package kamkeel.npcs.network;
+
+public class PacketClient extends PacketHandler {
+
+    public static void sendClient(AbstractPacket packet){
+        PacketHandler.Instance.sendToServer(packet);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java
new file mode 100644
index 000000000..a5728aa0d
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java
@@ -0,0 +1,554 @@
+package kamkeel.npcs.network;
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.network.FMLEventChannel;
+import cpw.mods.fml.common.network.FMLNetworkEvent;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.common.network.internal.FMLProxyPacket;
+import cpw.mods.fml.relauncher.Side;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.enums.EnumChannelType;
+import kamkeel.npcs.network.packets.data.*;
+import kamkeel.npcs.network.packets.data.gui.*;
+import kamkeel.npcs.network.packets.data.gui.IsGuiOpenPacket;
+import kamkeel.npcs.network.packets.data.large.*;
+import kamkeel.npcs.network.packets.data.npc.*;
+import kamkeel.npcs.network.packets.data.script.*;
+import kamkeel.npcs.network.packets.player.*;
+import kamkeel.npcs.network.packets.request.*;
+import kamkeel.npcs.network.packets.request.animation.*;
+import kamkeel.npcs.network.packets.request.bank.BankGetPacket;
+import kamkeel.npcs.network.packets.request.bank.BankRemovePacket;
+import kamkeel.npcs.network.packets.request.bank.BankSavePacket;
+import kamkeel.npcs.network.packets.request.bank.BanksGetPacket;
+import kamkeel.npcs.network.packets.request.clone.*;
+import kamkeel.npcs.network.packets.request.customgui.CustomGuiButtonPacket;
+import kamkeel.npcs.network.packets.request.customgui.CustomGuiClosePacket;
+import kamkeel.npcs.network.packets.request.customgui.CustomGuiUnfocusedPacket;
+import kamkeel.npcs.network.packets.request.customgui.CustomScrollClickPacket;
+import kamkeel.npcs.network.packets.request.dialog.*;
+import kamkeel.npcs.network.packets.request.effects.EffectGetPacket;
+import kamkeel.npcs.network.packets.request.effects.EffectRemovePacket;
+import kamkeel.npcs.network.packets.request.effects.EffectSavePacket;
+import kamkeel.npcs.network.packets.request.effects.EffectsGetPacket;
+import kamkeel.npcs.network.packets.request.faction.*;
+import kamkeel.npcs.network.packets.request.feather.DimensionTeleportPacket;
+import kamkeel.npcs.network.packets.request.jobs.JobGetPacket;
+import kamkeel.npcs.network.packets.request.jobs.JobSavePacket;
+import kamkeel.npcs.network.packets.request.jobs.JobSpawnerAddPacket;
+import kamkeel.npcs.network.packets.request.jobs.JobSpawnerRemovePacket;
+import kamkeel.npcs.network.packets.request.linked.LinkedAddPacket;
+import kamkeel.npcs.network.packets.request.linked.LinkedGetAllPacket;
+import kamkeel.npcs.network.packets.request.linked.LinkedRemovePacket;
+import kamkeel.npcs.network.packets.request.linked.LinkedSetPacket;
+import kamkeel.npcs.network.packets.request.mainmenu.*;
+import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnGetAllPacket;
+import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnGetPacket;
+import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnRemovePacket;
+import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnSavePacket;
+import kamkeel.npcs.network.packets.request.npc.*;
+import kamkeel.npcs.network.packets.request.party.*;
+import kamkeel.npcs.network.packets.request.pather.MovingPathGetPacket;
+import kamkeel.npcs.network.packets.request.pather.MovingPathSavePacket;
+import kamkeel.npcs.network.packets.request.playerdata.PlayerDataGetPacket;
+import kamkeel.npcs.network.packets.request.playerdata.PlayerDataMapRegenPacket;
+import kamkeel.npcs.network.packets.request.playerdata.PlayerDataRemovePacket;
+import kamkeel.npcs.network.packets.request.quest.*;
+import kamkeel.npcs.network.packets.request.recipe.RecipeGetPacket;
+import kamkeel.npcs.network.packets.request.recipe.RecipeRemovePacket;
+import kamkeel.npcs.network.packets.request.recipe.RecipeSavePacket;
+import kamkeel.npcs.network.packets.request.recipe.RecipesGetPacket;
+import kamkeel.npcs.network.packets.request.role.RoleCompanionUpdatePacket;
+import kamkeel.npcs.network.packets.request.role.RoleGetPacket;
+import kamkeel.npcs.network.packets.request.role.RoleSavePacket;
+import kamkeel.npcs.network.packets.request.script.*;
+import kamkeel.npcs.network.packets.request.script.item.ItemScriptErrorPacket;
+import kamkeel.npcs.network.packets.request.script.item.ItemScriptPacket;
+import kamkeel.npcs.network.packets.request.tags.*;
+import kamkeel.npcs.network.packets.request.transform.TransformGetPacket;
+import kamkeel.npcs.network.packets.request.transform.TransformLoadPacket;
+import kamkeel.npcs.network.packets.request.transform.TransformSavePacket;
+import kamkeel.npcs.network.packets.request.transport.*;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.NetHandlerPlayServer;
+import noppes.npcs.CustomNpcs;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.LogWriter;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.config.ConfigMain;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.util.*;
+
+public class PacketHandler {
+    public static PacketHandler Instance;
+
+    // Channels
+    public Map<EnumChannelType, FMLEventChannel> channels = new Hashtable<>();
+
+    // Client to Server
+    public static final PacketChannel REQUEST_PACKET = new PacketChannel("CNPC+|Req",   EnumChannelType.REQUEST);
+
+    // Client to Server - Typically information
+    public static final PacketChannel PLAYER_PACKET = new PacketChannel("CNPC+|Player",   EnumChannelType.PLAYER);
+
+    // Server to Client
+    public static final PacketChannel DATA_PACKET = new PacketChannel("CNPC+|Data", EnumChannelType.DATA);
+
+    public static final List<PacketChannel> packetChannels = new ArrayList<>();
+
+    public PacketHandler() {
+        // Register Channels
+        packetChannels.add(REQUEST_PACKET);
+        packetChannels.add(PLAYER_PACKET);
+        packetChannels.add(DATA_PACKET);
+
+        this.registerDataPackets();
+        this.registerRequestPackets();
+        this.registerPlayerPackets();
+    }
+
+    public void registerRequestPackets(){
+        // NPC Packets
+        REQUEST_PACKET.registerPacket(new NpcClosePacket());
+        REQUEST_PACKET.registerPacket(new NpcDeletePacket());
+
+        // Script Packets
+        REQUEST_PACKET.registerPacket(new BlockScriptPacket());
+        REQUEST_PACKET.registerPacket(new EventScriptPacket());
+        REQUEST_PACKET.registerPacket(new ForgeScriptPacket());
+        REQUEST_PACKET.registerPacket(new GlobalNPCScriptPacket());
+        REQUEST_PACKET.registerPacket(new ItemScriptPacket());
+        REQUEST_PACKET.registerPacket(new ItemScriptErrorPacket());
+        REQUEST_PACKET.registerPacket(new NPCScriptPacket());
+        REQUEST_PACKET.registerPacket(new PlayerScriptPacket());
+        REQUEST_PACKET.registerPacket(new ScriptInfoPacket());
+        REQUEST_PACKET.registerPacket(new EffectScriptPacket());
+
+        // Cloner Packets
+        REQUEST_PACKET.registerPacket(new CloneListPacket());
+        REQUEST_PACKET.registerPacket(new SpawnMobPacket());
+        REQUEST_PACKET.registerPacket(new MobSpawnerPacket());
+        REQUEST_PACKET.registerPacket(new ClonePreSavePacket());
+        REQUEST_PACKET.registerPacket(new CloneSavePacket());
+        REQUEST_PACKET.registerPacket(new CloneRemovePacket());
+        REQUEST_PACKET.registerPacket(new CloneTagListPacket());
+        REQUEST_PACKET.registerPacket(new CloneAllTagsPacket());
+        REQUEST_PACKET.registerPacket(new CloneAllTagsShortPacket());
+
+
+        // Linked Packets
+        REQUEST_PACKET.registerPacket(new LinkedGetAllPacket());
+        REQUEST_PACKET.registerPacket(new LinkedRemovePacket());
+        REQUEST_PACKET.registerPacket(new LinkedSetPacket());
+        REQUEST_PACKET.registerPacket(new LinkedAddPacket());
+
+        // Bank Packets
+        REQUEST_PACKET.registerPacket(new BanksGetPacket());
+        REQUEST_PACKET.registerPacket(new BankGetPacket());
+        REQUEST_PACKET.registerPacket(new BankRemovePacket());
+        REQUEST_PACKET.registerPacket(new BankSavePacket());
+
+        // Recipe Packets
+        REQUEST_PACKET.registerPacket(new RecipesGetPacket());
+        REQUEST_PACKET.registerPacket(new RecipeGetPacket());
+        REQUEST_PACKET.registerPacket(new RecipeRemovePacket());
+        REQUEST_PACKET.registerPacket(new RecipeSavePacket());
+
+        // Natural Spawn Packets
+        REQUEST_PACKET.registerPacket(new NaturalSpawnGetAllPacket());
+        REQUEST_PACKET.registerPacket(new NaturalSpawnGetPacket());
+        REQUEST_PACKET.registerPacket(new NaturalSpawnSavePacket());
+        REQUEST_PACKET.registerPacket(new NaturalSpawnRemovePacket());
+
+        // Dialog Category Packets
+        REQUEST_PACKET.registerPacket(new DialogCategorySavePacket());
+        REQUEST_PACKET.registerPacket(new DialogCategoryRemovePacket());
+        REQUEST_PACKET.registerPacket(new DialogCategoryGetPacket());
+        REQUEST_PACKET.registerPacket(new DialogCategoriesGetPacket());
+
+        // Dialog Packets
+        REQUEST_PACKET.registerPacket(new DialogSavePacket());
+        REQUEST_PACKET.registerPacket(new DialogRemovePacket());
+        REQUEST_PACKET.registerPacket(new DialogsGetPacket());
+        REQUEST_PACKET.registerPacket(new DialogGetPacket());
+
+        REQUEST_PACKET.registerPacket(new DialogNpcGetPacket());
+        REQUEST_PACKET.registerPacket(new DialogNpcSetPacket());
+        REQUEST_PACKET.registerPacket(new DialogNpcRemovePacket());
+
+        // Quest Category Packets
+        REQUEST_PACKET.registerPacket(new QuestCategorySavePacket());
+        REQUEST_PACKET.registerPacket(new QuestCategoryRemovePacket());
+        REQUEST_PACKET.registerPacket(new QuestCategoryGetPacket());
+        REQUEST_PACKET.registerPacket(new QuestCategoriesGetPacket());
+
+        // Quest Packets
+        REQUEST_PACKET.registerPacket(new QuestOpenGuiPacket());
+        REQUEST_PACKET.registerPacket(new QuestSavePacket());
+        REQUEST_PACKET.registerPacket(new QuestRemovePacket());
+        REQUEST_PACKET.registerPacket(new QuestDialogGetTitlePacket());
+        REQUEST_PACKET.registerPacket(new QuestLogToServerPacket());
+        REQUEST_PACKET.registerPacket(new QuestUntrackPacket());
+        REQUEST_PACKET.registerPacket(new QuestGetPacket());
+        REQUEST_PACKET.registerPacket(new QuestsGetPacket());
+
+        // Faction Packets
+        REQUEST_PACKET.registerPacket(new FactionSavePacket());
+        REQUEST_PACKET.registerPacket(new FactionRemovePacket());
+        REQUEST_PACKET.registerPacket(new FactionSetPacket());
+        REQUEST_PACKET.registerPacket(new FactionGetPacket());
+        REQUEST_PACKET.registerPacket(new FactionsGetPacket());
+
+        // Tag Packets
+        REQUEST_PACKET.registerPacket(new TagsGetPacket());
+        REQUEST_PACKET.registerPacket(new TagGetPacket());
+        REQUEST_PACKET.registerPacket(new TagsNpcGetPacket());
+        REQUEST_PACKET.registerPacket(new TagSetPacket());
+        REQUEST_PACKET.registerPacket(new TagSavePacket());
+        REQUEST_PACKET.registerPacket(new TagRemovePacket());
+
+        // PlayerData Packets
+        REQUEST_PACKET.registerPacket(new PlayerDataGetPacket());
+        REQUEST_PACKET.registerPacket(new PlayerDataRemovePacket());
+        REQUEST_PACKET.registerPacket(new PlayerDataMapRegenPacket());
+
+        // Main Menu Packets
+        REQUEST_PACKET.registerPacket(new MainmenuDisplayGetPacket());
+        REQUEST_PACKET.registerPacket(new MainmenuDisplaySavePacket());
+
+        REQUEST_PACKET.registerPacket(new MainmenuStatsGetPacket());
+        REQUEST_PACKET.registerPacket(new MainmenuStatsSavePacket());
+
+        REQUEST_PACKET.registerPacket(new MainmenuAIGetPacket());
+        REQUEST_PACKET.registerPacket(new MainmenuAISavePacket());
+
+        REQUEST_PACKET.registerPacket(new MainmenuAdvancedGetPacket());
+        REQUEST_PACKET.registerPacket(new MainmenuAdvancedSavePacket());
+        REQUEST_PACKET.registerPacket(new MainmenuAdvancedMarkDataPacket());
+
+        REQUEST_PACKET.registerPacket(new MainmenuInvGetPacket());
+        REQUEST_PACKET.registerPacket(new MainmenuInvSavePacket());
+
+        // Transport Packets
+        REQUEST_PACKET.registerPacket(new TransportCategoriesGetPacket());
+        REQUEST_PACKET.registerPacket(new TransportCategorySavePacket());
+        REQUEST_PACKET.registerPacket(new TransportCategoryRemovePacket());
+
+        REQUEST_PACKET.registerPacket(new TransportRemovePacket());
+        REQUEST_PACKET.registerPacket(new TransportsGetPacket());
+        REQUEST_PACKET.registerPacket(new TransportSavePacket());
+        REQUEST_PACKET.registerPacket(new TransportGetLocationPacket());
+
+        // Remote Packets Packets
+        REQUEST_PACKET.registerPacket(new RemoteMainMenuPacket());
+        REQUEST_PACKET.registerPacket(new RemoteGlobalMenuPacket());
+        REQUEST_PACKET.registerPacket(new RemoteDeletePacket());
+        REQUEST_PACKET.registerPacket(new RemoteNpcsGetPacket());
+        REQUEST_PACKET.registerPacket(new RemoteFreezeGetPacket());
+        REQUEST_PACKET.registerPacket(new RemoteFreezePacket());
+        REQUEST_PACKET.registerPacket(new RemoteResetPacket());
+        REQUEST_PACKET.registerPacket(new RemoteTpToNpcPacket());
+
+        // CustomGUI Packets
+        REQUEST_PACKET.registerPacket(new CustomGuiButtonPacket());
+        REQUEST_PACKET.registerPacket(new CustomGuiClosePacket());
+        REQUEST_PACKET.registerPacket(new CustomGuiUnfocusedPacket());
+        REQUEST_PACKET.registerPacket(new CustomScrollClickPacket());
+
+        // Job Packets
+        REQUEST_PACKET.registerPacket(new JobGetPacket());
+        REQUEST_PACKET.registerPacket(new JobSavePacket());
+        REQUEST_PACKET.registerPacket(new JobSpawnerAddPacket());
+        REQUEST_PACKET.registerPacket(new JobSpawnerRemovePacket());
+
+        // Role Packets
+        REQUEST_PACKET.registerPacket(new RoleCompanionUpdatePacket());
+        REQUEST_PACKET.registerPacket(new RoleSavePacket());
+        REQUEST_PACKET.registerPacket(new RoleGetPacket());
+
+        // Transform Packets
+        REQUEST_PACKET.registerPacket(new TransformSavePacket());
+        REQUEST_PACKET.registerPacket(new TransformGetPacket());
+        REQUEST_PACKET.registerPacket(new TransformLoadPacket());
+
+        // Trader Packets
+        REQUEST_PACKET.registerPacket(new TraderMarketSavePacket());
+
+        // Party Packets
+        REQUEST_PACKET.registerPacket(new PartySavePacket());
+        REQUEST_PACKET.registerPacket(new PartyInfoPacket());
+        REQUEST_PACKET.registerPacket(new PartyDisbandPacket());
+        REQUEST_PACKET.registerPacket(new PartySetLeaderPacket());
+        REQUEST_PACKET.registerPacket(new PartyKickPacket());
+        REQUEST_PACKET.registerPacket(new PartyLeavePacket());
+        REQUEST_PACKET.registerPacket(new PartySetQuestPacket());
+        REQUEST_PACKET.registerPacket(new PartyInvitePacket());
+        REQUEST_PACKET.registerPacket(new PartyAcceptInvitePacket());
+        REQUEST_PACKET.registerPacket(new PartyIgnoreInvitePacket());
+        REQUEST_PACKET.registerPacket(new PartyLogToServerPacket());
+
+        // Animation Packets
+        REQUEST_PACKET.registerPacket(new AnimationsGetPacket());
+        REQUEST_PACKET.registerPacket(new AnimationGetPacket());
+        REQUEST_PACKET.registerPacket(new AnimationRemovePacket());
+        REQUEST_PACKET.registerPacket(new AnimationSavePacket());
+        REQUEST_PACKET.registerPacket(new AnimationCachePacket());
+
+        // Moving Path
+        REQUEST_PACKET.registerPacket(new MovingPathSavePacket());
+        REQUEST_PACKET.registerPacket(new MovingPathGetPacket());
+
+        // Custom Effect Packets
+        REQUEST_PACKET.registerPacket(new EffectGetPacket());
+        REQUEST_PACKET.registerPacket(new EffectsGetPacket());
+        REQUEST_PACKET.registerPacket(new EffectSavePacket());
+        REQUEST_PACKET.registerPacket(new EffectRemovePacket());
+
+        // Other Packets
+        REQUEST_PACKET.registerPacket(new IsGuiOpenInform());
+        REQUEST_PACKET.registerPacket(new GuiRequestPacket());
+        REQUEST_PACKET.registerPacket(new DimensionsGetPacket());
+        REQUEST_PACKET.registerPacket(new MerchantUpdatePacket());
+        REQUEST_PACKET.registerPacket(new ModelDataSavePacket());
+        REQUEST_PACKET.registerPacket(new MailOpenSetupPacket());
+        REQUEST_PACKET.registerPacket(new TileEntityGetPacket());
+        REQUEST_PACKET.registerPacket(new TileEntitySavePacket());
+        REQUEST_PACKET.registerPacket(new MountPacket());
+        REQUEST_PACKET.registerPacket(new DimensionTeleportPacket());
+    }
+
+    public void registerDataPackets(){
+        // Data Packets
+        DATA_PACKET.registerPacket(new AchievementPacket());
+        DATA_PACKET.registerPacket(new ChatAlertPacket());
+        DATA_PACKET.registerPacket(new ChatBubblePacket());
+        DATA_PACKET.registerPacket(new ConfigCommandPacket());
+        DATA_PACKET.registerPacket(new DisableMouseInputPacket());
+        DATA_PACKET.registerPacket(new MarkDataPacket());
+        DATA_PACKET.registerPacket(new OverlayQuestTrackingPacket());
+        DATA_PACKET.registerPacket(new ParticlePacket());
+        DATA_PACKET.registerPacket(new PlayerUpdateSkinOverlaysPacket());
+        DATA_PACKET.registerPacket(new QuestCompletionPacket());
+        DATA_PACKET.registerPacket(new ScrollSelectedPacket());
+        DATA_PACKET.registerPacket(new SoundManagementPacket());
+        DATA_PACKET.registerPacket(new SwingPlayerArmPacket());
+        DATA_PACKET.registerPacket(new UpdateAnimationsPacket());
+        DATA_PACKET.registerPacket(new VillagerListPacket());
+
+        // Data | GUI Packets
+        DATA_PACKET.registerPacket(new GuiClosePacket());
+        DATA_PACKET.registerPacket(new GuiOpenPacket());
+        DATA_PACKET.registerPacket(new GuiErrorPacket());
+        DATA_PACKET.registerPacket(new GuiRedstonePacket());
+        DATA_PACKET.registerPacket(new GuiTeleporterPacket());
+        DATA_PACKET.registerPacket(new GuiWaypointPacket());
+        DATA_PACKET.registerPacket(new IsGuiOpenPacket());
+        DATA_PACKET.registerPacket(new GuiOpenBookPacket());
+
+        // Data | NPC Packets
+        DATA_PACKET.registerPacket(new DeleteNpcPacket());
+        DATA_PACKET.registerPacket(new EditNpcPacket());
+        DATA_PACKET.registerPacket(new UpdateNpcPacket());
+        DATA_PACKET.registerPacket(new DialogPacket());
+        DATA_PACKET.registerPacket(new RolePacket());
+        DATA_PACKET.registerPacket(new WeaponNpcPacket());
+
+        // Data | Script Packets
+        DATA_PACKET.registerPacket(new ScriptedParticlePacket());
+        DATA_PACKET.registerPacket(new ScriptOverlayClosePacket());
+        DATA_PACKET.registerPacket(new ScriptOverlayDataPacket());
+
+        // Data | Large Packets
+        DATA_PACKET.registerPacket(new ClonerPacket());
+        DATA_PACKET.registerPacket(new ScrollGroupPacket());
+        DATA_PACKET.registerPacket(new ScrollDataPacket());
+        DATA_PACKET.registerPacket(new ScrollListPacket());
+        DATA_PACKET.registerPacket(new SyncPacket());
+        DATA_PACKET.registerPacket(new SyncEffectPacket());
+        DATA_PACKET.registerPacket(new GuiDataPacket());
+        DATA_PACKET.registerPacket(new PartyDataPacket());
+    }
+
+    public void registerPlayerPackets() {
+        PLAYER_PACKET.registerPacket(new FollowerPacket());
+
+        PLAYER_PACKET.registerPacket(new TransportPacket());
+
+        PLAYER_PACKET.registerPacket(new BankActionPacket());
+
+        PLAYER_PACKET.registerPacket(new DialogSelectPacket());
+
+        PLAYER_PACKET.registerPacket(new CheckPlayerValue());
+
+        PLAYER_PACKET.registerPacket(new MailActionPacket());
+        PLAYER_PACKET.registerPacket(new MailActionPacket.MailSendPacket());
+
+        PLAYER_PACKET.registerPacket(new SaveSignPacket());
+        PLAYER_PACKET.registerPacket(new SaveBookPacket());
+
+        PLAYER_PACKET.registerPacket(new CompanionActionPacket());
+
+        PLAYER_PACKET.registerPacket(new GetNPCRole());
+
+        PLAYER_PACKET.registerPacket(new InputDevicePacket());
+
+        PLAYER_PACKET.registerPacket(new ScreenSizePacket());
+    }
+
+    public void registerChannels() {
+        for (PacketChannel channel : packetChannels) {
+            FMLEventChannel eventChannel =
+                NetworkRegistry.INSTANCE.newEventDrivenChannel(channel.getChannelName());
+            eventChannel.register(this);
+            channels.put(channel.getChannelType(), eventChannel);
+        }
+    }
+
+    public PacketChannel getPacketChannel(EnumChannelType type) {
+        return packetChannels.stream()
+            .filter(channel -> channel.getChannelType() == type)
+            .findFirst()
+            .orElse(null);
+    }
+
+    public FMLEventChannel getEventChannel(AbstractPacket abstractPacket){
+        PacketChannel packetChannel = getPacketChannel(abstractPacket.getChannel().getChannelType());
+        if (packetChannel == null) {
+            return null;
+        }
+        return channels.get(packetChannel.getChannelType());
+    }
+
+    @SubscribeEvent
+    public void onServerPacket(FMLNetworkEvent.ServerCustomPacketEvent event) {
+        handlePacket(event.packet, ((NetHandlerPlayServer) event.handler).playerEntity, Side.SERVER);
+    }
+
+    @SubscribeEvent
+    public void onClientPacket(FMLNetworkEvent.ClientCustomPacketEvent event) {
+        handlePacket(event.packet, CustomNpcs.proxy.getPlayer(), Side.CLIENT);
+    }
+
+    private void handlePacket(FMLProxyPacket packet, EntityPlayer player, Side side) {
+        ByteBuf buf = packet.payload();
+        try {
+            int packetTypeOrdinal = buf.readInt();
+            EnumChannelType packetType = EnumChannelType.values()[packetTypeOrdinal];
+
+            PacketChannel packetChannel = getPacketChannel(packetType);
+            if (packetChannel == null) {
+                LogWriter.error("Error: Packet channel is null for packet type: " + packetType);
+                return;
+            }
+
+            int packetId = buf.readInt();
+            AbstractPacket abstractPacket = packetChannel.packets.get(packetId);
+            if (abstractPacket == null) {
+                LogWriter.error("Error: Abstract packet is null for packet ID: " + packetId);
+                return;
+            }
+
+            if(side == Side.SERVER){
+                if(abstractPacket.getChannel() == REQUEST_PACKET && ConfigMain.OpsOnly && !NoppesUtilServer.isOp(player)){
+                    LogWriter.error(String.format("%s tried to use CNPC+ without being an op", player.getCommandSenderName()));
+                    return;
+                }
+
+                // Check if permission is allowed
+                if(abstractPacket.getPermission() != null && !CustomNpcsPermissions.hasPermission(player, abstractPacket.getPermission())){
+                    return;
+                }
+
+                // Check for required NPC
+                EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player);
+                if(abstractPacket.needsNPC() && npc == null){
+                    return;
+                }
+
+                abstractPacket.setNPC(npc);
+            }
+
+            // Let the packet parse the rest
+            abstractPacket.receiveData(buf, player);
+
+        } catch (IndexOutOfBoundsException e) {
+            LogWriter.error("Error: IndexOutOfBoundsException in handlePacket: " + e.getMessage());
+            e.printStackTrace();
+        } catch (Exception e) {
+            LogWriter.error("Error: Exception in handlePacket: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Sends every FMLProxyPacket produced by packet.generatePackets()
+     */
+    private void sendAllPackets(AbstractPacket packet, SendAction action) {
+        // get all generated FMLProxyPacket objects (could be 1 for normal, or many for large)
+        List<FMLProxyPacket> proxyPackets = packet.generatePackets();
+        if (proxyPackets.isEmpty()) {
+            LogWriter.error("Warning: No packets generated for " + packet.getClass().getName());
+        }
+
+        for (FMLProxyPacket proxy : proxyPackets) {
+            action.send(proxy);
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Public API methods for sending
+
+    public void sendToPlayer(AbstractPacket packet, EntityPlayerMP player) {
+        FMLEventChannel eventChannel = getEventChannel(packet);
+        if (eventChannel == null) {
+            LogWriter.error("Error: Event channel is null for packet: " + packet.getClass().getName());
+            return;
+        }
+        sendAllPackets(packet, p -> eventChannel.sendTo(p, player));
+    }
+
+    public void sendToServer(AbstractPacket packet) {
+        FMLEventChannel eventChannel = getEventChannel(packet);
+        if (eventChannel == null) {
+            LogWriter.error("Error: Event channel is null for packet: " + packet.getClass().getName());
+            return;
+        }
+        sendAllPackets(packet, eventChannel::sendToServer);
+    }
+
+    public void sendToAll(AbstractPacket packet) {
+        FMLEventChannel eventChannel = getEventChannel(packet);
+        if (eventChannel == null) {
+            LogWriter.error("Error: Event channel is null for packet: " + packet.getClass().getName());
+            return;
+        }
+        sendAllPackets(packet, eventChannel::sendToAll);
+    }
+
+    public void sendToDimension(AbstractPacket packet, final int dimensionId) {
+        FMLEventChannel eventChannel = getEventChannel(packet);
+        if (eventChannel == null) {
+            LogWriter.error("Error: Event channel is null for packet: " + packet.getClass().getName());
+            return;
+        }
+        sendAllPackets(packet, p -> eventChannel.sendToDimension(p, dimensionId));
+    }
+
+    public void sendTracking(AbstractPacket packet, final Entity entity) {
+        FMLEventChannel eventChannel = getEventChannel(packet);
+        if (eventChannel == null) {
+            LogWriter.error("Error: Event channel is null for packet: " + packet.getClass().getName());
+            return;
+        }
+        final NetworkRegistry.TargetPoint point = new NetworkRegistry.TargetPoint(entity.dimension, entity.posX, entity.posY, entity.posZ, 60);
+        sendAllPackets(packet, p -> eventChannel.sendToAllAround(p, point));
+    }
+
+    // Simple functional interface to unify the "send" action
+    private interface SendAction {
+        void send(FMLProxyPacket proxy);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/PacketUtil.java b/src/main/java/kamkeel/npcs/network/PacketUtil.java
new file mode 100644
index 000000000..3a95df786
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/PacketUtil.java
@@ -0,0 +1,232 @@
+package kamkeel.npcs.network;
+
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomItems;
+import noppes.npcs.LogWriter;
+import noppes.npcs.NBTTags;
+import noppes.npcs.controllers.ScriptContainer;
+import noppes.npcs.controllers.ScriptController;
+import noppes.npcs.controllers.data.IScriptHandler;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+public class PacketUtil {
+
+    public static boolean verifyItemPacket(EnumItemPacketType type, EntityPlayer player) {
+        if (player == null)
+            return false;
+
+        ItemStack item = player.inventory.getCurrentItem();
+        if (item == null) {
+            LogWriter.error(String.format("%s attempted to utilize a %s Packet without an item, they could be a hacker",
+                player.getCommandSenderName(), type));
+            return false;
+        }
+
+        switch (type) {
+            case WAND:
+                if (item.getItem() != CustomItems.wand) {
+                    LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Wand, they could be a hacker",
+                        player.getCommandSenderName(), type));
+                    return false;
+                }
+                break;
+            case MOUNTER:
+                if (item.getItem() != CustomItems.mount) {
+                    LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Mounter, they could be a hacker",
+                        player.getCommandSenderName(), type));
+                    return false;
+                }
+                break;
+            case CLONER:
+                if (item.getItem() != CustomItems.cloner) {
+                    LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Cloner, they could be a hacker",
+                        player.getCommandSenderName(), type));
+                    return false;
+                }
+                break;
+            case TELEPORTER:
+                if (item.getItem() != CustomItems.teleporter) {
+                    LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Teleporter, they could be a hacker",
+                        player.getCommandSenderName(), type));
+                    return false;
+                }
+                break;
+            case SCRIPTER:
+                if (item.getItem() != CustomItems.scripter) {
+                    LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Scripter, they could be a hacker",
+                        player.getCommandSenderName(), type));
+                    return false;
+                }
+                break;
+            case PATHER:
+                if (item.getItem() != CustomItems.moving) {
+                    LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Pather, they could be a hacker",
+                        player.getCommandSenderName(), type));
+                    return false;
+                }
+                break;
+            case BLOCK:
+                if (item.getItem() == Item.getItemFromBlock(CustomItems.waypoint)
+                    || item.getItem() == Item.getItemFromBlock(CustomItems.border)
+                    || item.getItem() == Item.getItemFromBlock(CustomItems.redstoneBlock)) {
+                    LogWriter.error(String.format("%s attempted to utilize a %s Packet without a valid Block, they could be a hacker",
+                        player.getCommandSenderName(), type));
+                    return false;
+                }
+                break;
+        }
+        return true;
+    }
+
+    /**
+     * New method that accepts multiple EnumItemPacketTypes.
+     * It returns true if any one of the provided types is valid.
+     * If none are valid, a merged error message is logged.
+     */
+    public static boolean verifyItemPacket(EntityPlayer player, EnumItemPacketType... types) {
+        if (player == null)
+            return false;
+
+        ItemStack item = player.inventory.getCurrentItem();
+        if (item == null) {
+            LogWriter.error(String.format("%s attempted to utilize a Packet without an item. Expected one of: %s, they could be a hacker",
+                player.getCommandSenderName(), getExpectedItemNames(types)));
+            return false;
+        }
+
+        for (EnumItemPacketType type : types) {
+            if (isValidItemForType(item, type)) {
+                return true;
+            }
+        }
+
+        // None passed; log one merged error message listing all expected items.
+        LogWriter.error(String.format("%s attempted to utilize a Packet without a valid item. Expected one of: %s, they could be a hacker",
+            player.getCommandSenderName(), getExpectedItemNames(types)));
+        return false;
+    }
+
+    private static boolean isValidItemForType(ItemStack item, EnumItemPacketType type) {
+        if(item == null || item.getItem() == null)
+            return false;
+
+        switch (type) {
+            case WAND:
+                return item.getItem() == CustomItems.wand;
+            case MOUNTER:
+                return item.getItem() == CustomItems.mount;
+            case CLONER:
+                return item.getItem() == CustomItems.cloner;
+            case TELEPORTER:
+                return item.getItem() == CustomItems.teleporter;
+            case SCRIPTER:
+                return item.getItem() == CustomItems.scripter;
+            case PATHER:
+                return item.getItem() == CustomItems.moving;
+            case BLOCK:
+                // For BLOCK, the item is valid as long as it is NOT one of these blocks.
+                return !(item.getItem() == Item.getItemFromBlock(CustomItems.waypoint)
+                    || item.getItem() == Item.getItemFromBlock(CustomItems.border)
+                    || item.getItem() == Item.getItemFromBlock(CustomItems.redstoneBlock));
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Builds a comma‐separated list of expected item names for the given types.
+     */
+    private static String getExpectedItemNames(EnumItemPacketType... types) {
+        Set<String> expectedNames = new LinkedHashSet<>();
+        for (EnumItemPacketType type : types) {
+            expectedNames.add(getExpectedItemName(type));
+        }
+        return String.join(", ", expectedNames);
+    }
+
+    /**
+     * Returns the expected item name for the given EnumItemPacketType.
+     */
+    private static String getExpectedItemName(EnumItemPacketType type) {
+        switch (type) {
+            case WAND:
+                return "Wand";
+            case MOUNTER:
+                return "Mounter";
+            case CLONER:
+                return "Cloner";
+            case TELEPORTER:
+                return "Teleporter";
+            case SCRIPTER:
+                return "Scripter";
+            case PATHER:
+                return "Pather";
+            case BLOCK:
+                return "valid Block";
+            default:
+                return type.toString();
+        }
+    }
+
+    public static void getScripts(IScriptHandler data, EntityPlayerMP player) {
+        NBTTagCompound compound = new NBTTagCompound();
+        compound.setBoolean("ScriptEnabled", data.getEnabled());
+        compound.setString("ScriptLanguage", data.getLanguage());
+        compound.setTag("Languages", ScriptController.Instance.nbtLanguages());
+        compound.setTag("ScriptConsole", NBTTags.NBTLongStringMap(data.getConsoleText()));
+        GuiDataPacket.sendGuiData(player, compound);
+        List<ScriptContainer> containers = data.getScripts();
+        for (int i = 0; i < containers.size(); i++) {
+            ScriptContainer container = containers.get(i);
+            NBTTagCompound tabCompound = new NBTTagCompound();
+            tabCompound.setInteger("Tab",i);
+            tabCompound.setTag("Script",container.writeToNBT(new NBTTagCompound()));
+            tabCompound.setInteger("TotalScripts",containers.size());
+            GuiDataPacket.sendGuiData(player, tabCompound);
+        }
+    }
+
+    public static void saveScripts(IScriptHandler data, ByteBuf buffer) throws IOException {
+        int tab = buffer.readInt();
+        int totalScripts = buffer.readInt();
+        if (totalScripts == 0) {
+            data.getScripts().clear();
+        }
+
+        if (tab >= 0) {
+            if (data.getScripts().size() > totalScripts) {
+                data.setScripts(data.getScripts().subList(0,totalScripts));
+            } else while (data.getScripts().size() < totalScripts) {
+                data.getScripts().add(new ScriptContainer(data));
+            }
+            NBTTagCompound tabCompound = ByteBufUtils.readNBT(buffer);
+            ScriptContainer script = new ScriptContainer(data);
+            script.readFromNBT(tabCompound);
+            data.getScripts().set(tab,script);
+        } else {
+            NBTTagCompound compound = ByteBufUtils.readNBT(buffer);
+            data.setLanguage(compound.getString("ScriptLanguage"));
+            if (!ScriptController.Instance.languages.containsKey(data.getLanguage())) {
+                if (!ScriptController.Instance.languages.isEmpty()) {
+                    data.setLanguage((String) ScriptController.Instance.languages.keySet().toArray()[0]);
+                } else {
+                    data.setLanguage("ECMAScript");
+                }
+            }
+            data.setEnabled(compound.getBoolean("ScriptEnabled"));
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumChannelType.java b/src/main/java/kamkeel/npcs/network/enums/EnumChannelType.java
new file mode 100644
index 000000000..87015e1c8
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/enums/EnumChannelType.java
@@ -0,0 +1,8 @@
+package kamkeel.npcs.network.enums;
+
+public enum EnumChannelType {
+    REQUEST,
+    PLAYER,
+    DATA,
+    INFO
+}
diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumConfigOperation.java b/src/main/java/kamkeel/npcs/network/enums/EnumConfigOperation.java
new file mode 100644
index 000000000..d210c00a9
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/enums/EnumConfigOperation.java
@@ -0,0 +1,5 @@
+package kamkeel.npcs.network.enums;
+
+public enum EnumConfigOperation {
+    FONT,
+}
diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumDataPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumDataPacket.java
new file mode 100644
index 000000000..afde0e87e
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/enums/EnumDataPacket.java
@@ -0,0 +1,60 @@
+package kamkeel.npcs.network.enums;
+
+// Packets to the Client
+public enum EnumDataPacket {
+    // Synchronization
+    SYNC,
+    SYNC_EFFECTS,
+    CONFIG_COMMAND,
+
+    // Messages
+    CHAT_ALERT,
+    ACHIEVEMENT,
+    CHATBUBBLE,
+    SOUND,
+    DIALOG,
+    QUEST_COMPLETION,
+
+
+    // NPC
+    EDIT_NPC,
+    UPDATE_NPC,
+    ROLE_NPC,
+    DELETE_NPC,
+    CLONE_NPC,
+    WEAPON_NPC,
+
+    // Data
+    SCROLL_LIST,
+    SCROLL_DATA,
+    SCROLL_GROUP,
+    SCROLL_SELECTED,
+    PARTY_DATA,
+
+    // GUI
+    GUI_OPEN,
+    GUI_REDSTONE,
+    GUI_WAYPOINT,
+    GUI_TELEPORTER,
+    GUI_BOOK,
+    GUI_DATA,
+    GUI_ERROR,
+    GUI_CLOSE,
+    ISGUIOPEN,
+
+    // Visual
+    SCRIPTED_PARTICLE,
+    PARTICLE,
+    PLAYER_UPDATE_SKIN_OVERLAYS,
+    UPDATE_ANIMATIONS,
+    SCRIPT_OVERLAY_DATA,
+    SCRIPT_OVERLAY_CLOSE,
+    OVERLAY_QUEST_TRACKING,
+    MARK_DATA,
+
+    // Other
+    VILLAGER_LIST,
+    SWING_PLAYER_ARM,
+    DISABLE_MOUSE_INPUT,
+    LOGIN,
+}
diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumItemPacketType.java b/src/main/java/kamkeel/npcs/network/enums/EnumItemPacketType.java
new file mode 100644
index 000000000..8c1513966
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/enums/EnumItemPacketType.java
@@ -0,0 +1,11 @@
+package kamkeel.npcs.network.enums;
+
+public enum EnumItemPacketType {
+    WAND,
+    MOUNTER,
+    CLONER,
+    TELEPORTER,
+    SCRIPTER,
+    PATHER,
+    BLOCK
+}
diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java
new file mode 100644
index 000000000..953e7ff19
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java
@@ -0,0 +1,17 @@
+package kamkeel.npcs.network.enums;
+
+public enum EnumPlayerPacket {
+    FollowerAction,
+    Transport,
+    BankAction,
+    DialogSelect,
+    GetPlayerValue,
+    MailBoxAction,
+    MailSend,
+    SaveSign,
+    SaveBook,
+    CompanionAction,
+    GetRole,
+    InputDevice,
+    ScreenSize
+}
diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java
new file mode 100644
index 000000000..46aa7c7d4
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java
@@ -0,0 +1,180 @@
+package kamkeel.npcs.network.enums;
+public enum EnumRequestPacket {
+    NPCDelete,
+    RemoteMainMenu,
+    RemoteGlobalMenu,
+    NpcClose,
+    RemoteDelete,
+    RemoteFreeze,
+    RemoteFreezeGet,
+    RemoteReset,
+    SpawnMob,
+    MobSpawner,
+
+    DimensionsGet,
+
+    MainmenuAISave,
+    MainmenuAIGet,
+    MainmenuInvSave,
+    MainmenuInvGet,
+    MainmenuStatsSave,
+    MainmenuStatsGet,
+    MainmenuDisplaySave,
+    MainmenuDisplayGet,
+    ModelDataSave,
+    MainmenuAdvancedSave,
+    MainmenuAdvancedGet,
+    MainmenuAdvancedMarkData,
+
+    DialogNpcSet,
+    DialogNpcRemove,
+    DialogNpcGet,
+    DialogCategorySave,
+    DialogCategoriesGet,
+    DialogCategoryRemove,
+    DialogCategoryGet,
+    DialogSave,
+    DialogsGet,
+    DialogGet,
+    DialogRemove,
+
+    TransportSave,
+    TransportCategoriesGet,
+    TransportCategorySave,
+    TransportCategoryRemove,
+    TransportRemove,
+    TransportGetLocation,
+    TransportsGet,
+
+    FactionSet,
+    FactionSave,
+    FactionsGet,
+    FactionGet,
+    FactionRemove,
+
+    TagSet,
+    TagSave,
+    TagsGet,
+    TagGet,
+    NpcTagsGet,
+    TagRemove,
+
+    QuestUntrack,
+    QuestLogToServer,
+    QuestCategorySave,
+    QuestCategoriesGet,
+    QuestRemove,
+    QuestCategoryRemove,
+    QuestRewardSave,
+    QuestSave,
+    QuestsGetFromQuest,
+    QuestsGet,
+    QuestDialogGetTitle,
+    QuestOpenGui,
+    QuestGet,
+
+    RecipeSave,
+    RecipeRemove,
+    RecipesGet,
+    RecipeGet,
+
+    NaturalSpawnSave,
+    NaturalSpawnGet,
+    NaturalSpawnRemove,
+    NaturalSpawnGetAll,
+
+    MerchantUpdate,
+    MountPacket,
+    MovingPathSave,
+    MovingPathGet,
+
+    AnimationsGet,
+    AnimationGet,
+    AnimationRemove,
+    AnimationSave,
+
+    RemoteNpcsGet,
+    RemoteTpToNpc,
+    TileEntitySave,
+    TileEntityGet,
+    Gui,
+    IsGuiOpen,
+    CacheAnimation,
+
+    CustomGuiButton,
+    CustomGuiScrollClick,
+    CustomGuiClose,
+    CustomGuiUnfocused,
+
+    PartyLogToServer,
+    PartySave,
+    PartyInfo,
+    PartyDisband,
+    PartyKick,
+    PartyLeave,
+    PartyInvite,
+    PartyAcceptInvite,
+    PartyIgnoreInvite,
+    PartySetLeader,
+    PartySetQuest,
+
+    LinkedRemove,
+    LinkedAdd,
+    LinkedGetAll,
+    LinkedSet,
+
+    BankGet,
+    BanksGet,
+    BankSave,
+    BankRemove,
+
+    QuestCategoryGet,
+
+    PlayerDataGet,
+    PlayerDataRemove,
+    PlayerDataMapRegen,
+
+    JobSave,
+    JobGet,
+    JobSpawnerAdd,
+    JobSpawnerRemove,
+
+    RoleCompanionUpdate,
+    RoleSave,
+    RoleGet,
+
+    MailOpenSetup,
+
+    TransformSave,
+    TransformGet,
+    TransformLoad,
+
+    TraderMarketSave,
+
+    CloneList,
+    CloneSave,
+    CloneRemove,
+    CloneTagList,
+    CloneAllTags,
+    CloneAllTagsShort,
+    ClonePreSave,
+
+    EventScript,
+    PlayerScript,
+    ForgeScript,
+    GlobalNPCScript,
+    ItemScript,
+    ItemScriptError,
+    BlockScript,
+    NPCScript,
+    ScriptInfo,
+    EffectScript,
+
+    DimensionTeleport,
+
+    EffectList,
+    EffectGet,
+    EffectScriptGet,
+    EffectRemove,
+    EffectSave,
+}
diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumSoundOperation.java b/src/main/java/kamkeel/npcs/network/enums/EnumSoundOperation.java
new file mode 100644
index 000000000..3295df155
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/enums/EnumSoundOperation.java
@@ -0,0 +1,12 @@
+package kamkeel.npcs.network.enums;
+
+public enum EnumSoundOperation {
+    CONTINUE_SOUNDS,
+    PAUSE_SOUNDS,
+    PLAY_MUSIC,
+    PLAY_SOUND,
+    PLAY_SOUND_TO,
+    PLAY_SOUND_TO_NO_ID,
+    STOP_SOUND_FOR,
+    STOP_SOUNDS
+}
diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumSyncAction.java b/src/main/java/kamkeel/npcs/network/enums/EnumSyncAction.java
new file mode 100644
index 000000000..f2260547e
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/enums/EnumSyncAction.java
@@ -0,0 +1,7 @@
+package kamkeel.npcs.network.enums;
+
+public enum EnumSyncAction {
+    RELOAD,
+    UPDATE,
+    REMOVE
+}
diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumSyncType.java b/src/main/java/kamkeel/npcs/network/enums/EnumSyncType.java
new file mode 100644
index 000000000..36c514e5d
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/enums/EnumSyncType.java
@@ -0,0 +1,15 @@
+package kamkeel.npcs.network.enums;
+
+public enum EnumSyncType {
+    FACTION,
+    DIALOG,
+    DIALOG_CATEGORY,
+    QUEST,
+    QUEST_CATEGORY,
+    PLAYERDATA,
+    MAGIC,
+    WORKBENCH_RECIPES,
+    CARPENTRY_RECIPES,
+    ANVIL_RECIPES,
+    CUSTOM_EFFECTS
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/AchievementPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/AchievementPacket.java
new file mode 100644
index 000000000..88f1b0b7e
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/AchievementPacket.java
@@ -0,0 +1,76 @@
+package kamkeel.npcs.network.packets.data;
+
+import cpw.mods.fml.common.ObfuscationReflectionHelper;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.achievement.GuiAchievement;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.init.Items;
+import net.minecraft.stats.Achievement;
+import net.minecraft.util.StatCollector;
+import noppes.npcs.CustomItems;
+import noppes.npcs.client.MessageAchievement;
+import noppes.npcs.config.ConfigClient;
+
+import java.io.IOException;
+
+public final class AchievementPacket extends AbstractPacket {
+    public static final String packetName = "Data|Achievement";
+
+    private boolean isParty;
+    private String description;
+    private String message;
+
+    public AchievementPacket() {
+    }
+
+    public AchievementPacket(boolean isParty, String description, String message) {
+        this.isParty = isParty;
+        this.description = description;
+        this.message = message;
+    }
+
+    public static void sendAchievement(EntityPlayerMP playerMP, boolean isParty, String description, String message) {
+        AchievementPacket packet = new AchievementPacket(isParty, description, message);
+        PacketHandler.Instance.sendToPlayer(packet, playerMP);
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.ACHIEVEMENT;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeBoolean(this.isParty);
+        ByteBufUtils.writeString(out, this.description);
+        ByteBufUtils.writeString(out, this.message);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!ConfigClient.BannerAlerts)
+            return;
+
+        boolean isNotParty = !in.readBoolean();
+        String description = StatCollector.translateToLocal(ByteBufUtils.readString(in));
+        String message = ByteBufUtils.readString(in);
+        Achievement ach = isNotParty ? new MessageAchievement(message, description) : new MessageAchievement(CustomItems.bag == null ? Items.paper : CustomItems.bag, message, description);
+        Minecraft.getMinecraft().guiAchievement.func_146256_a(ach);
+        ObfuscationReflectionHelper.setPrivateValue(GuiAchievement.class, Minecraft.getMinecraft().guiAchievement, ach.getDescription(), 4);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ChatAlertPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ChatAlertPacket.java
new file mode 100644
index 000000000..b57661e90
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/ChatAlertPacket.java
@@ -0,0 +1,63 @@
+package kamkeel.npcs.network.packets.data;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.util.ChatComponentTranslation;
+import noppes.npcs.config.ConfigClient;
+
+import java.io.IOException;
+
+public final class ChatAlertPacket extends AbstractPacket {
+    public static final String packetName = "Data|ChatAlert";
+
+    private Object[] objects;
+
+    public ChatAlertPacket() {
+    }
+
+    public ChatAlertPacket(final Object... obs) {
+        this.objects = obs;
+    }
+
+    public static void sendChatAlert(EntityPlayerMP playerMP, final Object... obs) {
+        ChatAlertPacket packet = new ChatAlertPacket(obs);
+        PacketHandler.Instance.sendToPlayer(packet, playerMP);
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.CHAT_ALERT;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.fillBuffer(out, this.objects);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!ConfigClient.ChatAlerts)
+            return;
+
+        StringBuilder message = new StringBuilder();
+        String str;
+        while ((str = ByteBufUtils.readString(in)) != null && !str.isEmpty()) {
+            message.append(str);
+        }
+        player.addChatMessage(new ChatComponentTranslation(message.toString()));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ChatBubblePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ChatBubblePacket.java
new file mode 100644
index 000000000..1d9892252
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/ChatBubblePacket.java
@@ -0,0 +1,70 @@
+package kamkeel.npcs.network.packets.data;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ChatComponentTranslation;
+import noppes.npcs.NoppesStringUtils;
+import noppes.npcs.client.RenderChatMessages;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class ChatBubblePacket extends AbstractPacket {
+    public static final String packetName = "Data|ChatBubble";
+
+    private int entityId;
+    private String text;
+    private boolean hideText;
+
+    public ChatBubblePacket() {
+    }
+
+    public ChatBubblePacket(int entityId, String text, boolean hideText) {
+        this.entityId = entityId;
+        this.text = text;
+        this.hideText = hideText;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.CHATBUBBLE;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.entityId);
+        ByteBufUtils.writeString(out, this.text);
+        out.writeBoolean(this.hideText);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(in.readInt());
+        if (!(entity instanceof EntityNPCInterface))
+            return;
+
+        EntityNPCInterface npc = (EntityNPCInterface) entity;
+        if (npc.messages == null)
+            npc.messages = new RenderChatMessages();
+        String text = NoppesStringUtils.formatText(ByteBufUtils.readString(in), player, npc);
+        npc.messages.addMessage(text, npc);
+
+        if (in.readBoolean())
+            player.addChatMessage(new ChatComponentTranslation(npc.getCommandSenderName() + ": " + text));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ClonerPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ClonerPacket.java
new file mode 100644
index 000000000..594ea2bcb
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/ClonerPacket.java
@@ -0,0 +1,57 @@
+package kamkeel.npcs.network.packets.data;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import kamkeel.npcs.network.LargeAbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.client.NoppesUtil;
+import noppes.npcs.client.gui.GuiNpcMobSpawnerAdd;
+
+import java.io.IOException;
+
+public final class ClonerPacket extends LargeAbstractPacket {
+    public static final String packetName = "Data|Clone";
+
+    private NBTTagCompound compound;
+
+    public ClonerPacket() {
+    }
+
+    public ClonerPacket(NBTTagCompound comp) {
+        this.compound = comp;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.CLONE_NPC;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+
+    @Override
+    protected byte[] getData() throws IOException {
+        ByteBuf buffer = Unpooled.buffer();
+        ByteBufUtils.writeBigNBT(buffer, compound);
+        byte[] bytes = new byte[buffer.readableBytes()];
+        buffer.readBytes(bytes);
+        return bytes;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException {
+        NBTTagCompound nbt = ByteBufUtils.readBigNBT(data);
+        NoppesUtil.openGUI(player, new GuiNpcMobSpawnerAdd(nbt));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ConfigCommandPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ConfigCommandPacket.java
new file mode 100644
index 000000000..6c8222b46
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/ConfigCommandPacket.java
@@ -0,0 +1,78 @@
+package kamkeel.npcs.network.packets.data;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumConfigOperation;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ChatComponentTranslation;
+import noppes.npcs.client.ClientProxy;
+import noppes.npcs.client.ClientProxy.FontContainer;
+import noppes.npcs.config.ConfigClient;
+
+import java.io.IOException;
+
+public final class ConfigCommandPacket extends AbstractPacket {
+    public static final String packetName = "Data|ConfigCommand";
+
+    private EnumConfigOperation configOperation;
+    private Object[] objects;
+
+    public ConfigCommandPacket() {
+    }
+
+    public ConfigCommandPacket(EnumConfigOperation operation, Object... obs) {
+        this.configOperation = operation;
+        this.objects = obs;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.CONFIG_COMMAND;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.configOperation.ordinal());
+        ByteBufUtils.fillBuffer(out, objects);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        EnumConfigOperation configType = EnumConfigOperation.values()[in.readInt()];
+        if (configType == EnumConfigOperation.FONT) { // Font Configuration
+            String font = ByteBufUtils.readString(in);
+            if(font == null)
+                return;
+
+            int size = in.readInt();
+            if (!font.isEmpty()) {
+                ConfigClient.FontType = font;
+                ConfigClient.FontSize = size;
+                ClientProxy.Font = new FontContainer(ConfigClient.FontType, ConfigClient.FontSize);
+
+                ConfigClient.FontTypeProperty.set(ConfigClient.FontType);
+                ConfigClient.FontSizeProperty.set(ConfigClient.FontSize);
+
+                if (ConfigClient.config.hasChanged()) {
+                    ConfigClient.config.save();
+                }
+
+                player.addChatMessage(new ChatComponentTranslation("Font set to %s", ClientProxy.Font.getName()));
+            } else {
+                player.addChatMessage(new ChatComponentTranslation("Current font is %s", ClientProxy.Font.getName()));
+            }
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/DisableMouseInputPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/DisableMouseInputPacket.java
new file mode 100644
index 000000000..290cdf609
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/DisableMouseInputPacket.java
@@ -0,0 +1,62 @@
+package kamkeel.npcs.network.packets.data;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.client.ClientEventHandler;
+
+import java.io.IOException;
+
+public final class DisableMouseInputPacket extends AbstractPacket {
+    public static final String packetName = "Data|DisableMouseInput";
+
+    private long duration;
+    private String keys;
+
+    public DisableMouseInputPacket() {
+    }
+
+    public DisableMouseInputPacket(long duration, String keys) {
+        this.duration = duration;
+        this.keys = keys;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.DISABLE_MOUSE_INPUT;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeLong(this.duration);
+        ByteBufUtils.writeString(out, this.keys);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        long duration = in.readLong();
+        String parsedButtons = ByteBufUtils.readString(in);
+
+        if (parsedButtons == null || parsedButtons.isEmpty()) {
+            ClientEventHandler.disabledButtonTimes.put(-1, duration);
+            return;
+        }
+
+        String[] buttonIds = parsedButtons.split(";");
+        for (String button : buttonIds) {
+            ClientEventHandler.disabledButtonTimes.put(Integer.parseInt(button), duration);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/LoginPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/LoginPacket.java
new file mode 100644
index 000000000..385b8fda4
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/LoginPacket.java
@@ -0,0 +1,41 @@
+package kamkeel.npcs.network.packets.data;
+
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+
+import java.io.IOException;
+
+public final class LoginPacket extends AbstractPacket {
+    public static final String packetName = "CNPC+|Login";
+
+    public LoginPacket() {
+    }
+
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.LOGIN;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+//        ByteBufUtils.writeUTF8String(out, this.data.player.getCommandSenderName());
+//        ByteBufUtils.writeNBT(out,this.data.saveFromNBT(new NBTTagCompound()));
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        String playerName = ByteBufUtils.readUTF8String(in);
+
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/MarkDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/MarkDataPacket.java
new file mode 100644
index 000000000..8fa4265bc
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/MarkDataPacket.java
@@ -0,0 +1,60 @@
+package kamkeel.npcs.network.packets.data;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.controllers.data.MarkData;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class MarkDataPacket extends AbstractPacket {
+    public static final String packetName = "Data|MarkData";
+
+    private int entityID;
+    private NBTTagCompound compound;
+
+    public MarkDataPacket() {
+    }
+
+    public MarkDataPacket(int entityID, NBTTagCompound compound) {
+        this.entityID = entityID;
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.MARK_DATA;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.entityID);
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        Entity entity = player.worldObj.getEntityByID(in.readInt());
+        if (!(entity instanceof EntityNPCInterface)) return;
+
+        EntityNPCInterface npc = (EntityNPCInterface) entity;
+        NBTTagCompound nbt = ByteBufUtils.readNBT(in);
+        MarkData data = MarkData.get(npc);
+        data.setNBT(nbt);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/OverlayQuestTrackingPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/OverlayQuestTrackingPacket.java
new file mode 100644
index 000000000..f31baf305
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/OverlayQuestTrackingPacket.java
@@ -0,0 +1,57 @@
+package kamkeel.npcs.network.packets.data;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.client.ClientCacheHandler;
+import noppes.npcs.client.gui.OverlayQuestTracking;
+
+import java.io.IOException;
+
+public final class OverlayQuestTrackingPacket extends AbstractPacket {
+    public static final String packetName = "Data|OverlayQuestTracking";
+
+    private NBTTagCompound compound;
+
+    public OverlayQuestTrackingPacket() {
+    }
+
+    public OverlayQuestTrackingPacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.OVERLAY_QUEST_TRACKING;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, compound);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        try {
+            NBTTagCompound nbt = ByteBufUtils.readNBT(in);
+            ClientCacheHandler.questTrackingOverlay = new OverlayQuestTracking(Minecraft.getMinecraft());
+            ClientCacheHandler.questTrackingOverlay.setOverlayData(nbt);
+        } catch (IOException e) {
+            ClientCacheHandler.questTrackingOverlay = null;
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ParticlePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ParticlePacket.java
new file mode 100644
index 000000000..93fb772ea
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/ParticlePacket.java
@@ -0,0 +1,95 @@
+package kamkeel.npcs.network.packets.data;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+
+import java.io.IOException;
+import java.util.Random;
+
+public final class ParticlePacket extends AbstractPacket {
+    public static final String packetName = "Data|Particle";
+
+    private double x;
+    private double y;
+    private double z;
+
+    private float height;
+    private float width;
+    private float yOffset;
+
+    private String particle;
+
+    public ParticlePacket() {
+    }
+
+    public ParticlePacket(double x, double y, double z, float height, float width, float yOffset, String particle) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.height = height;
+        this.width = width;
+        this.yOffset = yOffset;
+        this.particle = particle;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.PARTICLE;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeDouble(x);
+        out.writeDouble(y);
+        out.writeDouble(z);
+
+        out.writeFloat(height);
+        out.writeFloat(width);
+        out.writeFloat(yOffset);
+
+        ByteBufUtils.writeString(out, particle);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        spawnParticle(in);
+    }
+
+    @SideOnly(Side.CLIENT)
+    public static void spawnParticle(ByteBuf buffer) throws IOException {
+        double posX = buffer.readDouble();
+        double posY = buffer.readDouble();
+        double posZ = buffer.readDouble();
+        float height = buffer.readFloat();
+        float width = buffer.readFloat();
+        float yOffset = buffer.readFloat();
+
+        String particle = ByteBufUtils.readString(buffer);
+        if(particle != null){
+            World worldObj = Minecraft.getMinecraft().theWorld;
+
+            Random rand = worldObj.rand;
+            if (particle.equals("heal")) {
+                for (int k = 0; k < 6; k++) {
+                    worldObj.spawnParticle("instantSpell", posX + (rand.nextDouble() - 0.5D) * (double) width, (posY + rand.nextDouble() * (double) height) - (double) yOffset, posZ + (rand.nextDouble() - 0.5D) * (double) width, 0, 0, 0);
+                    worldObj.spawnParticle("spell", posX + (rand.nextDouble() - 0.5D) * (double) width, (posY + rand.nextDouble() * (double) height) - (double) yOffset, posZ + (rand.nextDouble() - 0.5D) * (double) width, 0, 0, 0);
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/PlayerUpdateSkinOverlaysPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/PlayerUpdateSkinOverlaysPacket.java
new file mode 100644
index 000000000..e16d7c06b
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/PlayerUpdateSkinOverlaysPacket.java
@@ -0,0 +1,58 @@
+package kamkeel.npcs.network.packets.data;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.client.NoppesUtil;
+
+import java.io.IOException;
+
+public final class PlayerUpdateSkinOverlaysPacket extends AbstractPacket {
+    public static final String packetName = "Data|PlayerUpdateSkinOverlays";
+
+    private String playerName;
+    private NBTTagCompound compound;
+
+    public PlayerUpdateSkinOverlaysPacket() {
+    }
+
+    public PlayerUpdateSkinOverlaysPacket(String playerName, NBTTagCompound compound) {
+        this.playerName = playerName;
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.PLAYER_UPDATE_SKIN_OVERLAYS;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, this.playerName);
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        String playerName = ByteBufUtils.readString(in);
+        NBTTagCompound nbt = ByteBufUtils.readNBT(in);
+        EntityPlayer sendingPlayer = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(playerName);
+        if (sendingPlayer != null) {
+            NoppesUtil.updateSkinOverlayData(sendingPlayer, nbt);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/QuestCompletionPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/QuestCompletionPacket.java
new file mode 100644
index 000000000..d4eda9be3
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/QuestCompletionPacket.java
@@ -0,0 +1,55 @@
+package kamkeel.npcs.network.packets.data;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.client.NoppesUtil;
+
+import java.io.IOException;
+
+public final class QuestCompletionPacket extends AbstractPacket {
+    public static final String packetName = "Data|QuestCompletion";
+
+    private NBTTagCompound compound;
+
+    public QuestCompletionPacket() {
+    }
+
+    public QuestCompletionPacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    public static void sendQuestComplete(EntityPlayerMP playerMP, NBTTagCompound compound) {
+        QuestCompletionPacket packet = new QuestCompletionPacket(compound);
+        PacketHandler.Instance.sendToPlayer(packet, playerMP);
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.QUEST_COMPLETION;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        NoppesUtil.guiQuestCompletion(player, ByteBufUtils.readNBT(in));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ScrollSelectedPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ScrollSelectedPacket.java
new file mode 100644
index 000000000..ff10fe045
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/ScrollSelectedPacket.java
@@ -0,0 +1,60 @@
+package kamkeel.npcs.network.packets.data;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.client.gui.util.IScrollData;
+
+import java.io.IOException;
+
+public final class ScrollSelectedPacket extends AbstractPacket {
+    public static final String packetName = "Data|ScrollSelected";
+
+    private String selected;
+
+    public ScrollSelectedPacket() {
+    }
+
+    public ScrollSelectedPacket(String selected) {
+        this.selected = selected;
+    }
+
+    public static void setSelectedList(EntityPlayerMP playerMP, String item) {
+        ScrollSelectedPacket packet = new ScrollSelectedPacket(item);
+        PacketHandler.Instance.sendToPlayer(packet, playerMP);
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.SCROLL_SELECTED;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, this.selected);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        GuiScreen gui = Minecraft.getMinecraft().currentScreen;
+        if (gui instanceof IScrollData) {
+            String selected = ByteBufUtils.readString(in);
+            ((IScrollData) gui).setSelected(selected);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/SoundManagementPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/SoundManagementPacket.java
new file mode 100644
index 000000000..8971cd8bc
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/SoundManagementPacket.java
@@ -0,0 +1,145 @@
+package kamkeel.npcs.network.packets.data;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.network.enums.EnumSoundOperation;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.client.controllers.MusicController;
+import noppes.npcs.client.controllers.ScriptClientSound;
+import noppes.npcs.client.controllers.ScriptSoundController;
+
+import java.io.IOException;
+
+public final class SoundManagementPacket extends AbstractPacket {
+    private EnumSoundOperation operation;
+    private String soundName;
+    private float x, y, z;
+    private NBTTagCompound nbt;
+    private int soundId;
+
+    public SoundManagementPacket() {
+    }
+
+    public SoundManagementPacket(EnumSoundOperation operation) {
+        this.operation = operation;
+    }
+
+    public SoundManagementPacket(EnumSoundOperation operation, String soundName) {
+        this.operation = operation;
+        this.soundName = soundName;
+    }
+
+    public SoundManagementPacket(EnumSoundOperation operation, String soundName, float x, float y, float z) {
+        this.operation = operation;
+        this.soundName = soundName;
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
+    public SoundManagementPacket(EnumSoundOperation operation, int soundId, NBTTagCompound nbt) {
+        this.operation = operation;
+        this.soundId = soundId;
+        this.nbt = nbt;
+    }
+
+    public SoundManagementPacket(EnumSoundOperation operation, NBTTagCompound nbt) {
+        this.operation = operation;
+        this.nbt = nbt;
+    }
+
+    public SoundManagementPacket(EnumSoundOperation operation, int soundId) {
+        this.operation = operation;
+        this.soundId = soundId;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.SOUND;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(operation.ordinal());
+        switch (operation) {
+            case PLAY_MUSIC:
+            case PLAY_SOUND:
+                ByteBufUtils.writeString(out, soundName);
+                if (operation == EnumSoundOperation.PLAY_SOUND) {
+                    out.writeFloat(x);
+                    out.writeFloat(y);
+                    out.writeFloat(z);
+                }
+                break;
+            case PLAY_SOUND_TO:
+                out.writeInt(soundId);
+                ByteBufUtils.writeNBT(out, nbt);
+                break;
+            case PLAY_SOUND_TO_NO_ID:
+                ByteBufUtils.writeNBT(out, nbt);
+                break;
+            case STOP_SOUND_FOR:
+                out.writeInt(soundId);
+                break;
+            default:
+                break;
+        }
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        EnumSoundOperation operation = EnumSoundOperation.values()[in.readInt()];
+        switch (operation) {
+            case CONTINUE_SOUNDS:
+                ScriptSoundController.Instance.continueAllSounds();
+                break;
+            case PAUSE_SOUNDS:
+                ScriptSoundController.Instance.pauseAllSounds();
+                break;
+            case PLAY_MUSIC:
+                String soundName = ByteBufUtils.readString(in);
+                MusicController.Instance.playMusicBackground(soundName, player, Integer.MAX_VALUE);
+                break;
+            case PLAY_SOUND:
+                String name = ByteBufUtils.readString(in);
+                float x = in.readFloat();
+                float y = in.readFloat();
+                float z = in.readFloat();
+                MusicController.Instance.playSound(name, x, y, z);
+                break;
+            case PLAY_SOUND_TO:
+                int id = in.readInt();
+                NBTTagCompound comp = ByteBufUtils.readNBT(in);
+                ScriptClientSound sound = ScriptClientSound.fromScriptSound(comp, player.worldObj);
+                ScriptSoundController.Instance.playSound(id, sound);
+                break;
+            case PLAY_SOUND_TO_NO_ID:
+                NBTTagCompound tagCompound = ByteBufUtils.readNBT(in);
+                ScriptClientSound soundNoId = ScriptClientSound.fromScriptSound(tagCompound, player.worldObj);
+                ScriptSoundController.Instance.playSound(soundNoId);
+                break;
+            case STOP_SOUND_FOR:
+                int stopID = in.readInt();
+                ScriptSoundController.Instance.stopSound(stopID);
+                break;
+            case STOP_SOUNDS:
+                ScriptSoundController.Instance.stopAllSounds();
+                break;
+            default:
+                break;
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/SwingPlayerArmPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/SwingPlayerArmPacket.java
new file mode 100644
index 000000000..04095517f
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/SwingPlayerArmPacket.java
@@ -0,0 +1,40 @@
+package kamkeel.npcs.network.packets.data;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayer;
+
+import java.io.IOException;
+
+public final class SwingPlayerArmPacket extends AbstractPacket {
+    public static final String packetName = "Data|SwingPlayerArm";
+
+    public SwingPlayerArmPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.SWING_PLAYER_ARM;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        Minecraft.getMinecraft().thePlayer.swingItem();
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/UpdateAnimationsPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/UpdateAnimationsPacket.java
new file mode 100644
index 000000000..d6f1922a7
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/UpdateAnimationsPacket.java
@@ -0,0 +1,93 @@
+package kamkeel.npcs.network.packets.data;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.network.packets.request.animation.AnimationCachePacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.client.ClientCacheHandler;
+import noppes.npcs.controllers.data.Animation;
+import noppes.npcs.controllers.data.AnimationData;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class UpdateAnimationsPacket extends AbstractPacket {
+    public static final String packetName = "Data|UpdateAnimations";
+
+    private NBTTagCompound animationCompound;
+    private String playername;
+
+    public UpdateAnimationsPacket() {
+    }
+
+    public UpdateAnimationsPacket(NBTTagCompound animationCompound, String playername) {
+        this.animationCompound = animationCompound;
+        this.playername = playername;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.UPDATE_ANIMATIONS;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.animationCompound);
+        ByteBufUtils.writeString(out, this.playername);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        NBTTagCompound nbt = ByteBufUtils.readNBT(in);
+        AnimationData animationData = null;
+
+        if (nbt.hasKey("EntityId")) {
+            Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(nbt.getInteger("EntityId"));
+            if (entity instanceof EntityNPCInterface) {
+                animationData = ((EntityNPCInterface) entity).display.animationData;
+            }
+        } else {
+            String playerName = ByteBufUtils.readString(in);
+            EntityPlayer sendingPlayer = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(playerName);
+            if (sendingPlayer != null) {
+                if (!ClientCacheHandler.playerAnimations.containsKey(sendingPlayer.getUniqueID())) {
+                    ClientCacheHandler.playerAnimations.put(sendingPlayer.getUniqueID(), new AnimationData(sendingPlayer));
+                }
+                animationData = ClientCacheHandler.playerAnimations.get(sendingPlayer.getUniqueID());
+                animationData.parent = sendingPlayer;
+            }
+        }
+
+        if (animationData != null) {
+            int animationId;
+            if (nbt.hasKey("AnimationID")) {
+                animationId = nbt.getInteger("AnimationID");
+            } else {
+                Animation animation = new Animation();
+                animation.readFromNBT(nbt.getCompoundTag("Animation"));
+                ClientCacheHandler.animationCache.put(animation.getID(), animation);
+                animationId = animation.getID();
+            }
+
+            animationData.setAnimation(ClientCacheHandler.animationCache.get(animationId));
+            animationData.readFromNBT(nbt);
+            PacketClient.sendClient(new AnimationCachePacket(animationId));
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/VillagerListPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/VillagerListPacket.java
new file mode 100644
index 000000000..af1535e27
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/VillagerListPacket.java
@@ -0,0 +1,51 @@
+package kamkeel.npcs.network.packets.data;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.village.MerchantRecipeList;
+import noppes.npcs.ServerEventsHandler;
+
+import java.io.IOException;
+
+public final class VillagerListPacket extends AbstractPacket {
+    public static final String packetName = "Data|VillagerList";
+
+    private MerchantRecipeList merchantrecipelist;
+
+    public VillagerListPacket() {
+    }
+
+    public VillagerListPacket(MerchantRecipeList merchantrecipelist) {
+        this.merchantrecipelist = merchantrecipelist;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.VILLAGER_LIST;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.fillBuffer(out, merchantrecipelist);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        MerchantRecipeList recipes = MerchantRecipeList.func_151390_b(new PacketBuffer(in));
+        ServerEventsHandler.Merchant.setRecipes(recipes);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiClosePacket.java
new file mode 100644
index 000000000..29dd90ddd
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiClosePacket.java
@@ -0,0 +1,67 @@
+package kamkeel.npcs.network.packets.data.gui;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.client.gui.util.IGuiClose;
+
+import java.io.IOException;
+
+public final class GuiClosePacket extends AbstractPacket {
+    public static final String packetName = "Data|GuiClose";
+
+    private int code;
+    private NBTTagCompound compound;
+
+    public GuiClosePacket() {
+    }
+
+    public GuiClosePacket(int code, NBTTagCompound compound) {
+        this.code = code;
+        this.compound = compound;
+    }
+
+    public static void closeGUI(EntityPlayerMP playerMP, int closeCode, NBTTagCompound compound) {
+        GuiClosePacket packet = new GuiClosePacket(closeCode, compound);
+        PacketHandler.Instance.sendToPlayer(packet, playerMP);
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.GUI_CLOSE;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(code);
+        ByteBufUtils.writeNBT(out, compound);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        GuiScreen gui = Minecraft.getMinecraft().currentScreen;
+        if (gui instanceof IGuiClose) {
+            int closeCode = in.readInt();
+            NBTTagCompound nbt = ByteBufUtils.readNBT(in);
+            ((IGuiClose) gui).setClose(closeCode, nbt);
+        }
+        Minecraft.getMinecraft().displayGuiScreen(null);
+        Minecraft.getMinecraft().setIngameFocus();
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiErrorPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiErrorPacket.java
new file mode 100644
index 000000000..8342375da
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiErrorPacket.java
@@ -0,0 +1,65 @@
+package kamkeel.npcs.network.packets.data.gui;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.client.gui.util.IGuiError;
+
+import java.io.IOException;
+
+public final class GuiErrorPacket extends AbstractPacket {
+    public static final String packetName = "Data|GuiError";
+
+    private int code;
+    private NBTTagCompound compound;
+
+    public GuiErrorPacket() {
+    }
+
+    public GuiErrorPacket(int code, NBTTagCompound compound) {
+        this.code = code;
+        this.compound = compound;
+    }
+
+    public static void errorGUI(EntityPlayerMP playerMP, int closeCode, NBTTagCompound compound) {
+        GuiErrorPacket packet = new GuiErrorPacket(closeCode, compound);
+        PacketHandler.Instance.sendToPlayer(packet, playerMP);
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.GUI_ERROR;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(code);
+        ByteBufUtils.writeNBT(out, compound);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        GuiScreen gui = Minecraft.getMinecraft().currentScreen;
+        if (gui instanceof IGuiError) {
+            int errorCode = in.readInt();
+            NBTTagCompound nbt = ByteBufUtils.readNBT(in);
+            ((IGuiError) gui).setError(errorCode, nbt);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenBookPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenBookPacket.java
new file mode 100644
index 000000000..c6e54678d
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenBookPacket.java
@@ -0,0 +1,67 @@
+package kamkeel.npcs.network.packets.data.gui;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.client.NoppesUtil;
+import noppes.npcs.client.gui.player.GuiBook;
+
+import java.io.IOException;
+
+public final class GuiOpenBookPacket extends AbstractPacket {
+    public static final String packetName = "Data|GuiOpenBook";
+
+    private int i;
+    private int j;
+    private int k;
+    private NBTTagCompound nbtTagCompound;
+
+    public GuiOpenBookPacket() {
+    }
+
+    public GuiOpenBookPacket(int i, int j, int k, NBTTagCompound nbtTagCompound) {
+        this.i = i;
+        this.j = j;
+        this.k = k;
+        this.nbtTagCompound = nbtTagCompound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.GUI_BOOK;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.i);
+        out.writeInt(this.j);
+        out.writeInt(this.k);
+
+        ByteBufUtils.writeNBT(out, this.nbtTagCompound);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        int x = in.readInt();
+        int y = in.readInt();
+        int z = in.readInt();
+        NBTTagCompound nbt = ByteBufUtils.readNBT(in);
+        ItemStack book = ItemStack.loadItemStackFromNBT(nbt);
+        if(book != null)
+            NoppesUtil.openGUI(player, new GuiBook(player, book, x, y, z));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenPacket.java
new file mode 100644
index 000000000..1a8324c66
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenPacket.java
@@ -0,0 +1,68 @@
+package kamkeel.npcs.network.packets.data.gui;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcs;
+import noppes.npcs.client.NoppesUtil;
+import noppes.npcs.constants.EnumGuiType;
+
+import java.io.IOException;
+
+public final class GuiOpenPacket extends AbstractPacket {
+    public static final String packetName = "Data|OpenGui";
+
+    private EnumGuiType type;
+    private int x;
+    private int y;
+    private int z;
+
+    public GuiOpenPacket() {
+    }
+
+    public GuiOpenPacket(EnumGuiType type, int x, int y, int z) {
+        this.type = type;
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
+    public static void openGUI(EntityPlayerMP playerMP, EnumGuiType type, int x, int y, int z) {
+        GuiOpenPacket packet = new GuiOpenPacket(type, x, y, z);
+        PacketHandler.Instance.sendToPlayer(packet, playerMP);
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.GUI_OPEN;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+        out.writeInt(x);
+        out.writeInt(y);
+        out.writeInt(z);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        EnumGuiType gui = EnumGuiType.values()[in.readInt()];
+        int x = in.readInt();
+        int y = in.readInt();
+        int z = in.readInt();
+        CustomNpcs.proxy.openGui(NoppesUtil.getLastNpc(), gui, x, y, z);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiRedstonePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiRedstonePacket.java
new file mode 100644
index 000000000..e1d5e5ba7
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiRedstonePacket.java
@@ -0,0 +1,50 @@
+package kamkeel.npcs.network.packets.data.gui;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.client.NoppesUtil;
+
+import java.io.IOException;
+
+public final class GuiRedstonePacket extends AbstractPacket {
+    public static final String packetName = "Data|GuiRedstone";
+
+    private NBTTagCompound compound;
+
+    public GuiRedstonePacket() {
+    }
+
+    public GuiRedstonePacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.GUI_REDSTONE;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        NBTTagCompound nbt = ByteBufUtils.readNBT(in);
+        NoppesUtil.saveRedstoneBlock(player, nbt);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiTeleporterPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiTeleporterPacket.java
new file mode 100644
index 000000000..ccda3e54c
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiTeleporterPacket.java
@@ -0,0 +1,42 @@
+package kamkeel.npcs.network.packets.data.gui;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.CustomNpcs;
+import noppes.npcs.constants.EnumGuiType;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class GuiTeleporterPacket extends AbstractPacket {
+    public static final String packetName = "Data|Teleporter";
+
+    public GuiTeleporterPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.GUI_TELEPORTER;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        CustomNpcs.proxy.openGui((EntityNPCInterface) null, EnumGuiType.NpcDimensions);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiWaypointPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiWaypointPacket.java
new file mode 100644
index 000000000..94e059508
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiWaypointPacket.java
@@ -0,0 +1,50 @@
+package kamkeel.npcs.network.packets.data.gui;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.client.NoppesUtil;
+
+import java.io.IOException;
+
+public final class GuiWaypointPacket extends AbstractPacket {
+    public static final String packetName = "Data|GuiWaypoint";
+
+    private NBTTagCompound compound;
+
+    public GuiWaypointPacket() {
+    }
+
+    public GuiWaypointPacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.GUI_WAYPOINT;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        NBTTagCompound nbt = ByteBufUtils.readNBT(in);
+        NoppesUtil.saveWayPointBlock(player, nbt);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/IsGuiOpenPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/IsGuiOpenPacket.java
new file mode 100644
index 000000000..25281bf3d
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/IsGuiOpenPacket.java
@@ -0,0 +1,42 @@
+package kamkeel.npcs.network.packets.data.gui;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.client.NoppesUtil;
+
+import java.io.IOException;
+
+public final class IsGuiOpenPacket extends AbstractPacket {
+    public static final String packetName = "Data|IsGuiOpen";
+
+    public IsGuiOpenPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.ISGUIOPEN;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        boolean isGuiOpen = Minecraft.getMinecraft().currentScreen != null;
+        NoppesUtil.isGUIOpen(isGuiOpen);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/GuiDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/GuiDataPacket.java
new file mode 100644
index 000000000..631e32bf2
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/large/GuiDataPacket.java
@@ -0,0 +1,73 @@
+package kamkeel.npcs.network.packets.data.large;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import kamkeel.npcs.network.LargeAbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.client.gui.util.GuiContainerNPCInterface;
+import noppes.npcs.client.gui.util.GuiNPCInterface;
+import noppes.npcs.client.gui.util.IGuiData;
+
+import java.io.IOException;
+
+public final class GuiDataPacket extends LargeAbstractPacket {
+    public static final String packetName = "Data|GuiData";
+
+    private NBTTagCompound compound;
+
+    public GuiDataPacket() {
+    }
+
+    public GuiDataPacket(NBTTagCompound comp) {
+        this.compound = comp;
+    }
+
+    public static void sendGuiData(EntityPlayerMP playerMP, NBTTagCompound compound) {
+        GuiDataPacket packet = new GuiDataPacket(compound);
+        PacketHandler.Instance.sendToPlayer(packet, playerMP);
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.GUI_DATA;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    protected byte[] getData() throws IOException {
+        ByteBuf buffer = Unpooled.buffer();
+        ByteBufUtils.writeBigNBT(buffer, compound);
+        byte[] bytes = new byte[buffer.readableBytes()];
+        buffer.readBytes(bytes);
+        return bytes;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException {
+        GuiScreen gui = Minecraft.getMinecraft().currentScreen;
+        if (gui instanceof GuiNPCInterface && ((GuiNPCInterface) gui).hasSubGui()) {
+            gui = ((GuiNPCInterface) gui).getSubGui();
+        } else if (gui instanceof GuiContainerNPCInterface && ((GuiContainerNPCInterface) gui).hasSubGui()) {
+            gui = ((GuiContainerNPCInterface) gui).getSubGui();
+        }
+        if (gui instanceof IGuiData) {
+            NBTTagCompound nbt = ByteBufUtils.readBigNBT(data);
+            ((IGuiData) gui).setGuiData(nbt);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/PartyDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/PartyDataPacket.java
new file mode 100644
index 000000000..1579a50ca
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/large/PartyDataPacket.java
@@ -0,0 +1,73 @@
+package kamkeel.npcs.network.packets.data.large;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import kamkeel.npcs.network.LargeAbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.client.gui.util.GuiContainerNPCInterface;
+import noppes.npcs.client.gui.util.GuiNPCInterface;
+import noppes.npcs.client.gui.util.IPartyData;
+
+import java.io.IOException;
+
+public final class PartyDataPacket extends LargeAbstractPacket {
+    public static final String packetName = "Data|PartyData";
+
+    private NBTTagCompound compound;
+
+    public PartyDataPacket() {
+    }
+
+    public PartyDataPacket(NBTTagCompound comp) {
+        this.compound = comp;
+    }
+
+    public static void sendPartyData(EntityPlayerMP playerMP, NBTTagCompound compound) {
+        PartyDataPacket packet = new PartyDataPacket(compound);
+        PacketHandler.Instance.sendToPlayer(packet, playerMP);
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.PARTY_DATA;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    protected byte[] getData() throws IOException {
+        ByteBuf buffer = Unpooled.buffer();
+        ByteBufUtils.writeBigNBT(buffer, compound);
+        byte[] bytes = new byte[buffer.readableBytes()];
+        buffer.readBytes(bytes);
+        return bytes;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException {
+        GuiScreen gui = Minecraft.getMinecraft().currentScreen;
+        if (gui instanceof GuiNPCInterface && ((GuiNPCInterface) gui).hasSubGui()) {
+            gui = ((GuiNPCInterface) gui).getSubGui();
+        } else if (gui instanceof GuiContainerNPCInterface && ((GuiContainerNPCInterface) gui).hasSubGui()) {
+            gui = ((GuiContainerNPCInterface) gui).getSubGui();
+        }
+        if (gui instanceof IPartyData) {
+            NBTTagCompound nbt = ByteBufUtils.readBigNBT(data);
+            ((IPartyData) gui).setPartyData(nbt);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollDataPacket.java
new file mode 100644
index 000000000..53fe29e7c
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollDataPacket.java
@@ -0,0 +1,61 @@
+package kamkeel.npcs.network.packets.data.large;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import kamkeel.npcs.network.LargeAbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.client.NoppesUtil;
+
+import java.io.IOException;
+import java.util.Map;
+
+public final class ScrollDataPacket extends LargeAbstractPacket {
+    public static final String packetName = "Large|ScrollData";
+
+    private Map<String, Integer> data;
+
+    public ScrollDataPacket() {
+    }
+
+    public ScrollDataPacket(Map<String, Integer> data) {
+        this.data = data;
+    }
+
+    public static void sendScrollData(EntityPlayerMP player, Map<String, Integer> map) {
+        ScrollDataPacket packet = new ScrollDataPacket(map);
+        PacketHandler.Instance.sendToPlayer(packet, player);
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.SCROLL_DATA;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    protected byte[] getData() throws IOException {
+        ByteBuf buffer = Unpooled.buffer();
+        buffer.writeInt(data.size());
+        for (Map.Entry<String, Integer> entry : data.entrySet()) {
+            buffer.writeInt(entry.getValue());
+            ByteBufUtils.writeString(buffer, entry.getKey());
+        }
+        byte[] bytes = new byte[buffer.readableBytes()];
+        buffer.readBytes(bytes);
+        return bytes;
+    }
+
+    @Override
+    protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException {
+        NoppesUtil.setScrollData(data);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollGroupPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollGroupPacket.java
new file mode 100644
index 000000000..376d8be5e
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollGroupPacket.java
@@ -0,0 +1,61 @@
+package kamkeel.npcs.network.packets.data.large;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import kamkeel.npcs.network.LargeAbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.client.NoppesUtil;
+
+import java.io.IOException;
+import java.util.Map;
+
+public final class ScrollGroupPacket extends LargeAbstractPacket {
+    public static final String packetName = "Large|ScrollGroup";
+
+    private Map<String, Integer> data;
+
+    public ScrollGroupPacket() {
+    }
+
+    public ScrollGroupPacket(Map<String, Integer> data) {
+        this.data = data;
+    }
+
+    public static void sendScrollGroup(EntityPlayerMP player, Map<String, Integer> map) {
+        ScrollGroupPacket packet = new ScrollGroupPacket(map);
+        PacketHandler.Instance.sendToPlayer(packet, player);
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.SCROLL_GROUP;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    protected byte[] getData() throws IOException {
+        ByteBuf buffer = Unpooled.buffer();
+        buffer.writeInt(data.size());
+        for (Map.Entry<String, Integer> entry : data.entrySet()) {
+            buffer.writeInt(entry.getValue());
+            ByteBufUtils.writeString(buffer, entry.getKey());
+        }
+        byte[] bytes = new byte[buffer.readableBytes()];
+        buffer.readBytes(bytes);
+        return bytes;
+    }
+
+    @Override
+    protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException {
+        NoppesUtil.setScrollGroup(data);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollListPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollListPacket.java
new file mode 100644
index 000000000..a78d71b3f
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollListPacket.java
@@ -0,0 +1,60 @@
+package kamkeel.npcs.network.packets.data.large;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import kamkeel.npcs.network.LargeAbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.client.NoppesUtil;
+
+import java.io.IOException;
+import java.util.List;
+
+public final class ScrollListPacket extends LargeAbstractPacket {
+    public static final String packetName = "Large|ScrollList";
+
+    private List<String> data;
+
+    public ScrollListPacket() {
+    }
+
+    public ScrollListPacket(List<String> data) {
+        this.data = data;
+    }
+
+    public static void sendList(EntityPlayerMP player, List<String> list) {
+        ScrollListPacket packet = new ScrollListPacket(list);
+        PacketHandler.Instance.sendToPlayer(packet, player);
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.SCROLL_LIST;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    protected byte[] getData() throws IOException {
+        ByteBuf buffer = Unpooled.buffer();
+        buffer.writeInt(data.size());
+        for (String entry : data) {
+            ByteBufUtils.writeString(buffer, entry);
+        }
+        byte[] bytes = new byte[buffer.readableBytes()];
+        buffer.readBytes(bytes);
+        return bytes;
+    }
+
+    @Override
+    protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException {
+        NoppesUtil.setScrollList(data);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/SyncEffectPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/SyncEffectPacket.java
new file mode 100644
index 000000000..723df8658
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/large/SyncEffectPacket.java
@@ -0,0 +1,64 @@
+package kamkeel.npcs.network.packets.data.large;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import kamkeel.npcs.controllers.SyncController;
+import kamkeel.npcs.network.LargeAbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.network.enums.EnumSyncAction;
+import kamkeel.npcs.network.enums.EnumSyncType;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcs;
+import noppes.npcs.LogWriter;
+
+import java.io.IOException;
+
+public final class SyncEffectPacket extends LargeAbstractPacket {
+
+    private NBTTagCompound syncData;
+
+    public SyncEffectPacket() {}
+
+    public SyncEffectPacket(NBTTagCompound syncData) {
+        this.syncData = syncData;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.SYNC_EFFECTS;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    protected byte[] getData() throws IOException {
+        ByteBuf buffer = Unpooled.buffer();
+        ByteBufUtils.writeBigNBT(buffer, syncData);
+        byte[] bytes = new byte[buffer.readableBytes()];
+        buffer.readBytes(bytes);
+        return bytes;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException {
+        if (CustomNpcs.side() != Side.CLIENT)
+            return;
+        try {
+            NBTTagCompound tag = ByteBufUtils.readBigNBT(data);
+            SyncController.clientSyncEffects(tag);
+        }
+        catch (RuntimeException e){
+            LogWriter.error(String.format("Attempted to Sync Effects but it was too big"));
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/SyncPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/SyncPacket.java
new file mode 100644
index 000000000..db7722ecb
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/large/SyncPacket.java
@@ -0,0 +1,108 @@
+package kamkeel.npcs.network.packets.data.large;
+
+import cpw.mods.fml.relauncher.Side;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import kamkeel.npcs.controllers.SyncController;
+import kamkeel.npcs.network.LargeAbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.network.enums.EnumSyncAction;
+import kamkeel.npcs.network.enums.EnumSyncType;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcs;
+import noppes.npcs.LogWriter;
+
+import java.io.IOException;
+
+/**
+ * A large sync packet that sends chunked data to the client for a given SyncType
+ * along with a SyncAction (RELOAD, UPDATE, REMOVE).
+ */
+public final class SyncPacket extends LargeAbstractPacket {
+
+    private EnumSyncType enumSyncType;
+    private EnumSyncAction enumSyncAction;
+    private NBTTagCompound syncData;
+    private int operationID;
+
+    public SyncPacket() {
+    }
+
+    /**
+     * Constructs a new LargeSyncPacket.
+     */
+    public SyncPacket(EnumSyncType enumSyncType, EnumSyncAction enumSyncAction, int catId, NBTTagCompound syncData) {
+        this.enumSyncType = enumSyncType;
+        this.enumSyncAction = enumSyncAction;
+        this.syncData = syncData;
+        this.operationID = catId;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.SYNC;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    protected byte[] getData() throws IOException {
+        ByteBuf buffer = Unpooled.buffer();
+        // 1) Write SyncType
+        buffer.writeInt(enumSyncType.ordinal());
+        // 2) Write SyncAction
+        buffer.writeInt(enumSyncAction.ordinal());
+        // 3) Optional Category ID
+        buffer.writeInt(operationID);
+        // 4) Write the NBTTagCompound
+        ByteBufUtils.writeBigNBT(buffer, syncData);
+
+        // Copy the buffer’s readable bytes into a byte[]
+        byte[] bytes = new byte[buffer.readableBytes()];
+        buffer.readBytes(bytes);
+        return bytes;
+    }
+
+    @Override
+    protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException {
+        if (CustomNpcs.side() != Side.CLIENT)
+            return;
+
+        // Reconstruct everything from the ByteBuf
+        int syncTypeOrdinal = data.readInt();
+        int syncActionOrdinal = data.readInt();
+        int categoryID = data.readInt();
+
+        EnumSyncType type = EnumSyncType.values()[syncTypeOrdinal];
+        EnumSyncAction action = EnumSyncAction.values()[syncActionOrdinal];
+        try {
+            NBTTagCompound tag = ByteBufUtils.readBigNBT(data);
+            // Now do your client-side logic (similar to your old clientSync() or clientSyncUpdate() approach)
+            handleSyncPacketClient(type, action, categoryID, tag);
+        }
+        catch (RuntimeException e){
+            LogWriter.error(String.format("Attempted to Sync %s but it was too big", type.toString()));
+        }
+    }
+
+    private void handleSyncPacketClient(EnumSyncType enumSyncType, EnumSyncAction enumSyncAction, int id, NBTTagCompound data) {
+        switch (enumSyncAction) {
+            case RELOAD:
+                SyncController.clientSync(enumSyncType, data);
+                break;
+            case UPDATE:
+                SyncController.clientUpdate(enumSyncType, id, data);
+                break;
+            case REMOVE:
+                SyncController.clientSyncRemove(enumSyncType, id);
+                break;
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/DeleteNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/DeleteNpcPacket.java
new file mode 100644
index 000000000..ee0dc7599
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/DeleteNpcPacket.java
@@ -0,0 +1,52 @@
+package kamkeel.npcs.network.packets.data.npc;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class DeleteNpcPacket extends AbstractPacket {
+    public static final String packetName = "Data|DeleteNpc";
+
+    private int entityId;
+
+    public DeleteNpcPacket() {
+    }
+
+    public DeleteNpcPacket(int id) {
+        this.entityId = id;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.DELETE_NPC;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.entityId);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(in.readInt());
+        if (entity instanceof EntityNPCInterface) {
+            ((EntityNPCInterface) entity).delete();
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/DialogPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/DialogPacket.java
new file mode 100644
index 000000000..83be63878
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/DialogPacket.java
@@ -0,0 +1,74 @@
+package kamkeel.npcs.network.packets.data.npc;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.client.NoppesUtil;
+import noppes.npcs.entity.EntityDialogNpc;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class DialogPacket extends AbstractPacket {
+    public static final String packetName = "Data|Dialog";
+
+    private String dummyName;
+    private int entityID;
+    private NBTTagCompound compound;
+
+    public DialogPacket() {
+    }
+
+    public DialogPacket(String dummyName, int entityID, NBTTagCompound compound) {
+        this.dummyName = dummyName;
+        this.entityID = entityID;
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.DIALOG;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.entityID);
+        ByteBufUtils.writeString(out, this.dummyName);
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        int entityID = in.readInt();
+        String name = ByteBufUtils.readString(in);
+        NBTTagCompound tagCompound = ByteBufUtils.readNBT(in);
+
+        // Dummy NPC
+        if (entityID == -1) {
+            EntityDialogNpc npc = new EntityDialogNpc(player.worldObj);
+            npc.display.name = name;
+            NoppesUtil.openDialog(tagCompound, npc, player);
+        } else {
+            Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(entityID);
+            if (!(entity instanceof EntityNPCInterface)) {
+                return;
+            }
+            NoppesUtil.openDialog(tagCompound, (EntityNPCInterface) entity, player);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/EditNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/EditNpcPacket.java
new file mode 100644
index 000000000..199cf319f
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/EditNpcPacket.java
@@ -0,0 +1,54 @@
+package kamkeel.npcs.network.packets.data.npc;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.client.NoppesUtil;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class EditNpcPacket extends AbstractPacket {
+    public static final String packetName = "Data|EditNpc";
+
+    int entityId;
+
+    public EditNpcPacket() {
+    }
+
+    public EditNpcPacket(int entityId) {
+        this.entityId = entityId;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.EDIT_NPC;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.entityId);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(in.readInt());
+        if (!(entity instanceof EntityNPCInterface)) {
+            return;
+        }
+        NoppesUtil.setLastNpc((EntityNPCInterface) entity);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/RolePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/RolePacket.java
new file mode 100644
index 000000000..a6f5869e9
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/RolePacket.java
@@ -0,0 +1,59 @@
+package kamkeel.npcs.network.packets.data.npc;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.client.NoppesUtil;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class RolePacket extends AbstractPacket {
+    public static final String packetName = "Data|Role";
+
+    private NBTTagCompound compound;
+
+    public RolePacket() {
+    }
+
+    public RolePacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.ROLE_NPC;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        NBTTagCompound compound = ByteBufUtils.readNBT(in);
+        Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(compound.getInteger("EntityId"));
+        if (entity instanceof EntityNPCInterface) {
+            EntityNPCInterface npc = (EntityNPCInterface) entity;
+            npc.advanced.setRole(compound.getInteger("Role"));
+            npc.roleInterface.readFromNBT(compound);
+            NoppesUtil.setLastNpc(npc);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/UpdateNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/UpdateNpcPacket.java
new file mode 100644
index 000000000..10472ef5e
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/UpdateNpcPacket.java
@@ -0,0 +1,55 @@
+package kamkeel.npcs.network.packets.data.npc;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class UpdateNpcPacket extends AbstractPacket {
+    public static final String packetName = "Data|UpdateNpc";
+
+    private NBTTagCompound npcCompound;
+
+    public UpdateNpcPacket() {
+    }
+
+    public UpdateNpcPacket(NBTTagCompound npcCompound) {
+        this.npcCompound = npcCompound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.UPDATE_NPC;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.npcCompound);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        NBTTagCompound compound = ByteBufUtils.readNBT(in);
+        Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(compound.getInteger("EntityId"));
+        if (entity instanceof EntityNPCInterface) {
+            ((EntityNPCInterface) entity).readSpawnData(compound);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/WeaponNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/WeaponNpcPacket.java
new file mode 100644
index 000000000..255583f7c
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/WeaponNpcPacket.java
@@ -0,0 +1,65 @@
+package kamkeel.npcs.network.packets.data.npc;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class WeaponNpcPacket extends AbstractPacket {
+    public static final String packetName = "Data|WeaponNpc";
+
+    private int entityId;
+    private int weaponIndex;
+    private NBTTagCompound compound;
+
+    public WeaponNpcPacket() {
+    }
+
+    public WeaponNpcPacket(int entityId, int weaponIndex, NBTTagCompound compound) {
+        this.entityId = entityId;
+        this.weaponIndex = weaponIndex;
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.WEAPON_NPC;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.entityId);
+        out.writeInt(this.weaponIndex);
+
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(in.readInt());
+        if (!(entity instanceof EntityNPCInterface))
+            return;
+        EntityNPCInterface npc = (EntityNPCInterface) entity;
+        int weaponSlotIndex = in.readInt();
+        ItemStack stack = ItemStack.loadItemStackFromNBT(ByteBufUtils.readNBT(in));
+        npc.inventory.weapons.put(weaponSlotIndex, stack);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayClosePacket.java
new file mode 100644
index 000000000..88c197207
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayClosePacket.java
@@ -0,0 +1,48 @@
+package kamkeel.npcs.network.packets.data.script;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.client.ClientCacheHandler;
+
+import java.io.IOException;
+
+public final class ScriptOverlayClosePacket extends AbstractPacket {
+    public static final String packetName = "Data|ScriptOverlayClose";
+
+    private int particleId;
+
+    public ScriptOverlayClosePacket() {
+    }
+
+    public ScriptOverlayClosePacket(int particleId) {
+        this.particleId = particleId;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.SCRIPT_OVERLAY_CLOSE;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.particleId);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        int overlayId = in.readInt();
+        ClientCacheHandler.customOverlays.remove(overlayId);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayDataPacket.java
new file mode 100644
index 000000000..fb800a1cd
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayDataPacket.java
@@ -0,0 +1,53 @@
+package kamkeel.npcs.network.packets.data.script;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.client.ClientCacheHandler;
+import noppes.npcs.client.gui.customoverlay.OverlayCustom;
+
+import java.io.IOException;
+
+public final class ScriptOverlayDataPacket extends AbstractPacket {
+    public static final String packetName = "Data|ScriptOverlayData";
+
+    private NBTTagCompound overlayCompound;
+
+    public ScriptOverlayDataPacket() {
+    }
+
+    public ScriptOverlayDataPacket(NBTTagCompound overlayCompound) {
+        this.overlayCompound = overlayCompound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.SCRIPT_OVERLAY_DATA;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.overlayCompound);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        OverlayCustom overlayCustom = new OverlayCustom(Minecraft.getMinecraft());
+        overlayCustom.setOverlayData(ByteBufUtils.readNBT(in));
+        ClientCacheHandler.customOverlays.put(overlayCustom.overlay.getID(), overlayCustom);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptedParticlePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptedParticlePacket.java
new file mode 100644
index 000000000..db489b234
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptedParticlePacket.java
@@ -0,0 +1,90 @@
+package kamkeel.npcs.network.packets.data.script;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import noppes.npcs.CustomNpcs;
+import noppes.npcs.client.fx.CustomFX;
+import noppes.npcs.scripted.ScriptParticle;
+
+import java.io.IOException;
+
+public final class ScriptedParticlePacket extends AbstractPacket {
+    public static final String packetName = "Data|ScriptedParticle";
+
+    private NBTTagCompound compound;
+
+    public ScriptedParticlePacket() {
+    }
+
+    public ScriptedParticlePacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumDataPacket.SCRIPTED_PARTICLE;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.DATA_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, compound);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (CustomNpcs.side() != Side.CLIENT)
+            return;
+
+        spawnScriptedParticle(player, in);
+    }
+
+    @SideOnly(Side.CLIENT)
+    public static void spawnScriptedParticle(EntityPlayer player, ByteBuf buffer) {
+        Minecraft minecraft = Minecraft.getMinecraft();
+
+        NBTTagCompound compound;
+        ScriptParticle particle;
+        try {
+            compound = ByteBufUtils.readNBT(buffer);
+            particle = ScriptParticle.fromNBT(compound);
+        } catch (IOException ignored) {
+            return;
+        }
+
+        World worldObj = player.worldObj;
+        if (worldObj == null) {
+            return;
+        }
+
+        Entity entity = null;
+        if (compound.hasKey("EntityID")) {
+            entity = worldObj.getEntityByID(compound.getInteger("EntityID"));
+            if (entity != null)
+                worldObj = entity.worldObj;
+            else return;
+        }
+
+        CustomFX fx = CustomFX.fromScriptedParticle(particle, worldObj, entity);
+
+        for (int i = 0; i < particle.amount; i++) {
+            minecraft.effectRenderer.addEffect(fx);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/player/BankActionPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/BankActionPacket.java
new file mode 100644
index 000000000..589d48796
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/player/BankActionPacket.java
@@ -0,0 +1,107 @@
+package kamkeel.npcs.network.packets.player;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumPlayerPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilPlayer;
+import noppes.npcs.constants.EnumRoleType;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.data.BankData;
+
+import java.io.IOException;
+
+public class BankActionPacket extends AbstractPacket {
+    public static final String packetName = "Player|Bank";
+
+    private Action type;
+    private int slotID;
+    private int bankID;
+
+    public BankActionPacket() {
+
+    }
+
+    private BankActionPacket(Action action, int bankID, int slotID) {
+        this.type = action;
+        this.bankID = bankID;
+        this.slotID = slotID;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    public static void Open(int bankID, int slotID) {
+        PacketClient.sendClient(new BankActionPacket(Action.OpenSlot, bankID, slotID));
+    }
+    public static void Upgrade() {
+        PacketClient.sendClient(new BankActionPacket(Action.Upgrade, -1, -1));
+    }
+    public static void Unlock() {
+        PacketClient.sendClient(new BankActionPacket(Action.Unlock, -1, -1));
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumPlayerPacket.BankAction;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.PLAYER_PACKET;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+
+        if (type == Action.OpenSlot) {
+            out.writeInt(bankID);
+            out.writeInt(slotID);
+        }
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        Action requestedAction = Action.values()[in.readInt()];
+
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        EntityPlayerMP playerMP = (EntityPlayerMP) player;
+
+        if(npc.advanced.role != EnumRoleType.Bank)
+            return;
+
+        switch (requestedAction) {
+            case Unlock:
+                NoppesUtilPlayer.bankUnlock(playerMP, npc);
+                break;
+            case Upgrade:
+                NoppesUtilPlayer.bankUpgrade(playerMP, npc);
+                break;
+            case OpenSlot:
+                int bankID = in.readInt();
+                int slotID = in.readInt();
+                BankData data = PlayerDataController.Instance.getBankData(playerMP,bankID).getBankOrDefault(bankID);
+                data.openBankGui(playerMP, npc, bankID, slotID);
+                break;
+        }
+
+    }
+
+    private enum Action {
+        Unlock,
+        Upgrade,
+        OpenSlot
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/player/CheckPlayerValue.java b/src/main/java/kamkeel/npcs/network/packets/player/CheckPlayerValue.java
new file mode 100644
index 000000000..9c3eb4c62
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/player/CheckPlayerValue.java
@@ -0,0 +1,87 @@
+package kamkeel.npcs.network.packets.player;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumPlayerPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilPlayer;
+import noppes.npcs.controllers.PartyController;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.data.Party;
+import noppes.npcs.controllers.data.PlayerData;
+import noppes.npcs.controllers.data.PlayerFactionData;
+import noppes.npcs.controllers.data.PlayerQuestData;
+
+import java.io.IOException;
+
+public class CheckPlayerValue extends AbstractPacket {
+    public static final String packetName = "Player|CheckPlayerVal";
+
+    private Type type;
+
+    public CheckPlayerValue() {
+    }
+
+    public CheckPlayerValue(Type type) {
+        this.type = type;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumPlayerPacket.GetPlayerValue;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.PLAYER_PACKET;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        EntityPlayerMP playerMP = (EntityPlayerMP) player;
+        Type type = Type.values()[in.readInt()];
+        switch (type) {
+            case Faction:
+                PlayerFactionData data = PlayerDataController.Instance.getPlayerData(playerMP).factionData;
+                GuiDataPacket.sendGuiData(playerMP, data.getPlayerGuiData());
+                break;
+            case QuestLog:
+                NoppesUtilPlayer.sendQuestLogData(playerMP);
+                break;
+            case TrackedQuest:
+                NoppesUtilPlayer.sendTrackedQuest(playerMP);
+                break;
+            case CheckQuestCompletion:
+                PlayerData playerData = PlayerDataController.Instance.getPlayerData(playerMP);
+                PlayerQuestData questData = PlayerDataController.Instance.getPlayerData(playerMP).questData;
+                Party playerParty = playerData.getPlayerParty();
+                if(playerParty != null)
+                    PartyController.Instance().checkQuestCompletion(playerParty, null);
+
+                questData.checkQuestCompletion(playerData, null);
+                break;
+
+        }
+    }
+
+    public enum Type {
+        Faction,
+        QuestLog,
+        TrackedQuest,
+        CheckQuestCompletion
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/player/CompanionActionPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/CompanionActionPacket.java
new file mode 100644
index 000000000..266ab2d07
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/player/CompanionActionPacket.java
@@ -0,0 +1,93 @@
+package kamkeel.npcs.network.packets.player;
+
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumPlayerPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.constants.EnumCompanionTalent;
+import noppes.npcs.constants.EnumGuiType;
+import noppes.npcs.constants.EnumRoleType;
+import noppes.npcs.roles.RoleCompanion;
+
+import java.io.IOException;
+
+public class CompanionActionPacket extends AbstractPacket {
+    public static final String packetName = "Player|CompanionAction";
+
+    private Type type;
+    private int talentOrdinal;
+    private int exp;
+
+    public CompanionActionPacket() {
+
+    }
+
+    public static void OpenInventory() {
+        CompanionActionPacket packet = new CompanionActionPacket();
+        packet.type = Type.OpenInventory;
+        PacketClient.sendClient(packet);
+    }
+
+    public static void TalentExp(EnumCompanionTalent talent, int exp) {
+        CompanionActionPacket packet = new CompanionActionPacket();
+        packet.type = Type.TalentExp;
+        packet.talentOrdinal = talent.ordinal();
+        packet.exp = exp;
+        PacketClient.sendClient(packet);
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumPlayerPacket.CompanionAction;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.PLAYER_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+
+        if (type == Type.TalentExp) {
+            out.writeInt(talentOrdinal);
+            out.writeInt(exp);
+        }
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        Type type = Type.values()[in.readInt()];
+
+        if(npc.advanced.role != EnumRoleType.Companion || player != npc.getOwner())
+            return;
+
+        if (type == Type.OpenInventory) {
+            NoppesUtilServer.sendOpenGui(player, EnumGuiType.CompanionInv, npc);
+            return;
+        }
+        int id = in.readInt();
+        int exp = in.readInt();
+        RoleCompanion role = (RoleCompanion) npc.roleInterface;
+        if(exp <= 0 || !role.canAddExp(-exp) || id < 0 || id >= EnumCompanionTalent.values().length) //should never happen unless hacking
+            return;
+        EnumCompanionTalent talent = EnumCompanionTalent.values()[id];
+        role.addExp(-exp);
+        role.addTalentExp(talent, exp);
+    }
+
+    private enum Type {
+        OpenInventory,
+        TalentExp
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/player/DialogSelectPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/DialogSelectPacket.java
new file mode 100644
index 000000000..c87f7ae5d
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/player/DialogSelectPacket.java
@@ -0,0 +1,56 @@
+package kamkeel.npcs.network.packets.player;
+
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumPlayerPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilPlayer;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public class DialogSelectPacket extends AbstractPacket {
+    public static final String packetName = "Player|DialogSelect";
+
+    private int dialogID, optionID;
+
+    public DialogSelectPacket(){
+    }
+    public DialogSelectPacket(int dialogID, int optionID) {
+        this.dialogID = dialogID;
+        this.optionID = optionID;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumPlayerPacket.DialogSelect;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.PLAYER_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(dialogID);
+        out.writeInt(optionID);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        EntityPlayerMP playerMP = (EntityPlayerMP) player;
+        NoppesUtilPlayer.dialogSelected(in.readInt(), in.readInt(), playerMP, npc);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/player/FollowerPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/FollowerPacket.java
new file mode 100644
index 000000000..d08e8f61d
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/player/FollowerPacket.java
@@ -0,0 +1,84 @@
+package kamkeel.npcs.network.packets.player;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumPlayerPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.NoppesUtilPlayer;
+import noppes.npcs.constants.EnumJobType;
+
+import java.io.IOException;
+
+public class FollowerPacket extends AbstractPacket {
+    public static final String packetName = "Player|Follower";
+
+    private Action type;
+
+    public FollowerPacket() {
+    }
+
+    public FollowerPacket(Action action) {
+        this.type = action;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumPlayerPacket.FollowerAction;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.PLAYER_PACKET;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        Action requestedAction = Action.values()[in.readInt()];
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        EntityPlayerMP playerMP = (EntityPlayerMP) player;
+
+        if (npc.advanced.job != EnumJobType.Follower)
+            return;
+
+        switch (requestedAction) {
+            case Hire:
+                NoppesUtilPlayer.hireFollower(playerMP, npc);
+                break;
+            case Extend:
+                NoppesUtilPlayer.extendFollower(playerMP, npc);
+                GuiDataPacket.sendGuiData(playerMP, npc.roleInterface.writeToNBT(new NBTTagCompound()));
+                break;
+            case State:
+                NoppesUtilPlayer.changeFollowerState(playerMP, npc);
+                GuiDataPacket.sendGuiData(playerMP, npc.roleInterface.writeToNBT(new NBTTagCompound()));
+                break;
+        }
+
+    }
+
+    public enum Action {
+        Hire,
+        Extend,
+        State
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/player/GetNPCRole.java b/src/main/java/kamkeel/npcs/network/packets/player/GetNPCRole.java
new file mode 100644
index 000000000..1056ddb48
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/player/GetNPCRole.java
@@ -0,0 +1,47 @@
+package kamkeel.npcs.network.packets.player;
+
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumPlayerPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.constants.EnumRoleType;
+
+import java.io.IOException;
+
+public class GetNPCRole extends AbstractPacket {
+    public static final String packetName = "Player|GetNPCRole";
+
+    @Override
+    public Enum getType() {
+        return EnumPlayerPacket.GetRole;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.PLAYER_PACKET;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if(!(player instanceof EntityPlayerMP))
+            return;
+        if (npc.advanced.role == EnumRoleType.None)
+            return;
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.roleInterface.writeToNBT(new NBTTagCompound()));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/player/InputDevicePacket.java b/src/main/java/kamkeel/npcs/network/packets/player/InputDevicePacket.java
new file mode 100644
index 000000000..84dac01fe
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/player/InputDevicePacket.java
@@ -0,0 +1,149 @@
+package kamkeel.npcs.network.packets.player;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumPlayerPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.EventHooks;
+import org.lwjgl.input.Keyboard;
+
+import java.io.IOException;
+
+public class InputDevicePacket extends AbstractPacket {
+    public static final String packetName = "Player|InputDevice";
+
+    private Type type;
+
+    private int key, scroll;
+    private boolean isKeyPressed, ctrlPressed, shiftPressed, altPressed, metaPressed;
+    private String keysDownList;
+
+    public InputDevicePacket() {
+
+    }
+
+    private InputDevicePacket(Type type, int key, boolean isDown) {
+        this.type = type;
+        this.key = key;
+        this.isKeyPressed = isDown;
+    }
+    public static void sendMouse(int mouseButton, int scroll, boolean isDown) {
+        InputDevicePacket packet = new InputDevicePacket(Type.MOUSE, mouseButton, isDown);
+        packet.scroll = scroll;
+        packet.commonDataGrabber();
+
+        PacketClient.sendClient(packet);
+    }
+
+    public static void sendKeyboard(int key, boolean isDown) {
+        InputDevicePacket packet = new InputDevicePacket(Type.KEYBOARD, key, isDown);
+        packet.commonDataGrabber();
+
+        PacketClient.sendClient(packet);
+    }
+
+    private void commonDataGrabber() {
+        ctrlPressed = Keyboard.isKeyDown(157) || Keyboard.isKeyDown(29);
+        shiftPressed = Keyboard.isKeyDown(54) || Keyboard.isKeyDown(42);
+        altPressed = Keyboard.isKeyDown(184) || Keyboard.isKeyDown(56);
+        metaPressed = Keyboard.isKeyDown(220) || Keyboard.isKeyDown(219);
+
+        StringBuilder keysDownString = new StringBuilder();
+        for (int i = 0; i < Keyboard.getKeyCount(); i++) {//Creates a comma separated string of the integer IDs of held keys
+            if (Keyboard.isKeyDown(i)) {
+                keysDownString.append(Integer.valueOf(i)).append(",");
+            }
+        }
+        if (keysDownString.length() > 0) {//Removes last comma for later parsing
+            keysDownString.deleteCharAt(keysDownString.length() - 1);
+        }
+        keysDownList = keysDownString.toString();
+    }
+
+
+    @Override
+    public Enum getType() {
+        return EnumPlayerPacket.InputDevice;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.PLAYER_PACKET;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+
+        out.writeInt(key);
+        out.writeBoolean(isKeyPressed);
+        if (type == Type.MOUSE) {
+            out.writeInt(scroll);
+        }
+
+        out.writeBoolean(ctrlPressed);
+        out.writeBoolean(shiftPressed);
+        out.writeBoolean(altPressed);
+        out.writeBoolean(metaPressed);
+        ByteBufUtils.writeString(out, keysDownList);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        EntityPlayerMP playerMP = (EntityPlayerMP) player;
+
+        Type incomingType = Type.values()[in.readInt()];
+        boolean isMouse = incomingType == Type.MOUSE;
+
+        int inputKey = in.readInt();
+        boolean isKeyDown = in.readBoolean();
+        int scroll = isMouse ? in.readInt() : 0;
+        boolean ctrl = in.readBoolean();
+        boolean shift = in.readBoolean();
+        boolean alt = in.readBoolean();
+        boolean meta = in.readBoolean();
+        int[] pressedKeys = getPressedArray(ByteBufUtils.readString(in));
+
+        if (isMouse)
+            EventHooks.onPlayerMouseClicked(playerMP, inputKey, scroll, isKeyDown, ctrl, shift, alt, meta, pressedKeys);
+        else
+            EventHooks.onPlayerKeyPressed(playerMP, inputKey, ctrl, shift, alt, meta, isKeyDown, pressedKeys);
+    }
+
+    private static int[] getPressedArray(String pressedKeys) {
+        if(pressedKeys == null)
+            return new int[0];
+
+        String[] split = pressedKeys.split(",");
+        int[] keysDown;
+
+        if(pressedKeys.length() > 0) {
+            keysDown = new int[split.length];
+            try {
+                for (int i = 0; i < split.length; i++) {
+                    keysDown[i] = Integer.parseInt(split[i]);
+                }
+            }
+            catch (NumberFormatException ignored){
+            }
+        } else {
+            keysDown = new int[0];
+        }
+        return keysDown;
+    }
+
+    private enum Type {
+        MOUSE,
+        KEYBOARD
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java
new file mode 100644
index 000000000..93f9034c3
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java
@@ -0,0 +1,215 @@
+package kamkeel.npcs.network.packets.player;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import kamkeel.npcs.network.*;
+import kamkeel.npcs.network.enums.EnumPlayerPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcs;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.constants.EnumGuiType;
+import noppes.npcs.containers.ContainerMail;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.PlayerQuestController;
+import noppes.npcs.controllers.data.PlayerMail;
+import noppes.npcs.controllers.data.PlayerMailData;
+import noppes.npcs.controllers.data.QuestData;
+
+import java.io.IOException;
+import java.util.Iterator;
+
+public class MailActionPacket extends AbstractPacket {
+    public static final String packetName = "Player|MailAction";
+
+    private Action action;
+    private long time;
+    private String username;
+
+    public MailActionPacket() {
+    }
+
+    private MailActionPacket(Action action, long time, String sender) {
+        this.action = action;
+        this.time = time;
+        this.username = sender;
+    }
+
+    public static void RequestMailData() {
+        MailActionPacket packet = new MailActionPacket();
+        packet.action = Action.GET;
+        PacketClient.sendClient(packet);
+    }
+    public static void OpenMail(long time, String sender) {
+        PacketClient.sendClient(new MailActionPacket(Action.OPEN, time, sender));
+    }
+    public static void DeleteMail(long time, String sender) {
+        PacketClient.sendClient(new MailActionPacket(Action.DELETE, time, sender));
+    }
+    public static void ReadMail(long time, String sender) {
+        PacketClient.sendClient(new MailActionPacket(Action.READ, time, sender));
+    }
+    public static void SendMail(String receiver, NBTTagCompound mailData) {
+        PacketClient.sendClient(new MailSendPacket(receiver, mailData));
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumPlayerPacket.MailBoxAction;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.PLAYER_PACKET;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(action.ordinal());
+
+        if (action == Action.GET)
+            return;
+
+        switch (action) {
+            case OPEN:
+            case DELETE:
+            case READ:
+                out.writeLong(time);
+                ByteBufUtils.writeString(out, username);
+                break;
+        }
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        Action type = Action.values()[in.readInt()];
+
+        if(!(player instanceof EntityPlayerMP))
+            return;
+        EntityPlayerMP playerMP = (EntityPlayerMP) player;
+        PlayerMailData data = PlayerDataController.Instance.getPlayerData(playerMP).mailData;
+
+        if (type == Action.GET) {
+            GuiDataPacket.sendGuiData(playerMP, data.saveNBTData(new NBTTagCompound()));
+            return;
+        }
+
+        long time = in.readLong();
+        String user = ByteBufUtils.readString(in);
+        Iterator<PlayerMail> it = data.playermail.iterator();
+        switch (type) {
+            case OPEN:
+                playerMP.closeContainer();
+
+                while(it.hasNext()){
+                    PlayerMail mail = it.next();
+                    if(mail.time == time && mail.sender.equals(user)){
+                        ContainerMail.staticmail = mail;
+                        playerMP.openGui(CustomNpcs.instance, EnumGuiType.PlayerMailman.ordinal(), playerMP.worldObj, 0, 0, 0);
+                        break;
+                    }
+                }
+                break;
+
+            case DELETE:
+                while(it.hasNext()){
+                    PlayerMail mail = it.next();
+                    if(mail.time == time && mail.sender.equals(user)){
+                        it.remove();
+                    }
+                }
+                GuiDataPacket.sendGuiData(playerMP, data.saveNBTData(new NBTTagCompound()));
+                break;
+
+            case READ:
+                while(it.hasNext()){
+                    PlayerMail mail = it.next();
+                    if(mail.time == time && mail.sender.equals(user)){
+                        mail.beenRead = true;
+                        if(mail.hasQuest())
+                            PlayerQuestController.addActiveQuest(new QuestData(mail.getQuest()), playerMP);
+                    }
+                }
+                break;
+        }
+    }
+
+    public static class MailSendPacket extends LargeAbstractPacket {
+        public static final String packetName = "Player|MailSend";
+        private String username;
+        private NBTTagCompound mailContent;
+
+        public MailSendPacket() {
+
+        }
+        private MailSendPacket(String username, NBTTagCompound mailContent) {
+            this.username = username;
+            this.mailContent = mailContent;
+        }
+
+        @Override
+        protected byte[] getData() throws IOException {
+            ByteBuf buffer = Unpooled.buffer();
+            ByteBufUtils.writeString(buffer, this.username);
+            ByteBufUtils.writeBigNBT(buffer, this.mailContent);
+            return buffer.array();
+        }
+
+        @Override
+        @SideOnly(Side.SERVER)
+        protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException {
+            if(!(player instanceof EntityPlayerMP))
+                return;
+            EntityPlayerMP playerMP = (EntityPlayerMP) player;
+            if(!(playerMP.openContainer instanceof ContainerMail))
+                return;
+
+            String mailReceiver = PlayerDataController.Instance.hasPlayer(ByteBufUtils.readString(data));
+            if (mailReceiver.isEmpty()) {
+                NoppesUtilServer.sendGuiError(playerMP, 0);
+                return;
+            }
+
+            PlayerMail mail = new PlayerMail();
+            String s = playerMP.getDisplayName();
+            if (!s.equals(playerMP.getCommandSenderName()))
+                s += " (" +playerMP.getCommandSenderName() + ")";
+            mail.readNBT(ByteBufUtils.readBigNBT(data));
+            mail.sender = s;
+            mail.items = ((ContainerMail) playerMP.openContainer).mail.items;
+
+            if (mail.subject.isEmpty()) {
+                NoppesUtilServer.sendGuiError(playerMP, 1);
+                return;
+            }
+            PlayerDataController.Instance.addPlayerMessage(mailReceiver, mail);
+
+            NBTTagCompound comp = new NBTTagCompound();
+            comp.setString("username", mailReceiver);
+            NoppesUtilServer.sendGuiClose(playerMP, 1,comp);
+        }
+
+        @Override
+        public Enum getType() {
+            return EnumPlayerPacket.MailSend;
+        }
+
+        @Override
+        public PacketChannel getChannel() {
+            return PacketHandler.PLAYER_PACKET;
+        }
+    }
+
+    private enum Action {
+        GET,
+        OPEN,
+        READ,
+        DELETE,
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/player/SaveBookPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/SaveBookPacket.java
new file mode 100644
index 000000000..0cac183e5
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/player/SaveBookPacket.java
@@ -0,0 +1,91 @@
+package kamkeel.npcs.network.packets.player;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import kamkeel.npcs.network.LargeAbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumPlayerPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemEditableBook;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemWritableBook;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagString;
+import net.minecraft.tileentity.TileEntity;
+import noppes.npcs.blocks.tiles.TileBook;
+
+import java.io.IOException;
+
+public class SaveBookPacket extends LargeAbstractPacket {
+    public static final String packetName = "Player|SaveBook";
+
+    private int x, y, z;
+    private boolean sign;
+    private NBTTagCompound compound;
+
+    public SaveBookPacket() {
+
+    }
+
+    public SaveBookPacket(int x, int y, int z, boolean sign, NBTTagCompound compound) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.sign = sign;
+        this.compound = compound;
+    }
+
+    @Override
+    protected byte[] getData() throws IOException {
+        ByteBuf buffer = Unpooled.buffer();
+        buffer.writeInt(x);
+        buffer.writeInt(y);
+        buffer.writeInt(z);
+        buffer.writeBoolean(sign);
+        ByteBufUtils.writeBigNBT(buffer, compound);
+        return buffer.array();
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException {
+        int x = data.readInt(), y = data.readInt(), z = data.readInt();
+
+        if (player.worldObj.blockExists(x, y, z)) {
+            TileEntity tileentity = player.worldObj.getTileEntity(x, y, z);
+            if (!(tileentity instanceof TileBook))
+                return;
+            TileBook tile = (TileBook) tileentity;
+            if (tile.book.getItem() == Items.written_book)
+                return;
+            boolean sign = data.readBoolean();
+            ItemStack book = ItemStack.loadItemStackFromNBT(ByteBufUtils.readBigNBT(data));
+            if (book == null)
+                return;
+            if (book.getItem() == Items.writable_book && !sign && ItemWritableBook.func_150930_a(book.getTagCompound())) {
+                tile.book.setTagInfo("pages", book.getTagCompound().getTagList("pages", 8));
+            }
+            if (book.getItem() == Items.written_book && sign && ItemEditableBook.validBookTagContents(book.getTagCompound())) {
+                tile.book.setTagInfo("author", new NBTTagString(player.getCommandSenderName()));
+                tile.book.setTagInfo("title", new NBTTagString(book.getTagCompound().getString("title")));
+                tile.book.setTagInfo("pages", book.getTagCompound().getTagList("pages", 8));
+                tile.book.func_150996_a(Items.written_book);
+            }
+        }
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumPlayerPacket.SaveBook;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.PLAYER_PACKET;
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/player/SaveSignPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/SaveSignPacket.java
new file mode 100644
index 000000000..b00ce42bc
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/player/SaveSignPacket.java
@@ -0,0 +1,68 @@
+package kamkeel.npcs.network.packets.player;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import kamkeel.npcs.network.LargeAbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumPlayerPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import noppes.npcs.blocks.tiles.TileBigSign;
+
+import java.io.IOException;
+
+public class SaveSignPacket extends LargeAbstractPacket {
+    public static final String packetName = "Player|SaveSign";
+    private int x, y, z;
+    private String text;
+
+    public SaveSignPacket() {
+
+    }
+
+    public SaveSignPacket(int x, int y, int z, String text) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.text = text;
+    }
+
+    @Override
+    protected byte[] getData() throws IOException {
+        ByteBuf buffer = Unpooled.buffer();
+        buffer.writeInt(x);
+        buffer.writeInt(y);
+        buffer.writeInt(z);
+        ByteBufUtils.writeString(buffer, text);
+        return buffer.array();
+    }
+
+    @Override
+    protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException {
+        int x = data.readInt(), y = data.readInt(), z = data.readInt();
+        if (player.worldObj.blockExists(x, y, z)) {
+            TileEntity tile = player.worldObj.getTileEntity(x, y, z);
+            if(!(tile instanceof TileBigSign))
+                return;
+            TileBigSign sign = (TileBigSign) tile;
+            if (sign.canEdit) {
+                sign.setText(ByteBufUtils.readString(data));
+                sign.canEdit = false;
+                player.worldObj.markBlockForUpdate(x, y, z);
+            }
+        }
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumPlayerPacket.SaveSign;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.PLAYER_PACKET;
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/player/ScreenSizePacket.java b/src/main/java/kamkeel/npcs/network/packets/player/ScreenSizePacket.java
new file mode 100644
index 000000000..83beebcd9
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/player/ScreenSizePacket.java
@@ -0,0 +1,49 @@
+package kamkeel.npcs.network.packets.player;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumPlayerPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.controllers.PlayerDataController;
+
+import java.io.IOException;
+
+public class ScreenSizePacket extends AbstractPacket {
+    public static final String packetName = "Player|ScreenSize";
+    private int width, height;
+
+    public ScreenSizePacket() {
+    }
+
+    public ScreenSizePacket(int width, int height){
+        this.width = width;
+        this.height = height;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumPlayerPacket.ScreenSize;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.PLAYER_PACKET;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(width);
+        out.writeInt(height);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        int width = in.readInt(), height = in.readInt();
+        PlayerDataController.Instance.getPlayerData(player).screenSize.setSize(width,height);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/player/TransportPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/TransportPacket.java
new file mode 100644
index 000000000..6d868a959
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/player/TransportPacket.java
@@ -0,0 +1,58 @@
+package kamkeel.npcs.network.packets.player;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumPlayerPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilPlayer;
+import noppes.npcs.constants.EnumRoleType;
+
+import java.io.IOException;
+
+public class TransportPacket extends AbstractPacket {
+    public static final String packetName = "Player|Transport";
+
+    private String destination;
+
+    public TransportPacket() {
+
+    }
+
+    public TransportPacket(String destination) {
+        this.destination = destination;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumPlayerPacket.Transport;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.PLAYER_PACKET;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, destination);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (npc.advanced.role != EnumRoleType.Transporter)
+            return;
+        NoppesUtilPlayer.transport((EntityPlayerMP) player, npc, ByteBufUtils.readString(in));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/DimensionsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/DimensionsGetPacket.java
new file mode 100644
index 000000000..2d64a8f63
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/DimensionsGetPacket.java
@@ -0,0 +1,51 @@
+package kamkeel.npcs.network.packets.request;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.ScrollDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.world.WorldProvider;
+import net.minecraftforge.common.DimensionManager;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+public final class DimensionsGetPacket extends AbstractPacket {
+    public static final String packetName = "Request|DimensionsGet";
+
+    public DimensionsGetPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.DimensionsGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        HashMap<String, Integer> map = new HashMap<String, Integer>();
+        for (int id : DimensionManager.getStaticDimensionIDs()) {
+            WorldProvider provider = DimensionManager.createProviderFor(id);
+            map.put(provider.getDimensionName(), id);
+        }
+        ScrollDataPacket.sendScrollData((EntityPlayerMP) player, map);
+    }
+
+
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/GuiRequestPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/GuiRequestPacket.java
new file mode 100644
index 000000000..823e86376
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/GuiRequestPacket.java
@@ -0,0 +1,65 @@
+package kamkeel.npcs.network.packets.request;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.constants.EnumGuiType;
+
+import java.io.IOException;
+
+public final class GuiRequestPacket extends AbstractPacket {
+    public static String packetName = "Request|Gui";
+
+    private int guiIndex, posX, posY, posZ;
+
+    public GuiRequestPacket(int guiIndex, int posX, int posY, int posZ) {
+        this.guiIndex = guiIndex;
+        this.posX = posX;
+        this.posY = posY;
+        this.posZ = posZ;
+    }
+
+    public GuiRequestPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.Gui;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(guiIndex);
+        out.writeInt(posX);
+        out.writeInt(posY);
+        out.writeInt(posZ);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        int index = in.readInt();
+        int x = in.readInt();
+        int y = in.readInt();
+        int z = in.readInt();
+        EnumGuiType gui = EnumGuiType.values()[index];
+        NoppesUtilServer.sendOpenGui(player, gui, npc, x, y, z);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/IsGuiOpenInform.java b/src/main/java/kamkeel/npcs/network/packets/request/IsGuiOpenInform.java
new file mode 100644
index 000000000..3aa839d51
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/IsGuiOpenInform.java
@@ -0,0 +1,51 @@
+package kamkeel.npcs.network.packets.request;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.data.PlayerData;
+
+import java.io.IOException;
+
+public final class IsGuiOpenInform extends AbstractPacket {
+    public static final String packetName = "Request|IsGuiOpen";
+
+    private boolean isOpen;
+
+    public IsGuiOpenInform() {
+    }
+
+    public IsGuiOpenInform(boolean isOpen) {
+        this.isOpen = isOpen;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.IsGuiOpen;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeBoolean(this.isOpen);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        PlayerData playerdata = PlayerDataController.Instance.getPlayerData(player);
+        boolean isGUIOpen = in.readBoolean();
+        playerdata.setGUIOpen(isGUIOpen);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/MailOpenSetupPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/MailOpenSetupPacket.java
new file mode 100644
index 000000000..473053715
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/MailOpenSetupPacket.java
@@ -0,0 +1,63 @@
+package kamkeel.npcs.network.packets.request;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcs;
+import noppes.npcs.constants.EnumGuiType;
+import noppes.npcs.containers.ContainerMail;
+import noppes.npcs.controllers.data.PlayerMail;
+
+import java.io.IOException;
+
+public final class MailOpenSetupPacket extends AbstractPacket {
+    public static String packetName = "Request|MailOpenSetup";
+
+    private NBTTagCompound compound;
+
+    public MailOpenSetupPacket() { }
+
+    public MailOpenSetupPacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MailOpenSetup;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        PlayerMail mail = new PlayerMail();
+        mail.readNBT(ByteBufUtils.readNBT(in));
+        ContainerMail.staticmail = mail;
+        player.openGui(CustomNpcs.instance, EnumGuiType.PlayerMailman.ordinal(), player.worldObj, 1, 0, 0);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/MerchantUpdatePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/MerchantUpdatePacket.java
new file mode 100644
index 000000000..41f812ae8
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/MerchantUpdatePacket.java
@@ -0,0 +1,73 @@
+package kamkeel.npcs.network.packets.request;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.village.MerchantRecipeList;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.io.IOException;
+
+public final class MerchantUpdatePacket extends AbstractPacket {
+    public static String packetName = "Request|MerchantUpdate";
+
+    private int entityID;
+    private MerchantRecipeList list;
+
+    public MerchantUpdatePacket() { }
+
+    public MerchantUpdatePacket(int entityID, MerchantRecipeList list) {
+        this.entityID = entityID;
+        this.list = list;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MerchantUpdate;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.EDIT_VILLAGER;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.fillBuffer(out, this.entityID, this.list);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int entityId = in.readInt();
+        Entity entity = player.worldObj.getEntityByID(entityId);
+        if (!(entity instanceof EntityVillager))
+            return;
+
+        MerchantRecipeList list = MerchantRecipeList.func_151390_b(new PacketBuffer(in));
+        ((EntityVillager)entity).setRecipes(list);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java
new file mode 100644
index 000000000..79572a782
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java
@@ -0,0 +1,93 @@
+package kamkeel.npcs.network.packets.request;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityList;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.ServerEventsHandler;
+
+import java.io.IOException;
+
+public final class MountPacket extends AbstractPacket {
+    public static final String packetName = "Request|MountPacket";
+
+    private Action action;
+    private NBTTagCompound compound;
+
+    public MountPacket() {}
+
+    public MountPacket(Action action, NBTTagCompound nbtTagCompound) {
+        this.action = action;
+        this.compound = nbtTagCompound;
+    }
+
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MountPacket;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.TOOL_MOUNTER;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(action.ordinal());
+        if(action == Action.Spawn)
+            ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.MOUNTER, player))
+            return;
+
+        MountPacket.Action requestedAction = MountPacket.Action.values()[in.readInt()];
+        switch (requestedAction){
+            case Player:
+                player.mountEntity(ServerEventsHandler.mounted);
+                break;
+            case Spawn:
+                Entity entity = EntityList.createEntityFromNBT(ByteBufUtils.readNBT(in), player.worldObj);
+                player.worldObj.spawnEntityInWorld(entity);
+                entity.mountEntity(ServerEventsHandler.mounted);
+                break;
+        }
+    }
+
+    public static MountPacket Player() {
+        return new MountPacket(Action.Player, new NBTTagCompound());
+    }
+    public static MountPacket Spawn(NBTTagCompound compound) {
+        return new MountPacket(Action.Spawn, compound);
+    }
+
+    private enum Action {
+        Player,
+        Spawn,
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/TileEntityGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/TileEntityGetPacket.java
new file mode 100644
index 000000000..280dc89dc
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/TileEntityGetPacket.java
@@ -0,0 +1,71 @@
+package kamkeel.npcs.network.packets.request;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.network.packets.data.large.ScrollDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.WorldProvider;
+import net.minecraftforge.common.DimensionManager;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+public final class TileEntityGetPacket extends AbstractPacket {
+    public static final String packetName = "Request|TileEntityGet";
+
+    private int x;
+    private int y;
+    private int z;
+
+
+    public TileEntityGetPacket() {}
+
+    public TileEntityGetPacket(int x, int y, int z) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TileEntityGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.x);
+        out.writeInt(this.y);
+        out.writeInt(this.z);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+            return;
+
+        TileEntity tile = player.worldObj.getTileEntity(in.readInt(), in.readInt(), in.readInt());
+        NBTTagCompound compound = new NBTTagCompound();
+        tile.writeToNBT(compound);
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/TileEntitySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/TileEntitySavePacket.java
new file mode 100644
index 000000000..42a0b5912
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/TileEntitySavePacket.java
@@ -0,0 +1,57 @@
+package kamkeel.npcs.network.packets.request;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.NoppesUtilServer;
+
+import java.io.IOException;
+
+public final class TileEntitySavePacket extends AbstractPacket {
+    public static final String packetName = "Request|TileEntitySave";
+
+    private NBTTagCompound compound;
+
+    public TileEntitySavePacket() {}
+
+    public TileEntitySavePacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TileEntitySave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+            return;
+
+        NoppesUtilServer.saveTileEntity((EntityPlayerMP) player, ByteBufUtils.readNBT(in));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/TraderMarketSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/TraderMarketSavePacket.java
new file mode 100644
index 000000000..1fee4191b
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/TraderMarketSavePacket.java
@@ -0,0 +1,81 @@
+package kamkeel.npcs.network.packets.request;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import foxz.utils.Market;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.roles.RoleTrader;
+
+import java.io.IOException;
+
+public final class TraderMarketSavePacket extends AbstractPacket {
+    public static String packetName = "Request|TraderMarketSave";
+
+    private String marketName;
+    private boolean setMarket;
+
+    public TraderMarketSavePacket() { }
+
+    public TraderMarketSavePacket(String marketName, boolean setMarket) {
+        this.marketName = marketName;
+        this.setMarket = setMarket;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TraderMarketSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, this.marketName);
+        out.writeBoolean(this.setMarket);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        String market = ByteBufUtils.readString(in);
+        if (market == null)
+            return;
+
+        boolean bo = in.readBoolean();
+        if(npc.roleInterface instanceof RoleTrader){
+            if(bo)
+                Market.setMarket(npc, market);
+            else
+                Market.save((RoleTrader)npc.roleInterface, market);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationCachePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationCachePacket.java
new file mode 100644
index 000000000..7bd561ce9
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationCachePacket.java
@@ -0,0 +1,46 @@
+package kamkeel.npcs.network.packets.request.animation;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.controllers.PlayerDataController;
+
+import java.io.IOException;
+
+public final class AnimationCachePacket extends AbstractPacket {
+    public static final String packetName = "Request|AnimationCache";
+    private int id;
+
+    public AnimationCachePacket() {
+    }
+
+    public AnimationCachePacket(int id) {
+        this.id = id;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.CacheAnimation;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.id);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        PlayerDataController.Instance.getPlayerData(player).animationData.cacheAnimation(in.readInt());
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationGetPacket.java
new file mode 100644
index 000000000..2e65b098e
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationGetPacket.java
@@ -0,0 +1,60 @@
+package kamkeel.npcs.network.packets.request.animation;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.controllers.AnimationController;
+import noppes.npcs.controllers.data.Animation;
+
+import java.io.IOException;
+
+public final class AnimationGetPacket extends AbstractPacket {
+    public static String packetName = "Request|AnimationGet";
+
+    private int animationID;
+
+    public AnimationGetPacket() { }
+
+    public AnimationGetPacket(int animationID) {
+        this.animationID = animationID;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.AnimationGet;
+    }
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(animationID);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int id = in.readInt();
+        Animation animation = (Animation) AnimationController.getInstance().get(id);
+        NBTTagCompound compound = animation.writeToNBT();
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationRemovePacket.java
new file mode 100644
index 000000000..49461a549
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationRemovePacket.java
@@ -0,0 +1,69 @@
+package kamkeel.npcs.network.packets.request.animation;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.AnimationController;
+import noppes.npcs.controllers.data.Animation;
+
+import java.io.IOException;
+
+public final class AnimationRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|AnimationRemove";
+
+    private int animationID;
+
+    public AnimationRemovePacket() { }
+
+    public AnimationRemovePacket(int animationID) {
+        this.animationID = animationID;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.AnimationRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_ANIMATION;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.animationID );
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int id = in.readInt();
+        AnimationController.getInstance().delete(id);
+        NoppesUtilServer.sendAnimationDataAll((EntityPlayerMP) player);
+        NBTTagCompound compound = new Animation().writeToNBT();
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationSavePacket.java
new file mode 100644
index 000000000..2b80eb5be
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationSavePacket.java
@@ -0,0 +1,70 @@
+package kamkeel.npcs.network.packets.request.animation;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.AnimationController;
+import noppes.npcs.controllers.data.Animation;
+
+import java.io.IOException;
+
+public final class AnimationSavePacket extends AbstractPacket {
+    public static String packetName = "Request|AnimationSave";
+
+    private NBTTagCompound animationNBT;
+
+    public AnimationSavePacket(NBTTagCompound animationNBT) {
+        this.animationNBT = animationNBT;
+    }
+    public AnimationSavePacket(){}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.AnimationSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_ANIMATION;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, animationNBT);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        NBTTagCompound compound = ByteBufUtils.readNBT(in);
+        Animation animation = new Animation();
+        animation.readFromNBT(compound);
+        AnimationController.getInstance().saveAnimation(animation);
+        NoppesUtilServer.sendAnimationDataAll((EntityPlayerMP) player);
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, animation.writeToNBT());
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationsGetPacket.java
new file mode 100644
index 000000000..206a1900e
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationsGetPacket.java
@@ -0,0 +1,46 @@
+package kamkeel.npcs.network.packets.request.animation;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilServer;
+
+import java.io.IOException;
+
+public final class AnimationsGetPacket extends AbstractPacket {
+    public static String packetName = "Request|AnimationsGet";
+
+    public AnimationsGetPacket() { }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.AnimationsGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException { }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        NoppesUtilServer.sendAnimationDataAll((EntityPlayerMP) player);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/bank/BankGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/bank/BankGetPacket.java
new file mode 100644
index 000000000..e49a50e39
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/bank/BankGetPacket.java
@@ -0,0 +1,59 @@
+package kamkeel.npcs.network.packets.request.bank;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.BankController;
+import noppes.npcs.controllers.data.Bank;
+
+import java.io.IOException;
+
+public final class BankGetPacket extends AbstractPacket {
+    public static String packetName = "Request|BankGet";
+
+    private int bankId;
+
+    public BankGetPacket(int bankId) {
+        this.bankId = bankId;
+    }
+
+    public BankGetPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.BankGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(bankId);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        int id = in.readInt();
+
+        Bank bank = BankController.getInstance().getBank(id);
+        NoppesUtilServer.sendBank((EntityPlayerMP) player, bank);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/bank/BankRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/bank/BankRemovePacket.java
new file mode 100644
index 000000000..ae34978f2
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/bank/BankRemovePacket.java
@@ -0,0 +1,66 @@
+package kamkeel.npcs.network.packets.request.bank;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.BankController;
+import noppes.npcs.controllers.data.Bank;
+
+import java.io.IOException;
+
+public final class BankRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|BankRemove";
+
+    private int bankId;
+
+    public BankRemovePacket(int bankId) {
+        this.bankId = bankId;
+    }
+
+    public BankRemovePacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.BankRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_BANK;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(bankId);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int id = in.readInt();
+        BankController.getInstance().removeBank(id);
+        NoppesUtilServer.sendBankDataAll((EntityPlayerMP) player);
+        NoppesUtilServer.sendBank((EntityPlayerMP) player, new Bank());
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/bank/BankSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/bank/BankSavePacket.java
new file mode 100644
index 000000000..42c29b719
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/bank/BankSavePacket.java
@@ -0,0 +1,70 @@
+package kamkeel.npcs.network.packets.request.bank;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.BankController;
+import noppes.npcs.controllers.data.Bank;
+
+import java.io.IOException;
+
+public final class BankSavePacket extends AbstractPacket {
+    public static String packetName = "Request|BankSave";
+
+    private NBTTagCompound bankNBT;
+
+    public BankSavePacket(NBTTagCompound bankNBT) {
+        this.bankNBT = bankNBT;
+    }
+
+    public BankSavePacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.BankSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_BANK;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, bankNBT);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        NBTTagCompound compound = ByteBufUtils.readNBT(in);
+        Bank bank = new Bank();
+        bank.readEntityFromNBT(compound);
+        BankController.getInstance().saveBank(bank);
+        NoppesUtilServer.sendBankDataAll((EntityPlayerMP) player);
+        NoppesUtilServer.sendBank((EntityPlayerMP) player, bank);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/bank/BanksGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/bank/BanksGetPacket.java
new file mode 100644
index 000000000..9c14168b1
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/bank/BanksGetPacket.java
@@ -0,0 +1,49 @@
+package kamkeel.npcs.network.packets.request.bank;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilServer;
+
+import java.io.IOException;
+
+public final class BanksGetPacket extends AbstractPacket {
+    public static String packetName = "Request|BanksGet";
+
+    public BanksGetPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.BanksGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    // No permission override since BanksGet is null in the enum
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        NoppesUtilServer.sendBankDataAll((EntityPlayerMP) player);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneAllTagsPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneAllTagsPacket.java
new file mode 100644
index 000000000..6aafe22dc
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneAllTagsPacket.java
@@ -0,0 +1,62 @@
+package kamkeel.npcs.network.packets.request.clone;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import noppes.npcs.controllers.ServerTagMapController;
+import noppes.npcs.controllers.TagController;
+import noppes.npcs.controllers.data.Tag;
+import noppes.npcs.controllers.data.TagMap;
+
+import java.io.IOException;
+import java.util.HashSet;
+
+public final class CloneAllTagsPacket extends AbstractPacket {
+    public static String packetName = "Request|CloneAllTags";
+
+    public CloneAllTagsPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.CloneAllTags;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {}
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
+            return;
+
+        NBTTagCompound compound = new NBTTagCompound();
+        HashSet<Tag> validTags = TagController.getInstance().getAllTags();
+        NBTTagList validTagList = new NBTTagList();
+        for(Tag tag : validTags){
+            NBTTagCompound tagCompound = new NBTTagCompound();
+            tag.writeNBT(tagCompound);
+            validTagList.appendTag(tagCompound);
+        }
+        compound.setTag("AllTags", validTagList);
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneAllTagsShortPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneAllTagsShortPacket.java
new file mode 100644
index 000000000..127a7caf2
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneAllTagsShortPacket.java
@@ -0,0 +1,60 @@
+package kamkeel.npcs.network.packets.request.clone;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import noppes.npcs.controllers.TagController;
+import noppes.npcs.controllers.data.Tag;
+
+import java.io.IOException;
+import java.util.HashSet;
+
+public final class CloneAllTagsShortPacket extends AbstractPacket {
+    public static String packetName = "Request|CloneAllTagsShort";
+
+    public CloneAllTagsShortPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.CloneAllTagsShort;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {}
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
+            return;
+
+        NBTTagCompound compound = new NBTTagCompound();
+        HashSet<Tag> validTags = TagController.getInstance().getAllTags();
+        NBTTagList validTagList = new NBTTagList();
+        for(Tag tag : validTags){
+            NBTTagCompound tagCompound = new NBTTagCompound();
+            tag.writeShortNBT(tagCompound);
+            validTagList.appendTag(tagCompound);
+        }
+        compound.setTag("ShortTags", validTagList);
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneListPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneListPacket.java
new file mode 100644
index 000000000..004ae7937
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneListPacket.java
@@ -0,0 +1,82 @@
+package kamkeel.npcs.network.packets.request.clone;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.NBTTagString;
+import noppes.npcs.LogWriter;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.config.ConfigDebug;
+import noppes.npcs.controllers.ServerCloneController;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class CloneListPacket extends AbstractPacket {
+    public static String packetName = "Request|CloneList";
+
+    private int tab;
+
+    public CloneListPacket(int tab) {
+        this.tab = tab;
+    }
+
+    public CloneListPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.CloneList;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(tab);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.MOUNTER, EnumItemPacketType.CLONER))
+            return;
+
+        int id = in.readInt();
+        Entity entity = player.worldObj.getEntityByID(id);
+        if (!(entity instanceof EntityNPCInterface))
+            return;
+
+        NBTTagList list = new NBTTagList();
+        int tab = in.readInt();
+        for(String name : ServerCloneController.Instance.getClones(tab))
+            list.appendTag(new NBTTagString(name));
+
+        NBTTagList listDate = new NBTTagList();
+        for(String name : ServerCloneController.Instance.getClonesDate(tab))
+            listDate.appendTag(new NBTTagString(name));
+
+        NBTTagCompound compound = new NBTTagCompound();
+        compound.setTag("List", list);
+        compound.setTag("ListDate", listDate);
+
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/ClonePreSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/ClonePreSavePacket.java
new file mode 100644
index 000000000..e769219c8
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/ClonePreSavePacket.java
@@ -0,0 +1,69 @@
+package kamkeel.npcs.network.packets.request.clone;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.controllers.ServerCloneController;
+
+import java.io.IOException;
+
+public final class ClonePreSavePacket extends AbstractPacket {
+    public static String packetName = "Request|ClonePreSave";
+
+    private String name;
+    private int tab;
+
+    public ClonePreSavePacket() {}
+
+    public ClonePreSavePacket(String name, int tab) {
+        this.name = name;
+        this.tab = tab;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.ClonePreSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission(){
+        return CustomNpcsPermissions.NPC_CLONE;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, this.name);
+        out.writeInt(tab);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
+            return;
+
+        boolean bo = ServerCloneController.Instance.getCloneData(null, ByteBufUtils.readString(in), in.readInt()) != null;
+        NBTTagCompound compound = new NBTTagCompound();
+        compound.setBoolean("NameExists", bo);
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneRemovePacket.java
new file mode 100644
index 000000000..44e33ccc9
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneRemovePacket.java
@@ -0,0 +1,84 @@
+package kamkeel.npcs.network.packets.request.clone;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.NBTTagString;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.controllers.ServerCloneController;
+
+import java.io.IOException;
+
+public final class CloneRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|CloneRemove";
+
+    private int tab;
+    private String name;
+
+    public CloneRemovePacket() {}
+
+    public CloneRemovePacket(int tab, String name) {
+        this.tab = tab;
+        this.name = name;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.CloneRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission(){
+        return CustomNpcsPermissions.NPC_CLONE;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(tab);
+        ByteBufUtils.writeString(out, this.name);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
+            return;
+
+        int tab = in.readInt();
+        ServerCloneController.Instance.removeClone(ByteBufUtils.readString(in), tab);
+
+        NBTTagList list = new NBTTagList();
+
+        for(String name : ServerCloneController.Instance.getClones(tab))
+            list.appendTag(new NBTTagString(name));
+
+        NBTTagList listDate = new NBTTagList();
+        for(String name : ServerCloneController.Instance.getClonesDate(tab))
+            listDate.appendTag(new NBTTagString(name));
+
+        NBTTagCompound compound = new NBTTagCompound();
+        compound.setTag("List", list);
+        compound.setTag("ListDate", listDate);
+
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneSavePacket.java
new file mode 100644
index 000000000..e757a9079
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneSavePacket.java
@@ -0,0 +1,85 @@
+package kamkeel.npcs.network.packets.request.clone;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.ServerCloneController;
+import noppes.npcs.controllers.data.PlayerData;
+
+import java.io.IOException;
+
+public final class CloneSavePacket extends AbstractPacket {
+    public static String packetName = "Request|CloneSave";
+
+    private String name;
+    private int tab;
+    private NBTTagCompound tagExtra;
+    private NBTTagCompound tagCompound;
+
+    public CloneSavePacket() {}
+
+    public CloneSavePacket(String name, int tab, NBTTagCompound tagExtra, NBTTagCompound tagCompound) {
+        this.name = name;
+        this.tab = tab;
+        this.tagExtra = tagExtra;
+        this.tagCompound = tagCompound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.CloneSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission(){
+        return CustomNpcsPermissions.NPC_CLONE;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, this.name);
+        out.writeInt(tab);
+        ByteBufUtils.writeNBT(out, this.tagExtra);
+        ByteBufUtils.writeNBT(out, this.tagCompound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
+            return;
+
+        PlayerData data = PlayerDataController.Instance.getPlayerData(player);
+        if(data.cloned == null)
+            return;
+
+        String name = ByteBufUtils.readString(in);
+        int tab = in.readInt();
+        NBTTagCompound tagExtra = ByteBufUtils.readNBT(in);
+        NBTTagCompound tagCompound = ByteBufUtils.readNBT(in);
+
+        NBTTagList tagList = tagCompound.getTagList("TagUUIDs", 8);
+        data.cloned.setTag("TagUUIDs", tagList);
+        ServerCloneController.Instance.addClone(data.cloned, name, tab, tagExtra);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneTagListPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneTagListPacket.java
new file mode 100644
index 000000000..312831112
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneTagListPacket.java
@@ -0,0 +1,66 @@
+package kamkeel.npcs.network.packets.request.clone;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.NBTTagString;
+import noppes.npcs.controllers.ServerCloneController;
+import noppes.npcs.controllers.ServerTagMapController;
+import noppes.npcs.controllers.data.TagMap;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class CloneTagListPacket extends AbstractPacket {
+    public static String packetName = "Request|CloneTagList";
+
+    private int tab;
+
+    public CloneTagListPacket(int tab) {
+        this.tab = tab;
+    }
+
+    public CloneTagListPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.CloneTagList;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(tab);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
+            return;
+
+        int tab = in.readInt();
+        TagMap tagMap = ServerTagMapController.Instance.getTagMap(tab);
+        NBTTagCompound compound = new NBTTagCompound();
+        compound.setTag("CloneTags", tagMap.writeNBT());
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java
new file mode 100644
index 000000000..29ff58063
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java
@@ -0,0 +1,130 @@
+package kamkeel.npcs.network.packets.request.clone;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ChatComponentText;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.LogWriter;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.config.ConfigDebug;
+import noppes.npcs.config.ConfigScript;
+import noppes.npcs.controllers.ServerCloneController;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public class MobSpawnerPacket extends AbstractPacket {
+    public static final String packetName = "Player|MobSpawner";
+
+    private Action type;
+    private int posX;
+    private int posY;
+    private int posz;
+
+    private String selectedName;
+    private int tab;
+
+    private NBTTagCompound compound;
+
+    public MobSpawnerPacket() {}
+
+    public MobSpawnerPacket(Action type, int posX, int posY, int posz, String selectedName, int tab) {
+        this.type = type;
+        this.posX = posX;
+        this.posY = posY;
+        this.posz = posz;
+        this.selectedName = selectedName;
+        this.tab = tab;
+    }
+
+    public MobSpawnerPacket(Action type, int posX, int posY, int posz, NBTTagCompound compound) {
+        this.type = type;
+        this.posX = posX;
+        this.posY = posY;
+        this.posz = posz;
+        this.compound = compound;
+    }
+
+    public static MobSpawnerPacket Server(int x, int y, int z, String name, int tab) {
+        return new MobSpawnerPacket(Action.Server, x, y, z, name, tab);
+    }
+    public static MobSpawnerPacket Client(int x, int y, int z, NBTTagCompound compound) {
+        return new MobSpawnerPacket(Action.Client, x, y, z, compound);
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MobSpawner;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.SPAWNER_CREATE;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+        out.writeInt(posX);
+        out.writeInt(posY);
+        out.writeInt(posz);
+
+        if (type == Action.Server) {
+            ByteBufUtils.writeString(out, this.selectedName);
+            out.writeInt(this.tab);
+        } else {
+            ByteBufUtils.writeNBT(out, this.compound);
+        }
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
+            return;
+
+        Action requestedAction = Action.values()[in.readInt()];
+        int x = in.readInt();
+        int y = in.readInt();
+        int z = in.readInt();
+        NBTTagCompound compound;
+
+        if(requestedAction == Action.Server)
+            compound = ServerCloneController.Instance.getCloneData(player, ByteBufUtils.readString(in), in.readInt());
+        else
+            compound = ByteBufUtils.readNBT(in);
+
+        if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) {
+            return;
+        }
+
+        if(compound != null)
+            NoppesUtilServer.createMobSpawner(x, y, z, compound, player);
+    }
+
+    private enum Action {
+        Server,
+        Client,
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java
new file mode 100644
index 000000000..68798c70a
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java
@@ -0,0 +1,140 @@
+package kamkeel.npcs.network.packets.request.clone;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ChatComponentText;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.LogWriter;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.config.ConfigDebug;
+import noppes.npcs.config.ConfigScript;
+import noppes.npcs.controllers.ServerCloneController;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public class SpawnMobPacket extends AbstractPacket {
+    public static final String packetName = "Player|SpawnMob";
+
+    private Action type;
+    private int posX;
+    private int posY;
+    private int posz;
+
+    private String selectedName;
+    private int tab;
+
+    private NBTTagCompound compound;
+
+    public SpawnMobPacket() {}
+
+    public SpawnMobPacket(Action type, int posX, int posY, int posz, String selectedName, int tab) {
+        this.type = type;
+        this.posX = posX;
+        this.posY = posY;
+        this.posz = posz;
+        this.selectedName = selectedName;
+        this.tab = tab;
+    }
+
+    public SpawnMobPacket(Action type, int posX, int posY, int posz, NBTTagCompound compound) {
+        this.type = type;
+        this.posX = posX;
+        this.posY = posY;
+        this.posz = posz;
+        this.compound = compound;
+    }
+
+    public static SpawnMobPacket Server(int x, int y, int z, String name, int tab) {
+        return new SpawnMobPacket(Action.Server, x, y, z, name, tab);
+    }
+    public static SpawnMobPacket Client(int x, int y, int z, NBTTagCompound compound) {
+        return new SpawnMobPacket(Action.Client, x, y, z, compound);
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.SpawnMob;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.SPAWNER_MOB;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+        out.writeInt(posX);
+        out.writeInt(posY);
+        out.writeInt(posz);
+
+        if (type == Action.Server) {
+            ByteBufUtils.writeString(out, this.selectedName);
+            out.writeInt(this.tab);
+        } else {
+            ByteBufUtils.writeNBT(out, this.compound);
+        }
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
+            return;
+
+        Action requestedAction = Action.values()[in.readInt()];
+        int x = in.readInt();
+        int y = in.readInt();
+        int z = in.readInt();
+        NBTTagCompound compound;
+
+        if(requestedAction == Action.Server)
+            compound = ServerCloneController.Instance.getCloneData(player, ByteBufUtils.readString(in), in.readInt());
+        else
+            compound = ByteBufUtils.readNBT(in);
+
+        if(compound == null)
+            return;
+        Entity entity = NoppesUtilServer.spawnClone(compound, x, y, z, player.worldObj);
+        if(entity == null){
+            player.addChatMessage(new ChatComponentText("Failed to create an entity out of your clone"));
+            return;
+        }
+
+        if (entity instanceof EntityNPCInterface && !ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) {
+            EntityNPCInterface npc = (EntityNPCInterface) entity;
+            npc.script.setEnabled(false);
+        }
+
+        if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
+            LogWriter.script(String.format("[%s] (Player) %s SPAWNED ENTITY %s", "CLONER", player.getCommandSenderName(), entity));
+        }
+    }
+
+    private enum Action {
+        Server,
+        Client,
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiButtonPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiButtonPacket.java
new file mode 100644
index 000000000..4dbec3676
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiButtonPacket.java
@@ -0,0 +1,63 @@
+package kamkeel.npcs.network.packets.request.customgui;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.EventHooks;
+import noppes.npcs.api.entity.IPlayer;
+import noppes.npcs.containers.ContainerCustomGui;
+import noppes.npcs.scripted.NpcAPI;
+
+import java.io.IOException;
+
+public final class CustomGuiButtonPacket extends AbstractPacket {
+    public static final String packetName = "Request|CustomGuiButton";
+
+    private NBTTagCompound compound;
+    private int id;
+
+    public CustomGuiButtonPacket() {
+    }
+
+    public CustomGuiButtonPacket(int id, NBTTagCompound comp) {
+        this.compound = comp;
+        this.id = id;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.CustomGuiButton;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(id);
+        ByteBufUtils.writeNBT(out, compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player.openContainer instanceof ContainerCustomGui))
+            return;
+
+        int id = in.readInt();
+        NBTTagCompound comp = ByteBufUtils.readNBT(in);
+
+        ((ContainerCustomGui) player.openContainer).customGui.fromNBT(comp);
+        EventHooks.onCustomGuiButton((IPlayer) NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui) player.openContainer).customGui, id);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiClosePacket.java
new file mode 100644
index 000000000..813eccfb5
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiClosePacket.java
@@ -0,0 +1,58 @@
+package kamkeel.npcs.network.packets.request.customgui;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.EventHooks;
+import noppes.npcs.api.entity.IPlayer;
+import noppes.npcs.containers.ContainerCustomGui;
+import noppes.npcs.scripted.NpcAPI;
+import noppes.npcs.scripted.gui.ScriptGui;
+
+import java.io.IOException;
+
+public final class CustomGuiClosePacket extends AbstractPacket {
+    public static final String packetName = "Request|CustomGuiClose";
+
+    private NBTTagCompound compound;
+
+    public CustomGuiClosePacket() {
+    }
+
+    public CustomGuiClosePacket(NBTTagCompound comp) {
+        this.compound = comp;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.CustomGuiClose;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player.openContainer instanceof ContainerCustomGui))
+            return;
+
+        NBTTagCompound comp = ByteBufUtils.readNBT(in);
+        EventHooks.onCustomGuiClose((IPlayer) NpcAPI.Instance().getIEntity(player), (new ScriptGui()).fromNBT(comp));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiUnfocusedPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiUnfocusedPacket.java
new file mode 100644
index 000000000..adb3456c4
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiUnfocusedPacket.java
@@ -0,0 +1,62 @@
+package kamkeel.npcs.network.packets.request.customgui;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.EventHooks;
+import noppes.npcs.api.entity.IPlayer;
+import noppes.npcs.containers.ContainerCustomGui;
+import noppes.npcs.scripted.NpcAPI;
+
+import java.io.IOException;
+
+public final class CustomGuiUnfocusedPacket extends AbstractPacket {
+    public static final String packetName = "Request|CustomGuiUnfocused";
+
+    private NBTTagCompound compound;
+    private int id;
+
+    public CustomGuiUnfocusedPacket() {}
+
+    public CustomGuiUnfocusedPacket(int id, NBTTagCompound comp) {
+        this.compound = comp;
+        this.id = id;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.CustomGuiUnfocused;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(id);
+        ByteBufUtils.writeNBT(out, compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player.openContainer instanceof ContainerCustomGui))
+            return;
+
+        int id = in.readInt();
+        NBTTagCompound comp = ByteBufUtils.readNBT(in);
+
+        ((ContainerCustomGui) player.openContainer).customGui.fromNBT(comp);
+        EventHooks.onCustomGuiUnfocused((IPlayer) NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui) player.openContainer).customGui, id);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomScrollClickPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomScrollClickPacket.java
new file mode 100644
index 000000000..d91502ef4
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomScrollClickPacket.java
@@ -0,0 +1,75 @@
+package kamkeel.npcs.network.packets.request.customgui;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.EventHooks;
+import noppes.npcs.api.entity.IPlayer;
+import noppes.npcs.containers.ContainerCustomGui;
+import noppes.npcs.controllers.CustomGuiController;
+import noppes.npcs.scripted.NpcAPI;
+
+import java.io.IOException;
+
+public final class CustomScrollClickPacket extends AbstractPacket {
+    public static final String packetName = "Request|CustomGuiScrollClick";
+
+    private int scrollId;
+    private int scrollIndex;
+    private NBTTagCompound selection;
+    private boolean doubleClick;
+    private NBTTagCompound compound;
+
+    public CustomScrollClickPacket() {}
+
+    public CustomScrollClickPacket(NBTTagCompound compound, int scrollId, int scrollIndex, NBTTagCompound selection, boolean doubleClick) {
+        this.compound = compound;
+        this.scrollId = scrollId;
+        this.scrollIndex = scrollIndex;
+        this.selection = selection;
+        this.doubleClick = doubleClick;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.CustomGuiScrollClick;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, compound);
+        out.writeInt(this.scrollId);
+        out.writeInt(this.scrollIndex);
+        ByteBufUtils.writeNBT(out, selection);
+        out.writeBoolean(this.doubleClick);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player.openContainer instanceof ContainerCustomGui))
+            return;
+
+        NBTTagCompound comp = ByteBufUtils.readNBT(in);
+        int scrollId = in.readInt();
+        int scrollIndex = in.readInt();
+        String[] list = CustomGuiController.readScrollSelection(in);
+        boolean doubleClick = in.readBoolean();
+
+        ((ContainerCustomGui) player.openContainer).customGui.fromNBT(comp);
+        EventHooks.onCustomGuiScrollClick((IPlayer) NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui) player.openContainer).customGui, scrollId, scrollIndex, list, doubleClick);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoriesGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoriesGetPacket.java
new file mode 100644
index 000000000..1a264fd01
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoriesGetPacket.java
@@ -0,0 +1,51 @@
+package kamkeel.npcs.network.packets.request.dialog;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.network.packets.data.large.ScrollDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.controllers.DialogController;
+import noppes.npcs.controllers.data.DialogCategory;
+
+import java.io.IOException;
+
+public final class DialogCategoriesGetPacket extends AbstractPacket {
+    public static String packetName = "Request|DialogCategoriesGet";
+
+    public DialogCategoriesGetPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.DialogCategoriesGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {}
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+            return;
+
+        ScrollDataPacket.sendScrollData((EntityPlayerMP) player, DialogController.Instance.getScroll());
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryGetPacket.java
new file mode 100644
index 000000000..0cf33b8dd
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryGetPacket.java
@@ -0,0 +1,60 @@
+package kamkeel.npcs.network.packets.request.dialog;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.controllers.DialogController;
+import noppes.npcs.controllers.data.DialogCategory;
+
+import java.io.IOException;
+
+public final class DialogCategoryGetPacket extends AbstractPacket {
+    public static String packetName = "Request|DialogCategoryGet";
+
+    private int categoryID;
+
+    public DialogCategoryGetPacket() {}
+
+    public DialogCategoryGetPacket(int categoryID) {
+        this.categoryID = categoryID;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.DialogCategoryGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.categoryID);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP)) return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
+        int id = in.readInt();
+        DialogCategory category = DialogController.Instance.categories.get(id);
+        if (category != null) {
+            NBTTagCompound comp = category.writeNBT(new NBTTagCompound());
+            comp.removeTag("Dialogs");
+            GuiDataPacket.sendGuiData((EntityPlayerMP) player, comp);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryRemovePacket.java
new file mode 100644
index 000000000..47986f566
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryRemovePacket.java
@@ -0,0 +1,64 @@
+package kamkeel.npcs.network.packets.request.dialog;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.ScrollDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.controllers.DialogController;
+
+import java.io.IOException;
+
+public final class DialogCategoryRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|DialogCategoryRemove";
+
+    private int categoryId;
+
+    public DialogCategoryRemovePacket(int categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public DialogCategoryRemovePacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.DialogCategoryRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_DIALOG;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(categoryId);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        int id = in.readInt();
+        DialogController.Instance.removeCategory(id);
+        ScrollDataPacket.sendScrollData((EntityPlayerMP) player, DialogController.Instance.getScroll());
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategorySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategorySavePacket.java
new file mode 100644
index 000000000..fb58afcef
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategorySavePacket.java
@@ -0,0 +1,66 @@
+package kamkeel.npcs.network.packets.request.dialog;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.ScrollDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.controllers.DialogController;
+import noppes.npcs.controllers.data.DialogCategory;
+
+import java.io.IOException;
+
+public final class DialogCategorySavePacket extends AbstractPacket {
+    public static String packetName = "Request|DialogCategorySave";
+
+    private NBTTagCompound categoryNBT;
+
+    public DialogCategorySavePacket(NBTTagCompound categoryNBT) {
+        this.categoryNBT = categoryNBT;
+    }
+
+    public DialogCategorySavePacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.DialogCategorySave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_DIALOG;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, categoryNBT);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP)) return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
+        NBTTagCompound compound = ByteBufUtils.readNBT(in);
+        DialogCategory category = new DialogCategory();
+        category.readNBT(compound);
+        DialogController.Instance.saveCategory(category);
+        ScrollDataPacket.sendScrollData((EntityPlayerMP) player, DialogController.Instance.getScroll());
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java
new file mode 100644
index 000000000..dfe96e28c
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java
@@ -0,0 +1,69 @@
+package kamkeel.npcs.network.packets.request.dialog;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.*;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.DialogController;
+import noppes.npcs.controllers.QuestController;
+import noppes.npcs.controllers.data.Dialog;
+import noppes.npcs.controllers.data.Quest;
+
+import java.io.IOException;
+
+public final class DialogGetPacket extends AbstractPacket {
+    public static String packetName = "Request|DialogGet";
+
+    private int dialogID;
+
+    public DialogGetPacket() {}
+
+    public DialogGetPacket(int dialogID) {
+        this.dialogID = dialogID;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.DialogGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.dialogID);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+            return;
+
+        Dialog dialog = DialogController.Instance.dialogs.get(in.readInt());
+        if(dialog != null){
+            NBTTagCompound compound = dialog.writeToNBT(new NBTTagCompound());
+            Quest quest = QuestController.Instance.quests.get(dialog.quest);
+            if(quest != null)
+                compound.setString("DialogQuestName", quest.title);
+            GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+        }
+    }
+
+    public static void getDialog(int id){
+        PacketClient.sendClient(new DialogGetPacket(id));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcGetPacket.java
new file mode 100644
index 000000000..ef2dcbf8b
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcGetPacket.java
@@ -0,0 +1,47 @@
+package kamkeel.npcs.network.packets.request.dialog;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilServer;
+
+import java.io.IOException;
+
+public final class DialogNpcGetPacket extends AbstractPacket {
+    public static String packetName = "Request|DialogNpcGet";
+
+    public DialogNpcGetPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.DialogNpcGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {}
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        NoppesUtilServer.sendNpcDialogs(player);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcRemovePacket.java
new file mode 100644
index 000000000..cf482b5fc
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcRemovePacket.java
@@ -0,0 +1,66 @@
+package kamkeel.npcs.network.packets.request.dialog;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.io.IOException;
+
+public final class DialogNpcRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|DialogNpcRemove";
+
+    private int index;
+
+    public DialogNpcRemovePacket(int index) {
+        this.index = index;
+    }
+
+    public DialogNpcRemovePacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.DialogNpcRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(index);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int idx = in.readInt();
+        npc.dialogs.remove(idx);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcSetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcSetPacket.java
new file mode 100644
index 000000000..a7db1b184
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcSetPacket.java
@@ -0,0 +1,76 @@
+package kamkeel.npcs.network.packets.request.dialog;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.data.DialogOption;
+
+import java.io.IOException;
+
+public final class DialogNpcSetPacket extends AbstractPacket {
+    public static String packetName = "Request|DialogNpcSet";
+
+    private int slot;
+    private int dialog;
+
+    public DialogNpcSetPacket(int slot, int dialog) {
+        this.slot = slot;
+        this.dialog = dialog;
+    }
+
+    public DialogNpcSetPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.DialogNpcSet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(slot);
+        out.writeInt(dialog);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP)) return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
+        int s = in.readInt();
+        int d = in.readInt();
+        DialogOption option = NoppesUtilServer.setNpcDialog(s, d, player);
+        if (option != null && option.hasDialog()) {
+            NBTTagCompound compound = option.writeNBT();
+            compound.setInteger("Position", s);
+            GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogRemovePacket.java
new file mode 100644
index 000000000..b0de2dc0a
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogRemovePacket.java
@@ -0,0 +1,76 @@
+package kamkeel.npcs.network.packets.request.dialog;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.DialogController;
+import noppes.npcs.controllers.data.Dialog;
+
+import java.io.IOException;
+
+public final class DialogRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|DialogRemove";
+
+    private int diagId;
+    private boolean sendGroup;
+
+    public DialogRemovePacket(int diagId, boolean sendGroup) {
+        this.diagId = diagId;
+        this.sendGroup = sendGroup;
+    }
+
+    public DialogRemovePacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.DialogRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_DIALOG;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(diagId);
+        out.writeBoolean(sendGroup);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        int diagId = in.readInt();
+        boolean sendGroup = in.readBoolean();
+        Dialog dialog = DialogController.Instance.dialogs.get(diagId);
+        if(dialog != null && dialog.category != null){
+            DialogController.Instance.removeDialog(dialog);
+            if(sendGroup){
+                NoppesUtilServer.sendDialogGroup((EntityPlayerMP) player,dialog.category);
+            }
+            else {
+                NoppesUtilServer.sendDialogData((EntityPlayerMP) player,dialog.category);
+            }
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogSavePacket.java
new file mode 100644
index 000000000..c221e043e
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogSavePacket.java
@@ -0,0 +1,85 @@
+package kamkeel.npcs.network.packets.request.dialog;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.DialogController;
+import noppes.npcs.controllers.data.Dialog;
+
+import java.io.IOException;
+
+public final class DialogSavePacket extends AbstractPacket {
+    public static String packetName = "Request|DialogSave";
+
+    private int categoryId;
+    private NBTTagCompound dialogNBT;
+    private boolean sendGroup;
+
+    public DialogSavePacket(int categoryId, NBTTagCompound dialogNBT, boolean sendGroup) {
+        this.categoryId = categoryId;
+        this.dialogNBT = dialogNBT;
+        this.sendGroup = sendGroup;
+    }
+
+    public DialogSavePacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.DialogSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_DIALOG;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(categoryId);
+        ByteBufUtils.writeNBT(out, dialogNBT);
+        out.writeBoolean(sendGroup);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int cat = in.readInt();
+        NBTTagCompound compound = ByteBufUtils.readNBT(in);
+        boolean sendGroup = in.readBoolean();
+        Dialog dialog = new Dialog();
+        dialog.readNBT(compound);
+        DialogController.Instance.saveDialog(cat, dialog);
+
+        if (dialog.category != null) {
+            if (sendGroup) {
+                NoppesUtilServer.sendDialogGroup((EntityPlayerMP) player, dialog.category);
+            } else {
+                NoppesUtilServer.sendDialogData((EntityPlayerMP) player, dialog.category);
+            }
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogsGetPacket.java
new file mode 100644
index 000000000..fb8563785
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogsGetPacket.java
@@ -0,0 +1,66 @@
+package kamkeel.npcs.network.packets.request.dialog;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.DialogController;
+
+import java.io.IOException;
+
+public final class DialogsGetPacket extends AbstractPacket {
+    public static String packetName = "Request|DialogsGet";
+
+    private int categoryID;
+    private boolean sendGroup;
+
+    public DialogsGetPacket() {}
+
+    public DialogsGetPacket(int categoryID, boolean send) {
+        this.categoryID = categoryID;
+        this.sendGroup = send;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.DialogsGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.categoryID);
+        out.writeBoolean(this.sendGroup);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+            return;
+
+        int catID = in.readInt();
+        boolean sendGroup = in.readBoolean();
+        if(sendGroup){
+            NoppesUtilServer.sendDialogGroup((EntityPlayerMP) player,DialogController.Instance.categories.get(catID));
+        }
+        else {
+            NoppesUtilServer.sendDialogData((EntityPlayerMP) player,DialogController.Instance.categories.get(catID));
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectGetPacket.java
new file mode 100644
index 000000000..4e9449efe
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectGetPacket.java
@@ -0,0 +1,56 @@
+package kamkeel.npcs.network.packets.request.effects;
+
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.controllers.CustomEffectController;
+import noppes.npcs.controllers.data.CustomEffect;
+
+import java.io.IOException;
+
+public final class EffectGetPacket extends AbstractPacket {
+    public static final String packetName = "NPC|GetEffect";
+    private int effectID;
+
+    public EffectGetPacket(int EffectID) {
+        this.effectID = EffectID;
+    }
+
+    public EffectGetPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.EffectGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.effectID);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        effectID = in.readInt();
+        NBTTagCompound compound = new NBTTagCompound();
+        if (effectID != -1 && CustomEffectController.getInstance().has(effectID)) {
+            CustomEffect Effect = (CustomEffect) CustomEffectController.getInstance().get(effectID);
+            if (Effect != null) {
+                compound = Effect.writeToNBT(false);
+                compound.setString("Type", "ViewEffect");
+            }
+        }
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectRemovePacket.java
new file mode 100644
index 000000000..772a0c92b
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectRemovePacket.java
@@ -0,0 +1,52 @@
+package kamkeel.npcs.network.packets.request.effects;
+
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.CustomEffectController;
+import noppes.npcs.controllers.data.CustomEffect;
+
+import java.io.IOException;
+
+public class EffectRemovePacket extends AbstractPacket {
+    public static final String packetName = "NPC|EffectRemove";
+
+    private int effectID;
+
+    public EffectRemovePacket(int outlineID) {
+        this.effectID = outlineID;
+    }
+
+    public EffectRemovePacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.EffectRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.effectID);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        effectID = in.readInt();
+        CustomEffectController.getInstance().delete(effectID);
+        NoppesUtilServer.sendCustomEffectDataAll((EntityPlayerMP) player);
+        NBTTagCompound compound = (new CustomEffect()).writeToNBT(false);
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectSavePacket.java
new file mode 100644
index 000000000..33bf554c0
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectSavePacket.java
@@ -0,0 +1,62 @@
+package kamkeel.npcs.network.packets.request.effects;
+
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.CustomEffectController;
+import noppes.npcs.controllers.data.CustomEffect;
+
+import java.io.IOException;
+
+public class EffectSavePacket extends AbstractPacket {
+    public static final String packetName = "NPC|EffectSave";
+
+    private String prevName;
+    private NBTTagCompound effectCompound;
+
+    public EffectSavePacket(NBTTagCompound compound, String prev){
+        this.effectCompound = compound;
+        this.prevName = prev;
+    }
+
+    public EffectSavePacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.EffectSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, prevName);
+        ByteBufUtils.writeNBT(out, effectCompound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        String prevName = ByteBufUtils.readString(in);
+
+        CustomEffect effect = new CustomEffect();
+        effect.readFromNBT(ByteBufUtils.readNBT(in));
+
+        CustomEffectController.getInstance().saveEffect(effect);
+
+        if(!prevName.isEmpty() && !prevName.equals(effect.name)){
+            CustomEffectController.getInstance().deleteEffectFile(prevName);
+        }
+
+        NoppesUtilServer.sendCustomEffectDataAll((EntityPlayerMP) player);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectsGetPacket.java
new file mode 100644
index 000000000..fee4e0517
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectsGetPacket.java
@@ -0,0 +1,58 @@
+package kamkeel.npcs.network.packets.request.effects;
+
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.CustomEffectController;
+import noppes.npcs.controllers.data.CustomEffect;
+
+import java.io.IOException;
+
+public final class EffectsGetPacket extends AbstractPacket {
+    public static final String packetName = "NPC|EffectsGetPacket";
+    private int effectID;
+
+    public EffectsGetPacket(int outlineID) {
+        this.effectID = outlineID;
+    }
+
+    public EffectsGetPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.EffectList;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.effectID);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        this.effectID = in.readInt();
+
+        if (effectID != -1) {
+            CustomEffect effect = (CustomEffect) CustomEffectController.getInstance().get(effectID);
+            if (effect != null) {
+                NBTTagCompound compound = effect.writeToNBT(false);
+                compound.setString("PACKETTYPE", "Effect");
+                GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+            }
+        } else {
+            NoppesUtilServer.sendCustomEffectDataAll((EntityPlayerMP) player);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java
new file mode 100644
index 000000000..487e08f6c
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java
@@ -0,0 +1,62 @@
+package kamkeel.npcs.network.packets.request.faction;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.*;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.controllers.FactionController;
+import noppes.npcs.controllers.data.Faction;
+
+import java.io.IOException;
+
+public final class FactionGetPacket extends AbstractPacket {
+    public static String packetName = "Request|FactionGet";
+
+    private int factionID;
+
+    public FactionGetPacket() {}
+
+    public FactionGetPacket(int factionID) {
+        this.factionID = factionID;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.FactionGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.factionID);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+            return;
+
+        NBTTagCompound compound = new NBTTagCompound();
+        Faction faction = FactionController.getInstance().get(in.readInt());
+        faction.writeNBT(compound);
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+    }
+
+    public static void getFaction(int id){
+        PacketClient.sendClient(new FactionGetPacket(id));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionRemovePacket.java
new file mode 100644
index 000000000..cc0a0aa0d
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionRemovePacket.java
@@ -0,0 +1,76 @@
+package kamkeel.npcs.network.packets.request.faction;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.FactionController;
+import noppes.npcs.controllers.data.Faction;
+
+import java.io.IOException;
+
+public final class FactionRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|FactionRemove";
+
+    private int factionId;
+
+    public FactionRemovePacket(int factionId) {
+        this.factionId = factionId;
+    }
+
+    public FactionRemovePacket() {
+
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.FactionRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_FACTION;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(factionId);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int id = in.readInt();
+        FactionController.getInstance().delete(id);
+        NoppesUtilServer.sendFactionDataAll((EntityPlayerMP) player);
+        NBTTagCompound comp = new NBTTagCompound();
+        new Faction().writeNBT(comp);
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, comp);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSavePacket.java
new file mode 100644
index 000000000..892c31c6e
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSavePacket.java
@@ -0,0 +1,79 @@
+package kamkeel.npcs.network.packets.request.faction;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.FactionController;
+import noppes.npcs.controllers.data.Faction;
+
+import java.io.IOException;
+
+public final class FactionSavePacket extends AbstractPacket {
+    public static String packetName = "Request|FactionSave";
+
+    private NBTTagCompound factionNBT;
+
+    public FactionSavePacket(NBTTagCompound factionNBT) {
+        this.factionNBT = factionNBT;
+    }
+
+    public FactionSavePacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.FactionSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_FACTION;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, factionNBT);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        NBTTagCompound compound = ByteBufUtils.readNBT(in);
+        Faction faction = new Faction();
+        faction.readNBT(compound);
+        FactionController.getInstance().saveFaction(faction);
+        NoppesUtilServer.sendFactionDataAll((EntityPlayerMP) player);
+        NBTTagCompound comp = new NBTTagCompound();
+        faction.writeNBT(comp);
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, comp);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSetPacket.java
new file mode 100644
index 000000000..8dc667712
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSetPacket.java
@@ -0,0 +1,67 @@
+package kamkeel.npcs.network.packets.request.faction;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.io.IOException;
+
+public final class FactionSetPacket extends AbstractPacket {
+    public static String packetName = "Request|FactionSet";
+
+    private int facID;
+
+    public FactionSetPacket() {
+    }
+
+    public FactionSetPacket(int id) {
+        this.facID = id;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.FactionSet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.facID);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int factionId = in.readInt();
+        npc.setFaction(factionId);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionsGetPacket.java
new file mode 100644
index 000000000..36273b4d3
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionsGetPacket.java
@@ -0,0 +1,50 @@
+package kamkeel.npcs.network.packets.request.faction;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.QuestController;
+import noppes.npcs.controllers.data.QuestCategory;
+
+import java.io.IOException;
+
+public final class FactionsGetPacket extends AbstractPacket {
+    public static String packetName = "Request|FactionsGet";
+
+    public FactionsGetPacket() {}
+
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.FactionsGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {}
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+            return;
+
+        NoppesUtilServer.sendFactionDataAll((EntityPlayerMP) player);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java
new file mode 100644
index 000000000..884552595
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java
@@ -0,0 +1,78 @@
+package kamkeel.npcs.network.packets.request.feather;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ChunkCoordinates;
+import net.minecraft.world.WorldServer;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilPlayer;
+import noppes.npcs.controllers.ServerCloneController;
+
+import java.io.IOException;
+
+public final class DimensionTeleportPacket extends AbstractPacket {
+    public static String packetName = "Request|DimensionTeleport";
+
+    private int dimensionID;
+
+    public DimensionTeleportPacket() {}
+
+    public DimensionTeleportPacket(int dimensionID) {
+        this.dimensionID = dimensionID;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.DimensionTeleport;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(dimensionID);
+    }
+
+    @SideOnly(Side.SERVER)
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.TELEPORTER))
+            return;
+
+        int dimension = in.readInt();
+        WorldServer world = MinecraftServer.getServer().worldServerForDimension(dimension);
+        ChunkCoordinates coords = world.getEntrancePortalLocation();
+        if(coords == null){
+            coords = world.getSpawnPoint();
+            if(!world.isAirBlock(coords.posX, coords.posY, coords.posZ))
+                coords.posY = world.getTopSolidOrLiquidBlock(coords.posX, coords.posZ);
+            else{
+                while(world.isAirBlock(coords.posX, coords.posY - 1, coords.posZ) && coords.posY > 0){
+                    coords.posY--;
+                }
+                if(coords.posY == 0)
+                    coords.posY = world.getTopSolidOrLiquidBlock(coords.posX, coords.posZ);
+            }
+        }
+        NoppesUtilPlayer.teleportPlayer((EntityPlayerMP) player, coords.posX, coords.posY, coords.posZ, dimension);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobGetPacket.java
new file mode 100644
index 000000000..4fa88fbb9
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobGetPacket.java
@@ -0,0 +1,71 @@
+package kamkeel.npcs.network.packets.request.jobs;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.constants.EnumJobType;
+import noppes.npcs.roles.JobSpawner;
+
+import java.io.IOException;
+
+public final class JobGetPacket extends AbstractPacket {
+    public static String packetName = "Request|JobGet";
+
+    public JobGetPacket() { }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.JobGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException { }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        if(npc.jobInterface == null)
+            return;
+
+        NBTTagCompound compound = new NBTTagCompound();
+        compound.setBoolean("JobData", true);
+        npc.jobInterface.writeToNBT(compound);
+        if(npc.advanced.job == EnumJobType.Spawner)
+            ((JobSpawner)npc.jobInterface).cleanCompound(compound);
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+        if(npc.advanced.job == EnumJobType.Spawner)
+            GuiDataPacket.sendGuiData((EntityPlayerMP) player, ((JobSpawner)npc.jobInterface).getTitles());
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java
new file mode 100644
index 000000000..3ae0559b6
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java
@@ -0,0 +1,77 @@
+package kamkeel.npcs.network.packets.request.jobs;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.*;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.roles.JobInterface;
+
+import java.io.IOException;
+import java.util.Set;
+
+public final class JobSavePacket extends AbstractPacket {
+    public static String packetName = "Request|JobSave";
+
+    private NBTTagCompound compound;
+
+    public JobSavePacket() { }
+
+    public JobSavePacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.JobSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        NBTTagCompound original = npc.jobInterface.writeToNBT(new NBTTagCompound());
+        NBTTagCompound compound = ByteBufUtils.readNBT(in);
+        Set<String> names = compound.func_150296_c();
+        for(String name : names)
+            original.setTag(name, compound.getTag(name));
+
+        npc.jobInterface.readFromNBT(original);
+        npc.updateClient = true;
+    }
+
+    public static void saveJob(JobInterface job){
+        PacketClient.sendClient(new JobSavePacket(job.writeToNBT(new NBTTagCompound())));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerAddPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerAddPacket.java
new file mode 100644
index 000000000..e0826b917
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerAddPacket.java
@@ -0,0 +1,106 @@
+package kamkeel.npcs.network.packets.request.jobs;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.constants.EnumJobType;
+import noppes.npcs.controllers.ServerCloneController;
+import noppes.npcs.roles.JobSpawner;
+
+import java.io.IOException;
+
+public final class JobSpawnerAddPacket extends AbstractPacket {
+    public static String packetName = "Request|JobSpawnerAdd";
+
+    private boolean isServer;
+
+    private String selected;
+    private int activeTab;
+    private int slot;
+
+    private NBTTagCompound compound;
+
+    public JobSpawnerAddPacket() { }
+
+    public JobSpawnerAddPacket(boolean isServer, String selected, int activeTab, int slot) {
+        this.isServer = isServer;
+        this.selected = selected;
+        this.activeTab = activeTab;
+        this.slot = slot;
+    }
+
+    public JobSpawnerAddPacket(boolean isServer, int slot, NBTTagCompound compound) {
+        this.isServer = isServer;
+        this.slot = slot;
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.JobSpawnerAdd;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeBoolean(this.isServer);
+        if(this.isServer){
+          ByteBufUtils.writeString(out, selected);
+          out.writeInt(this.activeTab);
+          out.writeInt(this.slot);
+        } else {
+            out.writeInt(this.slot);
+            ByteBufUtils.writeNBT(out, this.compound);
+        }
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        if(npc.advanced.job != EnumJobType.Spawner)
+            return;
+
+        JobSpawner job = (JobSpawner) npc.jobInterface;
+        boolean useServerClone = in.readBoolean();
+        if(useServerClone){
+            NBTTagCompound compound = ServerCloneController.Instance.getCloneData(null, ByteBufUtils.readString(in), in.readInt());
+            job.setJobCompound(in.readInt(), compound);
+        } else {
+            job.setJobCompound(in.readInt(), ByteBufUtils.readNBT(in));
+        }
+
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, job.getTitles());
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerRemovePacket.java
new file mode 100644
index 000000000..f5b415ed2
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerRemovePacket.java
@@ -0,0 +1,73 @@
+package kamkeel.npcs.network.packets.request.jobs;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.constants.EnumJobType;
+import noppes.npcs.roles.JobSpawner;
+
+import java.io.IOException;
+
+public final class JobSpawnerRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|JobSpawnerRemove";
+
+    private int slot;
+
+    public JobSpawnerRemovePacket(){}
+
+    public JobSpawnerRemovePacket(int slot) {
+        this.slot = slot;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.JobSpawnerRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.slot);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        if(npc.advanced.job != EnumJobType.Spawner)
+            return;
+
+        JobSpawner job = (JobSpawner) npc.jobInterface;
+        job.setJobCompound(in.readInt(), null);
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, job.getTitles());
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedAddPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedAddPacket.java
new file mode 100644
index 000000000..c7bc20b48
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedAddPacket.java
@@ -0,0 +1,72 @@
+package kamkeel.npcs.network.packets.request.linked;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.ScrollListPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.controllers.LinkedNpcController;
+import noppes.npcs.controllers.LinkedNpcController.LinkedData;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public final class LinkedAddPacket extends AbstractPacket {
+    public static String packetName = "Request|LinkedAdd";
+
+    private String data;
+
+    public LinkedAddPacket(String data) {
+        this.data = data;
+    }
+
+    public LinkedAddPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.LinkedAdd;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_LINKED;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, data);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        String received = ByteBufUtils.readString(in);
+        LinkedNpcController.Instance.addData(received);
+        List<String> list = new ArrayList<>();
+        for (LinkedData d : LinkedNpcController.Instance.list) {
+            list.add(d.name);
+        }
+        ScrollListPacket.sendList((EntityPlayerMP) player, list);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java
new file mode 100644
index 000000000..9690f15de
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java
@@ -0,0 +1,57 @@
+package kamkeel.npcs.network.packets.request.linked;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.ScrollSelectedPacket;
+import kamkeel.npcs.network.packets.data.large.ScrollListPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.controllers.LinkedNpcController;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public final class LinkedGetAllPacket extends AbstractPacket {
+    public static String packetName = "Request|LinkedGetAll";
+
+    public LinkedGetAllPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.LinkedGetAll;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        List<String> list = new ArrayList<>();
+        for (LinkedNpcController.LinkedData d : LinkedNpcController.Instance.list) {
+            list.add(d.name);
+        }
+        ScrollListPacket.sendList((EntityPlayerMP) player, list);
+        if (npc != null) {
+            ScrollSelectedPacket.setSelectedList((EntityPlayerMP) player, npc.linkedName);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedRemovePacket.java
new file mode 100644
index 000000000..a30366cd8
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedRemovePacket.java
@@ -0,0 +1,70 @@
+package kamkeel.npcs.network.packets.request.linked;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.ScrollListPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.controllers.LinkedNpcController;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public final class LinkedRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|LinkedRemove";
+
+    private String data;
+
+    public LinkedRemovePacket(String data) {
+        this.data = data;
+    }
+
+    public LinkedRemovePacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.LinkedRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_LINKED;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, data);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        String received = ByteBufUtils.readString(in);
+        LinkedNpcController.Instance.removeData(received);
+        List<String> list = new ArrayList<>();
+        for (LinkedNpcController.LinkedData d : LinkedNpcController.Instance.list) {
+            list.add(d.name);
+        }
+        ScrollListPacket.sendList((EntityPlayerMP) player, list);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedSetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedSetPacket.java
new file mode 100644
index 000000000..ffdb49dc9
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedSetPacket.java
@@ -0,0 +1,67 @@
+package kamkeel.npcs.network.packets.request.linked;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.controllers.LinkedNpcController;
+
+import java.io.IOException;
+
+public final class LinkedSetPacket extends AbstractPacket {
+    public static String packetName = "Request|LinkedSet";
+
+    private String linkedName;
+
+    public LinkedSetPacket(String linkedName) {
+        this.linkedName = linkedName;
+    }
+
+    public LinkedSetPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.LinkedSet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, linkedName);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        npc.linkedName = ByteBufUtils.readString(in);
+        LinkedNpcController.Instance.loadNpcData(npc);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAIGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAIGetPacket.java
new file mode 100644
index 000000000..875d9c762
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAIGetPacket.java
@@ -0,0 +1,53 @@
+package kamkeel.npcs.network.packets.request.mainmenu;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.io.IOException;
+
+public final class MainmenuAIGetPacket extends AbstractPacket {
+    public static String packetName = "Request|MainmenuAIGet";
+
+    public MainmenuAIGetPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MainmenuAIGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {}
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.ais.writeToNBT(new NBTTagCompound()));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAISavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAISavePacket.java
new file mode 100644
index 000000000..d08e9e056
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAISavePacket.java
@@ -0,0 +1,70 @@
+package kamkeel.npcs.network.packets.request.mainmenu;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.io.IOException;
+
+public final class MainmenuAISavePacket extends AbstractPacket {
+    public static String packetName = "Request|MainmenuInvSave";
+
+    private NBTTagCompound compound;
+
+    public MainmenuAISavePacket() {}
+
+    public MainmenuAISavePacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MainmenuAISave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_AI;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        npc.ais.readToNBT(ByteBufUtils.readNBT(in));
+        npc.setHealth(npc.getMaxHealth());
+        npc.updateAI = true;
+        npc.updateClient = true;
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedGetPacket.java
new file mode 100644
index 000000000..9665c07fe
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedGetPacket.java
@@ -0,0 +1,53 @@
+package kamkeel.npcs.network.packets.request.mainmenu;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.io.IOException;
+
+public final class MainmenuAdvancedGetPacket extends AbstractPacket {
+    public static String packetName = "Request|MainmenuAdvancedGet";
+
+    public MainmenuAdvancedGetPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MainmenuAdvancedGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {}
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.advanced.writeToNBT(new NBTTagCompound()));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedMarkDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedMarkDataPacket.java
new file mode 100644
index 000000000..dc8048632
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedMarkDataPacket.java
@@ -0,0 +1,70 @@
+package kamkeel.npcs.network.packets.request.mainmenu;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.controllers.data.MarkData;
+
+import java.io.IOException;
+
+public final class MainmenuAdvancedMarkDataPacket extends AbstractPacket {
+    public static String packetName = "Request|MainmenuAdvancedMarkData";
+
+    private NBTTagCompound compound;
+
+    public MainmenuAdvancedMarkDataPacket() {}
+
+    public MainmenuAdvancedMarkDataPacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MainmenuAdvancedMarkData;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        MarkData data = MarkData.get(npc);
+        data.setNBT(ByteBufUtils.readNBT(in));
+        data.syncClients();
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedSavePacket.java
new file mode 100644
index 000000000..d979ceb03
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedSavePacket.java
@@ -0,0 +1,69 @@
+package kamkeel.npcs.network.packets.request.mainmenu;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.io.IOException;
+
+public final class MainmenuAdvancedSavePacket extends AbstractPacket {
+    public static String packetName = "Request|MainmenuInvSave";
+
+    private NBTTagCompound compound;
+
+    public MainmenuAdvancedSavePacket() {}
+
+    public MainmenuAdvancedSavePacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MainmenuAdvancedSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        npc.advanced.readToNBT(ByteBufUtils.readNBT(in));
+        npc.updateAI = true;
+        npc.updateClient = true;
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplayGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplayGetPacket.java
new file mode 100644
index 000000000..c286b37e2
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplayGetPacket.java
@@ -0,0 +1,56 @@
+package kamkeel.npcs.network.packets.request.mainmenu;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.io.IOException;
+
+public final class MainmenuDisplayGetPacket extends AbstractPacket {
+    public static String packetName = "Request|MainmenuDisplayGet";
+
+    public MainmenuDisplayGetPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MainmenuDisplayGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.display.writeToNBT(new NBTTagCompound()));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplaySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplaySavePacket.java
new file mode 100644
index 000000000..83c1af9b2
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplaySavePacket.java
@@ -0,0 +1,68 @@
+package kamkeel.npcs.network.packets.request.mainmenu;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.io.IOException;
+
+public final class MainmenuDisplaySavePacket extends AbstractPacket {
+    public static String packetName = "Request|MainmenuDisplaySave";
+
+    private NBTTagCompound compound;
+
+    public MainmenuDisplaySavePacket() {}
+
+    public MainmenuDisplaySavePacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MainmenuDisplaySave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_DISPLAY;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        npc.display.readToNBT(ByteBufUtils.readNBT(in));
+        npc.updateClient = true;
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvGetPacket.java
new file mode 100644
index 000000000..b4fbd2a3b
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvGetPacket.java
@@ -0,0 +1,53 @@
+package kamkeel.npcs.network.packets.request.mainmenu;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.io.IOException;
+
+public final class MainmenuInvGetPacket extends AbstractPacket {
+    public static String packetName = "Request|MainmenuInvGet";
+
+    public MainmenuInvGetPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MainmenuInvGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {}
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.inventory.writeEntityToNBT(new NBTTagCompound()));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvSavePacket.java
new file mode 100644
index 000000000..78933373c
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvSavePacket.java
@@ -0,0 +1,69 @@
+package kamkeel.npcs.network.packets.request.mainmenu;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.io.IOException;
+
+public final class MainmenuInvSavePacket extends AbstractPacket {
+    public static String packetName = "Request|MainmenuInvSave";
+
+    private NBTTagCompound compound;
+
+    public MainmenuInvSavePacket() {}
+
+    public MainmenuInvSavePacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MainmenuInvSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_INVENTORY;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        npc.inventory.readEntityFromNBT(ByteBufUtils.readNBT(in));
+        npc.updateAI = true;
+        npc.updateClient = true;
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsGetPacket.java
new file mode 100644
index 000000000..4b0ab51ed
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsGetPacket.java
@@ -0,0 +1,54 @@
+package kamkeel.npcs.network.packets.request.mainmenu;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.io.IOException;
+
+public final class MainmenuStatsGetPacket extends AbstractPacket {
+    public static String packetName = "Request|MainmenuStatsGet";
+
+    public MainmenuStatsGetPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MainmenuStatsGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {}
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.stats.writeToNBT(new NBTTagCompound()));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsSavePacket.java
new file mode 100644
index 000000000..3ff26f5a5
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsSavePacket.java
@@ -0,0 +1,68 @@
+package kamkeel.npcs.network.packets.request.mainmenu;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.io.IOException;
+
+public final class MainmenuStatsSavePacket extends AbstractPacket {
+    public static String packetName = "Request|MainmenuStatsSave";
+
+    private NBTTagCompound compound;
+
+    public MainmenuStatsSavePacket() {}
+
+    public MainmenuStatsSavePacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MainmenuStatsSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_STATS;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        npc.stats.readToNBT(ByteBufUtils.readNBT(in));
+        npc.updateClient = true;
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetAllPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetAllPacket.java
new file mode 100644
index 000000000..5058f5e00
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetAllPacket.java
@@ -0,0 +1,48 @@
+package kamkeel.npcs.network.packets.request.naturalspawns;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.ScrollDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.controllers.SpawnController;
+
+import java.io.IOException;
+
+public final class NaturalSpawnGetAllPacket extends AbstractPacket {
+    public static String packetName = "Request|NaturalSpawnGetAll";
+
+    public NaturalSpawnGetAllPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.NaturalSpawnGetAll;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        ScrollDataPacket.sendScrollData((EntityPlayerMP) player, SpawnController.Instance.getScroll());
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetPacket.java
new file mode 100644
index 000000000..d49f6448e
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetPacket.java
@@ -0,0 +1,61 @@
+package kamkeel.npcs.network.packets.request.naturalspawns;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.controllers.SpawnController;
+import noppes.npcs.controllers.data.SpawnData;
+
+import java.io.IOException;
+
+public final class NaturalSpawnGetPacket extends AbstractPacket {
+    public static String packetName = "Request|NaturalSpawnGet";
+
+    private int spawnId;
+
+    public NaturalSpawnGetPacket(int spawnId) {
+        this.spawnId = spawnId;
+    }
+
+    public NaturalSpawnGetPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.NaturalSpawnGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(spawnId);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        int id = in.readInt();
+        SpawnData spawn = SpawnController.Instance.getSpawnData(id);
+        if (spawn != null) {
+            GuiDataPacket.sendGuiData((EntityPlayerMP) player, spawn.writeNBT(new NBTTagCompound()));
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnRemovePacket.java
new file mode 100644
index 000000000..56116b24d
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnRemovePacket.java
@@ -0,0 +1,62 @@
+package kamkeel.npcs.network.packets.request.naturalspawns;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.ScrollDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.controllers.SpawnController;
+
+import java.io.IOException;
+
+public final class NaturalSpawnRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|NaturalSpawnRemove";
+
+    private int spawnId;
+
+    public NaturalSpawnRemovePacket(int spawnId) {
+        this.spawnId = spawnId;
+    }
+
+    public NaturalSpawnRemovePacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.NaturalSpawnRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_NATURALSPAWN;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(spawnId);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        int id = in.readInt();
+        SpawnController.Instance.removeSpawnData(id);
+        ScrollDataPacket.sendScrollData((EntityPlayerMP) player, SpawnController.Instance.getScroll());
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnSavePacket.java
new file mode 100644
index 000000000..92521afef
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnSavePacket.java
@@ -0,0 +1,67 @@
+package kamkeel.npcs.network.packets.request.naturalspawns;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.ScrollDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.controllers.SpawnController;
+import noppes.npcs.controllers.data.SpawnData;
+
+import java.io.IOException;
+
+public final class NaturalSpawnSavePacket extends AbstractPacket {
+    public static String packetName = "Request|NaturalSpawnSave";
+
+    private NBTTagCompound spawnNBT;
+
+    public NaturalSpawnSavePacket(NBTTagCompound spawnNBT) {
+        this.spawnNBT = spawnNBT;
+    }
+
+    public NaturalSpawnSavePacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.NaturalSpawnSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_NATURALSPAWN;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, spawnNBT);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        NBTTagCompound compound = ByteBufUtils.readNBT(in);
+        SpawnData data = new SpawnData();
+        data.readNBT(compound);
+        SpawnController.Instance.saveSpawnData(data);
+        ScrollDataPacket.sendScrollData((EntityPlayerMP) player, SpawnController.Instance.getScroll());
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/ModelDataSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/ModelDataSavePacket.java
new file mode 100644
index 000000000..81a426df1
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/ModelDataSavePacket.java
@@ -0,0 +1,69 @@
+package kamkeel.npcs.network.packets.request.npc;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.entity.EntityCustomNpc;
+
+import java.io.IOException;
+
+public final class ModelDataSavePacket extends AbstractPacket {
+    public static String packetName = "Request|ModelDataSave";
+
+    private NBTTagCompound save;
+
+    public ModelDataSavePacket() { }
+
+    public ModelDataSavePacket(NBTTagCompound save) {
+        this.save = save;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.ModelDataSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_DISPLAY;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.save);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        if(npc instanceof EntityCustomNpc)
+            ((EntityCustomNpc)npc).modelData.readFromNBT(ByteBufUtils.readNBT(in));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcClosePacket.java
new file mode 100644
index 000000000..53cbb4e2c
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcClosePacket.java
@@ -0,0 +1,67 @@
+package kamkeel.npcs.network.packets.request.npc;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.LogWriter;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.config.ConfigDebug;
+import noppes.npcs.controllers.LinkedNpcController;
+
+import java.io.IOException;
+
+public final class NpcClosePacket extends AbstractPacket {
+    public static final String packetName = "Request|NPCClose";
+
+    public NpcClosePacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.NpcClose;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_GUI;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        npc.reset();
+        if (npc.linkedData != null)
+            LinkedNpcController.Instance.saveNpcData(npc);
+
+        if (ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) {
+            LogWriter.script(String.format("[%s] (Player) %s CLOSE NPC %s (%s, %s, %s) [%s]", "WAND", player.getCommandSenderName(), npc.display.getName(), (int) npc.posX, (int) npc.posY, (int) npc.posZ, npc.worldObj.getWorldInfo().getWorldName()));
+        }
+        NoppesUtilServer.setEditingNpc(player, null);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcDeletePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcDeletePacket.java
new file mode 100644
index 000000000..6a4125ef2
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcDeletePacket.java
@@ -0,0 +1,66 @@
+package kamkeel.npcs.network.packets.request.npc;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.LogWriter;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.config.ConfigDebug;
+
+import java.io.IOException;
+
+public final class NpcDeletePacket extends AbstractPacket {
+    public static final String packetName = "Request|NPCDelete";
+
+    public NpcDeletePacket() {}
+
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.NPCDelete;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_DELETE;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        if (ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) {
+            LogWriter.script(String.format("[%s] (Player) %s DELETE NPC %s (%s, %s, %s) [%s]", "WAND", player.getCommandSenderName(), npc.display.getName(), (int) npc.posX, (int) npc.posY, (int) npc.posZ, npc.worldObj.getWorldInfo().getWorldName()));
+        }
+
+        npc.delete();
+        NoppesUtilServer.deleteNpc(npc, player);
+    }
+
+
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteDeletePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteDeletePacket.java
new file mode 100644
index 000000000..98fdaebb4
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteDeletePacket.java
@@ -0,0 +1,75 @@
+package kamkeel.npcs.network.packets.request.npc;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.LogWriter;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.config.ConfigDebug;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class RemoteDeletePacket extends AbstractPacket {
+    public static String packetName = "Request|RemoteDelete";
+
+    private int entityId;
+
+    public RemoteDeletePacket(int entityId) {
+        this.entityId = entityId;
+    }
+
+    public RemoteDeletePacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.RemoteDelete;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_DELETE;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(entityId);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof net.minecraft.entity.player.EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        int id = in.readInt();
+        Entity entity = player.worldObj.getEntityByID(id);
+        if (!(entity instanceof EntityNPCInterface))
+            return;
+
+        npc = (EntityNPCInterface) entity;
+        if (ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) {
+            LogWriter.script(String.format("[%s] (Player) %s DELETE NPC %s (%s, %s, %s) [%s]", "WAND", player.getCommandSenderName(), npc.display.getName(), (int) npc.posX, (int) npc.posY, (int) npc.posZ, npc.worldObj.getWorldInfo().getWorldName()));
+        }
+        npc.delete();
+        NoppesUtilServer.deleteNpc(npc, player);
+        NoppesUtilServer.sendNearbyNpcs((EntityPlayerMP) player);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezeGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezeGetPacket.java
new file mode 100644
index 000000000..7eeede76c
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezeGetPacket.java
@@ -0,0 +1,48 @@
+package kamkeel.npcs.network.packets.request.npc;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.ScrollSelectedPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcs;
+
+import java.io.IOException;
+
+public final class RemoteFreezeGetPacket extends AbstractPacket {
+    public static String packetName = "Request|RemoteFreezeGet";
+
+    public RemoteFreezeGetPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.RemoteFreezeGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        ScrollSelectedPacket.setSelectedList((EntityPlayerMP) player, CustomNpcs.FreezeNPCs ? "Unfreeze NPCs" : "Freeze NPCs");
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezePacket.java
new file mode 100644
index 000000000..0604bedae
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezePacket.java
@@ -0,0 +1,55 @@
+package kamkeel.npcs.network.packets.request.npc;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.ScrollSelectedPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcs;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.io.IOException;
+
+public final class RemoteFreezePacket extends AbstractPacket {
+    public static String packetName = "Request|RemoteFreeze";
+
+    public RemoteFreezePacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.RemoteFreeze;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_FREEZE;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        CustomNpcs.FreezeNPCs = !CustomNpcs.FreezeNPCs;
+        ScrollSelectedPacket.setSelectedList((EntityPlayerMP) player, CustomNpcs.FreezeNPCs ? "Unfreeze NPCs" : "Freeze NPCs");
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteGlobalMenuPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteGlobalMenuPacket.java
new file mode 100644
index 000000000..e2f4a2af2
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteGlobalMenuPacket.java
@@ -0,0 +1,61 @@
+package kamkeel.npcs.network.packets.request.npc;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.LogWriter;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.config.ConfigDebug;
+import noppes.npcs.constants.EnumGuiType;
+
+import java.io.IOException;
+
+public final class RemoteGlobalMenuPacket extends AbstractPacket {
+    public static String packetName = "Request|RemoteGlobalMenu";
+
+    public RemoteGlobalMenuPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.RemoteGlobalMenu;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_REMOTE;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        NoppesUtilServer.sendOpenGui(player, EnumGuiType.GlobalRemote, null);
+        if (ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) {
+            LogWriter.script(String.format("[%s] (Player) %s OPEN GLOBAL MENU",
+                "WAND", player.getCommandSenderName()));
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteMainMenuPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteMainMenuPacket.java
new file mode 100644
index 000000000..31674ac80
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteMainMenuPacket.java
@@ -0,0 +1,75 @@
+package kamkeel.npcs.network.packets.request.npc;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.LogWriter;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.config.ConfigDebug;
+import noppes.npcs.constants.EnumGuiType;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class RemoteMainMenuPacket extends AbstractPacket {
+    public static String packetName = "Request|RemoteMainMenu";
+
+    private int entityID;
+
+    public RemoteMainMenuPacket() {}
+
+    public RemoteMainMenuPacket(int entityID) {
+        this.entityID = entityID;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.RemoteMainMenu;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_GUI;
+    }
+
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.entityID);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        Entity entity = player.worldObj.getEntityByID(in.readInt());
+        if(!(entity instanceof EntityNPCInterface))
+            return;
+
+        NoppesUtilServer.sendOpenGui(player, EnumGuiType.MainMenuDisplay, (EntityNPCInterface) entity);
+        if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
+            LogWriter.script(String.format("[%s] (Player) %s OPEN NPC %s (%s, %s, %s) [%s]", "WAND", player.getCommandSenderName(), ((EntityNPCInterface)entity).display.getName(), entity.posX, entity.posY, entity.posZ,  entity.worldObj.getWorldInfo().getWorldName()));
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteNpcsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteNpcsGetPacket.java
new file mode 100644
index 000000000..6d4e84647
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteNpcsGetPacket.java
@@ -0,0 +1,53 @@
+package kamkeel.npcs.network.packets.request.npc;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+
+import java.io.IOException;
+
+public final class RemoteNpcsGetPacket extends AbstractPacket {
+    public static String packetName = "Request|RemoteNpcsGet";
+
+    public RemoteNpcsGetPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.RemoteNpcsGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_GUI;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        NoppesUtilServer.sendNearbyNpcs((EntityPlayerMP) player);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteResetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteResetPacket.java
new file mode 100644
index 000000000..73d34036a
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteResetPacket.java
@@ -0,0 +1,66 @@
+package kamkeel.npcs.network.packets.request.npc;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class RemoteResetPacket extends AbstractPacket {
+    public static String packetName = "Request|RemoteReset";
+
+    private int entityID;
+
+    public RemoteResetPacket() {}
+
+    public RemoteResetPacket(int entityID) {
+        this.entityID = entityID;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.RemoteReset;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_RESET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.entityID);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        Entity entity = player.worldObj.getEntityByID(in.readInt());
+        if(!(entity instanceof EntityNPCInterface))
+            return;
+        npc = (EntityNPCInterface) entity;
+        npc.reset();
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteTpToNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteTpToNpcPacket.java
new file mode 100644
index 000000000..661f7d6e0
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteTpToNpcPacket.java
@@ -0,0 +1,63 @@
+package kamkeel.npcs.network.packets.request.npc;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class RemoteTpToNpcPacket extends AbstractPacket {
+    public static String packetName = "Request|RemoteTpToNpc";
+
+    private int entityID;
+    public RemoteTpToNpcPacket() {}
+
+    public RemoteTpToNpcPacket(int entityID) {
+        this.entityID = entityID;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.RemoteTpToNpc;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_TELEPORT;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.entityID);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        Entity entity = player.worldObj.getEntityByID(in.readInt());
+        if(!(entity instanceof EntityNPCInterface))
+            return;
+        npc = (EntityNPCInterface) entity;
+        ((EntityPlayerMP) player).playerNetServerHandler.setPlayerLocation(npc.posX, npc.posY, npc.posZ, 0, 0);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyAcceptInvitePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyAcceptInvitePacket.java
new file mode 100644
index 000000000..be9bf04ba
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyAcceptInvitePacket.java
@@ -0,0 +1,56 @@
+package kamkeel.npcs.network.packets.request.party;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.data.PlayerData;
+
+import java.io.IOException;
+import java.util.UUID;
+
+public final class PartyAcceptInvitePacket extends AbstractPacket {
+    public static final String packetName = "Request|PartyAcceptInvite";
+
+    private String uuid;
+
+    public PartyAcceptInvitePacket() {
+    }
+
+    public PartyAcceptInvitePacket(String playerUUID) {
+        this.uuid = playerUUID;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.PartyAcceptInvite;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, this.uuid);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
+        String uuidString = ByteBufUtils.readString(in);
+        if (uuidString != null) {
+            UUID uuid = UUID.fromString(uuidString);
+            playerData.acceptInvite(uuid);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyDisbandPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyDisbandPacket.java
new file mode 100644
index 000000000..e22f8f349
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyDisbandPacket.java
@@ -0,0 +1,53 @@
+package kamkeel.npcs.network.packets.request.party;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.PartyDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.controllers.PartyController;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.data.PlayerData;
+
+import java.io.IOException;
+
+public final class PartyDisbandPacket extends AbstractPacket {
+    public static final String packetName = "Request|PartyDisband";
+
+
+    public PartyDisbandPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.PartyDisband;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
+        if (playerData.partyUUID != null) {
+            PartyController.Instance().disbandParty(playerData.partyUUID);
+        }
+        NBTTagCompound compound = new NBTTagCompound();
+        compound.setBoolean("Disband", true);
+        PartyDataPacket.sendPartyData((EntityPlayerMP) player, compound);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyIgnoreInvitePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyIgnoreInvitePacket.java
new file mode 100644
index 000000000..bc8c5733b
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyIgnoreInvitePacket.java
@@ -0,0 +1,56 @@
+package kamkeel.npcs.network.packets.request.party;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.data.PlayerData;
+
+import java.io.IOException;
+import java.util.UUID;
+
+public final class PartyIgnoreInvitePacket extends AbstractPacket {
+    public static final String packetName = "Request|PartyIgnoreInvite";
+
+    private String uuid;
+
+    public PartyIgnoreInvitePacket() {
+    }
+
+    public PartyIgnoreInvitePacket(String partyUUID) {
+        this.uuid = partyUUID;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.PartyIgnoreInvite;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, this.uuid);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
+        String uuidString = ByteBufUtils.readString(in);
+        if (uuidString != null) {
+            UUID uuid = UUID.fromString(uuidString);
+            playerData.ignoreInvite(uuid);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInfoPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInfoPacket.java
new file mode 100644
index 000000000..02f146965
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInfoPacket.java
@@ -0,0 +1,96 @@
+package kamkeel.npcs.network.packets.request.party;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.PartyDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.NBTTagString;
+import noppes.npcs.config.ConfigMain;
+import noppes.npcs.constants.EnumQuestCompletion;
+import noppes.npcs.controllers.PartyController;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.data.Party;
+import noppes.npcs.controllers.data.PlayerData;
+import noppes.npcs.controllers.data.Quest;
+
+import java.io.IOException;
+import java.util.Vector;
+
+import static kamkeel.npcs.network.packets.request.party.PartyInvitePacket.sendInviteData;
+
+public final class PartyInfoPacket extends AbstractPacket {
+    public static final String packetName = "Request|PartyInfo";
+
+
+    boolean newParty;
+
+    public PartyInfoPacket() {
+    }
+
+    public PartyInfoPacket(boolean party) {
+        this.newParty = party;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.PartyInfo;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeBoolean(this.newParty);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        boolean isNew = in.readBoolean();
+        if (!ConfigMain.PartiesEnabled)
+            return;
+
+        if (isNew) {
+            Party party = PartyController.Instance().createParty();
+            party.addPlayer(player);
+            party.setLeader(player);
+        }
+        sendPartyData((EntityPlayerMP) player);
+    }
+
+    public static void sendPartyData(EntityPlayerMP player) {
+        PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
+        if (playerData.partyUUID != null) {
+            Party party = PartyController.Instance().getParty(playerData.partyUUID);
+            NBTTagCompound compound = party.writeToNBT();
+            if (party.getQuest() != null) {
+                Quest quest = (Quest) party.getQuest();
+                compound.setString("QuestName", quest.getCategory().getName() + ":" + quest.getName());
+                Vector<String> vector = quest.questInterface.getPartyQuestLogStatus(party);
+                NBTTagList list = new NBTTagList();
+                for (String s : vector) {
+                    list.appendTag(new NBTTagString(s));
+                }
+                compound.setTag("QuestProgress", list);
+                if(quest.completion == EnumQuestCompletion.Npc && quest.questInterface.isPartyCompleted(party)) {
+                    compound.setString("QuestCompleteWith", quest.completerNpc);
+                }
+            }
+            PartyDataPacket.sendPartyData(player, compound);
+        } else {
+            sendInviteData(player);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInvitePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInvitePacket.java
new file mode 100644
index 000000000..1ae14a308
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInvitePacket.java
@@ -0,0 +1,96 @@
+package kamkeel.npcs.network.packets.request.party;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.PartyDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import noppes.npcs.EventHooks;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.api.entity.IPlayer;
+import noppes.npcs.controllers.PartyController;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.data.Party;
+import noppes.npcs.controllers.data.PlayerData;
+import noppes.npcs.scripted.NpcAPI;
+import noppes.npcs.scripted.event.PartyEvent;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.UUID;
+
+public final class PartyInvitePacket extends AbstractPacket {
+    public static final String packetName = "Request|PartyInvite";
+
+    private String name;
+
+    public PartyInvitePacket() {
+    }
+
+    public PartyInvitePacket(String playername) {
+        this.name = playername;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.PartyInvite;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, this.name);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        EntityPlayer invitedPlayer = NoppesUtilServer.getPlayerByName(ByteBufUtils.readString(in));
+        if (invitedPlayer != null) {
+            PlayerData senderData = PlayerDataController.Instance.getPlayerData(player);
+            PlayerData invitedData = PlayerDataController.Instance.getPlayerData(invitedPlayer);
+            if (senderData.partyUUID != null && invitedData.partyUUID == null) {
+                Party party = PartyController.Instance().getParty(senderData.partyUUID);
+                if (!party.getIsLocked()) {
+                    PartyEvent.PartyInviteEvent partyEvent = new PartyEvent.PartyInviteEvent(party, party.getQuest(), (IPlayer) NpcAPI.Instance().getIEntity(invitedPlayer));
+                    EventHooks.onPartyInvite(partyEvent);
+                    if (!partyEvent.isCancelled()) {
+                        invitedData.inviteToParty(party);
+                        sendInviteData((EntityPlayerMP) invitedPlayer);
+                    }
+                }
+            }
+        }
+    }
+
+    public static void sendInviteData(EntityPlayerMP player) {
+        PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
+        if (playerData.partyUUID == null) {
+            NBTTagCompound compound = new NBTTagCompound();
+            NBTTagList list = new NBTTagList();
+            HashSet<UUID> partyInvites = playerData.getPartyInvites();
+            for (UUID uuid : partyInvites) {
+                Party party = PartyController.Instance().getParty(uuid);
+                NBTTagCompound partyCompound = new NBTTagCompound();
+                partyCompound.setString("PartyLeader", party.getPartyLeaderName());
+                partyCompound.setString("PartyUUID", party.getPartyUUID().toString());
+                list.appendTag(partyCompound);
+            }
+            compound.setTag("PartyInvites", list);
+            PartyDataPacket.sendPartyData(player, compound);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyKickPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyKickPacket.java
new file mode 100644
index 000000000..0a0d3b97c
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyKickPacket.java
@@ -0,0 +1,96 @@
+package kamkeel.npcs.network.packets.request.party;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.EventHooks;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.api.entity.IPlayer;
+import noppes.npcs.controllers.PartyController;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.data.Party;
+import noppes.npcs.controllers.data.PlayerData;
+import noppes.npcs.scripted.NpcAPI;
+import noppes.npcs.scripted.event.PartyEvent;
+
+import java.io.IOException;
+import java.util.UUID;
+
+import static kamkeel.npcs.network.packets.request.party.PartyInvitePacket.sendInviteData;
+
+public final class PartyKickPacket extends AbstractPacket {
+    public static final String packetName = "Request|PartyKick";
+
+    private String name;
+
+    public PartyKickPacket() {
+    }
+
+    public PartyKickPacket(String playername) {
+        this.name = playername;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.PartyKick;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, this.name);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        String kickPlayerName = ByteBufUtils.readString(in);
+        EntityPlayer kickPlayer = NoppesUtilServer.getPlayerByName(kickPlayerName);
+        PlayerData playerData = null;
+        UUID playerUUID = null;
+        if (kickPlayer != null) {
+            playerData = PlayerDataController.Instance.getPlayerData(player);
+        } else {
+            String uuid = PlayerDataController.Instance.getPlayerUUIDFromName(kickPlayerName);
+            if (!uuid.isEmpty()) {
+                playerData = PlayerDataController.Instance.getPlayerDataCache(uuid);
+                playerUUID = UUID.fromString(uuid);
+            }
+        }
+
+        if (playerData != null) {
+            if (playerData.partyUUID != null) {
+                Party party = PartyController.Instance().getParty(playerData.partyUUID);
+                if (!party.getIsLocked()) {
+                    PartyEvent.PartyKickEvent partyEvent = new PartyEvent.PartyKickEvent(party, party.getQuest(), (IPlayer) NpcAPI.Instance().getIEntity(kickPlayer));
+                    EventHooks.onPartyKick(partyEvent);
+                    if (!partyEvent.isCancelled()) {
+                        boolean successful = party.removePlayer(kickPlayer);
+                        if (!successful)
+                            successful = party.removePlayer(playerUUID);
+
+                        if (successful) {
+                            if (kickPlayer != null) {
+                                sendInviteData((EntityPlayerMP) kickPlayer);
+                            }
+                            PartyController.Instance().pingPartyUpdate(party);
+                            PartyController.Instance().sendKickMessages(party, kickPlayer, kickPlayerName);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyLeavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyLeavePacket.java
new file mode 100644
index 000000000..1a55d008a
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyLeavePacket.java
@@ -0,0 +1,74 @@
+package kamkeel.npcs.network.packets.request.party;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.EventHooks;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.api.entity.IPlayer;
+import noppes.npcs.controllers.PartyController;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.data.Party;
+import noppes.npcs.controllers.data.PlayerData;
+import noppes.npcs.scripted.NpcAPI;
+import noppes.npcs.scripted.event.PartyEvent;
+
+import java.io.IOException;
+
+import static kamkeel.npcs.network.packets.request.party.PartyInvitePacket.sendInviteData;
+
+public final class PartyLeavePacket extends AbstractPacket {
+    public static final String packetName = "Request|PartyLeave";
+
+    private String name;
+
+    public PartyLeavePacket() {
+    }
+
+    public PartyLeavePacket(String playername) {
+        this.name = playername;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.PartyLeave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, this.name);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        EntityPlayer leavingPlayer = NoppesUtilServer.getPlayerByName(ByteBufUtils.readString(in));
+        if (leavingPlayer != null) {
+            PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
+            if (playerData.partyUUID != null) {
+                Party party = PartyController.Instance().getParty(playerData.partyUUID);
+                boolean successful = party.removePlayer(leavingPlayer);
+                if (successful) {
+                    PartyEvent.PartyLeaveEvent partyEvent = new PartyEvent.PartyLeaveEvent(party, party.getQuest(), (IPlayer) NpcAPI.Instance().getIEntity(leavingPlayer));
+                    EventHooks.onPartyLeave(partyEvent);
+                    sendInviteData((EntityPlayerMP) leavingPlayer);
+                    PartyController.Instance().pingPartyUpdate(party);
+                    PartyController.Instance().sendLeavingMessages(party, leavingPlayer);
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyLogToServerPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyLogToServerPacket.java
new file mode 100644
index 000000000..bcf2c0bc3
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyLogToServerPacket.java
@@ -0,0 +1,51 @@
+package kamkeel.npcs.network.packets.request.party;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilPlayer;
+
+import java.io.IOException;
+
+public final class PartyLogToServerPacket extends AbstractPacket {
+    public static final String packetName = "Request|PartyLogToServer";
+
+    private String key;
+
+    public PartyLogToServerPacket() {
+    }
+
+    public PartyLogToServerPacket(String key) {
+        this.key = key;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.PartyLogToServer;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, this.key);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        NoppesUtilPlayer.updatePartyQuestLogData(in, (EntityPlayerMP) player);
+    }
+
+
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java
new file mode 100644
index 000000000..7248b6f27
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java
@@ -0,0 +1,57 @@
+package kamkeel.npcs.network.packets.request.party;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.controllers.PartyController;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.data.Party;
+import noppes.npcs.controllers.data.PlayerData;
+
+import java.io.IOException;
+
+public final class PartySavePacket extends AbstractPacket {
+    public static final String packetName = "Request|PartySave";
+
+    private NBTTagCompound compound;
+
+    public PartySavePacket() {
+    }
+
+    public PartySavePacket(NBTTagCompound partyCompound) {
+        this.compound = partyCompound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.PartySave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
+        if (playerData.partyUUID != null) {
+            Party party = PartyController.Instance().getParty(playerData.partyUUID);
+            party.readClientNBT(ByteBufUtils.readNBT(in));
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetLeaderPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetLeaderPacket.java
new file mode 100644
index 000000000..2d90068c8
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetLeaderPacket.java
@@ -0,0 +1,60 @@
+package kamkeel.npcs.network.packets.request.party;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.PartyController;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.data.Party;
+import noppes.npcs.controllers.data.PlayerData;
+
+import java.io.IOException;
+
+public final class PartySetLeaderPacket extends AbstractPacket {
+    public static final String packetName = "Request|PartySetLeader";
+
+    private String name;
+
+    public PartySetLeaderPacket() {
+    }
+
+    public PartySetLeaderPacket(String playername) {
+        this.name = playername;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.PartySetLeader;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, this.name);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
+        if (playerData.partyUUID != null) {
+            Party party = PartyController.Instance().getParty(playerData.partyUUID);
+            if (!party.getIsLocked()) {
+                party.setLeader(NoppesUtilServer.getPlayerByName(ByteBufUtils.readString(in)));
+                PartyController.Instance().pingPartyUpdate(party);
+            }
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetQuestPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetQuestPacket.java
new file mode 100644
index 000000000..932b852c2
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetQuestPacket.java
@@ -0,0 +1,85 @@
+package kamkeel.npcs.network.packets.request.party;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.EventHooks;
+import noppes.npcs.controllers.PartyController;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.QuestController;
+import noppes.npcs.controllers.data.Party;
+import noppes.npcs.controllers.data.PlayerData;
+import noppes.npcs.controllers.data.Quest;
+import noppes.npcs.controllers.data.QuestData;
+import noppes.npcs.scripted.event.PartyEvent;
+
+import java.io.IOException;
+
+public final class PartySetQuestPacket extends AbstractPacket {
+    public static final String packetName = "Request|PartySetQuest";
+
+    private int questID;
+
+    public PartySetQuestPacket() {
+    }
+
+    public PartySetQuestPacket(int questID) {
+        this.questID = questID;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.PartySetQuest;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.questID);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
+        if (playerData.partyUUID != null) {
+            Party party = PartyController.Instance().getParty(playerData.partyUUID);
+            if (party != null) {
+                if (party.getLeaderUUID().equals(player.getUniqueID())) {
+                    int questID = in.readInt();
+                    party.setQuest(null);
+                    if (questID != -1) {
+                        Quest foundQuest = QuestController.Instance.quests.get(questID);
+                        if (foundQuest != null) {
+                            if (foundQuest.partyOptions.allowParty) {
+                                if (party.validateQuest(questID, true)) {
+                                    PartyEvent.PartyQuestSetEvent partyEvent = new PartyEvent.PartyQuestSetEvent(party, foundQuest);
+                                    EventHooks.onPartyQuestSet(partyEvent);
+                                    if (!partyEvent.isCancelled()) {
+                                        if (playerData.questData.hasActiveQuest(questID)) {
+                                            QuestData questdata = new QuestData(foundQuest);
+                                            playerData.questData.activeQuests.put(questID, questdata);
+                                        }
+                                        party.setQuest(foundQuest);
+                                        PartyController.Instance().sendQuestChat(party, "party.setChat", " ", foundQuest.title);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    PartyController.Instance().pingPartyUpdate(party);
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/pather/MovingPathGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/pather/MovingPathGetPacket.java
new file mode 100644
index 000000000..e87b3c52b
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/pather/MovingPathGetPacket.java
@@ -0,0 +1,53 @@
+package kamkeel.npcs.network.packets.request.pather;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.io.IOException;
+
+public final class MovingPathGetPacket extends AbstractPacket {
+    public static String packetName = "Request|MovingPathGet";
+
+    public MovingPathGetPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MovingPathGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {}
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.PATHER, player))
+            return;
+
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.ais.writeToNBT(new NBTTagCompound()));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/pather/MovingPathSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/pather/MovingPathSavePacket.java
new file mode 100644
index 000000000..c96564bba
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/pather/MovingPathSavePacket.java
@@ -0,0 +1,69 @@
+package kamkeel.npcs.network.packets.request.pather;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NBTTags;
+
+import java.io.IOException;
+
+public final class MovingPathSavePacket extends AbstractPacket {
+    public static String packetName = "Request|MovingPathSave";
+
+    private NBTTagCompound saveNBT;
+
+    public MovingPathSavePacket(NBTTagCompound saveNBT) {
+        this.saveNBT = saveNBT;
+    }
+
+    public MovingPathSavePacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.MovingPathSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.TOOL_PATHER;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, saveNBT);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.PATHER, player))
+            return;
+
+        npc.ais.setMovingPath(NBTTags.getIntegerArraySet(ByteBufUtils.readNBT(in).getTagList("MovingPathNew",10)));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataGetPacket.java
new file mode 100644
index 000000000..557698999
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataGetPacket.java
@@ -0,0 +1,70 @@
+package kamkeel.npcs.network.packets.request.playerdata;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.constants.EnumPlayerData;
+
+import java.io.IOException;
+
+public final class PlayerDataGetPacket extends AbstractPacket {
+    public static String packetName = "Request|PlayerDataGet";
+
+    private EnumPlayerData playerData;
+    private String name;
+
+    public PlayerDataGetPacket() {}
+
+    public PlayerDataGetPacket(EnumPlayerData playerData, String name) {
+        this.playerData = playerData;
+        this.name = name;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.PlayerDataGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(playerData.ordinal());
+        if(playerData != EnumPlayerData.Players)
+            ByteBufUtils.writeString(out, this.name);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int id = in.readInt();
+        if (EnumPlayerData.values().length <= id)
+            return;
+
+        String name = null;
+        EnumPlayerData datatype = EnumPlayerData.values()[id];
+        if (datatype != EnumPlayerData.Players)
+            name = ByteBufUtils.readString(in);
+
+        NoppesUtilServer.sendPlayerData(datatype, (EntityPlayerMP) player, name);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataMapRegenPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataMapRegenPacket.java
new file mode 100644
index 000000000..dec497e86
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataMapRegenPacket.java
@@ -0,0 +1,55 @@
+package kamkeel.npcs.network.packets.request.playerdata;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+
+import java.io.IOException;
+
+public final class PlayerDataMapRegenPacket extends AbstractPacket {
+    public static String packetName = "Request|PlayerDataMapRegen";
+
+    public PlayerDataMapRegenPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.PlayerDataMapRegen;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_PLAYERDATA;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        NoppesUtilServer.regenPlayerData((EntityPlayerMP) player);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java
new file mode 100644
index 000000000..19ede4793
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java
@@ -0,0 +1,81 @@
+package kamkeel.npcs.network.packets.request.playerdata;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.constants.EnumPlayerData;
+
+import java.io.IOException;
+
+public final class PlayerDataRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|PlayerDataRemove";
+
+    private EnumPlayerData playerData;
+    private String name;
+
+    private int type;
+    private String selected;
+
+    public PlayerDataRemovePacket() {}
+
+    public PlayerDataRemovePacket(EnumPlayerData playerData, String name, String selected) {
+        this.playerData = playerData;
+        this.name = name;
+        this.selected = selected;
+    }
+
+    public PlayerDataRemovePacket(EnumPlayerData playerData, String name, int selectedType) {
+        this.playerData = playerData;
+        this.name = name;
+        this.type = selectedType;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.PlayerDataRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_PLAYERDATA;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+       out.writeInt(playerData.ordinal());
+       ByteBufUtils.writeString(out, this.name);
+       if(playerData == EnumPlayerData.Players){
+           ByteBufUtils.writeString(out, this.selected);
+       } else {
+           out.writeInt(this.type);
+       }
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        NoppesUtilServer.removePlayerData(in, (EntityPlayerMP) player);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoriesGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoriesGetPacket.java
new file mode 100644
index 000000000..12ed56a54
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoriesGetPacket.java
@@ -0,0 +1,49 @@
+package kamkeel.npcs.network.packets.request.quest;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.ScrollDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.DialogController;
+
+import java.io.IOException;
+
+public final class QuestCategoriesGetPacket extends AbstractPacket {
+    public static String packetName = "Request|QuestCategoriesGet";
+
+    public QuestCategoriesGetPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.QuestCategoriesGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {}
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+            return;
+
+        NoppesUtilServer.sendQuestCategoryData((EntityPlayerMP) player);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryGetPacket.java
new file mode 100644
index 000000000..946fd8554
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryGetPacket.java
@@ -0,0 +1,64 @@
+package kamkeel.npcs.network.packets.request.quest;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.controllers.QuestController;
+import noppes.npcs.controllers.data.QuestCategory;
+
+import java.io.IOException;
+
+public final class QuestCategoryGetPacket extends AbstractPacket {
+    public static String packetName = "Request|QuestCategoryGet";
+
+    private int categoryID;
+
+    public QuestCategoryGetPacket() {}
+
+    public QuestCategoryGetPacket(int categoryID) {
+        this.categoryID = categoryID;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.QuestCategoryGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.categoryID);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int id = in.readInt();
+        QuestCategory category = QuestController.Instance.categories.get(id);
+        if (category != null) {
+            NBTTagCompound comp = category.writeNBT(new NBTTagCompound());
+            comp.removeTag("Dialogs");
+            GuiDataPacket.sendGuiData((EntityPlayerMP) player, comp);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryRemovePacket.java
new file mode 100644
index 000000000..2e41d8bfe
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryRemovePacket.java
@@ -0,0 +1,64 @@
+package kamkeel.npcs.network.packets.request.quest;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.QuestController;
+
+import java.io.IOException;
+
+public final class QuestCategoryRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|QuestCategoryRemove";
+
+    private int categoryId;
+
+    public QuestCategoryRemovePacket(int categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public QuestCategoryRemovePacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.QuestCategoryRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_QUEST;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(categoryId);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int id = in.readInt();
+        QuestController.Instance.removeCategory(id);
+        NoppesUtilServer.sendQuestCategoryData((EntityPlayerMP) player);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategorySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategorySavePacket.java
new file mode 100644
index 000000000..76695d132
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategorySavePacket.java
@@ -0,0 +1,70 @@
+package kamkeel.npcs.network.packets.request.quest;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.QuestController;
+import noppes.npcs.controllers.data.QuestCategory;
+
+import java.io.IOException;
+
+public final class QuestCategorySavePacket extends AbstractPacket {
+    public static String packetName = "Request|QuestCategorySave";
+
+    private NBTTagCompound categoryNBT;
+
+    public QuestCategorySavePacket(NBTTagCompound categoryNBT) {
+        this.categoryNBT = categoryNBT;
+    }
+
+    public QuestCategorySavePacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.QuestCategorySave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_QUEST;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, categoryNBT);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        NBTTagCompound compound = ByteBufUtils.readNBT(in);
+        QuestCategory category = new QuestCategory();
+        category.readNBT(compound);
+        QuestController.Instance.saveCategory(category);
+        NoppesUtilServer.sendQuestCategoryData((EntityPlayerMP) player);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestDialogGetTitlePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestDialogGetTitlePacket.java
new file mode 100644
index 000000000..251db49dd
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestDialogGetTitlePacket.java
@@ -0,0 +1,81 @@
+package kamkeel.npcs.network.packets.request.quest;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.controllers.DialogController;
+import noppes.npcs.controllers.data.Dialog;
+
+import java.io.IOException;
+
+public final class QuestDialogGetTitlePacket extends AbstractPacket {
+    public static String packetName = "Request|QuestDialogGetTitle";
+
+    private int dialogOne;
+    private int dialogTwo;
+    private int dialogThree;
+
+    public QuestDialogGetTitlePacket() {}
+
+    public QuestDialogGetTitlePacket(int dialogOne, int dialogTwo, int dialogThree) {
+        this.dialogOne = dialogOne;
+        this.dialogTwo = dialogTwo;
+        this.dialogThree = dialogThree;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.QuestDialogGetTitle;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_QUEST;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(dialogOne);
+        out.writeInt(dialogTwo);
+        out.writeInt(dialogThree);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        Dialog quest = DialogController.Instance.dialogs.get(in.readInt());
+        Dialog quest2 = DialogController.Instance.dialogs.get(in.readInt());
+        Dialog quest3 = DialogController.Instance.dialogs.get(in.readInt());
+        NBTTagCompound compound = new NBTTagCompound();
+        if (quest != null)
+            compound.setString("1", quest.title);
+        if (quest2 != null)
+            compound.setString("2", quest2.title);
+        if (quest3 != null)
+            compound.setString("3", quest3.title);
+
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java
new file mode 100644
index 000000000..e3f9119d4
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java
@@ -0,0 +1,67 @@
+package kamkeel.npcs.network.packets.request.quest;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.*;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.controllers.DialogController;
+import noppes.npcs.controllers.QuestController;
+import noppes.npcs.controllers.data.Dialog;
+import noppes.npcs.controllers.data.Quest;
+
+import java.io.IOException;
+
+public final class QuestGetPacket extends AbstractPacket {
+    public static String packetName = "Request|QuestGet";
+
+    private int questID;
+
+    public QuestGetPacket() {}
+
+    public QuestGetPacket(int questID) {
+        this.questID = questID;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.QuestGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.questID);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+            return;
+
+        Quest quest = QuestController.Instance.quests.get(in.readInt());
+        if(quest != null){
+            NBTTagCompound compound = new NBTTagCompound();
+            if(quest.hasNewQuest())
+                compound.setString("NextQuestTitle", quest.getNextQuest().title);
+            GuiDataPacket.sendGuiData((EntityPlayerMP) player, quest.writeToNBT(compound));
+        }
+    }
+
+    public static void getQuest(int id){
+        PacketClient.sendClient(new QuestGetPacket(id));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestLogToServerPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestLogToServerPacket.java
new file mode 100644
index 000000000..4e9566d98
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestLogToServerPacket.java
@@ -0,0 +1,55 @@
+package kamkeel.npcs.network.packets.request.quest;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.NoppesUtilPlayer;
+
+import java.io.IOException;
+
+public final class QuestLogToServerPacket extends AbstractPacket {
+    public static final String packetName = "Request|QuestLogToServer";
+
+    private NBTTagCompound compound;
+    private String key;
+
+    public QuestLogToServerPacket() {
+    }
+
+    public QuestLogToServerPacket(NBTTagCompound compound, String key) {
+        this.compound = compound;
+        this.key = key;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.QuestLogToServer;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+        ByteBufUtils.writeString(out, this.key);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        NoppesUtilPlayer.updateQuestLogData(in, (EntityPlayerMP) player);
+    }
+
+
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestOpenGuiPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestOpenGuiPacket.java
new file mode 100644
index 000000000..698fa75de
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestOpenGuiPacket.java
@@ -0,0 +1,68 @@
+package kamkeel.npcs.network.packets.request.quest;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcs;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.constants.EnumGuiType;
+import noppes.npcs.controllers.data.Quest;
+
+import java.io.IOException;
+
+public final class QuestOpenGuiPacket extends AbstractPacket {
+    public static String packetName = "Request|QuestOpenGui";
+
+    private EnumGuiType guiType;
+    private NBTTagCompound questNBT;
+
+    public QuestOpenGuiPacket(EnumGuiType guiType, NBTTagCompound questNBT) {
+        this.guiType = guiType;
+        this.questNBT = questNBT;
+    }
+
+    public QuestOpenGuiPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.QuestOpenGui;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(guiType.ordinal());
+        ByteBufUtils.writeNBT(out, questNBT);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int gui = in.readInt();
+        NBTTagCompound compound = ByteBufUtils.readNBT(in);
+        Quest quest = new Quest();
+        quest.readNBT(compound);
+        NoppesUtilServer.setEditingQuest(player, quest);
+        player.openGui(CustomNpcs.instance, gui, player.worldObj, 0, 0, 0);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestRemovePacket.java
new file mode 100644
index 000000000..55ca84f39
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestRemovePacket.java
@@ -0,0 +1,77 @@
+package kamkeel.npcs.network.packets.request.quest;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.DialogController;
+import noppes.npcs.controllers.QuestController;
+import noppes.npcs.controllers.data.Dialog;
+import noppes.npcs.controllers.data.Quest;
+
+import java.io.IOException;
+
+public final class QuestRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|DialogRemove";
+
+    private int questID;
+    private boolean sendGroup;
+
+    public QuestRemovePacket(int questID, boolean sendGroup) {
+        this.questID = questID;
+        this.sendGroup = sendGroup;
+    }
+
+    public QuestRemovePacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.QuestRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_DIALOG;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(questID);
+        out.writeBoolean(sendGroup);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        Quest quest = QuestController.Instance.quests.get(in.readInt());
+        boolean sendGroup = in.readBoolean();
+        if(quest != null){
+            QuestController.Instance.removeQuest(quest);
+            if(sendGroup){
+                NoppesUtilServer.sendQuestGroup((EntityPlayerMP) player,quest.category);
+            }
+            else {
+                NoppesUtilServer.sendQuestData((EntityPlayerMP) player,quest.category);
+            }
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestSavePacket.java
new file mode 100644
index 000000000..7a5f6f65e
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestSavePacket.java
@@ -0,0 +1,84 @@
+package kamkeel.npcs.network.packets.request.quest;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.QuestController;
+import noppes.npcs.controllers.data.Quest;
+
+import java.io.IOException;
+
+public final class QuestSavePacket extends AbstractPacket {
+    public static String packetName = "Request|QuestSave";
+
+    private int categoryId;
+    private NBTTagCompound questNBT;
+    private boolean sendGroup;
+
+    public QuestSavePacket(int categoryId, NBTTagCompound questNBT, boolean sendGroup) {
+        this.categoryId = categoryId;
+        this.questNBT = questNBT;
+        this.sendGroup = sendGroup;
+    }
+
+    public QuestSavePacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.QuestSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_QUEST;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(categoryId);
+        ByteBufUtils.writeNBT(out, questNBT);
+        out.writeBoolean(sendGroup);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int cat = in.readInt();
+        NBTTagCompound compound = ByteBufUtils.readNBT(in);
+        boolean sendGroup = in.readBoolean();
+        Quest quest = new Quest();
+        quest.readNBT(compound);
+        QuestController.Instance.saveQuest(cat, quest);
+        if (quest.category != null) {
+            if (sendGroup) {
+                NoppesUtilServer.sendQuestGroup((EntityPlayerMP) player, quest.category);
+            } else {
+                NoppesUtilServer.sendQuestData((EntityPlayerMP) player, quest.category);
+            }
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestUntrackPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestUntrackPacket.java
new file mode 100644
index 000000000..fd6291a6b
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestUntrackPacket.java
@@ -0,0 +1,43 @@
+package kamkeel.npcs.network.packets.request.quest;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilPlayer;
+
+import java.io.IOException;
+
+public final class QuestUntrackPacket extends AbstractPacket {
+    public static final String packetName = "Request|QuestUntrack";
+
+    public QuestUntrackPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.QuestUntrack;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        NoppesUtilPlayer.clearTrackQuest((EntityPlayerMP) player);
+    }
+
+
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestsGetPacket.java
new file mode 100644
index 000000000..29fc59194
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestsGetPacket.java
@@ -0,0 +1,68 @@
+package kamkeel.npcs.network.packets.request.quest;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.DialogController;
+import noppes.npcs.controllers.QuestController;
+import noppes.npcs.controllers.data.QuestCategory;
+
+import java.io.IOException;
+
+public final class QuestsGetPacket extends AbstractPacket {
+    public static String packetName = "Request|QuestsGet";
+
+    private int categoryID;
+    private boolean sendGroup;
+
+    public QuestsGetPacket() {}
+
+    public QuestsGetPacket(int categoryID, boolean send) {
+        this.categoryID = categoryID;
+        this.sendGroup = send;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.QuestsGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.categoryID);
+        out.writeBoolean(this.sendGroup);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+            return;
+
+        QuestCategory category = QuestController.Instance.categories.get(in.readInt());
+        boolean sendGroup = in.readBoolean();
+        if(sendGroup){
+            NoppesUtilServer.sendQuestGroup((EntityPlayerMP) player,category);
+        }
+        else {
+            NoppesUtilServer.sendQuestData((EntityPlayerMP) player,category);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeGetPacket.java
new file mode 100644
index 000000000..8f5eaf57d
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeGetPacket.java
@@ -0,0 +1,68 @@
+package kamkeel.npcs.network.packets.request.recipe;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.RecipeController;
+import noppes.npcs.controllers.data.RecipeAnvil;
+import noppes.npcs.controllers.data.RecipeCarpentry;
+
+import java.io.IOException;
+
+public final class RecipeGetPacket extends AbstractPacket {
+    public static String packetName = "Request|RecipeGet";
+
+    private int recipeId;
+    private boolean isAnvil = false;
+
+    public RecipeGetPacket(int recipeId, boolean anvil) {
+        this.recipeId = recipeId;
+        this.isAnvil = anvil;
+    }
+
+    public RecipeGetPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.RecipeGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(recipeId);
+        out.writeBoolean(this.isAnvil);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        int id = in.readInt();
+        boolean anvil = in.readBoolean();
+        if(anvil){
+            RecipeAnvil recipe = RecipeController.Instance.getAnvilRecipe(id);
+            NoppesUtilServer.setRecipeAnvilGui((EntityPlayerMP) player, recipe);
+        } else {
+            RecipeCarpentry recipe = RecipeController.Instance.getRecipe(id);
+            NoppesUtilServer.setRecipeGui((EntityPlayerMP) player, recipe);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeRemovePacket.java
new file mode 100644
index 000000000..0df707054
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeRemovePacket.java
@@ -0,0 +1,75 @@
+package kamkeel.npcs.network.packets.request.recipe;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.RecipeController;
+import noppes.npcs.controllers.data.RecipeAnvil;
+import noppes.npcs.controllers.data.RecipeCarpentry;
+
+import java.io.IOException;
+
+public final class RecipeRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|RecipeRemove";
+
+    private int recipeId;
+    private boolean isAnvil;
+
+    public RecipeRemovePacket(int recipeId, boolean isAnvil) {
+        this.recipeId = recipeId;
+        this.isAnvil = isAnvil;
+    }
+
+    public RecipeRemovePacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.RecipeRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_RECIPE;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(recipeId);
+        out.writeBoolean(isAnvil);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+        int id = in.readInt();
+        boolean anvil = in.readBoolean();
+        if(anvil){
+            RecipeAnvil recipe = RecipeController.Instance.deleteAnvil(id);
+            NoppesUtilServer.sendRecipeData((EntityPlayerMP) player, 1);
+            NoppesUtilServer.setRecipeAnvilGui((EntityPlayerMP) player, new RecipeAnvil());
+        } else {
+            RecipeCarpentry recipe = RecipeController.Instance.delete(id);
+            NoppesUtilServer.sendRecipeData((EntityPlayerMP) player, recipe.isGlobal ? 3 : 4);
+            NoppesUtilServer.setRecipeGui((EntityPlayerMP) player, new RecipeCarpentry(""));
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeSavePacket.java
new file mode 100644
index 000000000..cc6f69d87
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeSavePacket.java
@@ -0,0 +1,74 @@
+package kamkeel.npcs.network.packets.request.recipe;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.RecipeController;
+import noppes.npcs.controllers.data.RecipeAnvil;
+import noppes.npcs.controllers.data.RecipeCarpentry;
+
+import java.io.IOException;
+
+public final class RecipeSavePacket extends AbstractPacket {
+    public static String packetName = "Request|RecipeSave";
+
+    private NBTTagCompound recipeNBT;
+
+    public RecipeSavePacket(NBTTagCompound recipeNBT) {
+        this.recipeNBT = recipeNBT;
+    }
+
+    public RecipeSavePacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.RecipeSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_RECIPE;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, recipeNBT);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        NBTTagCompound compound = ByteBufUtils.readNBT(in);
+        if(compound.hasKey("IsAnvil")){
+            RecipeAnvil recipe = RecipeController.Instance.saveAnvilRecipe(compound);
+            NoppesUtilServer.sendRecipeData((EntityPlayerMP) player, 1);
+            NoppesUtilServer.setRecipeAnvilGui((EntityPlayerMP) player, recipe);
+        } else {
+            RecipeCarpentry recipe = RecipeController.Instance.saveRecipe(compound);
+            NoppesUtilServer.sendRecipeData((EntityPlayerMP) player, recipe.isGlobal ? 3 : 4);
+            NoppesUtilServer.setRecipeGui((EntityPlayerMP) player, recipe);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipesGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipesGetPacket.java
new file mode 100644
index 000000000..c63ed66c2
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipesGetPacket.java
@@ -0,0 +1,52 @@
+package kamkeel.npcs.network.packets.request.recipe;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilServer;
+
+import java.io.IOException;
+
+public final class RecipesGetPacket extends AbstractPacket {
+    public static String packetName = "Request|RecipesGet";
+
+    private int categoryId;
+
+    public RecipesGetPacket(int categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public RecipesGetPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.RecipesGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(categoryId);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP)) return;
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
+        int id = in.readInt();
+        NoppesUtilServer.sendRecipeData((EntityPlayerMP) player, id);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleCompanionUpdatePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleCompanionUpdatePacket.java
new file mode 100644
index 000000000..1b291fb0d
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleCompanionUpdatePacket.java
@@ -0,0 +1,72 @@
+package kamkeel.npcs.network.packets.request.role;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.constants.EnumCompanionStage;
+import noppes.npcs.constants.EnumRoleType;
+import noppes.npcs.roles.RoleCompanion;
+
+import java.io.IOException;
+
+public final class RoleCompanionUpdatePacket extends AbstractPacket {
+    public static String packetName = "Request|RoleCompanionUpdate";
+
+    private EnumCompanionStage companionStage;
+
+    public RoleCompanionUpdatePacket() { }
+
+    public RoleCompanionUpdatePacket(EnumCompanionStage companionStage) {
+        this.companionStage = companionStage;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.RoleCompanionUpdate;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.companionStage.ordinal());
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        if(npc.advanced.role != EnumRoleType.Companion)
+            return;
+
+        ((RoleCompanion)npc.roleInterface).matureTo(EnumCompanionStage.values()[in.readInt()]);
+        npc.updateClient = true;
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java
new file mode 100644
index 000000000..11f6e0037
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java
@@ -0,0 +1,59 @@
+package kamkeel.npcs.network.packets.request.role;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.io.IOException;
+
+public final class RoleGetPacket extends AbstractPacket {
+    public static String packetName = "Request|RoleGet";
+
+    public RoleGetPacket() { }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.RoleGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException { }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        if(npc.roleInterface == null)
+            return;
+
+        NBTTagCompound compound = new NBTTagCompound();
+        compound.setBoolean("RoleData", true);
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.roleInterface.writeToNBT(compound));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleSavePacket.java
new file mode 100644
index 000000000..8a7555d9b
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleSavePacket.java
@@ -0,0 +1,68 @@
+package kamkeel.npcs.network.packets.request.role;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.io.IOException;
+
+public final class RoleSavePacket extends AbstractPacket {
+    public static String packetName = "Request|RoleSave";
+
+    private NBTTagCompound compound;
+
+    public RoleSavePacket() { }
+
+    public RoleSavePacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.RoleSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        npc.roleInterface.readFromNBT(ByteBufUtils.readNBT(in));
+        npc.updateClient = true;
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/BlockScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/BlockScriptPacket.java
new file mode 100644
index 000000000..1b9fcb81d
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/script/BlockScriptPacket.java
@@ -0,0 +1,113 @@
+package kamkeel.npcs.network.packets.request.script;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.blocks.tiles.TileScripted;
+import noppes.npcs.config.ConfigScript;
+import noppes.npcs.controllers.ScriptController;
+import noppes.npcs.controllers.data.PlayerDataScript;
+import noppes.npcs.scripted.NpcAPI;
+import noppes.npcs.scripted.item.ScriptCustomItem;
+
+import java.io.IOException;
+
+public final class BlockScriptPacket extends AbstractPacket {
+    public static String packetName = "Request|BlockScript";
+
+    private BlockScriptPacket.Action type;
+    private int x;
+    private int y;
+    private int z;
+    private NBTTagCompound compound;
+
+    public BlockScriptPacket() {}
+
+    public BlockScriptPacket(Action type, int x, int y, int z, NBTTagCompound compound) {
+        this.type = type;
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.BlockScript;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission(){
+        return CustomNpcsPermissions.SCRIPT_BLOCK;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+        out.writeInt(x);
+        out.writeInt(y);
+        out.writeInt(z);
+        if(type == Action.SAVE){
+            ByteBufUtils.writeNBT(out, this.compound);
+        }
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT))
+            return;
+
+        Action requestedAction = Action.values()[in.readInt()];
+        if(requestedAction == Action.GET){
+            TileEntity tile = player.worldObj.getTileEntity(in.readInt(), in.readInt(), in.readInt());
+            if(!(tile instanceof TileScripted))
+                return;
+            NBTTagCompound compound = ((TileScripted) tile).getNBT(new NBTTagCompound());
+            compound.setTag("Languages", ScriptController.Instance.nbtLanguages());
+            GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+        } else {
+            if (!player.capabilities.isCreativeMode) {
+                return;
+            }
+            TileEntity tile = player.worldObj.getTileEntity(in.readInt(), in.readInt(), in.readInt());
+            if(!(tile instanceof TileScripted))
+                return;
+            TileScripted script = (TileScripted) tile;
+            script.setNBT(ByteBufUtils.readNBT(in));
+            script.lastInited = -1;
+        }
+    }
+
+    public static void Save(int x, int y, int z, NBTTagCompound compound) {
+        PacketClient.sendClient(new BlockScriptPacket(Action.SAVE, x, y, z, compound));
+    }
+    public static void Get(int x, int y, int z) {
+        PacketClient.sendClient(new BlockScriptPacket(Action.GET, x, y, z, new NBTTagCompound()));
+    }
+
+    private enum Action {
+        GET,
+        SAVE
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/EffectScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/EffectScriptPacket.java
new file mode 100644
index 000000000..8c1d878b7
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/script/EffectScriptPacket.java
@@ -0,0 +1,106 @@
+package kamkeel.npcs.network.packets.request.script;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.*;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.LogWriter;
+import noppes.npcs.config.ConfigDebug;
+import noppes.npcs.config.ConfigScript;
+import noppes.npcs.controllers.CustomEffectController;
+import noppes.npcs.controllers.data.CustomEffect;
+import noppes.npcs.controllers.data.EffectScript;
+import noppes.npcs.controllers.data.IScriptHandler;
+
+import java.io.IOException;
+
+public final class EffectScriptPacket extends AbstractPacket {
+    public static String packetName = "Request|EffectScript";
+
+    private EffectScriptPacket.Action type;
+    private int id;
+    private int page;
+    private int maxSize;
+    private NBTTagCompound compound;
+
+    public EffectScriptPacket() {}
+
+    public EffectScriptPacket(Action type, int id, int page, int maxSize, NBTTagCompound compound) {
+        this.type = type;
+        this.id = id;
+        this.page = page;
+        this.maxSize = maxSize;
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.EffectScript;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission(){
+        return CustomNpcsPermissions.SCRIPT_PLAYER;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+        out.writeInt(id);
+
+        if(type == Action.SAVE){
+            out.writeInt(this.page);
+            out.writeInt(this.maxSize);
+            ByteBufUtils.writeNBT(out, this.compound);
+        }
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT))
+            return;
+
+        Action requestedAction = Action.values()[in.readInt()];
+        CustomEffect effect = CustomEffectController.getInstance().get(in.readInt());
+        if(effect == null)
+            return;
+
+        EffectScript data = effect.getOrCreateScriptHandler();
+        if(requestedAction == Action.GET){
+            PacketUtil.getScripts((IScriptHandler) data, (EntityPlayerMP) player);
+        } else {
+            data.saveScript(in);
+            if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
+                LogWriter.script(String.format("[%s] (Player) %s SAVED EFFECT %s [%s]", "EFFECT SCRIPTS", player.getCommandSenderName(), effect.getName()));
+            }
+        }
+    }
+
+    public static void Save(int effectID, int id, int maxSize, NBTTagCompound compound) {
+        PacketClient.sendClient(new EffectScriptPacket(Action.SAVE, effectID, id, maxSize, compound));
+    }
+    public static void Get(int effectID) {
+        PacketClient.sendClient(new EffectScriptPacket(Action.GET, effectID, -1, -1, new NBTTagCompound()));
+    }
+
+    private enum Action {
+        GET,
+        SAVE
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java
new file mode 100644
index 000000000..cac6be389
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java
@@ -0,0 +1,107 @@
+package kamkeel.npcs.network.packets.request.script;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.*;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.LogWriter;
+import noppes.npcs.config.ConfigDebug;
+import noppes.npcs.config.ConfigScript;
+import noppes.npcs.controllers.data.DataScript;
+
+import java.io.IOException;
+
+public final class EventScriptPacket extends AbstractPacket {
+    public static String packetName = "Request|EventScript";
+
+    private EventScriptPacket.Action type;
+    private int page;
+    private int maxSize;
+    private NBTTagCompound compound;
+
+    public EventScriptPacket() {}
+
+    public EventScriptPacket(Action type, int page, int maxSize, NBTTagCompound compound) {
+        this.type = type;
+        this.page = page;
+        this.maxSize = maxSize;
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.EventScript;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public boolean needsNPC(){
+        return true;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission(){
+        return CustomNpcsPermissions.SCRIPT_NPC;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+
+        if(type == Action.SAVE){
+            out.writeInt(this.page);
+            out.writeInt(this.maxSize);
+            ByteBufUtils.writeNBT(out, this.compound);
+        }
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.SCRIPTER))
+            return;
+
+        Action requestedAction = Action.values()[in.readInt()];
+        DataScript data = npc.script;
+        if(requestedAction == Action.GET){
+            PacketUtil.getScripts(data, (EntityPlayerMP) player);
+        } else {
+            PacketUtil.saveScripts(data, in);
+            npc.updateAI = true;
+            npc.script.hasInited = false;
+            if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
+                LogWriter.script(String.format("[%s] (Player) %s SAVED NPC %s (%s, %s, %s) [%s]", "SCRIPTER", player.getCommandSenderName(), npc.display.getName(), (int)npc.posX, (int)(npc).posY, (int)npc.posZ,  npc.worldObj.getWorldInfo().getWorldName()));
+            }
+        }
+    }
+
+    public static void Save(int id, int maxSize, NBTTagCompound compound) {
+        PacketClient.sendClient(new EventScriptPacket(Action.SAVE, id, maxSize, compound));
+    }
+    public static void Get() {
+        PacketClient.sendClient(new EventScriptPacket(Action.GET, -1, -1, new NBTTagCompound()));
+    }
+
+    private enum Action {
+        GET,
+        SAVE
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java
new file mode 100644
index 000000000..02ab27097
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java
@@ -0,0 +1,101 @@
+package kamkeel.npcs.network.packets.request.script;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.*;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.config.ConfigScript;
+import noppes.npcs.controllers.ScriptController;
+import noppes.npcs.controllers.data.ForgeDataScript;
+import noppes.npcs.controllers.data.IScriptHandler;
+import noppes.npcs.controllers.data.PlayerDataScript;
+
+import java.io.IOException;
+
+public final class ForgeScriptPacket extends AbstractPacket {
+    public static String packetName = "Request|EventScript";
+
+    private ForgeScriptPacket.Action type;
+    private int page;
+    private int maxSize;
+    private NBTTagCompound compound;
+
+    public ForgeScriptPacket() {}
+
+    public ForgeScriptPacket(Action type, int page, int maxSize, NBTTagCompound compound) {
+        this.type = type;
+        this.page = page;
+        this.maxSize = maxSize;
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.ForgeScript;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission(){
+        return CustomNpcsPermissions.SCRIPT_FORGE;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+
+        if(type == Action.SAVE){
+            out.writeInt(this.page);
+            out.writeInt(this.maxSize);
+            ByteBufUtils.writeNBT(out, this.compound);
+        }
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.SCRIPTER))
+            return;
+
+        Action requestedAction = Action.values()[in.readInt()];
+        ForgeDataScript data = ScriptController.Instance.forgeScripts;
+        if(requestedAction == Action.GET){
+            PacketUtil.getScripts((IScriptHandler) data, (EntityPlayerMP) player);
+        } else {
+            int tab = in.getInt(in.readerIndex());
+            PacketUtil.saveScripts(data, in);
+            ScriptController.Instance.lastForgeUpdate = System.currentTimeMillis();
+            if(tab == -1)
+                ScriptController.Instance.saveForgeScriptsSync();
+        }
+    }
+
+    public static void Save(int id, int maxSize, NBTTagCompound compound) {
+        PacketClient.sendClient(new ForgeScriptPacket(Action.SAVE, id, maxSize, compound));
+    }
+    public static void Get() {
+        PacketClient.sendClient(new ForgeScriptPacket(Action.GET, -1, -1, new NBTTagCompound()));
+    }
+
+    private enum Action {
+        GET,
+        SAVE
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java
new file mode 100644
index 000000000..a34cbb1fa
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java
@@ -0,0 +1,101 @@
+package kamkeel.npcs.network.packets.request.script;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.*;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.config.ConfigScript;
+import noppes.npcs.controllers.ScriptController;
+import noppes.npcs.controllers.data.ForgeDataScript;
+import noppes.npcs.controllers.data.GlobalNPCDataScript;
+import noppes.npcs.controllers.data.IScriptHandler;
+
+import java.io.IOException;
+
+public final class GlobalNPCScriptPacket extends AbstractPacket {
+    public static String packetName = "Request|GlobalNPCScript";
+
+    private GlobalNPCScriptPacket.Action type;
+    private int page;
+    private int maxSize;
+    private NBTTagCompound compound;
+
+    public GlobalNPCScriptPacket() {}
+
+    public GlobalNPCScriptPacket(Action type, int page, int maxSize, NBTTagCompound compound) {
+        this.type = type;
+        this.page = page;
+        this.maxSize = maxSize;
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.GlobalNPCScript;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission(){
+        return CustomNpcsPermissions.SCRIPT_GLOBAL;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+
+        if(type == Action.SAVE){
+            out.writeInt(this.page);
+            out.writeInt(this.maxSize);
+            ByteBufUtils.writeNBT(out, this.compound);
+        }
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.SCRIPTER))
+            return;
+
+        Action requestedAction = Action.values()[in.readInt()];
+        GlobalNPCDataScript data = ScriptController.Instance.globalNpcScripts;
+        if(requestedAction == Action.GET){
+            PacketUtil.getScripts((IScriptHandler) data, (EntityPlayerMP) player);
+        } else {
+            int tab = in.getInt(in.readerIndex());
+            PacketUtil.saveScripts(data,in);
+            ScriptController.Instance.lastGlobalNpcUpdate = System.currentTimeMillis();
+            if(tab == -1)
+                ScriptController.Instance.saveGlobalScriptsSync();
+        }
+    }
+
+    public static void Save(int id, int maxSize, NBTTagCompound compound) {
+        PacketClient.sendClient(new GlobalNPCScriptPacket(Action.SAVE, id, maxSize, compound));
+    }
+    public static void Get() {
+        PacketClient.sendClient(new GlobalNPCScriptPacket(Action.GET, -1, -1, new NBTTagCompound()));
+    }
+
+    private enum Action {
+        GET,
+        SAVE
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java
new file mode 100644
index 000000000..fc6073fbb
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java
@@ -0,0 +1,105 @@
+package kamkeel.npcs.network.packets.request.script;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.*;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.LogWriter;
+import noppes.npcs.config.ConfigDebug;
+import noppes.npcs.config.ConfigScript;
+import noppes.npcs.controllers.ScriptController;
+import noppes.npcs.controllers.data.GlobalNPCDataScript;
+import noppes.npcs.controllers.data.IScriptHandler;
+
+import java.io.IOException;
+
+public final class NPCScriptPacket extends AbstractPacket {
+    public static String packetName = "Request|NPCScript";
+
+    private NPCScriptPacket.Action type;
+    private NBTTagCompound compound;
+
+    public NPCScriptPacket() {}
+
+    public NPCScriptPacket(Action type, NBTTagCompound compound) {
+        this.type = type;
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.NPCScript;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission(){
+        return CustomNpcsPermissions.SCRIPT_NPC;
+    }
+
+    @Override
+    public boolean needsNPC(){
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+
+        if(type == Action.SAVE){
+            ByteBufUtils.writeNBT(out, this.compound);
+        }
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.SCRIPTER))
+            return;
+
+        Action requestedAction = Action.values()[in.readInt()];
+        if(requestedAction == Action.GET){
+            NBTTagCompound compound = npc.script.writeToNBT(new NBTTagCompound());
+            compound.setTag("Languages", ScriptController.Instance.nbtLanguages());
+            GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+        } else {
+            npc.script.readFromNBT(ByteBufUtils.readNBT(in));
+            npc.updateAI = true;
+            npc.script.hasInited = false;
+            if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
+                LogWriter.script(String.format("[%s] (Player) %s SAVED NPC %s (%s, %s, %s) [%s]", "SCRIPTER", player.getCommandSenderName(), npc.display.getName(), (int)npc.posX, (int)(npc).posY, (int)npc.posZ,  npc.worldObj.getWorldInfo().getWorldName()));
+            }
+        }
+    }
+
+    public static void Save(NBTTagCompound compound) {
+        PacketClient.sendClient(new NPCScriptPacket(Action.SAVE, compound));
+    }
+    public static void Get() {
+        PacketClient.sendClient(new NPCScriptPacket(Action.GET, new NBTTagCompound()));
+    }
+
+    private enum Action {
+        GET,
+        SAVE
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java
new file mode 100644
index 000000000..ec57a2d25
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java
@@ -0,0 +1,104 @@
+package kamkeel.npcs.network.packets.request.script;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.*;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.LogWriter;
+import noppes.npcs.config.ConfigDebug;
+import noppes.npcs.config.ConfigScript;
+import noppes.npcs.controllers.ScriptController;
+import noppes.npcs.controllers.data.DataScript;
+import noppes.npcs.controllers.data.IScriptHandler;
+import noppes.npcs.controllers.data.PlayerDataScript;
+
+import java.io.IOException;
+
+public final class PlayerScriptPacket extends AbstractPacket {
+    public static String packetName = "Request|PlayerScript";
+
+    private PlayerScriptPacket.Action type;
+    private int page;
+    private int maxSize;
+    private NBTTagCompound compound;
+
+    public PlayerScriptPacket() {}
+
+    public PlayerScriptPacket(Action type, int page, int maxSize, NBTTagCompound compound) {
+        this.type = type;
+        this.page = page;
+        this.maxSize = maxSize;
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.PlayerScript;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission(){
+        return CustomNpcsPermissions.SCRIPT_PLAYER;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+
+        if(type == Action.SAVE){
+            out.writeInt(this.page);
+            out.writeInt(this.maxSize);
+            ByteBufUtils.writeNBT(out, this.compound);
+        }
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.SCRIPTER))
+            return;
+
+        Action requestedAction = Action.values()[in.readInt()];
+        PlayerDataScript data = ScriptController.Instance.playerScripts;
+        if(requestedAction == Action.GET){
+            PacketUtil.getScripts((IScriptHandler) data, (EntityPlayerMP) player);
+        } else {
+            int tab = in.getInt(in.readerIndex());
+            PacketUtil.saveScripts(data, in);
+            ScriptController.Instance.lastPlayerUpdate = System.currentTimeMillis();
+            if(tab == -1)
+                ScriptController.Instance.savePlayerScriptsSync();
+        }
+    }
+
+    public static void Save(int id, int maxSize, NBTTagCompound compound) {
+        PacketClient.sendClient(new PlayerScriptPacket(Action.SAVE, id, maxSize, compound));
+    }
+    public static void Get() {
+        PacketClient.sendClient(new PlayerScriptPacket(Action.GET, -1, -1, new NBTTagCompound()));
+    }
+
+    private enum Action {
+        GET,
+        SAVE
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java
new file mode 100644
index 000000000..c4bfbfa8b
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java
@@ -0,0 +1,100 @@
+package kamkeel.npcs.network.packets.request.script;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.*;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.LogWriter;
+import noppes.npcs.config.ConfigDebug;
+import noppes.npcs.config.ConfigScript;
+import noppes.npcs.controllers.ScriptController;
+
+import java.io.IOException;
+
+public final class ScriptInfoPacket extends AbstractPacket {
+    public static String packetName = "Request|NPCScript";
+
+    private ScriptInfoPacket.Action type;
+    private NBTTagCompound compound;
+
+    public ScriptInfoPacket() {}
+
+    public ScriptInfoPacket(Action type, NBTTagCompound compound) {
+        this.type = type;
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.ScriptInfo;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission(){
+        return CustomNpcsPermissions.SCRIPT_GLOBAL;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+
+        if(type == Action.SAVE){
+            ByteBufUtils.writeNBT(out, this.compound);
+        }
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.SCRIPTER))
+            return;
+
+        Action requestedAction = Action.values()[in.readInt()];
+        if(requestedAction == Action.GET){
+            NBTTagCompound compound = new NBTTagCompound();
+            compound.setBoolean("ScriptsEnabled", ConfigScript.ScriptingEnabled);
+            compound.setBoolean("PlayerScriptsEnabled", ConfigScript.GlobalPlayerScripts);
+            compound.setBoolean("GlobalNPCScriptsEnabled", ConfigScript.GlobalNPCScripts);
+            compound.setBoolean("ForgeScriptsEnabled", ConfigScript.GlobalForgeScripts);
+            GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+        } else {
+            NBTTagCompound compound = ByteBufUtils.readNBT(in);
+            ConfigScript.ScriptingEnabled = compound.getBoolean("ScriptsEnabled");
+            ConfigScript.GlobalPlayerScripts = compound.getBoolean("PlayerScriptsEnabled");
+            ConfigScript.GlobalNPCScripts = compound.getBoolean("GlobalNPCScriptsEnabled");
+            ConfigScript.GlobalForgeScripts = compound.getBoolean("ForgeScriptsEnabled");
+        }
+    }
+
+    public static void Save(NBTTagCompound compound) {
+        PacketClient.sendClient(new ScriptInfoPacket(Action.SAVE, compound));
+    }
+    public static void Get() {
+        PacketClient.sendClient(new ScriptInfoPacket(Action.GET, new NBTTagCompound()));
+    }
+
+    private enum Action {
+        GET,
+        SAVE
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/item/ItemScriptErrorPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/item/ItemScriptErrorPacket.java
new file mode 100644
index 000000000..c40417a41
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/script/item/ItemScriptErrorPacket.java
@@ -0,0 +1,108 @@
+package kamkeel.npcs.network.packets.request.script.item;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NBTTags;
+import noppes.npcs.api.item.IItemStack;
+import noppes.npcs.client.gui.script.GuiScriptItem;
+import noppes.npcs.config.ConfigScript;
+import noppes.npcs.controllers.ScriptContainer;
+import noppes.npcs.controllers.ScriptController;
+import noppes.npcs.scripted.NpcAPI;
+import noppes.npcs.scripted.item.ScriptCustomItem;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.TreeMap;
+
+public final class ItemScriptErrorPacket extends AbstractPacket {
+    public static String packetName = "Request|ItemScriptError";
+
+    private Action action;
+
+    public ItemScriptErrorPacket() {}
+
+    public ItemScriptErrorPacket(Action action) {
+        this.action = action;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.ItemScriptError;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission(){
+        return CustomNpcsPermissions.SCRIPT_ITEM;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(action.ordinal());
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT))
+            return;
+
+
+        Action requestedAction = Action.values()[in.readInt()];
+        IItemStack iw = NpcAPI.Instance().getIItemStack(player.getHeldItem());
+        if(iw instanceof ScriptCustomItem){
+            if(requestedAction == Action.GET){
+                TreeMap<Long, String> map = new TreeMap<>();
+                int tab = 0;
+                for (ScriptContainer script : ((ScriptCustomItem) iw).scripts) {
+                    ++tab;
+
+                    for (Map.Entry<Long, String> longStringEntry : script.console.entrySet()) {
+                        map.put(longStringEntry.getKey(), " tab " + tab + ":\n" + longStringEntry.getValue());
+                    }
+                }
+
+                NBTTagCompound compound = new NBTTagCompound();
+                compound.setTag("ItemScriptConsole", NBTTags.NBTLongStringMap(map));
+                GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+            } else {
+                for (ScriptContainer script : ((ScriptCustomItem) iw).scripts) {
+                    script.console.clear();
+                }
+            }
+        }
+    }
+
+    public static void Clear() {
+        PacketClient.sendClient(new ItemScriptErrorPacket(Action.CLEAR));
+    }
+
+    public static void Get() {
+        PacketClient.sendClient(new ItemScriptErrorPacket(Action.GET));
+    }
+
+    private enum Action {
+        GET,
+        CLEAR
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/item/ItemScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/item/ItemScriptPacket.java
new file mode 100644
index 000000000..bc66d732f
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/script/item/ItemScriptPacket.java
@@ -0,0 +1,100 @@
+package kamkeel.npcs.network.packets.request.script.item;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.*;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.config.ConfigScript;
+import noppes.npcs.controllers.ScriptController;
+import noppes.npcs.scripted.NpcAPI;
+import noppes.npcs.scripted.item.ScriptCustomItem;
+
+import java.io.IOException;
+
+public final class ItemScriptPacket extends AbstractPacket {
+    public static String packetName = "Request|ItemScript";
+
+    private ItemScriptPacket.Action type;
+    private NBTTagCompound compound;
+
+    public ItemScriptPacket() {}
+
+    public ItemScriptPacket(Action type, NBTTagCompound compound) {
+        this.type = type;
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.ItemScript;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission(){
+        return CustomNpcsPermissions.SCRIPT_ITEM;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(type.ordinal());
+
+        if(type == Action.SAVE){
+            ByteBufUtils.writeNBT(out, this.compound);
+        }
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT))
+            return;
+
+        Action requestedAction = Action.values()[in.readInt()];
+        if(requestedAction == Action.GET){
+            ScriptCustomItem iw = (ScriptCustomItem) NpcAPI.Instance().getIItemStack(player.getHeldItem());
+            iw.loadScriptData();
+            NBTTagCompound compound = iw.getMCNbt();
+            compound.setTag("Languages", ScriptController.Instance.nbtLanguages());
+            GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+        } else {
+            if (!player.capabilities.isCreativeMode) {
+                return;
+            }
+
+            NBTTagCompound compound = ByteBufUtils.readNBT(in);
+            ScriptCustomItem wrapper = (ScriptCustomItem) NpcAPI.Instance().getIItemStack(player.getHeldItem());
+            wrapper.setMCNbt(compound);
+            wrapper.saveScriptData();
+            wrapper.loaded = false;
+            wrapper.lastInited = -1;
+            ((EntityPlayerMP) player).sendContainerToPlayer(player.inventoryContainer);
+        }
+    }
+
+    public static void Save(NBTTagCompound compound) {
+        PacketClient.sendClient(new ItemScriptPacket(Action.SAVE, compound));
+    }
+    public static void Get() {
+        PacketClient.sendClient(new ItemScriptPacket(Action.GET, new NBTTagCompound()));
+    }
+
+    private enum Action {
+        GET,
+        SAVE
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagGetPacket.java
new file mode 100644
index 000000000..74a2561dc
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagGetPacket.java
@@ -0,0 +1,61 @@
+package kamkeel.npcs.network.packets.request.tags;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.TagController;
+import noppes.npcs.controllers.data.Tag;
+
+import java.io.IOException;
+
+public final class TagGetPacket extends AbstractPacket {
+    public static final String packetName = "Request|TagGet";
+
+    private int tagID;
+
+    public TagGetPacket() {}
+
+    public TagGetPacket(int tagID) {
+        this.tagID = tagID;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TagGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(tagID);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.CLONER))
+            return;
+
+        NBTTagCompound compound = new NBTTagCompound();
+        Tag tag = TagController.getInstance().get(in.readInt());
+        tag.writeNBT(compound);
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+    }
+
+
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagRemovePacket.java
new file mode 100644
index 000000000..9e75492d2
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagRemovePacket.java
@@ -0,0 +1,75 @@
+package kamkeel.npcs.network.packets.request.tags;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.TagController;
+import noppes.npcs.controllers.data.Tag;
+
+import java.io.IOException;
+
+public final class TagRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|TagRemove";
+
+    private int tagId;
+
+    public TagRemovePacket(int tagId) {
+        this.tagId = tagId;
+    }
+
+    public TagRemovePacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TagRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_TAG;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return false;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(tagId);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int id = in.readInt();
+        TagController.getInstance().delete(id);
+        NoppesUtilServer.sendTagDataAll((EntityPlayerMP) player);
+        NBTTagCompound comp = new NBTTagCompound();
+        (new Tag()).writeNBT(comp);
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, comp);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSavePacket.java
new file mode 100644
index 000000000..6b79c5b8b
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSavePacket.java
@@ -0,0 +1,78 @@
+package kamkeel.npcs.network.packets.request.tags;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.TagController;
+import noppes.npcs.controllers.data.Tag;
+
+import java.io.IOException;
+
+public final class TagSavePacket extends AbstractPacket {
+    public static String packetName = "Request|TagSave";
+
+    private NBTTagCompound tagNBT;
+
+    public TagSavePacket(NBTTagCompound tagNBT) {
+        this.tagNBT = tagNBT;
+    }
+
+    public TagSavePacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TagSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_TAG;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return false;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, tagNBT);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        Tag tag = new Tag();
+        tag.readNBT(ByteBufUtils.readNBT(in));
+        TagController.getInstance().saveTag(tag);
+        NoppesUtilServer.sendTagDataAll((EntityPlayerMP) player);
+        NBTTagCompound comp = new NBTTagCompound();
+        tag.writeNBT(comp);
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, comp);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSetPacket.java
new file mode 100644
index 000000000..e28190fa1
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSetPacket.java
@@ -0,0 +1,80 @@
+package kamkeel.npcs.network.packets.request.tags;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.controllers.TagController;
+import noppes.npcs.controllers.data.Tag;
+import noppes.npcs.entity.EntityNPCInterface;
+
+import java.io.IOException;
+
+public final class TagSetPacket extends AbstractPacket {
+    public static String packetName = "Request|TagSet";
+
+    private NBTTagCompound compound;
+
+    public TagSetPacket() {}
+
+    public TagSetPacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TagSet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.CLONER))
+            return;
+
+        this.setTags(npc, in);
+    }
+
+    private void setTags(EntityNPCInterface npc, ByteBuf buffer) throws IOException {
+        npc.advanced.tagUUIDs.removeIf(uuid -> TagController.getInstance().getTagFromUUID(uuid) != null);
+        NBTTagCompound compound = ByteBufUtils.readNBT(buffer);
+        NBTTagList list = compound.getTagList("TagNames", 8);
+        for (int i = 0; i < list.tagCount(); i++) {
+            String tagName = list.getStringTagAt(i);
+            npc.advanced.tagUUIDs.add(TagController.getInstance().getTagFromName(tagName).uuid);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagsGetPacket.java
new file mode 100644
index 000000000..4b303b65e
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagsGetPacket.java
@@ -0,0 +1,48 @@
+package kamkeel.npcs.network.packets.request.tags;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilServer;
+
+import java.io.IOException;
+
+public final class TagsGetPacket extends AbstractPacket {
+    public static final String packetName = "Request|TagsGet";
+
+    public TagsGetPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TagsGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.CLONER))
+            return;
+
+        NoppesUtilServer.sendTagDataAll((EntityPlayerMP) player);
+    }
+
+
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagsNpcGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagsNpcGetPacket.java
new file mode 100644
index 000000000..66cf66621
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagsNpcGetPacket.java
@@ -0,0 +1,65 @@
+package kamkeel.npcs.network.packets.request.tags;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.NBTTagString;
+import noppes.npcs.controllers.TagController;
+import noppes.npcs.controllers.data.Tag;
+
+import java.io.IOException;
+import java.util.UUID;
+
+public final class TagsNpcGetPacket extends AbstractPacket {
+    public static final String packetName = "Request|NpcTagsGet";
+
+    public TagsNpcGetPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.NpcTagsGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.CLONER))
+            return;
+
+        NBTTagCompound compound = new NBTTagCompound();
+        NBTTagList tagList = new NBTTagList();
+        for (UUID uuid : npc.advanced.tagUUIDs) {
+            Tag tag = TagController.getInstance().getTagFromUUID(uuid);
+            if (tag != null) {
+                tagList.appendTag(new NBTTagString(tag.name));
+            }
+        }
+        compound.setTag("TagNames", tagList);
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformGetPacket.java
new file mode 100644
index 000000000..19f561c9d
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformGetPacket.java
@@ -0,0 +1,59 @@
+package kamkeel.npcs.network.packets.request.transform;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.io.IOException;
+
+public final class TransformGetPacket extends AbstractPacket {
+    public static String packetName = "Request|TransformGet";
+
+    public TransformGetPacket() { }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TransformGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException { }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.transform.writeOptions(new NBTTagCompound()));
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformLoadPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformLoadPacket.java
new file mode 100644
index 000000000..d4b82f2d9
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformLoadPacket.java
@@ -0,0 +1,66 @@
+package kamkeel.npcs.network.packets.request.transform;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.io.IOException;
+
+public final class TransformLoadPacket extends AbstractPacket {
+    public static String packetName = "Request|TransformLoad";
+
+    private boolean transform;
+
+    public TransformLoadPacket() { }
+
+    public TransformLoadPacket(boolean transform) {
+        this.transform = transform;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TransformLoad;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeBoolean(this.transform);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        if(npc.transform.isValid())
+            npc.transform.transform(in.readBoolean());
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformSavePacket.java
new file mode 100644
index 000000000..4872161a3
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformSavePacket.java
@@ -0,0 +1,70 @@
+package kamkeel.npcs.network.packets.request.transform;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+
+import java.io.IOException;
+
+public final class TransformSavePacket extends AbstractPacket {
+    public static String packetName = "Request|TransformSave";
+
+    private NBTTagCompound compound;
+
+    public TransformSavePacket() { }
+
+    public TransformSavePacket(NBTTagCompound compound) {
+        this.compound = compound;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TransformSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeNBT(out, this.compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        boolean isValid = npc.transform.isValid();
+        npc.transform.readOptions(ByteBufUtils.readNBT(in));
+        if (isValid != npc.transform.isValid())
+            npc.updateAI = true;
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoriesGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoriesGetPacket.java
new file mode 100644
index 000000000..44c8709ca
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoriesGetPacket.java
@@ -0,0 +1,48 @@
+package kamkeel.npcs.network.packets.request.transport;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilServer;
+
+import java.io.IOException;
+
+public final class TransportCategoriesGetPacket extends AbstractPacket {
+    public static String packetName = "Request|TransportCategoriesGet";
+
+    public TransportCategoriesGetPacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TransportCategoriesGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        NoppesUtilServer.sendTransportCategoryData((EntityPlayerMP) player);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoryRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoryRemovePacket.java
new file mode 100644
index 000000000..379391328
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoryRemovePacket.java
@@ -0,0 +1,64 @@
+package kamkeel.npcs.network.packets.request.transport;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.TransportController;
+
+import java.io.IOException;
+
+public final class TransportCategoryRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|TransportCategoryRemove";
+
+    private int categoryId;
+
+    public TransportCategoryRemovePacket(int categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public TransportCategoryRemovePacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TransportCategoryRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_TRANSPORT;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(categoryId);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int id = in.readInt();
+        TransportController.getInstance().removeCategory(id);
+        NoppesUtilServer.sendTransportCategoryData((EntityPlayerMP) player);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategorySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategorySavePacket.java
new file mode 100644
index 000000000..d443c1c5c
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategorySavePacket.java
@@ -0,0 +1,68 @@
+package kamkeel.npcs.network.packets.request.transport;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.controllers.TransportController;
+
+import java.io.IOException;
+
+public final class TransportCategorySavePacket extends AbstractPacket {
+    public static String packetName = "Request|TransportCategorySave";
+
+    private String categoryName;
+    private int id;
+
+    public TransportCategorySavePacket(String categoryName, int id) {
+        this.categoryName = categoryName;
+        this.id = id;
+    }
+
+    public TransportCategorySavePacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TransportCategorySave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_TRANSPORT;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        ByteBufUtils.writeString(out, categoryName);
+        out.writeInt(id);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        String name = ByteBufUtils.readString(in);
+        int id = in.readInt();
+        TransportController.getInstance().saveCategory(name, id);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportGetLocationPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportGetLocationPacket.java
new file mode 100644
index 000000000..dbcbe2bd9
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportGetLocationPacket.java
@@ -0,0 +1,64 @@
+package kamkeel.npcs.network.packets.request.transport;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.ScrollSelectedPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.constants.EnumRoleType;
+import noppes.npcs.roles.RoleTransporter;
+
+import java.io.IOException;
+
+public final class TransportGetLocationPacket extends AbstractPacket {
+    public static String packetName = "Request|TransportGetLocation";
+
+    public TransportGetLocationPacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TransportGetLocation;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        if (npc.advanced.role != EnumRoleType.Transporter)
+            return;
+
+        RoleTransporter role = (RoleTransporter) npc.roleInterface;
+        if (role.hasTransport()) {
+            GuiDataPacket.sendGuiData((EntityPlayerMP) player, role.getLocation().writeNBT());
+            ScrollSelectedPacket.setSelectedList((EntityPlayerMP) player, role.getLocation().category.title);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportRemovePacket.java
new file mode 100644
index 000000000..fe9e12922
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportRemovePacket.java
@@ -0,0 +1,67 @@
+package kamkeel.npcs.network.packets.request.transport;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.controllers.TransportController;
+import noppes.npcs.controllers.data.TransportLocation;
+
+import java.io.IOException;
+
+public final class TransportRemovePacket extends AbstractPacket {
+    public static String packetName = "Request|TransportRemove";
+
+    private int locationId;
+
+    public TransportRemovePacket(int locationId) {
+        this.locationId = locationId;
+    }
+
+    public TransportRemovePacket() {
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TransportRemove;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.GLOBAL_TRANSPORT;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(locationId);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int id = in.readInt();
+        TransportLocation loc = TransportController.getInstance().removeLocation(id);
+        if (loc != null)
+            NoppesUtilServer.sendTransportData((EntityPlayerMP) player, loc.category.id);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportSavePacket.java
new file mode 100644
index 000000000..6fe84ed05
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportSavePacket.java
@@ -0,0 +1,85 @@
+package kamkeel.npcs.network.packets.request.transport;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.constants.EnumJobType;
+import noppes.npcs.constants.EnumRoleType;
+import noppes.npcs.controllers.ServerCloneController;
+import noppes.npcs.controllers.TransportController;
+import noppes.npcs.controllers.data.TransportLocation;
+import noppes.npcs.roles.JobSpawner;
+import noppes.npcs.roles.RoleTransporter;
+
+import java.io.IOException;
+
+public final class TransportSavePacket extends AbstractPacket {
+    public static String packetName = "Request|TransportSave";
+
+    private int categoryId;
+    private NBTTagCompound compound;
+
+    public TransportSavePacket(int categoryId, NBTTagCompound compound) {
+        this.categoryId = categoryId;
+        this.compound = compound;
+    }
+
+    public TransportSavePacket() {}
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TransportSave;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @Override
+    public CustomNpcsPermissions.Permission getPermission() {
+        return CustomNpcsPermissions.NPC_ADVANCED;
+    }
+
+    @Override
+    public boolean needsNPC() {
+        return true;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(categoryId);
+        ByteBufUtils.writeNBT(out, compound);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int cat = in.readInt();
+        TransportLocation location = TransportController.getInstance().saveLocation(cat, ByteBufUtils.readNBT(in), npc);
+        if(location != null){
+            if(npc.advanced.role != EnumRoleType.Transporter)
+                return;
+            RoleTransporter role = (RoleTransporter) npc.roleInterface;
+            role.setTransport(location);
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportsGetPacket.java
new file mode 100644
index 000000000..523bd66f0
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportsGetPacket.java
@@ -0,0 +1,56 @@
+package kamkeel.npcs.network.packets.request.transport;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.AbstractPacket;
+import kamkeel.npcs.network.PacketChannel;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.PacketUtil;
+import kamkeel.npcs.network.enums.EnumItemPacketType;
+import kamkeel.npcs.network.enums.EnumRequestPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import noppes.npcs.NoppesUtilServer;
+
+import java.io.IOException;
+
+public final class TransportsGetPacket extends AbstractPacket {
+    public static String packetName = "Request|TransportsGet";
+
+    private int id;
+
+    public TransportsGetPacket() {}
+
+    public TransportsGetPacket(int id) {
+        this.id = id;
+    }
+
+    @Override
+    public Enum getType() {
+        return EnumRequestPacket.TransportsGet;
+    }
+
+    @Override
+    public PacketChannel getChannel() {
+        return PacketHandler.REQUEST_PACKET;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void sendData(ByteBuf out) throws IOException {
+        out.writeInt(this.id);
+    }
+
+    @Override
+    public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
+        if (!(player instanceof EntityPlayerMP))
+            return;
+
+        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+            return;
+
+        int id = in.readInt();
+        NoppesUtilServer.sendTransportData((EntityPlayerMP) player, id);
+    }
+}
diff --git a/src/main/java/kamkeel/npcs/util/ByteBufUtils.java b/src/main/java/kamkeel/npcs/util/ByteBufUtils.java
new file mode 100644
index 000000000..f470e17c0
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/util/ByteBufUtils.java
@@ -0,0 +1,124 @@
+package kamkeel.npcs.util;
+
+import com.google.common.base.Charsets;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.nbt.CompressedStreamTools;
+import net.minecraft.nbt.NBTSizeTracker;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.village.MerchantRecipeList;
+import noppes.npcs.LogWriter;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+public class ByteBufUtils extends cpw.mods.fml.common.network.ByteBufUtils {
+
+    public static void fillBuffer(ByteBuf buffer, Object... obs) throws IOException{
+        for(Object ob : obs){
+            if(ob == null)
+                continue;
+            if(ob instanceof Map){
+                Map<String,Integer> map = (Map<String, Integer>) ob;
+
+                buffer.writeInt(map.size());
+                for(String key : map.keySet()){
+                    int value = map.get(key);
+                    buffer.writeInt(value);
+                    writeString(buffer, key);
+                }
+            }
+            else if(ob instanceof MerchantRecipeList)
+                ((MerchantRecipeList)ob).func_151391_a(new PacketBuffer(buffer));
+            else if(ob instanceof List){
+                List<String> list = (List<String>) ob;
+                buffer.writeInt(list.size());
+                for(String s : list)
+                    writeString(buffer, s);
+            }
+            else if(ob instanceof Enum)
+                buffer.writeInt(((Enum<?>) ob).ordinal());
+            else if(ob instanceof Integer)
+                buffer.writeInt((Integer) ob);
+            else if(ob instanceof Boolean)
+                buffer.writeBoolean((Boolean) ob);
+            else if(ob instanceof String)
+                writeString(buffer, (String) ob);
+            else if(ob instanceof Float)
+                buffer.writeFloat((Float) ob);
+            else if(ob instanceof Long)
+                buffer.writeLong((Long) ob);
+            else if(ob instanceof Double)
+                buffer.writeDouble((Double) ob);
+            else if (ob instanceof byte[]) {
+                // Write byte array length followed by bytes
+                byte[] byteArray = (byte[]) ob;
+                buffer.writeShort((short) byteArray.length);
+                buffer.writeBytes(byteArray);
+            }
+            else if(ob instanceof NBTTagCompound)
+                writeNBT(buffer, (NBTTagCompound) ob);
+        }
+        return;
+    }
+
+    public static void writeIntArray(ByteBuf buffer, int[] arr) {
+        buffer.writeInt(arr.length);
+        for (int i : arr) {
+            buffer.writeInt(i);
+        }
+    }
+
+    public static int[] readIntArray(ByteBuf buffer) {
+        int length = buffer.readInt();
+        int[] arr = new int[length];
+        for (int i = 0; i < length; i++) {
+            arr[i] = buffer.readInt();
+        }
+        return arr;
+    }
+
+    public static void writeNBT(ByteBuf buffer, NBTTagCompound compound) throws IOException {
+        byte[] bytes = CompressedStreamTools.compress(compound);
+        buffer.writeShort((short)bytes.length);
+        buffer.writeBytes(bytes);
+    }
+
+    public static NBTTagCompound readNBT(ByteBuf buffer) throws IOException {
+        byte[] bytes = new byte[buffer.readShort()];
+        buffer.readBytes(bytes);
+        return CompressedStreamTools.func_152457_a(bytes, new NBTSizeTracker(2097152L));
+    }
+
+    public static void writeBigNBT(ByteBuf buffer, NBTTagCompound compound) throws IOException {
+        byte[] bytes = CompressedStreamTools.compress(compound);
+        buffer.writeInt(bytes.length);
+        buffer.writeBytes(bytes);
+    }
+
+    public static NBTTagCompound readBigNBT(ByteBuf buffer) throws IOException {
+        int length = buffer.readInt();
+        byte[] bytes = new byte[length];
+        buffer.readBytes(bytes);
+        return CompressedStreamTools.func_152457_a(bytes, new NBTSizeTracker(15728640L));
+    }
+
+    public static void writeString(ByteBuf buffer, String s){
+        byte[] bytes = s.getBytes(Charsets.UTF_8);
+        buffer.writeShort((short)bytes.length);
+        buffer.writeBytes(bytes);
+    }
+
+    public static String readString(ByteBuf buffer){
+        try{
+            byte[] bytes = new byte[buffer.readShort()];
+            buffer.readBytes(bytes);
+            return new String(bytes, Charsets.UTF_8);
+        }
+        catch(IndexOutOfBoundsException ex){
+            return null;
+        }
+    }
+}
diff --git a/src/main/java/kamkeel/util/TextSplitter.java b/src/main/java/kamkeel/npcs/util/TextSplitter.java
similarity index 97%
rename from src/main/java/kamkeel/util/TextSplitter.java
rename to src/main/java/kamkeel/npcs/util/TextSplitter.java
index 30092cf92..d4b887dcf 100644
--- a/src/main/java/kamkeel/util/TextSplitter.java
+++ b/src/main/java/kamkeel/npcs/util/TextSplitter.java
@@ -1,4 +1,4 @@
-package kamkeel.util;
+package kamkeel.npcs.util;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,4 +37,4 @@ public class TextSplitter {
             System.out.println(line);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/nikedemos/markovnames/MarkovDictionarySPA.java b/src/main/java/nikedemos/markovnames/MarkovDictionarySPA.java
index bf7fcc61c..129e0b8e2 100644
--- a/src/main/java/nikedemos/markovnames/MarkovDictionarySPA.java
+++ b/src/main/java/nikedemos/markovnames/MarkovDictionarySPA.java
@@ -7,7 +7,6 @@ public class MarkovDictionarySPA extends MarkovDictionary {
 
 	public MarkovDictionarySPA(String dictionary, int seqlen, Random rng) {
 		super(dictionary, seqlen, rng);
-		// TODO Auto-generated constructor stub
 	}
 
 	@Override
diff --git a/src/main/java/noppes/npcs/CommonProxy.java b/src/main/java/noppes/npcs/CommonProxy.java
index 4bf6458d7..108866fa2 100644
--- a/src/main/java/noppes/npcs/CommonProxy.java
+++ b/src/main/java/noppes/npcs/CommonProxy.java
@@ -40,9 +40,6 @@ public class CommonProxy implements IGuiHandler {
 
 	public void load() {
         this.createAnimationThread();
-
-		CustomNpcs.Channel.register(new PacketHandlerServer());
-		CustomNpcs.ChannelPlayer.register(new PacketHandlerPlayer());
 	}
 
     protected void createAnimationThread() {
@@ -163,9 +160,12 @@ public class CommonProxy implements IGuiHandler {
 		if(gui == EnumGuiType.PlayerTrader)
 			return  new ContainerNPCTrader(npc, player);
 
-		if(gui == EnumGuiType.PlayerAnvil)
+		if(gui == EnumGuiType.PlayerCarpentryBench)
 			return new ContainerCarpentryBench(player.inventory, player.worldObj, x, y, z);
 
+        if(gui == EnumGuiType.PlayerAnvil)
+            return new ContainerAnvilRepair(player.inventory, player.worldObj, x, y, z);
+
 		if(gui == EnumGuiType.SetupItemGiver)
 			return new ContainerNpcItemGiver(npc, player);
 
@@ -204,16 +204,16 @@ public class CommonProxy implements IGuiHandler {
 
 	@Override
 	public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
-		// TODO Auto-generated method stub
+
 		return null;
 	}
 
 	public void openGui(EntityNPCInterface npc, EnumGuiType gui) {
-		// TODO Auto-generated method stub
+
 	}
 
 	public void openGui(EntityNPCInterface npc, EnumGuiType gui, int x, int y, int z) {
-		// TODO Auto-generated method stub
+
 	}
 
 
@@ -222,12 +222,12 @@ public class CommonProxy implements IGuiHandler {
 	}
 
 	public void openGui(EntityPlayer player, Object guiscreen) {
-		// TODO Auto-generated method stub
+
 
 	}
 
 	public void spawnParticle(EntityLivingBase player, String string, Object... ob) {
-		// TODO Auto-generated method stub
+
 
 	}
 
@@ -242,7 +242,7 @@ public class CommonProxy implements IGuiHandler {
 	}
 
 	public void registerItem(Item item) {
-		// TODO Auto-generated method stub
+
 
 	}
 
@@ -255,7 +255,11 @@ public class CommonProxy implements IGuiHandler {
 
 	}
 
-	public String getAchievementDesc(Achievement achievement) {
+    public void generateBigSmokeParticles(World world, int x, int y, int z, boolean signalFire){
+
+    }
+
+    public String getAchievementDesc(Achievement achievement) {
 		return "";
 	}
 
diff --git a/src/main/java/noppes/npcs/CustomItems.java b/src/main/java/noppes/npcs/CustomItems.java
index 3c0da19e2..0ac849fc9 100644
--- a/src/main/java/noppes/npcs/CustomItems.java
+++ b/src/main/java/noppes/npcs/CustomItems.java
@@ -123,6 +123,11 @@ public class CustomItems {
 	public static Item spellDark;
 	public static Item spellHoly;
 
+    public static Item earthElement;
+    public static Item fireElement;
+    public static Item waterElement;
+    public static Item airElement;
+
 	public static Item staffWood;
 	public static Item staffStone;
 	public static Item staffIron;
@@ -743,10 +748,10 @@ public class CustomItems {
 
 			quest = new ItemNpcArmor(26957,ArmorMaterial.IRON,0,"mask").setMaxStackSize(64).setUnlocalizedName("npcBanditMask").setCreativeTab(CustomItems.tabArmor).setTextureName("customnpcs:npcBanditMask");
 			quest = new ItemNpcInterface(26958).setUnlocalizedName("npcBrokenArrow").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcBrokenArrow");
-			quest = new ItemNpcInterface(26959).setUnlocalizedName("npcEarthElement").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcEarthElement");
-			quest = new ItemNpcInterface(26960).setUnlocalizedName("npcWaterElement").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcWaterElement");
-			quest = new ItemNpcInterface(26961).setUnlocalizedName("npcFireElement").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcFireElement");
-			quest = new ItemNpcInterface(26962).setUnlocalizedName("npcAirElement").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcAirElement");
+			earthElement = new ItemNpcInterface(26959).setUnlocalizedName("npcEarthElement").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcEarthElement");
+			waterElement = new ItemNpcInterface(26960).setUnlocalizedName("npcWaterElement").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcWaterElement");
+            fireElement = new ItemNpcInterface(26961).setUnlocalizedName("npcFireElement").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcFireElement");
+			airElement = new ItemNpcInterface(26962).setUnlocalizedName("npcAirElement").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcAirElement");
 
 			quest = new ItemNpcInterface(26963).setUnlocalizedName("npcCarKey").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcCarKey");
 			quest = new ItemNpcInterface(26964).setUnlocalizedName("npcKey").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcKey");
diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java
index 45c49e810..eb739ab24 100644
--- a/src/main/java/noppes/npcs/CustomNpcs.java
+++ b/src/main/java/noppes/npcs/CustomNpcs.java
@@ -8,10 +8,15 @@ import cpw.mods.fml.common.event.*;
 import cpw.mods.fml.common.network.FMLEventChannel;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.EntityRegistry;
+import cpw.mods.fml.relauncher.Side;
 import foxz.command.CommandNoppes;
-import kamkeel.addon.AddonManager;
-import kamkeel.command.CommandKamkeel;
-import kamkeel.developer.Developer;
+import kamkeel.npcs.addon.AddonManager;
+import kamkeel.npcs.command.CommandKamkeel;
+import kamkeel.npcs.command.profile.CommandProfile;
+import kamkeel.npcs.controllers.ProfileController;
+import kamkeel.npcs.controllers.data.CNPCData;
+import kamkeel.npcs.developer.Developer;
+import kamkeel.npcs.network.PacketHandler;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockIce;
 import net.minecraft.block.BlockLeavesBase;
@@ -50,9 +55,6 @@ public class CustomNpcs {
 
     public static boolean FreezeNPCs = false;
 
-    public static FMLEventChannel Channel;
-    public static FMLEventChannel ChannelPlayer;
-
     public static final MarkovGenerator[] MARKOV_GENERATOR = new MarkovGenerator[10];
 
     public static boolean InitIgnore = false;
@@ -82,8 +84,7 @@ public class CustomNpcs {
 
     @EventHandler
     public void load(FMLPreInitializationEvent ev) {
-        Channel = NetworkRegistry.INSTANCE.newEventDrivenChannel("CustomNPCs");
-        ChannelPlayer = NetworkRegistry.INSTANCE.newEventDrivenChannel("CustomNPCsPlayer");
+        PacketHandler.Instance = new PacketHandler();
 
         MinecraftServer server = MinecraftServer.getServer();
         String dir = "";
@@ -190,6 +191,7 @@ public class CustomNpcs {
         MARKOV_GENERATOR[8] = new MarkovCustomNPCsClassic(3);
         MARKOV_GENERATOR[9] = new MarkovSpanish(3);
 
+        PacketHandler.Instance.registerChannels();
     }
 
     @EventHandler
@@ -198,6 +200,8 @@ public class CustomNpcs {
         ChunkController.Instance.clear();
         FactionController.getInstance().load();
         // VisibilityController.instance = new VisibilityController();
+        new MagicController();
+        MagicController.getInstance().load();
         new PlayerDataController();
         new TagController();
         new TransportController();
@@ -205,6 +209,11 @@ public class CustomNpcs {
         new SpawnController();
         new LinkedNpcController();
         new AnimationController();
+
+        // Profile Controller
+        new ProfileController();
+        ProfileController.registerProfileType(new CNPCData());
+
         ScriptController.Instance.loadStoredData();
         ScriptController.Instance.loadForgeScripts();
         ScriptController.Instance.loadGlobalNPCScripts();
@@ -240,6 +249,7 @@ public class CustomNpcs {
         ServerTagMapController.Instance = new ServerTagMapController();
     }
 
+
     @EventHandler
     public void stopped(FMLServerStoppedEvent event){
         ServerCloneController.Instance = null;
@@ -253,6 +263,7 @@ public class CustomNpcs {
     public void serverstart(FMLServerStartingEvent event) {
         event.registerServerCommand(new CommandNoppes());
         event.registerServerCommand(new CommandKamkeel());
+        event.registerServerCommand(new CommandProfile());
     }
 
     private void registerNpc(Class<? extends Entity> cl, String name) {
@@ -309,4 +320,8 @@ public class CustomNpcs {
     public static MinecraftServer getServer(){
         return MinecraftServer.getServer();
     }
+
+    public static Side side() {
+        return FMLCommonHandler.instance().getEffectiveSide();
+    }
 }
diff --git a/src/main/java/noppes/npcs/CustomNpcsPermissions.java b/src/main/java/noppes/npcs/CustomNpcsPermissions.java
index ebb749fe5..24898e8a4 100644
--- a/src/main/java/noppes/npcs/CustomNpcsPermissions.java
+++ b/src/main/java/noppes/npcs/CustomNpcsPermissions.java
@@ -2,7 +2,7 @@ package noppes.npcs;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
-import kamkeel.developer.Developer;
+import kamkeel.npcs.developer.Developer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import org.apache.logging.log4j.LogManager;
diff --git a/src/main/java/noppes/npcs/DataInventory.java b/src/main/java/noppes/npcs/DataInventory.java
index 992a68ae5..6db4c4ccf 100644
--- a/src/main/java/noppes/npcs/DataInventory.java
+++ b/src/main/java/noppes/npcs/DataInventory.java
@@ -24,14 +24,14 @@ public class DataInventory implements IInventory {
 	public HashMap<Integer,ItemStack> weapons = new HashMap<Integer, ItemStack>();
 	public HashMap<Integer,ItemStack> prevWeapons = new HashMap<Integer, ItemStack>();
 	public HashMap<Integer,ItemStack> armor = new HashMap<Integer, ItemStack>();
-		
+
 	public int minExp = 0;
 	public int maxExp = 0;
-	
+
 	public int lootMode = 0;
-	
+
 	private EntityNPCInterface npc;
-	
+
 	public DataInventory(EntityNPCInterface npc){
 		this.npc = npc;
 	}
@@ -43,7 +43,7 @@ public class DataInventory implements IInventory {
 		nbttagcompound.setTag("Weapons", NBTTags.nbtItemStackList(getWeapons()));
 		nbttagcompound.setTag("DoubleDropChance", NBTTags.nbtIntegerDoubleMap(dropchance));
 		nbttagcompound.setInteger("LootMode", lootMode);
-		
+
 		return nbttagcompound;
 	}
 	public void readEntityFromNBT(NBTTagCompound nbttagcompound){
@@ -187,7 +187,7 @@ public class DataInventory implements IInventory {
 				npc.worldObj.spawnEntityInWorld(item);
 		}
 	}
-	
+
 	public EntityItem getEntityItem(ItemStack itemstack) {
 		if (itemstack == null) {
 			return null;
@@ -205,13 +205,13 @@ public class DataInventory implements IInventory {
 
 		return entityitem;
 	}
-	
+
 	public ItemStack armorItemInSlot(int i) {
 		return getArmor().get(i);
 	}
 	@Override
 	public int getSizeInventory() {
-		// TODO Auto-generated method stub
+
 		return 15;
 	}
 	@Override
@@ -243,7 +243,7 @@ public class DataInventory implements IInventory {
         	var3 = getArmor();
             i = 2;
         }
-        
+
         ItemStack var4 = null;
         if (var3.get(par1) != null)
         {
@@ -355,17 +355,17 @@ public class DataInventory implements IInventory {
 	}
 	@Override
 	public void markDirty() {
-		// TODO Auto-generated method stub
-		
+
+
 	}
 	@Override
 	public void openInventory() {
-		// TODO Auto-generated method stub
-		
+
+
 	}
 	@Override
 	public void closeInventory() {
-		// TODO Auto-generated method stub
-		
+
+
 	}
 }
diff --git a/src/main/java/noppes/npcs/LogWriter.java b/src/main/java/noppes/npcs/LogWriter.java
index 6286f2c1f..aeccab32f 100644
--- a/src/main/java/noppes/npcs/LogWriter.java
+++ b/src/main/java/noppes/npcs/LogWriter.java
@@ -81,10 +81,10 @@ public class LogWriter {
 			logger.setLevel(Level.ALL);
 			info(new Date().toString());
 		} catch (SecurityException e) {
-			// TODO Auto-generated catch block
+
 			e.printStackTrace();
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
+
 			e.printStackTrace();
 		}
 	}
@@ -223,4 +223,4 @@ class NPCStamp
 	public Date makeDate = new Date();
 	public Date recentDate = new Date();
 	public int counter = 1;
-};
\ No newline at end of file
+};
diff --git a/src/main/java/noppes/npcs/NPCSpawning.java b/src/main/java/noppes/npcs/NPCSpawning.java
index e95622242..aa7eff574 100644
--- a/src/main/java/noppes/npcs/NPCSpawning.java
+++ b/src/main/java/noppes/npcs/NPCSpawning.java
@@ -181,8 +181,8 @@ public class NPCSpawning {
 			if(spawnEntity instanceof EntityCustomNpc){
 				EntityCustomNpc npc = (EntityCustomNpc) spawnEntity;
 				npc.stats.spawnCycle = 3;
-				npc.ai.returnToStart = false;
-				npc.ai.startPos = new int[]{x,y, z};
+				npc.ais.returnToStart = false;
+				npc.ais.startPos = new int[]{x,y, z};
                 npc.updateAI = true;
                 npc.updateClient = true;
                 npc.getNavigator().clearPathEntity();
diff --git a/src/main/java/noppes/npcs/NoppesUtilPlayer.java b/src/main/java/noppes/npcs/NoppesUtilPlayer.java
index 7290bef48..2f364de8f 100644
--- a/src/main/java/noppes/npcs/NoppesUtilPlayer.java
+++ b/src/main/java/noppes/npcs/NoppesUtilPlayer.java
@@ -3,6 +3,14 @@ package noppes.npcs;
 import cpw.mods.fml.common.network.internal.FMLProxyPacket;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumSoundOperation;
+import kamkeel.npcs.network.packets.data.*;
+import kamkeel.npcs.network.packets.data.gui.GuiClosePacket;
+import kamkeel.npcs.network.packets.data.gui.IsGuiOpenPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.network.packets.data.large.PartyDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.inventory.Container;
@@ -133,11 +141,11 @@ public class NoppesUtilPlayer {
 			}
 		}
 
-		Server.sendData(player, EnumPacketClient.DISABLE_MOUSE_INPUT, time, stringedIds.toString());
+        PacketHandler.Instance.sendToPlayer(new DisableMouseInputPacket(time, stringedIds.toString()), player);
 	}
 
 	public static void swingPlayerArm(EntityPlayerMP player){
-		Server.sendData(player, EnumPacketClient.SWING_PLAYER_ARM);
+        PacketHandler.Instance.sendToPlayer(new SwingPlayerArmPacket(), player);
 	}
 
 	private static void followerBuy(RoleFollower role,IInventory currencyInv,EntityPlayerMP player, EntityNPCInterface npc){
@@ -251,16 +259,6 @@ public class NoppesUtilPlayer {
 
 		bankData.openBankGui(player, npc, bank.id, container.slot);
 	}
-	public static void sendData(EnumPlayerPacket enu, Object... obs) {
-		ByteBuf buffer = Unpooled.buffer();
-		try {
-			if(!Server.fillBuffer(buffer, enu, obs))
-				return;
-			CustomNpcs.ChannelPlayer.sendToServer(new FMLProxyPacket(buffer,"CustomNPCsPlayer"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
 
 	public static void dialogSelected(int dialogId, int optionId, EntityPlayerMP player, EntityNPCInterface npc) {
 		Dialog dialog = DialogController.Instance.dialogs.get(dialogId);
@@ -286,23 +284,23 @@ public class NoppesUtilPlayer {
     		if(npc.roleInterface != null)
     			npc.roleInterface.interact(player);
     		else
-    			Server.sendData(player, EnumPacketClient.GUI_CLOSE);
+                GuiClosePacket.closeGUI(player, -1 , new NBTTagCompound());
     	}
     	else if(option.optionType == EnumOptionType.DialogOption){
     		NoppesUtilServer.openDialog(player, npc, option.getDialog(), optionId+1);
     	}
     	else if(option.optionType == EnumOptionType.CommandBlock){
-			Server.sendData(player, EnumPacketClient.GUI_CLOSE);
+            GuiClosePacket.closeGUI(player, -1 , new NBTTagCompound());
     		NoppesUtilServer.runCommand(player, npc.getCommandSenderName(), option.command);
     	}
     	else
-			Server.sendData(player, EnumPacketClient.GUI_CLOSE);
+            GuiClosePacket.closeGUI(player, -1 , new NBTTagCompound());
 	}
 
 	public static void updateQuestLogData(ByteBuf buffer, EntityPlayerMP player) throws IOException {
 		PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
 
-		NBTTagCompound compound = Server.readNBT(buffer);
+		NBTTagCompound compound = ByteBufUtils.readNBT(buffer);
 		HashMap<String,String> questAlerts = NBTTags.getStringStringMap(compound.getTagList("Alerts", 10));
 		for (Map.Entry<String,String> entry : questAlerts.entrySet()) {
 			Quest quest = getQuestFromStringKey(entry.getKey());
@@ -311,7 +309,7 @@ public class NoppesUtilPlayer {
 			}
 		}
 
-		String trackedQuestString = Server.readString(buffer);
+		String trackedQuestString = ByteBufUtils.readString(buffer);
 		Quest trackedQuest = getQuestFromStringKey(trackedQuestString);
 		if (trackedQuest != null) {
 			playerData.questData.trackQuest(trackedQuest);
@@ -328,7 +326,7 @@ public class NoppesUtilPlayer {
 
     public static void updatePartyQuestLogData(ByteBuf buffer, EntityPlayerMP player) throws IOException {
         PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
-        String trackedQuestString = Server.readString(buffer);
+        String trackedQuestString = ByteBufUtils.readString(buffer);
         Quest trackedQuest = getQuestFromStringKey(trackedQuestString);
         if (trackedQuest != null) {
             playerData.questData.trackParty(playerData.getPlayerParty());
@@ -384,7 +382,7 @@ public class NoppesUtilPlayer {
 			}
 			compound.setTag("ObjectiveList",nbtTagList);
 
-			Server.sendData(player, EnumPacketClient.OVERLAY_QUEST_TRACKING, compound);
+            PacketHandler.Instance.sendToPlayer(new OverlayQuestTrackingPacket(compound), player);
 		}
 	}
 
@@ -407,8 +405,7 @@ public class NoppesUtilPlayer {
                     nbtTagList.appendTag(new NBTTagString(objective.getAdditionalText()));
             }
             compound.setTag("ObjectiveList",nbtTagList);
-
-            Server.sendData(player, EnumPacketClient.OVERLAY_QUEST_TRACKING, compound);
+            PacketHandler.Instance.sendToPlayer(new OverlayQuestTrackingPacket(compound), player);
         }
     }
 
@@ -418,13 +415,14 @@ public class NoppesUtilPlayer {
         }
         QuestLogData data = new QuestLogData();
         data.setData(player);
-        Server.sendData(player, EnumPacketClient.GUI_DATA, data.writeNBT());
+        GuiDataPacket.sendGuiData(player, data.writeNBT());
 	}
 
     public static void sendTrackedQuest(EntityPlayerMP player) {
         QuestLogData data = new QuestLogData();
         data.setTrackedQuestKey(player);
-        Server.sendData(player, EnumPacketClient.PARTY_DATA, data.writeTrackedQuest());
+
+        PartyDataPacket.sendPartyData(player, data.writeTrackedQuest());
     }
 
 	public static boolean questCompletion(EntityPlayerMP player, int questId) {
@@ -626,7 +624,7 @@ public class NoppesUtilPlayer {
             }
 
             playerData.save();
-            Server.sendData((EntityPlayerMP)player, EnumPacketClient.QUEST_COMPLETION, data.quest.writeToNBT(new NBTTagCompound()));
+            QuestCompletionPacket.sendQuestComplete((EntityPlayerMP)player, data.quest.writeToNBT(new NBTTagCompound()));
         }
 
         if(quest.type == EnumQuestType.Item && partyOptions.objectiveRequirement == EnumPartyObjectives.Shared){
@@ -740,7 +738,7 @@ public class NoppesUtilPlayer {
 		}
 	}
 	public static void isGUIOpen(EntityPlayerMP player){
-		Server.sendData(player, EnumPacketClient.ISGUIOPEN);
+        PacketHandler.Instance.sendToPlayer(new IsGuiOpenPacket(), player);
 	}
 
 	public static List<ItemStack> countStacks(IInventory inv, boolean ignoreDamage, boolean ignoreNBT) {
@@ -773,30 +771,30 @@ public class NoppesUtilPlayer {
 	public static void playSoundTo(EntityPlayerMP player, int id, ScriptSound sound) {
 		NBTTagCompound compound = sound.writeToNBT();
 		if (sound.sourceEntity == null || player.worldObj.provider.dimensionId == sound.sourceEntity.getDimension()) {
-			Server.sendData(player, EnumPacketClient.PLAY_SOUND_TO, id, compound);
+            PacketHandler.Instance.sendToPlayer(new SoundManagementPacket(EnumSoundOperation.PLAY_SOUND_TO, id, compound), player);
 		}
 	}
 
 	public static void playSoundTo(EntityPlayerMP player, ScriptSound sound) {
 		NBTTagCompound compound = sound.writeToNBT();
 		if (sound.sourceEntity == null || player.worldObj.provider.dimensionId == sound.sourceEntity.getDimension()) {
-			Server.sendData(player, EnumPacketClient.PLAY_SOUND_TO_NO_ID, compound);
+            PacketHandler.Instance.sendToPlayer(new SoundManagementPacket(EnumSoundOperation.PLAY_SOUND_TO_NO_ID, compound), player);
 		}
 	}
 
 	public static void stopSoundFor(EntityPlayerMP player, int id) {
-		Server.sendData(player, EnumPacketClient.STOP_SOUND_FOR, id);
+        PacketHandler.Instance.sendToPlayer(new SoundManagementPacket(EnumSoundOperation.STOP_SOUND_FOR, id), player);
 	}
 
 	public static void pauseSoundsFor(EntityPlayerMP player) {
-		Server.sendData(player, EnumPacketClient.PAUSE_SOUNDS);
+        PacketHandler.Instance.sendToPlayer(new SoundManagementPacket(EnumSoundOperation.PAUSE_SOUNDS), player);
 	}
 
 	public static void continueSoundsFor(EntityPlayerMP player) {
-		Server.sendData(player, EnumPacketClient.CONTINUE_SOUNDS);
+        PacketHandler.Instance.sendToPlayer(new SoundManagementPacket(EnumSoundOperation.CONTINUE_SOUNDS), player);
 	}
 
 	public static void stopSoundsFor(EntityPlayerMP player) {
-		Server.sendData(player, EnumPacketClient.STOP_SOUNDS);
+        PacketHandler.Instance.sendToPlayer(new SoundManagementPacket(EnumSoundOperation.STOP_SOUNDS), player);
 	}
 }
diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java
index ae7dcb408..5111262b6 100644
--- a/src/main/java/noppes/npcs/NoppesUtilServer.java
+++ b/src/main/java/noppes/npcs/NoppesUtilServer.java
@@ -1,6 +1,22 @@
 package noppes.npcs;
 
 import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.controllers.SyncController;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.packets.data.gui.GuiClosePacket;
+import kamkeel.npcs.network.packets.data.gui.GuiErrorPacket;
+import kamkeel.npcs.network.packets.data.gui.GuiOpenPacket;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.network.packets.data.large.ScrollDataPacket;
+import kamkeel.npcs.network.packets.data.large.ScrollListPacket;
+import kamkeel.npcs.network.packets.data.npc.DialogPacket;
+import kamkeel.npcs.network.packets.data.ParticlePacket;
+import kamkeel.npcs.network.packets.data.script.ScriptedParticlePacket;
+import kamkeel.npcs.network.packets.data.npc.DeleteNpcPacket;
+import kamkeel.npcs.network.packets.data.npc.EditNpcPacket;
+import kamkeel.npcs.network.packets.data.npc.RolePacket;
+import kamkeel.npcs.network.packets.data.gui.GuiTeleporterPacket;
+import kamkeel.npcs.util.ByteBufUtils;
 import net.minecraft.command.server.CommandBlockLogic;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
@@ -13,7 +29,6 @@ import net.minecraft.entity.projectile.EntityThrowable;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.tileentity.MobSpawnerBaseLogic;
@@ -27,7 +42,6 @@ import net.minecraft.world.World;
 import noppes.npcs.api.entity.IPlayer;
 import noppes.npcs.config.ConfigMain;
 import noppes.npcs.constants.EnumGuiType;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.constants.EnumPlayerData;
 import noppes.npcs.constants.EnumRoleType;
 import noppes.npcs.containers.ContainerManageBanks;
@@ -41,43 +55,53 @@ import noppes.npcs.scripted.NpcAPI;
 import noppes.npcs.scripted.ScriptSound;
 import noppes.npcs.scripted.event.DialogEvent;
 
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.text.DecimalFormat;
 import java.util.*;
-import java.util.zip.GZIPOutputStream;
+
+import static kamkeel.npcs.network.packets.data.large.ScrollDataPacket.sendScrollData;
+import static kamkeel.npcs.network.packets.data.large.ScrollGroupPacket.sendScrollGroup;
 
 public class NoppesUtilServer {
 	private static HashMap<String,Quest> editingQuests = new HashMap<String,Quest>();
 
-    public static void setEditingNpc(EntityPlayer player, EntityNPCInterface npc){
-    	PlayerData data = PlayerDataController.Instance.getPlayerData(player);
-    	data.editingNpc = npc;
-    	if(npc != null)
-    		Server.sendDataChecked((EntityPlayerMP)player, EnumPacketClient.EDIT_NPC, npc.getEntityId());
-    }
-    public static EntityNPCInterface getEditingNpc(EntityPlayer player){
-    	PlayerData data = PlayerDataController.Instance.getPlayerData(player);
-    	return data.editingNpc;
+    public static IPlayer getIPlayer(EntityPlayer p) {
+        return (IPlayer) NpcAPI.Instance().getIEntity(p);
+    }
+
+    public static UUID getUUID(Entity entity) {
+        return entity instanceof EntityPlayer ? ((EntityPlayer) entity).getGameProfile().getId() : entity.getUniqueID();
+    }
+
+    public static void setEditingNpc(EntityPlayer player, EntityNPCInterface npc){
+        PlayerData data = PlayerDataController.Instance.getPlayerData(player);
+        data.editingNpc = npc;
+        if(npc != null)
+            PacketHandler.Instance.sendToPlayer(new EditNpcPacket(npc.getEntityId()), (EntityPlayerMP)player);
+    }
+
+    public static EntityNPCInterface getEditingNpc(EntityPlayer player){
+        PlayerData data = PlayerDataController.Instance.getPlayerData(player);
+        return data.editingNpc;
+    }
+
+    public static void setEditingQuest(EntityPlayer player, Quest quest) {
+        editingQuests.put(player.getCommandSenderName(), quest);
     }
 
-	public static void setEditingQuest(EntityPlayer player, Quest quest) {
-		editingQuests.put(player.getCommandSenderName(), quest);
-	}
     public static Quest getEditingQuest(EntityPlayer player){
-    	return editingQuests.get(player.getCommandSenderName());
+        return editingQuests.get(player.getCommandSenderName());
     }
 
     public static void sendRoleData(EntityPlayer player, EntityNPCInterface npc){
-    	if(npc.advanced.role == EnumRoleType.None)
-    		return;
-    	NBTTagCompound comp = new NBTTagCompound();
-    	npc.roleInterface.writeToNBT(comp);
-    	comp.setInteger("EntityId", npc.getEntityId());
-    	comp.setInteger("Role", npc.advanced.role.ordinal());
-        Server.sendData((EntityPlayerMP)player, EnumPacketClient.ROLE, comp);
+        if(npc.advanced.role == EnumRoleType.None)
+            return;
+        NBTTagCompound comp = new NBTTagCompound();
+        npc.roleInterface.writeToNBT(comp);
+        comp.setInteger("EntityId", npc.getEntityId());
+        comp.setInteger("Role", npc.advanced.role.ordinal());
+        PacketHandler.Instance.sendToPlayer(new RolePacket(comp), (EntityPlayerMP)player);
     }
 
 	public static void sendFactionDataAll(EntityPlayerMP player) {
@@ -184,11 +208,12 @@ public class NoppesUtilServer {
 
 		if(npc instanceof EntityDialogNpc || dia.id < 0){
 			dialog.hideNPC = true;
-			Server.sendData((EntityPlayerMP)player, EnumPacketClient.DIALOG_DUMMY, npc.getCommandSenderName(), dialog.writeToNBT(new NBTTagCompound()));
+            PacketHandler.Instance.sendToPlayer(new DialogPacket(npc.getCommandSenderName(), -1, dialog.writeToNBT(new NBTTagCompound())), (EntityPlayerMP)player);
 		}
 		else
-			Server.sendData((EntityPlayerMP)player, EnumPacketClient.DIALOG, npc.getEntityId(), dialog.writeToNBT(new NBTTagCompound()));
-		dia.factionOptions.addPoints(player);
+            PacketHandler.Instance.sendToPlayer(new DialogPacket("Real", npc.getEntityId(), dialog.writeToNBT(new NBTTagCompound())), (EntityPlayerMP)player);
+
+        dia.factionOptions.addPoints(player);
         if(dialog.hasQuest())
         	PlayerQuestController.addActiveQuest(new QuestData(dialog.getQuest()),player);
         if(!dialog.command.isEmpty()){
@@ -263,9 +288,6 @@ public class NoppesUtilServer {
         	player.destroyCurrentEquippedItem();
 	}
 
-	public static DataOutputStream getDataOutputStream(ByteArrayOutputStream stream) throws IOException{
-        return new DataOutputStream(new GZIPOutputStream(stream));
-	}
 	public static void sendOpenGui(EntityPlayer player,
 			EnumGuiType gui, EntityNPCInterface npc) {
 		sendOpenGui(player, gui, npc, 0, 0, 0);
@@ -289,14 +311,14 @@ public class NoppesUtilServer {
 			return;
 		}
 		else{
-			Server.sendDataChecked((EntityPlayerMP)player, EnumPacketClient.GUI, gui.ordinal(), i, j, k);
+            GuiOpenPacket.openGUI((EntityPlayerMP)player, gui, i, j, k);
 		}
 		ArrayList<String> list = getScrollData(player, gui, npc);
 		if(list == null || list.isEmpty())
 			return;
 
-		Server.sendData((EntityPlayerMP)player, EnumPacketClient.SCROLL_LIST, list);
-	}
+        ScrollListPacket.sendList((EntityPlayerMP)player, list);
+    }
 
 	public static void sendOpenGuiNoDelay(final EntityPlayer player,
 								   final EnumGuiType gui, final EntityNPCInterface npc, final int i, final int j, final int k) {
@@ -311,13 +333,13 @@ public class NoppesUtilServer {
 			return;
 		}
 		else{
-			Server.sendDataChecked((EntityPlayerMP)player, EnumPacketClient.GUI, gui.ordinal(), i, j, k);
+            GuiOpenPacket.openGUI((EntityPlayerMP)player, gui, i, j, k);
 		}
 		ArrayList<String> list = getScrollData(player, gui, npc);
 		if(list == null || list.isEmpty())
 			return;
 
-		Server.sendData((EntityPlayerMP)player, EnumPacketClient.SCROLL_LIST, list);
+        ScrollListPacket.sendList((EntityPlayerMP)player, list);
 	}
 
 
@@ -352,17 +374,12 @@ public class NoppesUtilServer {
 		}
 		return null;
 	}
-	public static void spawnParticle(Entity entity,String particle,int dimension){
-		Server.sendAssociatedData(entity, EnumPacketClient.PARTICLE, entity.posX, entity.posY, entity.posZ, entity.height, entity.width, entity.yOffset, particle);
+	public static void spawnParticle(Entity entity,String particle, int dimension){
+        PacketHandler.Instance.sendTracking(new ParticlePacket(entity.posX, entity.posY, entity.posZ, entity.height, entity.width, entity.yOffset, particle), entity);
     }
 
 	public static void spawnScriptedParticle(NBTTagCompound compound, int dimensionId){
-		List<EntityPlayer> list = MinecraftServer.getServer().getConfigurationManager().playerEntityList;
-		for (EntityPlayer player : list) {
-			if (player.worldObj.provider.dimensionId == dimensionId) {
-				Server.sendData((EntityPlayerMP) player, EnumPacketClient.SCRIPTED_PARTICLE, compound);
-			}
-		}
+        PacketHandler.Instance.sendToDimension(new ScriptedParticlePacket(compound), dimensionId);
 	}
 
 	public static void playSound(int id, ScriptSound sound) {
@@ -408,7 +425,7 @@ public class NoppesUtilServer {
 	}
 
 	public static void deleteNpc(EntityNPCInterface npc,EntityPlayer player) {
-		Server.sendAssociatedData(npc, EnumPacketClient.DELETE_NPC, npc.getEntityId());
+        PacketHandler.Instance.sendTracking(new DeleteNpcPacket(npc.getEntityId()), npc);
 	}
 
 	public static void createMobSpawner(int x, int y, int z, NBTTagCompound comp, EntityPlayer player) {
@@ -505,14 +522,14 @@ public class NoppesUtilServer {
 			}
 		}
 
-		NoppesUtilServer.sendScrollData(player, map);
+		sendScrollData(player, map);
 	}
 
 	public static void removePlayerData(ByteBuf buffer, EntityPlayerMP player) throws IOException {
 		int id = buffer.readInt();
 		if(EnumPlayerData.values().length <= id)
 			return;
-		String name = Server.readString(buffer);
+		String name = ByteBufUtils.readString(buffer);
 		EnumPlayerData type = EnumPlayerData.values()[id];
         EntityPlayer pl = MinecraftServer.getServer().getConfigurationManager().func_152612_a(name);
 		PlayerData playerdata = null;
@@ -538,7 +555,6 @@ public class NoppesUtilServer {
             	playerdata.setNBT(new NBTTagCompound());
                 sendPlayerData(type, player, name);
                 playerdata.save();
-
                 return;
             }
         }
@@ -585,37 +601,18 @@ public class NoppesUtilServer {
 			for(RecipeCarpentry recipe : RecipeController.Instance.globalRecipes.values()){
 				map.put(recipe.name, recipe.id);
 			}
-		}
+		} else if (size == 4){
+            for(RecipeCarpentry recipe : RecipeController.Instance.carpentryRecipes.values()){
+                map.put(recipe.name, recipe.id);
+            }
+        }
 		else{
-			for(RecipeCarpentry recipe : RecipeController.Instance.anvilRecipes.values()){
-				map.put(recipe.name, recipe.id);
-			}
+            for(RecipeAnvil recipe : RecipeController.Instance.anvilRecipes.values()){
+                map.put(recipe.name, recipe.id);
+            }
 		}
 		sendScrollData(player, map);
 	}
-	public static void sendScrollData(EntityPlayerMP player, Map<String,Integer> map){
-		Map<String, Integer> send = new HashMap<String, Integer>();
-		for(String key : map.keySet()){
-			send.put(key, map.get(key));
-			if(send.size() == 100){
-				Server.sendData(player, EnumPacketClient.SCROLL_DATA_PART, send);
-				send = new HashMap<String, Integer>();
-			}
-		}
-		Server.sendData(player, EnumPacketClient.SCROLL_DATA, send);
-	}
-
-	public static void sendScrollGroup(EntityPlayerMP player, Map<String,Integer> map){
-		Map<String, Integer> send = new HashMap<String, Integer>();
-		for(String key : map.keySet()){
-			send.put(key, map.get(key));
-			if(send.size() == 100){
-				Server.sendData(player, EnumPacketClient.SCROLL_GROUP_PART, send);
-				send = new HashMap<String, Integer>();
-			}
-		}
-		Server.sendData(player, EnumPacketClient.SCROLL_GROUP, send);
-	}
 
 	public static void sendDialogData(EntityPlayerMP player, DialogCategory category) {
 		if(category == null)
@@ -659,6 +656,14 @@ public class NoppesUtilServer {
 		sendScrollGroup(player, map);
 	}
 
+    public static void sendCustomEffectDataAll(EntityPlayerMP player) {
+        Map<String, Integer> map = new HashMap<String, Integer>();
+        for (CustomEffect effect : CustomEffectController.getInstance().customEffects.values()) {
+            map.put(effect.name, effect.id);
+        }
+        ScrollDataPacket.sendScrollData(player, map);
+    }
+
 	public static void sendTransportCategoryData(EntityPlayerMP player) {
 		HashMap<String,Integer> map = new HashMap<String,Integer>();
 		for(TransportCategory category : TransportController.getInstance().categories.values()){
@@ -690,8 +695,7 @@ public class NoppesUtilServer {
 
 			NBTTagCompound compound = option.writeNBT();
 			compound.setInteger("Position", pos);
-			Server.sendData((EntityPlayerMP)player, EnumPacketClient.GUI_DATA, compound);
-
+            GuiDataPacket.sendGuiData((EntityPlayerMP)player, compound);
 		}
 	}
 
@@ -727,13 +731,13 @@ public class NoppesUtilServer {
     public static void setClonerGui(EntityPlayerMP player, int x, int y, int z){
         if(player == null)
             return;
-        Server.sendData(player, EnumPacketClient.CLONER, x, y, z);
+        GuiOpenPacket.openGUI(player, EnumGuiType.Cloner, x, y, z);
     }
 
     public static void setTeleporterGUI(EntityPlayerMP player){
         if(player == null)
             return;
-        Server.sendData(player, EnumPacketClient.TELEPORTER);
+        PacketHandler.Instance.sendToPlayer(new GuiTeleporterPacket(), player);
     }
 
 	public static void setRecipeGui(EntityPlayerMP player, RecipeCarpentry recipe){
@@ -744,14 +748,24 @@ public class NoppesUtilServer {
 
 		ContainerManageRecipes container = (ContainerManageRecipes) player.openContainer;
 		container.setRecipe(recipe);
-
-		Server.sendData(player, EnumPacketClient.GUI_DATA, recipe.writeNBT());
+        GuiDataPacket.sendGuiData((EntityPlayerMP)player, recipe.writeNBT());
 	}
 
+    public static void setRecipeAnvilGui(EntityPlayerMP player, RecipeAnvil recipe){
+        if(recipe == null)
+            return;
+        if(!(player.openContainer instanceof ContainerManageRecipes))
+            return;
+
+        ContainerManageRecipes container = (ContainerManageRecipes) player.openContainer;
+        container.setRecipe(recipe);
+        GuiDataPacket.sendGuiData((EntityPlayerMP)player, recipe.writeNBT());
+    }
+
 	public static void sendBank(EntityPlayerMP player,Bank bank) {
 		NBTTagCompound compound = new NBTTagCompound();
 		bank.writeEntityToNBT(compound);
-		Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
+        GuiDataPacket.sendGuiData((EntityPlayerMP)player, compound);
 
 		if(player.openContainer instanceof ContainerManageBanks){
 			((ContainerManageBanks)player.openContainer).setBank(bank);
@@ -777,14 +791,14 @@ public class NoppesUtilServer {
 	}
 
 	public static void sendGuiError(EntityPlayer player, int i) {
-		Server.sendData((EntityPlayerMP)player, EnumPacketClient.GUI_ERROR, i, new NBTTagCompound());
+        GuiErrorPacket.errorGUI((EntityPlayerMP)player, i, new NBTTagCompound());
 	}
 
 	public static void sendGuiClose(EntityPlayerMP player, int i, NBTTagCompound comp) {
 		if(player.openContainer != player.inventoryContainer){
 			player.openContainer = player.inventoryContainer;
 		}
-		Server.sendData(player, EnumPacketClient.GUI_CLOSE, i, comp);
+        GuiClosePacket.closeGUI(player, i, comp);
 	}
 
 	public static Entity spawnCloneWithProtection(NBTTagCompound compound, int x, int y,
@@ -798,7 +812,7 @@ public class NoppesUtilServer {
 		entity.setPosition((double) x + 0.5, (double) y, (double) z + 0.5);
 		if(entity instanceof EntityNPCInterface){
 			EntityNPCInterface npc = (EntityNPCInterface) entity;
-			npc.ai.startPos = new int[]{MathHelper.floor_double(npc.posX),MathHelper.floor_double(npc.posY),MathHelper.floor_double(npc.posZ)};
+			npc.ais.startPos = new int[]{MathHelper.floor_double(npc.posX),MathHelper.floor_double(npc.posY),MathHelper.floor_double(npc.posZ)};
 			npc.ticksExisted = 0;
 			npc.totalTicksAlive = 0;
 		}
@@ -817,7 +831,7 @@ public class NoppesUtilServer {
 		}
 		if(entity instanceof EntityNPCInterface){
 			EntityNPCInterface npc = (EntityNPCInterface) entity;
-			npc.ai.startPos = new int[]{MathHelper.floor_double(npc.posX),MathHelper.floor_double(npc.posY),MathHelper.floor_double(npc.posZ)};
+			npc.ais.startPos = new int[]{MathHelper.floor_double(npc.posX),MathHelper.floor_double(npc.posY),MathHelper.floor_double(npc.posZ)};
 			npc.ticksExisted = 0;
 			npc.totalTicksAlive = 0;
 		}
@@ -826,7 +840,7 @@ public class NoppesUtilServer {
 
 	public static Entity spawnClone(NBTTagCompound compound, int x, int y,
 									int z, World worldObj) {
-		Entity entity = NoppesUtilServer.getEntityFromNBT(compound,x,y,z,worldObj);
+		Entity entity = getEntityFromNBT(compound,x,y,z,worldObj);
 		if(entity == null){
 			return null;
 		}
@@ -845,48 +859,6 @@ public class NoppesUtilServer {
 			return entity;
 		}
 	}
-    public static void sendPlayerDataCompound(EntityPlayerMP player, NBTTagCompound compound, boolean sync) {
-        try {
-            byte[] bytes = CompressedStreamTools.compress(compound);
-
-            // Split byte array into chunks and send each chunk
-            int chunkSize = 16000;
-            int totalChunks = (int) Math.ceil((double) bytes.length / chunkSize);
-            for (int i = 0; i < totalChunks; i++) {
-                int start = i * chunkSize;
-                int length = Math.min(bytes.length - start, chunkSize);
-                byte[] chunk = new byte[length];
-                System.arraycopy(bytes, start, chunk, 0, length);
-                Server.sendData(player, EnumPacketClient.LARGE_NBT_PART, (Object) chunk);
-            }
-            // Send end packet
-            Server.sendData(player, EnumPacketClient.SYNC_PLAYER, sync);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static void sendDBCCompound(EntityPlayerMP player, NBTTagCompound compound) {
-        try {
-            byte[] bytes = CompressedStreamTools.compress(compound);
-
-            // Split byte array into chunks and send each chunk
-            int chunkSize = 16000;
-            int totalChunks = (int) Math.ceil((double) bytes.length / chunkSize);
-            for (int i = 0; i < totalChunks; i++) {
-                int start = i * chunkSize;
-                int length = Math.min(bytes.length - start, chunkSize);
-                byte[] chunk = new byte[length];
-                System.arraycopy(bytes, start, chunk, 0, length);
-                Server.sendData(player, EnumPacketClient.LARGE_NBT_PART, (Object) chunk);
-            }
-            // Send end packet
-            Server.sendData(player, EnumPacketClient.DBC_FORM);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
 
     public static boolean isOp(EntityPlayer player) {
 		return MinecraftServer.getServer().getConfigurationManager().func_152596_g(player.getGameProfile());
diff --git a/src/main/java/noppes/npcs/PacketHandlerPlayer.java b/src/main/java/noppes/npcs/PacketHandlerPlayer.java
deleted file mode 100644
index ec85c256b..000000000
--- a/src/main/java/noppes/npcs/PacketHandlerPlayer.java
+++ /dev/null
@@ -1,338 +0,0 @@
-package noppes.npcs;
-
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent;
-import io.netty.buffer.ByteBuf;
-import kamkeel.addon.DBCAddon;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemEditableBook;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.ItemWritableBook;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagString;
-import net.minecraft.network.NetHandlerPlayServer;
-import net.minecraft.tileentity.TileEntity;
-import noppes.npcs.blocks.tiles.TileBigSign;
-import noppes.npcs.blocks.tiles.TileBook;
-import noppes.npcs.constants.*;
-import noppes.npcs.containers.ContainerMail;
-import noppes.npcs.controllers.PartyController;
-import noppes.npcs.controllers.PlayerDataController;
-import noppes.npcs.controllers.PlayerQuestController;
-import noppes.npcs.controllers.ScriptController;
-import noppes.npcs.controllers.data.*;
-import noppes.npcs.entity.EntityNPCInterface;
-import noppes.npcs.roles.RoleCompanion;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.UUID;
-
-public class PacketHandlerPlayer{
-
-	@SubscribeEvent
-	public void onServerPacket(ServerCustomPacketEvent event) {
-		EntityPlayerMP player = ((NetHandlerPlayServer)event.handler).playerEntity;
-		ByteBuf buffer = event.packet.payload();
-		try {
-			player(buffer, player, EnumPlayerPacket.values()[buffer.readInt()]);
-		} catch (IOException e) {
-			LogWriter.except(e);
-		}
-	}
-
-	private void player(ByteBuf buffer, EntityPlayerMP player, EnumPlayerPacket type) throws IOException {
-        if(type == EnumPlayerPacket.MarkData){
-            String uuid = Server.readString(buffer);
-            if(uuid == null)
-                return;
-
-            Entity entity = NoppesUtilServer.getEntityFromUUID(player.worldObj, UUID.fromString(uuid));
-            if(!(entity instanceof EntityNPCInterface))
-                return;
-            MarkData data = MarkData.get((EntityNPCInterface) entity);
-        }
-		else if(type == EnumPlayerPacket.CompanionTalentExp){
-			EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player);
-			if(npc == null || npc.advanced.role != EnumRoleType.Companion || player != npc.getOwner())
-				return;
-			int id = buffer.readInt();
-			int exp = buffer.readInt();
-			RoleCompanion role = (RoleCompanion) npc.roleInterface;
-			if(exp <= 0 || !role.canAddExp(-exp) || id < 0 || id >= EnumCompanionTalent.values().length) //should never happen unless hacking
-				return;
-			EnumCompanionTalent talent = EnumCompanionTalent.values()[id];
-			role.addExp(-exp);
-			role.addTalentExp(talent, exp);
-		}
-		else if(type == EnumPlayerPacket.CompanionOpenInv){
-			EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player);
-			if(npc == null || npc.advanced.role != EnumRoleType.Companion || player != npc.getOwner())
-				return;
-			NoppesUtilServer.sendOpenGui(player, EnumGuiType.CompanionInv, npc);
-		}
-		else if(type == EnumPlayerPacket.KeyPressed) {
-			if(ScriptController.Instance.languages.isEmpty()) {
-				return;
-			}
-
-			int button = buffer.readInt();
-			boolean isCtrlPressed = buffer.readBoolean();
-			boolean isShiftPressed = buffer.readBoolean();
-			boolean isAltPressed = buffer.readBoolean();
-			boolean isMetaPressed = buffer.readBoolean();
-			boolean buttonDown = buffer.readBoolean();
-
-			String ints = Server.readString(buffer);
-			String[] split = ints.split(",");
-			int[] keysDown;
-
-			if(ints.length() > 0) {
-				keysDown = new int[split.length];
-				try {
-					for (int i = 0; i < split.length; i++) {
-						keysDown[i] = Integer.parseInt(split[i]);
-					}
-				}
-				catch (NumberFormatException ignored){
-				}
-			} else {
-				keysDown = new int[0];
-			}
-
-			EventHooks.onPlayerKeyPressed(player, button, isCtrlPressed, isShiftPressed, isAltPressed, isMetaPressed, buttonDown, keysDown);
-		}
-		else if(type == EnumPlayerPacket.MouseClicked) {
-			if(ScriptController.Instance.languages.isEmpty()) {
-				return;
-			}
-
-			int button = buffer.readInt();
-			int mouseWheel = buffer.readInt();
-			boolean buttonDown = buffer.readBoolean();
-
-			boolean isCtrlPressed = buffer.readBoolean();
-			boolean isShiftPressed = buffer.readBoolean();
-			boolean isAltPressed = buffer.readBoolean();
-			boolean isMetaPressed = buffer.readBoolean();
-
-			String ints = Server.readString(buffer);
-			String[] split = ints.split(",");
-			int[] keysDown;
-
-			if(ints.length() > 0) {
-				keysDown = new int[split.length];
-				try {
-					for (int i = 0; i < split.length; i++) {
-						keysDown[i] = Integer.parseInt(split[i]);
-					}
-				}
-				catch (NumberFormatException ignored){
-				}
-			} else {
-				keysDown = new int[0];
-			}
-
-			EventHooks.onPlayerMouseClicked(player, button, mouseWheel, buttonDown, isCtrlPressed, isShiftPressed, isAltPressed, isMetaPressed, keysDown);
-		}
-		else if(type == EnumPlayerPacket.FollowerHire){
-			EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player);
-			if(npc == null || npc.advanced.role != EnumRoleType.Follower)
-				return;
-			NoppesUtilPlayer.hireFollower(player, npc);
-		}
-		else if(type == EnumPlayerPacket.FollowerExtend){
-			EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player);
-			if(npc == null || npc.advanced.role != EnumRoleType.Follower)
-				return;
-			NoppesUtilPlayer.extendFollower(player, npc);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, npc.roleInterface.writeToNBT(new NBTTagCompound()));
-		}
-		else if(type == EnumPlayerPacket.FollowerState){
-			EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player);
-			if(npc == null || npc.advanced.role != EnumRoleType.Follower)
-				return;
-			NoppesUtilPlayer.changeFollowerState(player,npc);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, npc.roleInterface.writeToNBT(new NBTTagCompound()));
-		}
-		else if(type == EnumPlayerPacket.RoleGet){
-			EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player);
-			if(npc == null || npc.advanced.role == EnumRoleType.None)
-				return;
-			Server.sendData(player, EnumPacketClient.GUI_DATA, npc.roleInterface.writeToNBT(new NBTTagCompound()));
-		}
-		else if(type == EnumPlayerPacket.Transport){
-			EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player);
-			if(npc == null || npc.advanced.role != EnumRoleType.Transporter)
-				return;
-			NoppesUtilPlayer.transport(player, npc, Server.readString(buffer));
-		}
-		else if(type == EnumPlayerPacket.BankUpgrade){
-			EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player);
-			if(npc == null || npc.advanced.role != EnumRoleType.Bank)
-				return;
-			NoppesUtilPlayer.bankUpgrade(player, npc);
-		}
-		else if(type == EnumPlayerPacket.BankUnlock){
-			EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player);
-			if(npc == null || npc.advanced.role != EnumRoleType.Bank)
-				return;
-			NoppesUtilPlayer.bankUnlock(player, npc);
-		}
-		else if(type == EnumPlayerPacket.BankSlotOpen){
-			EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player);
-			if(npc == null || npc.advanced.role != EnumRoleType.Bank)
-				return;
-			int slot = buffer.readInt();
-			int bankId = buffer.readInt();
-			BankData data = PlayerDataController.Instance.getBankData(player,bankId).getBankOrDefault(bankId);
-			data.openBankGui(player, npc, bankId, slot);
-		}
-		else if(type == EnumPlayerPacket.Dialog){
-			EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player);
-			if(npc == null)
-				return;
-			NoppesUtilPlayer.dialogSelected(buffer.readInt(), buffer.readInt(), player, npc);
-		}
-		else if(type == EnumPlayerPacket.CheckQuestCompletion){
-			PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
-			PlayerQuestData questData = PlayerDataController.Instance.getPlayerData(player).questData;
-            Party playerParty = playerData.getPlayerParty();
-            if(playerParty != null)
-                PartyController.Instance().checkQuestCompletion(playerParty, null);
-
-			questData.checkQuestCompletion(playerData, null);
-		}
-		else if(type == EnumPlayerPacket.QuestLog){
-			NoppesUtilPlayer.sendQuestLogData(player);
-		}
-        else if(type == EnumPlayerPacket.TrackedQuest){
-            NoppesUtilPlayer.sendTrackedQuest(player);
-        }
-		else if(type == EnumPlayerPacket.FactionsGet){
-			PlayerFactionData data = PlayerDataController.Instance.getPlayerData(player).factionData;
-			Server.sendData(player, EnumPacketClient.GUI_DATA, data.getPlayerGuiData());
-		}
-		else if(type == EnumPlayerPacket.MailGet){
-			PlayerMailData data = PlayerDataController.Instance.getPlayerData(player).mailData;
-			Server.sendData(player, EnumPacketClient.GUI_DATA, data.saveNBTData(new NBTTagCompound()));
-		}
-		else if(type == EnumPlayerPacket.MailDelete){
-			long time = buffer.readLong();
-			String username = Server.readString(buffer);
-			PlayerMailData data = PlayerDataController.Instance.getPlayerData(player).mailData;
-
-			Iterator<PlayerMail> it = data.playermail.iterator();
-			while(it.hasNext()){
-				PlayerMail mail = it.next();
-				if(mail.time == time && mail.sender.equals(username)){
-					it.remove();
-				}
-			}
-			Server.sendData(player, EnumPacketClient.GUI_DATA, data.saveNBTData(new NBTTagCompound()));
-		}
-		else if(type == EnumPlayerPacket.MailSend){
-			if(!(player.openContainer instanceof ContainerMail))
-				return;
-			String username = PlayerDataController.Instance.hasPlayer(Server.readString(buffer));
-			if(username.isEmpty()){
-				NoppesUtilServer.sendGuiError(player, 0);
-				return;
-			}
-
-			PlayerMail mail = new PlayerMail();
-            //String s = player.func_145748_c_().getFormattedText();
-            String s = player.getDisplayName();
-            if(!s.equals(player.getCommandSenderName()))
-            	s += "(" + player.getCommandSenderName() + ")";
-			mail.readNBT(Server.readNBT(buffer));
-			mail.sender = s;
-			mail.items = ((ContainerMail)player.openContainer).mail.items;
-
-			if(mail.subject.isEmpty()){
-				NoppesUtilServer.sendGuiError(player, 1);
-				return;
-			}
-			PlayerDataController.Instance.addPlayerMessage(username, mail);
-
-			NBTTagCompound comp = new NBTTagCompound();
-			comp.setString("username", username);
-			NoppesUtilServer.sendGuiClose(player, 1,comp);
-		}
-		else if(type == EnumPlayerPacket.MailboxOpenMail){
-			long time = buffer.readLong();
-			String username = Server.readString(buffer);
-			player.closeContainer();
-			PlayerMailData data = PlayerDataController.Instance.getPlayerData(player).mailData;
-
-			Iterator<PlayerMail> it = data.playermail.iterator();
-			while(it.hasNext()){
-				PlayerMail mail = it.next();
-				if(mail.time == time && mail.sender.equals(username)){
-					ContainerMail.staticmail = mail;
-					player.openGui(CustomNpcs.instance, EnumGuiType.PlayerMailman.ordinal(), player.worldObj, 0, 0, 0);
-					break;
-				}
-			}
-		}
-		else if(type == EnumPlayerPacket.MailRead){
-			long time = buffer.readLong();
-			String username = Server.readString(buffer);
-			PlayerMailData data = PlayerDataController.Instance.getPlayerData(player).mailData;
-
-			Iterator<PlayerMail> it = data.playermail.iterator();
-			while(it.hasNext()){
-				PlayerMail mail = it.next();
-				if(mail.time == time && mail.sender.equals(username)){
-					mail.beenRead = true;
-					if(mail.hasQuest())
-						PlayerQuestController.addActiveQuest(new QuestData(mail.getQuest()), player);
-				}
-			}
-		}
-		else if(type == EnumPlayerPacket.SignSave) {
-			int x = buffer.readInt(), y = buffer.readInt(), z = buffer.readInt();
-			if (player.worldObj.blockExists(x, y, z)) {
-				TileEntity tile = player.worldObj.getTileEntity(x, y, z);
-				if(!(tile instanceof TileBigSign))
-					return;
-				TileBigSign sign = (TileBigSign) tile;
-				if (sign.canEdit) {
-					sign.setText(Server.readString(buffer));
-					sign.canEdit = false;
-					player.worldObj.markBlockForUpdate(x, y, z);
-				}
-			}
-		}
-		else if(type == EnumPlayerPacket.SaveBook) {
-			int x = buffer.readInt(), y = buffer.readInt(), z = buffer.readInt();
-			if (player.worldObj.blockExists(x, y, z)) {
-				TileEntity tileentity = player.worldObj.getTileEntity(x, y, z);
-				if (!(tileentity instanceof TileBook))
-					return;
-				TileBook tile = (TileBook) tileentity;
-				if (tile.book.getItem() == Items.written_book)
-					return;
-				boolean sign = buffer.readBoolean();
-				ItemStack book = ItemStack.loadItemStackFromNBT(Server.readNBT(buffer));
-				if (book == null)
-					return;
-				if (book.getItem() == Items.writable_book && !sign && ItemWritableBook.func_150930_a(book.getTagCompound())) {
-					tile.book.setTagInfo("pages", book.getTagCompound().getTagList("pages", 8));
-				}
-				if (book.getItem() == Items.written_book && sign && ItemEditableBook.validBookTagContents(book.getTagCompound())) {
-					tile.book.setTagInfo("author", new NBTTagString(player.getCommandSenderName()));
-					tile.book.setTagInfo("title", new NBTTagString(book.getTagCompound().getString("title")));
-					tile.book.setTagInfo("pages", book.getTagCompound().getTagList("pages", 8));
-					tile.book.func_150996_a(Items.written_book);
-				}
-			}
-		}
-		else if(type == EnumPlayerPacket.ScreenSize){
-			int width = buffer.readInt(), height = buffer.readInt();
-			PlayerDataController.Instance.getPlayerData(player).screenSize.setSize(width,height);
-		}
-	}
-}
diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java
deleted file mode 100644
index 83bf168df..000000000
--- a/src/main/java/noppes/npcs/PacketHandlerServer.java
+++ /dev/null
@@ -1,1396 +0,0 @@
-package noppes.npcs;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent;
-import cpw.mods.fml.relauncher.Side;
-import foxz.utils.Market;
-import io.netty.buffer.ByteBuf;
-import kamkeel.addon.DBCAddon;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityList;
-import net.minecraft.entity.passive.EntityVillager;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.nbt.NBTTagString;
-import net.minecraft.network.NetHandlerPlayServer;
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.village.MerchantRecipeList;
-import net.minecraft.world.WorldProvider;
-import net.minecraft.world.WorldServer;
-import net.minecraftforge.common.DimensionManager;
-import noppes.npcs.api.entity.IPlayer;
-import noppes.npcs.blocks.tiles.TileScripted;
-import noppes.npcs.config.ConfigDebug;
-import noppes.npcs.config.ConfigMain;
-import noppes.npcs.config.ConfigScript;
-import noppes.npcs.constants.*;
-import noppes.npcs.containers.ContainerCustomGui;
-import noppes.npcs.containers.ContainerMail;
-import noppes.npcs.controllers.*;
-import noppes.npcs.controllers.LinkedNpcController.LinkedData;
-import noppes.npcs.controllers.data.*;
-import noppes.npcs.entity.EntityCustomNpc;
-import noppes.npcs.entity.EntityNPCInterface;
-import noppes.npcs.roles.JobSpawner;
-import noppes.npcs.roles.RoleCompanion;
-import noppes.npcs.roles.RoleTrader;
-import noppes.npcs.roles.RoleTransporter;
-import noppes.npcs.scripted.NpcAPI;
-import noppes.npcs.scripted.event.PartyEvent;
-import noppes.npcs.scripted.gui.ScriptGui;
-import noppes.npcs.scripted.item.ScriptCustomItem;
-
-import java.io.IOException;
-import java.util.*;
-
-public class PacketHandlerServer{
-
-	@SubscribeEvent
-	public void onServerPacket(ServerCustomPacketEvent event) {
-		EntityPlayerMP player = ((NetHandlerPlayServer)event.handler).playerEntity;
-		if(ConfigMain.OpsOnly && !NoppesUtilServer.isOp(player)){
-			warn(player, "tried to use custom npcs without being an op");
-			return;
-		}
-		ByteBuf buffer = event.packet.payload();
-		EnumPacketServer type = null;
-		try {
-			type = EnumPacketServer.values()[buffer.readInt()];
-
-			ItemStack item = player.inventory.getCurrentItem();
-
-			EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player);
-
-			if (type == EnumPacketServer.IsGuiOpen) {
-				isGuiOpenPacket(buffer, player);
-				return;
-			} else if (type == EnumPacketServer.CustomGuiButton && player.openContainer instanceof ContainerCustomGui) {
-				((ContainerCustomGui) player.openContainer).customGui.fromNBT(Server.readNBT(buffer));
-				EventHooks.onCustomGuiButton((IPlayer) NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui) player.openContainer).customGui, buffer.readInt());
-				return;
-			} else if (type == EnumPacketServer.CustomGuiUnfocused && player.openContainer instanceof ContainerCustomGui) {
-				((ContainerCustomGui) player.openContainer).customGui.fromNBT(Server.readNBT(buffer));
-				EventHooks.onCustomGuiUnfocused((IPlayer) NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui) player.openContainer).customGui, buffer.readInt());
-				return;
-			} else if (type == EnumPacketServer.CustomGuiScrollClick && player.openContainer instanceof ContainerCustomGui) {
-				((ContainerCustomGui) player.openContainer).customGui.fromNBT(Server.readNBT(buffer));
-				EventHooks.onCustomGuiScrollClick((IPlayer) NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui) player.openContainer).customGui, buffer.readInt(), buffer.readInt(), CustomGuiController.readScrollSelection(buffer), buffer.readBoolean());
-				return;
-			} else if (type == EnumPacketServer.CustomGuiClose) {
-				EventHooks.onCustomGuiClose((IPlayer) NpcAPI.Instance().getIEntity(player), (new ScriptGui()).fromNBT(Server.readNBT(buffer)));
-				return;
-			} else if (type == EnumPacketServer.QuestLogToServer) {
-				NoppesUtilPlayer.updateQuestLogData(buffer, player);
-				return;
-			} else if (type == EnumPacketServer.PartyLogToServer) {
-                NoppesUtilPlayer.updatePartyQuestLogData(buffer, player);
-                return;
-            } else if (type == EnumPacketServer.UntrackQuest) {
-                NoppesUtilPlayer.clearTrackQuest(player);
-                return;
-            } else if(type == EnumPacketServer.DimensionsGet){
-				HashMap<String,Integer> map = new HashMap<String,Integer>();
-				for(int id : DimensionManager.getStaticDimensionIDs()){
-					WorldProvider provider = DimensionManager.createProviderFor(id);
-					map.put(provider.getDimensionName(), id);
-				}
-				NoppesUtilServer.sendScrollData(player, map);
-			} else if(type == EnumPacketServer.TagsGet){
-				NoppesUtilServer.sendTagDataAll(player);
-			} else if (type == EnumPacketServer.NpcTagsGet) {
-				NBTTagCompound compound = new NBTTagCompound();
-				NBTTagList tagList = new NBTTagList();
-				for (UUID uuid : npc.advanced.tagUUIDs) {
-					Tag tag = TagController.getInstance().getTagFromUUID(uuid);
-					if (tag != null) {
-						tagList.appendTag(new NBTTagString(tag.name));
-					}
-				}
-				compound.setTag("TagNames",tagList);
-				Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-			} else if (type == EnumPacketServer.CacheAnimation) {
-				PlayerDataController.Instance.getPlayerData(player).animationData.cacheAnimation(buffer.readInt());
-				return;
-			} else if (type == EnumPacketServer.GetPartyData || type == EnumPacketServer.CreateParty) {
-                if(!ConfigMain.PartiesEnabled)
-                    return;
-
-				if (type == EnumPacketServer.CreateParty) {
-					Party party = PartyController.Instance().createParty();
-					party.addPlayer(player);
-					party.setLeader(player);
-				}
-				sendPartyData(player);
-			} else if (type == EnumPacketServer.DisbandParty) {
-				PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
-				if (playerData.partyUUID != null) {
-					PartyController.Instance().disbandParty(playerData.partyUUID);
-				}
-				NBTTagCompound compound = new NBTTagCompound();
-				compound.setBoolean("Disband", true);
-				Server.sendData(player, EnumPacketClient.PARTY_DATA, compound);
-			} else if (type == EnumPacketServer.KickPlayer) {
-                String kickPlayerName = Server.readString(buffer);
-				EntityPlayer kickPlayer = NoppesUtilServer.getPlayerByName(kickPlayerName);
-                PlayerData playerData = null;
-                UUID playerUUID = null;
-				if (kickPlayer != null) {
-                    playerData = PlayerDataController.Instance.getPlayerData(player);
-				} else {
-                    String uuid = PlayerDataController.Instance.getPlayerUUIDFromName(kickPlayerName);
-                    if(!uuid.isEmpty()){
-                        playerData = PlayerDataController.Instance.getPlayerDataCache(uuid);
-                        playerUUID = UUID.fromString(uuid);
-                    }
-                }
-
-                if(playerData != null){
-                    if (playerData.partyUUID != null) {
-                        Party party = PartyController.Instance().getParty(playerData.partyUUID);
-                        if (!party.getIsLocked()) {
-                            PartyEvent.PartyKickEvent partyEvent = new PartyEvent.PartyKickEvent(party, party.getQuest(), (IPlayer) NpcAPI.Instance().getIEntity(kickPlayer));
-                            EventHooks.onPartyKick(partyEvent);
-                            if (!partyEvent.isCancelled()){
-                                boolean successful = party.removePlayer(kickPlayer);
-                                if(!successful)
-                                    successful = party.removePlayer(playerUUID);
-
-                                if(successful){
-                                    if(kickPlayer != null){
-                                        sendInviteData((EntityPlayerMP) kickPlayer);
-                                    }
-                                    PartyController.Instance().pingPartyUpdate(party);
-                                    PartyController.Instance().sendKickMessages(party, kickPlayer, kickPlayerName);
-                                }
-                            }
-                        }
-                    }
-                }
-			} else if (type == EnumPacketServer.LeavePlayer) {
-                EntityPlayer leavingPlayer = NoppesUtilServer.getPlayerByName(Server.readString(buffer));
-                if (leavingPlayer != null) {
-                    PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
-                    if (playerData.partyUUID != null) {
-                        Party party = PartyController.Instance().getParty(playerData.partyUUID);
-                        boolean successful = party.removePlayer(leavingPlayer);
-                        if(successful){
-                            PartyEvent.PartyLeaveEvent partyEvent = new PartyEvent.PartyLeaveEvent(party, party.getQuest(), (IPlayer) NpcAPI.Instance().getIEntity(leavingPlayer));
-                            EventHooks.onPartyLeave(partyEvent);
-                            sendInviteData((EntityPlayerMP) leavingPlayer);
-                            PartyController.Instance().pingPartyUpdate(party);
-                            PartyController.Instance().sendLeavingMessages(party, leavingPlayer);
-                        }
-                    }
-                }
-            } else if (type == EnumPacketServer.SavePartyData) {
-				PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
-				if (playerData.partyUUID != null) {
-					Party party = PartyController.Instance().getParty(playerData.partyUUID);
-					party.readClientNBT(Server.readNBT(buffer));
-				}
-			} else if (type == EnumPacketServer.SetPartyLeader) {
-				PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
-				if (playerData.partyUUID != null) {
-					Party party = PartyController.Instance().getParty(playerData.partyUUID);
-                    if (!party.getIsLocked()) {
-                        party.setLeader(NoppesUtilServer.getPlayerByName(Server.readString(buffer)));
-                        PartyController.Instance().pingPartyUpdate(party);
-                    }
-				}
-			} else if (type == EnumPacketServer.PartyInvite) {
-				EntityPlayer invitedPlayer = NoppesUtilServer.getPlayerByName(Server.readString(buffer));
-				if (invitedPlayer != null) {
-					PlayerData senderData = PlayerDataController.Instance.getPlayerData(player);
-					PlayerData invitedData = PlayerDataController.Instance.getPlayerData(invitedPlayer);
-					if (senderData.partyUUID != null && invitedData.partyUUID == null) {//only send invite if player is not in a party
-                        Party party = PartyController.Instance().getParty(senderData.partyUUID);
-                        if (!party.getIsLocked()) {
-                            PartyEvent.PartyInviteEvent partyEvent = new PartyEvent.PartyInviteEvent(party, party.getQuest(), (IPlayer) NpcAPI.Instance().getIEntity(invitedPlayer));
-                            EventHooks.onPartyInvite(partyEvent);
-                            if (!partyEvent.isCancelled()){
-                                invitedData.inviteToParty(party);
-                                sendInviteData((EntityPlayerMP) invitedPlayer);
-                            }
-                        }
-					}
-				}
-			} else if (type == EnumPacketServer.GetPartyInviteList) {
-				sendInviteData(player);
-			} else if (type == EnumPacketServer.AcceptInvite) {
-				PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
-				String uuidString = Server.readString(buffer);
-				if (uuidString != null) {
-					UUID uuid = UUID.fromString(uuidString);
-					playerData.acceptInvite(uuid);
-				}
-			} else if (type == EnumPacketServer.IgnoreInvite) {
-				PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
-				String uuidString = Server.readString(buffer);
-				if (uuidString != null) {
-					UUID uuid = UUID.fromString(uuidString);
-					playerData.ignoreInvite(uuid);
-				}
-			} else if (type == EnumPacketServer.SetPartyQuest) {
-				PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
-                if(playerData.partyUUID != null){
-                    Party party = PartyController.Instance().getParty(playerData.partyUUID);
-                    if (party != null) {
-                        if (party.getLeaderUUID().equals(player.getUniqueID())) {
-                            int questID = buffer.readInt();
-                            party.setQuest(null);
-                            if(questID != -1){
-                                Quest foundQuest = QuestController.Instance.quests.get(questID);
-                                if(foundQuest != null){
-                                    if (foundQuest.partyOptions.allowParty) {
-                                        if(party.validateQuest(questID, true)){
-                                            PartyEvent.PartyQuestSetEvent partyEvent = new PartyEvent.PartyQuestSetEvent(party, foundQuest);
-                                            EventHooks.onPartyQuestSet(partyEvent);
-                                            if (!partyEvent.isCancelled()){
-                                                if(playerData.questData.hasActiveQuest(questID)){
-                                                    QuestData questdata = new QuestData(foundQuest);
-                                                    playerData.questData.activeQuests.put(questID, questdata);
-                                                }
-                                                party.setQuest(foundQuest);
-                                                PartyController.Instance().sendQuestChat(party, "party.setChat", " ", foundQuest.title);
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                            PartyController.Instance().pingPartyUpdate(party);
-                        }
-                    }
-                }
-			}
-
-			if(type.needsNpc && npc == null){
-
-			}
-			else if(type.hasPermission() && !CustomNpcsPermissions.hasPermission(player, type.permission)){
-				//player doesnt have permission to do this
-			}
-			else if(item == null && (type == EnumPacketServer.ScriptPlayerGet || type == EnumPacketServer.ScriptPlayerSave || type == EnumPacketServer.ScriptGlobalNPCGet || type == EnumPacketServer.ScriptGlobalNPCSave || type == EnumPacketServer.ScriptForgeGet || type == EnumPacketServer.ScriptForgeSave))
-				warn(player, "tried to use custom npcs without a tool in hand, probably a hacker");
-			else {
-				if (item != null) {
-					if (item.getItem() == CustomItems.wand)
-						wandPackets(type, buffer, player, npc);
-					else if (item.getItem() == CustomItems.moving)
-						movingPackets(type, buffer, player, npc);
-					else if (item.getItem() == CustomItems.mount)
-						mountPackets(type, buffer, player);
-					else if (item.getItem() == CustomItems.cloner)
-						clonePackets(type, buffer, player);
-					else if (item.getItem() == CustomItems.teleporter)
-						featherPackets(type, buffer, player);
-					else if (item.getItem() == Item.getItemFromBlock(CustomItems.waypoint) || item.getItem() == Item.getItemFromBlock(CustomItems.border) || item.getItem() == Item.getItemFromBlock(CustomItems.redstoneBlock))
-						blockPackets(type, buffer, player);
-					else if (ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) {
-						if (type == EnumPacketServer.EventScriptDataGet || type == EnumPacketServer.EventScriptDataSave)
-							npcEventScriptPackets(type, buffer, player, npc);
-						else if (type == EnumPacketServer.ScriptPlayerGet || type == EnumPacketServer.ScriptPlayerSave)
-							playerScriptPackets(type, buffer, player);
-						else if (type == EnumPacketServer.ScriptGlobalNPCGet || type == EnumPacketServer.ScriptGlobalNPCSave)
-							npcGlobalScriptPackets(type, buffer, player);
-						else if (type == EnumPacketServer.ScriptForgeGet || type == EnumPacketServer.ScriptForgeSave)
-							forgeScriptPackets(type, buffer, player);
-						else if (type == EnumPacketServer.ScriptItemDataGet || type == EnumPacketServer.ScriptItemDataSave)
-							itemScriptPackets(type, buffer, player);
-						else if (type == EnumPacketServer.ScriptBlockDataGet || type == EnumPacketServer.ScriptBlockDataSave)
-							blockScriptPackets(type, buffer, player);
-						else if (type == EnumPacketServer.ScriptGlobalGuiDataGet || type == EnumPacketServer.ScriptGlobalGuiDataSave)
-							getScriptsEnabled(type, buffer, player);
-						else if (item.getItem() == CustomItems.scripter)
-							scriptPackets(type, buffer, player, npc);
-					}
-				}
-			}
-		} catch (Exception e) {
-			LogWriter.error("Error with EnumPacketServer." + type, e);
-		}
-	}
-
-	public static void sendPartyData(EntityPlayerMP player) {
-		PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
-		if (playerData.partyUUID != null) {
-			Party party = PartyController.Instance().getParty(playerData.partyUUID);
-            NBTTagCompound compound = party.writeToNBT();
-            if (party.getQuest() != null) {
-                Quest quest = (Quest) party.getQuest();
-                compound.setString("QuestName", quest.getCategory().getName() + ":" + quest.getName());
-                Vector<String> vector = quest.questInterface.getPartyQuestLogStatus(party);
-                NBTTagList list = new NBTTagList();
-                for (String s : vector) {
-                    list.appendTag(new NBTTagString(s));
-                }
-                compound.setTag("QuestProgress", list);
-                if(quest.completion == EnumQuestCompletion.Npc && quest.questInterface.isPartyCompleted(party)) {
-                    compound.setString("QuestCompleteWith", quest.completerNpc);
-                }
-            }
-			Server.sendData(player, EnumPacketClient.PARTY_DATA, compound);
-		} else {
-			sendInviteData(player);
-		}
-	}
-
-	public static void sendInviteData(EntityPlayerMP player) {
-		PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
-		if (playerData.partyUUID == null) {
-			NBTTagCompound compound = new NBTTagCompound();
-			NBTTagList list = new NBTTagList();
-			HashSet<UUID> partyInvites = playerData.getPartyInvites();
-			for (UUID uuid : partyInvites) {
-				Party party = PartyController.Instance().getParty(uuid);
-				NBTTagCompound partyCompound = new NBTTagCompound();
-				partyCompound.setString("PartyLeader", party.getPartyLeaderName());
-				partyCompound.setString("PartyUUID", party.getPartyUUID().toString());
-				list.appendTag(partyCompound);
-			}
-			compound.setTag("PartyInvites", list);
-			Server.sendData(player, EnumPacketClient.PARTY_DATA, compound);
-		}
-	}
-
-	private void isGuiOpenPacket(ByteBuf buffer, EntityPlayerMP player) throws IOException {
-		NoppesUtilServer.isGUIOpen(buffer, player);
-	}
-
-	private void getScriptsEnabled(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws IOException {
-		if (type == EnumPacketServer.ScriptGlobalGuiDataGet) {
-			NBTTagCompound compound = new NBTTagCompound();
-			compound.setBoolean("ScriptsEnabled", ConfigScript.ScriptingEnabled);
-			compound.setBoolean("PlayerScriptsEnabled", ConfigScript.GlobalPlayerScripts);
-			compound.setBoolean("GlobalNPCScriptsEnabled", ConfigScript.GlobalNPCScripts);
-			compound.setBoolean("ForgeScriptsEnabled", ConfigScript.GlobalForgeScripts);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else if (type == EnumPacketServer.ScriptGlobalGuiDataSave) {
-			NBTTagCompound compound = Server.readNBT(buffer);
-			ConfigScript.ScriptingEnabled = compound.getBoolean("ScriptsEnabled");
-			ConfigScript.GlobalPlayerScripts = compound.getBoolean("PlayerScriptsEnabled");
-			ConfigScript.GlobalNPCScripts = compound.getBoolean("GlobalNPCScriptsEnabled");
-			ConfigScript.GlobalForgeScripts = compound.getBoolean("ForgeScriptsEnabled");
-		}
-	}
-
-	private void scriptPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player, EntityNPCInterface npc) throws Exception {
-		if(type == EnumPacketServer.ScriptDataSave){
-			npc.script.readFromNBT(Server.readNBT(buffer));
-			npc.updateAI = true;
-			npc.script.hasInited = false;
-			if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
-				LogWriter.script(String.format("[%s] (Player) %s SAVED NPC %s (%s, %s, %s) [%s]", "SCRIPTER", player.getCommandSenderName(), npc.display.getName(), (int)npc.posX, (int)(npc).posY, (int)npc.posZ,  npc.worldObj.getWorldInfo().getWorldName()));
-			}
-		}
-		else if(type == EnumPacketServer.ScriptDataGet){
-			NBTTagCompound compound = npc.script.writeToNBT(new NBTTagCompound());
-			compound.setTag("Languages", ScriptController.Instance.nbtLanguages());
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-	}
-
-	public static void getScripts(IScriptHandler data, ByteBuf buffer, EntityPlayerMP player) {
-		NBTTagCompound compound = new NBTTagCompound();
-		compound.setBoolean("ScriptEnabled", data.getEnabled());
-		compound.setString("ScriptLanguage", data.getLanguage());
-		compound.setTag("Languages", ScriptController.Instance.nbtLanguages());
-		compound.setTag("ScriptConsole", NBTTags.NBTLongStringMap(data.getConsoleText()));
-		Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		List<ScriptContainer> containers = data.getScripts();
-		for (int i = 0; i < containers.size(); i++) {
-			ScriptContainer container = containers.get(i);
-			NBTTagCompound tabCompound = new NBTTagCompound();
-			tabCompound.setInteger("Tab",i);
-			tabCompound.setTag("Script",container.writeToNBT(new NBTTagCompound()));
-			tabCompound.setInteger("TotalScripts",containers.size());
-			Server.sendData(player, EnumPacketClient.GUI_DATA, tabCompound);
-		}
-	}
-
-	public static void saveScripts(IScriptHandler data, ByteBuf buffer, EntityPlayerMP player) throws IOException {
-		int tab = buffer.readInt();
-		int totalScripts = buffer.readInt();
-		if (totalScripts == 0) {
-			data.getScripts().clear();
-		}
-
-		if (tab >= 0) {
-			if (data.getScripts().size() > totalScripts) {
-				data.setScripts(data.getScripts().subList(0,totalScripts));
-			} else while (data.getScripts().size() < totalScripts) {
-				data.getScripts().add(new ScriptContainer(data));
-			}
-			NBTTagCompound tabCompound = Server.readNBT(buffer);
-			ScriptContainer script = new ScriptContainer(data);
-			script.readFromNBT(tabCompound);
-			data.getScripts().set(tab,script);
-		} else {
-			NBTTagCompound compound = Server.readNBT(buffer);
-			data.setLanguage(compound.getString("ScriptLanguage"));
-			if (!ScriptController.Instance.languages.containsKey(data.getLanguage())) {
-				if (!ScriptController.Instance.languages.isEmpty()) {
-					data.setLanguage((String) ScriptController.Instance.languages.keySet().toArray()[0]);
-				} else {
-					data.setLanguage("ECMAScript");
-				}
-			}
-			data.setEnabled(compound.getBoolean("ScriptEnabled"));
-		}
-	}
-
-	private void npcEventScriptPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player, EntityNPCInterface npc) throws Exception {
-		DataScript data = npc.script;
-		if(type == EnumPacketServer.EventScriptDataGet) {
-			getScripts(data,buffer,player);
-		} else if(type == EnumPacketServer.EventScriptDataSave) {
-			saveScripts(data,buffer,player);
-			npc.updateAI = true;
-			npc.script.hasInited = false;
-			if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
-				LogWriter.script(String.format("[%s] (Player) %s SAVED NPC %s (%s, %s, %s) [%s]", "SCRIPTER", player.getCommandSenderName(), npc.display.getName(), (int)npc.posX, (int)(npc).posY, (int)npc.posZ,  npc.worldObj.getWorldInfo().getWorldName()));
-			}
-		}
-	}
-
-	private void playerScriptPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws Exception {
-		PlayerDataScript data = ScriptController.Instance.playerScripts;
-		if(type == EnumPacketServer.ScriptPlayerGet) {
-			getScripts(data,buffer,player);
-		} else if(type == EnumPacketServer.ScriptPlayerSave) {
-            int tab = buffer.getInt(buffer.readerIndex());
-			saveScripts(data,buffer,player);
-			ScriptController.Instance.lastPlayerUpdate = System.currentTimeMillis();
-            if(tab == -1)
-                ScriptController.Instance.savePlayerScriptsSync();
-		}
-	}
-
-	private void forgeScriptPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws Exception {
-		ForgeDataScript data = ScriptController.Instance.forgeScripts;
-		if (type == EnumPacketServer.ScriptForgeGet) {
-			getScripts(data,buffer,player);
-		} else if (type == EnumPacketServer.ScriptForgeSave) {
-            int tab = buffer.getInt(buffer.readerIndex());
-			saveScripts(data,buffer,player);
-			ScriptController.Instance.lastForgeUpdate = System.currentTimeMillis();
-            if(tab == -1)
-                ScriptController.Instance.saveForgeScriptsSync();
-		}
-	}
-
-	private void npcGlobalScriptPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws Exception {
-		GlobalNPCDataScript data = ScriptController.Instance.globalNpcScripts;
-		if(type == EnumPacketServer.ScriptGlobalNPCGet) {
-			getScripts(data,buffer,player);
-		} else if(type == EnumPacketServer.ScriptGlobalNPCSave) {
-            int tab = buffer.getInt(buffer.readerIndex());
-			saveScripts(data,buffer,player);
-			ScriptController.Instance.lastGlobalNpcUpdate = System.currentTimeMillis();
-            if(tab == -1)
-                ScriptController.Instance.saveGlobalScriptsSync();
-		}
-	}
-
-	private void itemScriptPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws Exception {
-		if (type == EnumPacketServer.ScriptItemDataGet) {
-			ScriptCustomItem iw = (ScriptCustomItem) NpcAPI.Instance().getIItemStack(player.getHeldItem());
-			iw.loadScriptData();
-			NBTTagCompound compound = iw.getMCNbt();
-			compound.setTag("Languages", ScriptController.Instance.nbtLanguages());
-			Server.sendData(player, EnumPacketClient.GUI_DATA, new Object[]{compound});
-		} else if (type == EnumPacketServer.ScriptItemDataSave) {
-			if (!player.capabilities.isCreativeMode) {
-				return;
-			}
-
-			NBTTagCompound compound = Server.readNBT(buffer);
-			ScriptCustomItem wrapper = (ScriptCustomItem) NpcAPI.Instance().getIItemStack(player.getHeldItem());
-			wrapper.setMCNbt(compound);
-			wrapper.saveScriptData();
-			wrapper.loaded = false;
-            wrapper.lastInited = -1;
-			player.sendContainerToPlayer(player.inventoryContainer);
-		}
-	}
-
-	private void blockScriptPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws Exception {
-		if (type == EnumPacketServer.ScriptBlockDataGet) {
-			TileEntity tile = player.worldObj.getTileEntity(buffer.readInt(), buffer.readInt(), buffer.readInt());
-			if(!(tile instanceof TileScripted))
-				return;
-			NBTTagCompound compound = ((TileScripted) tile).getNBT(new NBTTagCompound());
-			compound.setTag("Languages", ScriptController.Instance.nbtLanguages());
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		} else if (type == EnumPacketServer.ScriptBlockDataSave) {
-			if (!player.capabilities.isCreativeMode) {
-				return;
-			}
-			TileEntity tile = player.worldObj.getTileEntity(buffer.readInt(), buffer.readInt(), buffer.readInt());
-			if(!(tile instanceof TileScripted))
-				return;
-			TileScripted script = (TileScripted) tile;
-			script.setNBT(Server.readNBT(buffer));
-			script.lastInited = -1;
-		}
-	}
-
-	private void featherPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws IOException {
-		if(type == EnumPacketServer.DimensionTeleport){
-			int dimension = buffer.readInt();
-			WorldServer world = MinecraftServer.getServer().worldServerForDimension(dimension);
-			ChunkCoordinates coords = world.getEntrancePortalLocation();
-			if(coords == null){
-				coords = world.getSpawnPoint();
-				if(!world.isAirBlock(coords.posX, coords.posY, coords.posZ))
-					coords.posY = world.getTopSolidOrLiquidBlock(coords.posX, coords.posZ);
-				else{
-					while(world.isAirBlock(coords.posX, coords.posY - 1, coords.posZ) && coords.posY > 0){
-						coords.posY--;
-					}
-					if(coords.posY == 0)
-						coords.posY = world.getTopSolidOrLiquidBlock(coords.posX, coords.posZ);
-				}
-			}
-			NoppesUtilPlayer.teleportPlayer(player, coords.posX, coords.posY, coords.posZ, dimension);
-		}
-	}
-
-	private void movingPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player, EntityNPCInterface npc) throws IOException {
-		if(type == EnumPacketServer.MovingPathGet){
-			Server.sendData(player, EnumPacketClient.GUI_DATA, npc.ai.writeToNBT(new NBTTagCompound()));
-		}
-		else if(type == EnumPacketServer.MovingPathSave){
-			npc.ai.setMovingPath(NBTTags.getIntegerArraySet(Server.readNBT(buffer).getTagList("MovingPathNew",10)));
-		}
-	}
-
-	private void blockPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws IOException {
-		if (type == EnumPacketServer.SaveTileEntity) {
-			NoppesUtilServer.saveTileEntity(player, Server.readNBT(buffer));
-		}
-		else if(type == EnumPacketServer.GetTileEntity){
-			TileEntity tile = player.worldObj.getTileEntity(buffer.readInt(), buffer.readInt(), buffer.readInt());
-			NBTTagCompound compound = new NBTTagCompound();
-			tile.writeToNBT(compound);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else if(type == EnumPacketServer.DialogCategoriesGet){
-			NoppesUtilServer.sendScrollData(player, DialogController.Instance.getScroll());
-		}
-		else if(type == EnumPacketServer.DialogsGetFromDialog){
-			Dialog dialog = DialogController.Instance.dialogs.get(buffer.readInt());
-			if(dialog == null)
-				return;
-			NoppesUtilServer.sendDialogData(player,dialog.category);
-		}
-		else if(type == EnumPacketServer.DialogsGet){
-			int catID = buffer.readInt();
-			boolean sendGroup = buffer.readBoolean();
-			if(sendGroup){
-				NoppesUtilServer.sendDialogGroup(player,DialogController.Instance.categories.get(catID));
-			}
-			else {
-				NoppesUtilServer.sendDialogData(player,DialogController.Instance.categories.get(catID));
-			}
-		}
-		else if(type == EnumPacketServer.QuestsGetFromQuest){
-			Quest quest = QuestController.Instance.quests.get(buffer.readInt());
-			if(quest == null)
-				return;
-			NoppesUtilServer.sendQuestData(player,quest.category);
-		}
-		else if(type == EnumPacketServer.QuestCategoriesGet){
-			NoppesUtilServer.sendQuestCategoryData(player);
-		}
-		else if(type == EnumPacketServer.QuestsGet){
-			QuestCategory category = QuestController.Instance.categories.get(buffer.readInt());
-			boolean sendGroup = buffer.readBoolean();
-			if(sendGroup){
-				NoppesUtilServer.sendQuestGroup(player,category);
-			}
-			else {
-				NoppesUtilServer.sendQuestData(player,category);
-			}
-		}
-		else if(type == EnumPacketServer.FactionsGet){
-			NoppesUtilServer.sendFactionDataAll(player);
-		}
-		else if(type == EnumPacketServer.DialogGet){
-			Dialog dialog = DialogController.Instance.dialogs.get(buffer.readInt());
-			if(dialog != null){
-				NBTTagCompound compound = dialog.writeToNBT(new NBTTagCompound());
-				Quest quest = QuestController.Instance.quests.get(dialog.quest);
-				if(quest != null)
-					compound.setString("DialogQuestName", quest.title);
-				Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-			}
-		}
-		else if(type == EnumPacketServer.QuestGet){
-			Quest quest = QuestController.Instance.quests.get(buffer.readInt());
-			if(quest != null){
-				NBTTagCompound compound = new NBTTagCompound();
-				if(quest.hasNewQuest())
-					compound.setString("NextQuestTitle", quest.getNextQuest().title);
-				Server.sendData(player, EnumPacketClient.GUI_DATA, quest.writeToNBT(compound));
-			}
-		}
-		else if(type == EnumPacketServer.FactionGet){
-			NBTTagCompound compound = new NBTTagCompound();
-			Faction faction = FactionController.getInstance().get(buffer.readInt());
-			faction.writeNBT(compound);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else if(type == EnumPacketServer.TagGet){
-			NBTTagCompound compound = new NBTTagCompound();
-			Tag tag = TagController.getInstance().get(buffer.readInt());
-			tag.writeNBT(compound);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-	}
-
-	private void wandPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player, EntityNPCInterface npc) throws IOException{
-		if(type == EnumPacketServer.Delete){
-			if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
-				LogWriter.script(String.format("[%s] (Player) %s DELETE NPC %s (%s, %s, %s) [%s]", "WAND", player.getCommandSenderName(), npc.display.getName(), (int)npc.posX, (int)npc.posY, (int)npc.posZ,  npc.worldObj.getWorldInfo().getWorldName()));
-			}
-			npc.delete();
-			NoppesUtilServer.deleteNpc(npc,player);
-		}
-		else if(type == EnumPacketServer.LinkedAdd){
-			LinkedNpcController.Instance.addData(Server.readString(buffer));
-
-			List<String> list = new ArrayList<String>();
-			for(LinkedData data : LinkedNpcController.Instance.list)
-				list.add(data.name);
-			Server.sendData((EntityPlayerMP)player, EnumPacketClient.SCROLL_LIST, list);
-		}
-		else if(type == EnumPacketServer.LinkedRemove){
-			LinkedNpcController.Instance.removeData(Server.readString(buffer));
-
-			List<String> list = new ArrayList<String>();
-			for(LinkedData data : LinkedNpcController.Instance.list)
-				list.add(data.name);
-			Server.sendData((EntityPlayerMP)player, EnumPacketClient.SCROLL_LIST, list);
-		}
-		else if(type == EnumPacketServer.LinkedGetAll){
-			List<String> list = new ArrayList<String>();
-			for(LinkedData data : LinkedNpcController.Instance.list)
-				list.add(data.name);
-			Server.sendData(player, EnumPacketClient.SCROLL_LIST, list);
-			if(npc != null)
-				Server.sendData(player, EnumPacketClient.SCROLL_SELECTED, npc.linkedName);
-		}
-		else if(type == EnumPacketServer.LinkedSet){
-			npc.linkedName = Server.readString(buffer);
-			LinkedNpcController.Instance.loadNpcData(npc);
-		}
-		else if(type == EnumPacketServer.NpcMenuClose){
-			npc.reset();
-			if(npc.linkedData != null)
-				LinkedNpcController.Instance.saveNpcData(npc);
-			if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
-				LogWriter.script(String.format("[%s] (Player) %s CLOSE NPC %s (%s, %s, %s) [%s]", "WAND", player.getCommandSenderName(), npc.display.getName(), (int)npc.posX, (int)npc.posY, (int)npc.posZ,  npc.worldObj.getWorldInfo().getWorldName()));
-			}
-			NoppesUtilServer.setEditingNpc(player, null);
-		}
-		else if(type == EnumPacketServer.BanksGet){
-			NoppesUtilServer.sendBankDataAll(player);
-		}
-		else if(type == EnumPacketServer.BankGet){
-			Bank bank = BankController.getInstance().getBank(buffer.readInt());
-			NoppesUtilServer.sendBank(player,bank);
-		}
-		else if(type == EnumPacketServer.BankSave){
-			Bank bank = new Bank();
-			bank.readEntityFromNBT(Server.readNBT(buffer));
-			BankController.getInstance().saveBank(bank);
-			NoppesUtilServer.sendBankDataAll(player);
-			NoppesUtilServer.sendBank(player,bank);
-		}
-		else if(type == EnumPacketServer.BankRemove){
-			BankController.getInstance().removeBank(buffer.readInt());
-			NoppesUtilServer.sendBankDataAll(player);
-			NoppesUtilServer.sendBank(player,new Bank());
-		}
-		else if(type == EnumPacketServer.RemoteMainMenu){
-			Entity entity = player.worldObj.getEntityByID(buffer.readInt());
-			if(entity == null || !(entity instanceof EntityNPCInterface))
-				return;
-			NoppesUtilServer.sendOpenGui(player, EnumGuiType.MainMenuDisplay, (EntityNPCInterface) entity);
-			if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
-				LogWriter.script(String.format("[%s] (Player) %s OPEN NPC %s (%s, %s, %s) [%s]", "WAND", player.getCommandSenderName(), ((EntityNPCInterface)entity).display.getName(), entity.posX, entity.posY, entity.posZ,  entity.worldObj.getWorldInfo().getWorldName()));
-			}
-		}
-        else if(type == EnumPacketServer.RemoteGlobalMenu){
-            NoppesUtilServer.sendOpenGui(player, EnumGuiType.GlobalRemote, null);
-            if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
-                LogWriter.script(String.format("[%s] (Player) %s OPEN GLOBAL MENU", "WAND", player.getCommandSenderName()));
-            }
-        }
-		else if(type == EnumPacketServer.RemoteDelete){
-			Entity entity = player.worldObj.getEntityByID(buffer.readInt());
-			if(entity == null || !(entity instanceof EntityNPCInterface))
-				return;
-			npc = (EntityNPCInterface) entity;
-			if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
-				LogWriter.script(String.format("[%s] (Player) %s DELETE NPC %s (%s, %s, %s) [%s]", "WAND", player.getCommandSenderName(), npc.display.getName(), (int)npc.posX, (int)npc.posY, (int)npc.posZ,  npc.worldObj.getWorldInfo().getWorldName()));
-			}
-			npc.delete();
-			NoppesUtilServer.deleteNpc(npc,player);
-			NoppesUtilServer.sendNearbyNpcs(player);
-		}
-		else if(type == EnumPacketServer.RemoteNpcsGet){
-			NoppesUtilServer.sendNearbyNpcs(player);
-		}
-		else if(type == EnumPacketServer.RemoteFreeze){
-			CustomNpcs.FreezeNPCs = !CustomNpcs.FreezeNPCs;
-			Server.sendData(player, EnumPacketClient.SCROLL_SELECTED, CustomNpcs.FreezeNPCs?"Unfreeze NPCs":"Freeze NPCs");
-		}
-        else if(type == EnumPacketServer.RemoteFreezeGet){
-            Server.sendData(player, EnumPacketClient.SCROLL_SELECTED, CustomNpcs.FreezeNPCs?"Unfreeze NPCs":"Freeze NPCs");
-        }
-		else if(type == EnumPacketServer.RemoteReset){
-			Entity entity = player.worldObj.getEntityByID(buffer.readInt());
-			if(entity == null || !(entity instanceof EntityNPCInterface))
-				return;
-			npc = (EntityNPCInterface) entity;
-			npc.reset();
-		}
-		else if(type == EnumPacketServer.RemoteTpToNpc){
-			Entity entity = player.worldObj.getEntityByID(buffer.readInt());
-			if(entity == null || !(entity instanceof EntityNPCInterface))
-				return;
-			npc = (EntityNPCInterface) entity;
-			player.playerNetServerHandler.setPlayerLocation(npc.posX, npc.posY, npc.posZ, 0, 0);
-		}
-		else if(type == EnumPacketServer.Gui){
-			EnumGuiType gui = EnumGuiType.values()[buffer.readInt()];
-			int i = buffer.readInt();
-			int j = buffer.readInt();
-			int k = buffer.readInt();
-			NoppesUtilServer.sendOpenGui(player, gui, npc, i, j, k);
-		}
-		else if(type == EnumPacketServer.RecipesGet){
-			NoppesUtilServer.sendRecipeData(player,buffer.readInt());
-		}
-		else if(type == EnumPacketServer.RecipeGet){
-			RecipeCarpentry recipe = RecipeController.Instance.getRecipe(buffer.readInt());
-			NoppesUtilServer.setRecipeGui(player,recipe);
-		}
-		else if(type == EnumPacketServer.RecipeRemove){
-			RecipeCarpentry recipe = RecipeController.Instance.delete(buffer.readInt());
-			NoppesUtilServer.sendRecipeData(player, recipe.isGlobal?3:4);
-			NoppesUtilServer.setRecipeGui(player,new RecipeCarpentry(""));
-		}
-		else if(type == EnumPacketServer.RecipeSave){
-			RecipeCarpentry recipe = RecipeController.Instance.saveRecipe(Server.readNBT(buffer));
-			NoppesUtilServer.sendRecipeData(player, recipe.isGlobal?3:4);
-			NoppesUtilServer.setRecipeGui(player,recipe);
-		}
-		else if(type == EnumPacketServer.NaturalSpawnGetAll){
-			NoppesUtilServer.sendScrollData(player, SpawnController.Instance.getScroll());
-		}
-		else if(type == EnumPacketServer.NaturalSpawnGet){
-			SpawnData spawn = SpawnController.Instance.getSpawnData(buffer.readInt());
-			if(spawn != null){
-				Server.sendData(player, EnumPacketClient.GUI_DATA, spawn.writeNBT(new NBTTagCompound()));
-			}
-		}
-		else if(type == EnumPacketServer.NaturalSpawnSave){
-			SpawnData data = new SpawnData();
-			data.readNBT(Server.readNBT(buffer));
-			SpawnController.Instance.saveSpawnData(data);
-
-			NoppesUtilServer.sendScrollData(player, SpawnController.Instance.getScroll());
-		}
-		else if(type == EnumPacketServer.NaturalSpawnRemove){
-			SpawnController.Instance.removeSpawnData(buffer.readInt());
-			NoppesUtilServer.sendScrollData(player, SpawnController.Instance.getScroll());
-		}
-		else if(type == EnumPacketServer.DialogCategorySave){
-			DialogCategory category = new DialogCategory();
-			category.readNBT(Server.readNBT(buffer));
-			DialogController.Instance.saveCategory(category);
-			NoppesUtilServer.sendScrollData(player, DialogController.Instance.getScroll());
-		}
-		else if(type == EnumPacketServer.DialogCategoryRemove){
-			DialogController.Instance.removeCategory(buffer.readInt());
-			NoppesUtilServer.sendScrollData(player, DialogController.Instance.getScroll());
-		}
-		else if(type == EnumPacketServer.DialogCategoryGet){
-			DialogCategory category = DialogController.Instance.categories.get(buffer.readInt());
-			if(category != null){
-				NBTTagCompound comp = category.writeNBT(new NBTTagCompound());
-				comp.removeTag("Dialogs");
-				Server.sendData(player, EnumPacketClient.GUI_DATA, comp);
-			}
-		}
-		else if(type == EnumPacketServer.DialogSave){
-			int category = buffer.readInt();
-			Dialog dialog = new Dialog();
-			dialog.readNBT(Server.readNBT(buffer));
-			boolean sendGroup = buffer.readBoolean();
-			DialogController.Instance.saveDialog(category,dialog);
-			if(dialog.category != null){
-				if(sendGroup){
-					NoppesUtilServer.sendDialogGroup(player,dialog.category);
-				}
-				else {
-					NoppesUtilServer.sendDialogData(player,dialog.category);
-				}
-			}
-		}
-		else if(type == EnumPacketServer.QuestOpenGui){
-			Quest quest = new Quest();
-			int gui = buffer.readInt();
-			quest.readNBT(Server.readNBT(buffer));
-			NoppesUtilServer.setEditingQuest(player,quest);
-			player.openGui(CustomNpcs.instance, gui , player.worldObj, 0, 0, 0);
-		}
-		else if(type == EnumPacketServer.DialogRemove){
-			int diagId = buffer.readInt();
-			boolean sendGroup = buffer.readBoolean();
-			Dialog dialog = DialogController.Instance.dialogs.get(diagId);
-			if(dialog != null && dialog.category != null){
-				DialogController.Instance.removeDialog(dialog);
-				if(sendGroup){
-					NoppesUtilServer.sendDialogGroup(player,dialog.category);
-				}
-				else {
-					NoppesUtilServer.sendDialogData(player,dialog.category);
-				}
-			}
-		}
-		else if(type == EnumPacketServer.DialogNpcGet){
-			NoppesUtilServer.sendNpcDialogs(player);
-		}
-		else if(type == EnumPacketServer.DialogNpcSet){
-			int slot = buffer.readInt();
-			int dialog = buffer.readInt();
-			DialogOption option = NoppesUtilServer.setNpcDialog(slot,dialog,player);
-			if(option != null && option.hasDialog()){
-				NBTTagCompound compound = option.writeNBT();
-				compound.setInteger("Position", slot);
-				Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-			}
-		}
-		else if(type == EnumPacketServer.DialogNpcRemove){
-			npc.dialogs.remove(buffer.readInt());
-		}
-		else if(type == EnumPacketServer.QuestCategoryGet){
-			QuestCategory category = QuestController.Instance.categories.get(buffer.readInt());
-			if(category != null){
-				NBTTagCompound comp = category.writeNBT(new NBTTagCompound());
-				comp.removeTag("Dialogs");
-				Server.sendData(player, EnumPacketClient.GUI_DATA, comp);
-			}
-		}
-		else if(type == EnumPacketServer.QuestCategorySave){
-			QuestCategory category = new QuestCategory();
-			category.readNBT(Server.readNBT(buffer));
-			QuestController.Instance.saveCategory(category);
-			NoppesUtilServer.sendQuestCategoryData(player);
-		}
-		else if(type == EnumPacketServer.QuestCategoryRemove){
-			QuestController.Instance.removeCategory(buffer.readInt());
-			NoppesUtilServer.sendQuestCategoryData(player);
-		}
-		else if(type == EnumPacketServer.QuestSave){
-			int category = buffer.readInt();
-			Quest quest = new Quest();
-			quest.readNBT(Server.readNBT(buffer));
-			boolean sendGroup = buffer.readBoolean();
-			QuestController.Instance.saveQuest(category, quest);
-			if(quest.category != null){
-				if(sendGroup){
-					NoppesUtilServer.sendQuestGroup(player, quest.category);
-				}
-				else {
-					NoppesUtilServer.sendQuestData(player, quest.category);
-				}
-			}
-		}
-		else if(type == EnumPacketServer.QuestDialogGetTitle){
-			Dialog quest = DialogController.Instance.dialogs.get(buffer.readInt());
-			Dialog quest2 = DialogController.Instance.dialogs.get(buffer.readInt());
-			Dialog quest3 = DialogController.Instance.dialogs.get(buffer.readInt());
-			NBTTagCompound compound = new NBTTagCompound();
-			if(quest != null)
-				compound.setString("1", quest.title);
-			if(quest2 != null)
-				compound.setString("2", quest2.title);
-			if(quest3 != null)
-				compound.setString("3", quest3.title);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else if(type == EnumPacketServer.QuestRemove){
-			Quest quest = QuestController.Instance.quests.get(buffer.readInt());
-			boolean sendGroup = buffer.readBoolean();
-			if(quest != null){
-				QuestController.Instance.removeQuest(quest);
-				if(sendGroup){
-					NoppesUtilServer.sendQuestGroup(player,quest.category);
-				}
-				else {
-					NoppesUtilServer.sendQuestData(player,quest.category);
-				}
-			}
-		}
-		else if(type == EnumPacketServer.TransportCategoriesGet){
-			NoppesUtilServer.sendTransportCategoryData(player);
-		}
-		else if(type == EnumPacketServer.TransportCategorySave){
-			TransportController.getInstance().saveCategory(Server.readString(buffer), buffer.readInt());
-		}
-		else if(type == EnumPacketServer.TransportCategoryRemove){
-			TransportController.getInstance().removeCategory(buffer.readInt());
-			NoppesUtilServer.sendTransportCategoryData(player);
-		}
-		else if(type == EnumPacketServer.TransportRemove){
-			int id = buffer.readInt();
-			TransportLocation loc = TransportController.getInstance().removeLocation(id);
-			if(loc != null)
-				NoppesUtilServer.sendTransportData(player,loc.category.id);
-		}
-		else if(type == EnumPacketServer.TransportsGet){
-			NoppesUtilServer.sendTransportData(player,buffer.readInt());
-		}
-		else if(type == EnumPacketServer.TransportSave){
-			int cat = buffer.readInt();
-			TransportLocation location = TransportController.getInstance().saveLocation(cat,Server.readNBT(buffer), npc);
-			if(location != null){
-				if(npc.advanced.role != EnumRoleType.Transporter)
-					return;
-				RoleTransporter role = (RoleTransporter) npc.roleInterface;
-				role.setTransport(location);
-			}
-		}
-		else if(type == EnumPacketServer.TransportGetLocation){
-			if(npc.advanced.role != EnumRoleType.Transporter)
-				return;
-			RoleTransporter role = (RoleTransporter) npc.roleInterface;
-			if(role.hasTransport()){
-				Server.sendData(player,EnumPacketClient.GUI_DATA,role.getLocation().writeNBT());
-				Server.sendData(player, EnumPacketClient.SCROLL_SELECTED,role.getLocation().category.title);
-			}
-		}
-		else if(type == EnumPacketServer.FactionSet){
-			npc.setFaction(buffer.readInt());
-		}
-		else if(type == EnumPacketServer.FactionSave){
-			Faction faction = new Faction();
-			faction.readNBT(Server.readNBT(buffer));
-			FactionController.getInstance().saveFaction(faction);
-			NoppesUtilServer.sendFactionDataAll(player);
-			NBTTagCompound compound = new NBTTagCompound();
-			faction.writeNBT(compound);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else if(type == EnumPacketServer.FactionRemove){
-			FactionController.getInstance().delete(buffer.readInt());
-			NoppesUtilServer.sendFactionDataAll(player);
-			NBTTagCompound compound = new NBTTagCompound();
-			(new Faction()).writeNBT(compound);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else if(type == EnumPacketServer.TagSet){
-			this.setTags(npc,buffer);
-		}
-		else if(type == EnumPacketServer.TagSave){
-			Tag tag = new Tag();
-			tag.readNBT(Server.readNBT(buffer));
-			TagController.getInstance().saveTag(tag);
-			NoppesUtilServer.sendTagDataAll(player);
-			NBTTagCompound compound = new NBTTagCompound();
-			tag.writeNBT(compound);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else if(type == EnumPacketServer.TagRemove){
-			TagController.getInstance().delete(buffer.readInt());
-			NoppesUtilServer.sendTagDataAll(player);
-			NBTTagCompound compound = new NBTTagCompound();
-			(new Tag()).writeNBT(compound);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else if(type == EnumPacketServer.PlayerDataGet){
-			int id = buffer.readInt();
-			if(EnumPlayerData.values().length <= id)
-				return;
-			String name = null;
-			EnumPlayerData datatype = EnumPlayerData.values()[id];
-			if(datatype != EnumPlayerData.Players)
-				name = Server.readString(buffer);
-			NoppesUtilServer.sendPlayerData(datatype,player,name);
-		}
-		else if(type == EnumPacketServer.PlayerDataRemove){
-			NoppesUtilServer.removePlayerData(buffer,player);
-		}
-		else if(type == EnumPacketServer.PlayerDataMapRegen){
-			NoppesUtilServer.regenPlayerData(player);
-		}
-		else if(type == EnumPacketServer.MainmenuDisplayGet){
-			Server.sendData(player, EnumPacketClient.GUI_DATA, npc.display.writeToNBT(new NBTTagCompound()));
-		}
-		else if(type == EnumPacketServer.MainmenuDisplaySave){
-			npc.display.readToNBT(Server.readNBT(buffer));
-			npc.updateClient = true;
-		}
-		else if(type == EnumPacketServer.MainmenuStatsGet){
-			Server.sendData(player, EnumPacketClient.GUI_DATA, npc.stats.writeToNBT(new NBTTagCompound()));
-		}
-		else if(type == EnumPacketServer.MainmenuStatsSave){
-			npc.stats.readToNBT(Server.readNBT(buffer));
-			npc.updateClient = true;
-		}
-		else if(type == EnumPacketServer.MainmenuInvGet){
-			Server.sendData(player, EnumPacketClient.GUI_DATA, npc.inventory.writeEntityToNBT(new NBTTagCompound()));
-		}
-		else if(type == EnumPacketServer.MainmenuInvSave){
-			npc.inventory.readEntityFromNBT(Server.readNBT(buffer));
-			npc.updateAI = true;
-			npc.updateClient = true;
-		}
-		else if(type == EnumPacketServer.MainmenuAIGet){
-			Server.sendData(player, EnumPacketClient.GUI_DATA, npc.ai.writeToNBT(new NBTTagCompound()));
-		}
-		else if(type == EnumPacketServer.MainmenuAISave){
-			npc.ai.readToNBT(Server.readNBT(buffer));
-			npc.setHealth(npc.getMaxHealth());
-			npc.updateAI = true;
-			npc.updateClient = true;
-		}
-		else if(type == EnumPacketServer.MainmenuAdvancedGet){
-			Server.sendData(player, EnumPacketClient.GUI_DATA, npc.advanced.writeToNBT(new NBTTagCompound()));
-		}
-		else if(type == EnumPacketServer.MainmenuAdvancedSave){
-			npc.advanced.readToNBT(Server.readNBT(buffer));
-			npc.updateAI = true;
-			npc.updateClient = true;
-		}
-        else if(type == EnumPacketServer.MainmenuAdvancedMarkData){
-            MarkData data = MarkData.get(npc);
-            data.setNBT(Server.readNBT(buffer));
-            data.syncClients();
-        }
-		else if(type == EnumPacketServer.JobSave){
-			NBTTagCompound original = npc.jobInterface.writeToNBT(new NBTTagCompound());
-			NBTTagCompound compound = Server.readNBT(buffer);
-			Set<String> names = compound.func_150296_c();
-			for(String name : names)
-				original.setTag(name, compound.getTag(name));
-			npc.jobInterface.readFromNBT(original);
-			npc.updateClient = true;
-		}
-		else if(type == EnumPacketServer.JobGet){
-			if(npc.jobInterface == null)
-				return;
-			NBTTagCompound compound = new NBTTagCompound();
-			compound.setBoolean("JobData", true);
-			npc.jobInterface.writeToNBT(compound);
-
-			if(npc.advanced.job == EnumJobType.Spawner)
-				((JobSpawner)npc.jobInterface).cleanCompound(compound);
-
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-
-			if(npc.advanced.job == EnumJobType.Spawner)
-				Server.sendData(player, EnumPacketClient.GUI_DATA, ((JobSpawner)npc.jobInterface).getTitles());
-		}
-		else if(type == EnumPacketServer.JobSpawnerAdd){
-			if(npc.advanced.job != EnumJobType.Spawner)
-				return;
-			JobSpawner job = (JobSpawner) npc.jobInterface;
-			if(buffer.readBoolean()){
-				NBTTagCompound compound = ServerCloneController.Instance.getCloneData(null, Server.readString(buffer), buffer.readInt());
-
-				job.setJobCompound(buffer.readInt(), compound);
-			}
-			else{
-				job.setJobCompound(buffer.readInt(), Server.readNBT(buffer));
-			}
-			Server.sendData(player, EnumPacketClient.GUI_DATA, job.getTitles());
-		}
-		else if(type == EnumPacketServer.RoleCompanionUpdate){
-			if(npc.advanced.role != EnumRoleType.Companion)
-				return;
-			((RoleCompanion)npc.roleInterface).matureTo(EnumCompanionStage.values()[buffer.readInt()]);
-			npc.updateClient = true;
-		}
-		else if(type == EnumPacketServer.JobSpawnerRemove){
-			if(npc.advanced.job != EnumJobType.Spawner)
-				return;
-			JobSpawner job = (JobSpawner) npc.jobInterface;
-			job.setJobCompound(buffer.readInt(), null);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, job.getTitles());
-		}
-		else if(type == EnumPacketServer.RoleSave){
-			npc.roleInterface.readFromNBT(Server.readNBT(buffer));
-			npc.updateClient = true;
-		}
-		else if(type == EnumPacketServer.RoleGet){
-			if(npc.roleInterface == null)
-				return;
-			NBTTagCompound compound = new NBTTagCompound();
-			compound.setBoolean("RoleData", true);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, npc.roleInterface.writeToNBT(compound));
-		}
-		else if(type == EnumPacketServer.MerchantUpdate){
-			Entity entity = player.worldObj.getEntityByID(buffer.readInt());
-			if(entity == null || !(entity instanceof EntityVillager))
-				return;
-			MerchantRecipeList list = MerchantRecipeList.func_151390_b(new PacketBuffer(buffer));
-			((EntityVillager)entity).setRecipes(list);
-		}
-		else if(type == EnumPacketServer.ModelDataSave){
-			if(npc instanceof EntityCustomNpc)
-				((EntityCustomNpc)npc).modelData.readFromNBT(Server.readNBT(buffer));
-		}
-		else if(type == EnumPacketServer.MailOpenSetup){
-			PlayerMail mail = new PlayerMail();
-			mail.readNBT(Server.readNBT(buffer));
-			ContainerMail.staticmail = mail;
-			player.openGui(CustomNpcs.instance, EnumGuiType.PlayerMailman.ordinal(), player.worldObj, 1, 0, 0);
-		}
-		else if(type == EnumPacketServer.TransformSave){
-			boolean isValid = npc.transform.isValid();
-			npc.transform.readOptions(Server.readNBT(buffer));
-			if(isValid != npc.transform.isValid())
-				npc.updateAI = true;
-		}
-		else if(type == EnumPacketServer.TransformGet){
-			Server.sendData(player, EnumPacketClient.GUI_DATA, npc.transform.writeOptions(new NBTTagCompound()));
-		}
-		else if(type == EnumPacketServer.TransformLoad){
-			if(npc.transform.isValid())
-				npc.transform.transform(buffer.readBoolean());
-		}
-		else if(type == EnumPacketServer.TraderMarketSave){
-			String market = Server.readString(buffer);
-            if(market == null)
-                return;
-			boolean bo = buffer.readBoolean();
-			if(npc.roleInterface instanceof RoleTrader){
-				if(bo)
-					Market.setMarket(npc, market);
-				else
-					Market.save((RoleTrader)npc.roleInterface, market);
-			}
-		}
-		else if(type == EnumPacketServer.AnimationsGet){
-			NoppesUtilServer.sendAnimationDataAll(player);
-		}
-		else if(type == EnumPacketServer.AnimationGet){
-			Animation animation = (Animation) AnimationController.getInstance().get(buffer.readInt());
-			NBTTagCompound compound = animation.writeToNBT();
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else if(type == EnumPacketServer.AnimationRemove){
-			AnimationController.getInstance().delete(buffer.readInt());
-			NoppesUtilServer.sendAnimationDataAll(player);
-			NBTTagCompound compound = (new Animation()).writeToNBT();
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else if(type == EnumPacketServer.AnimationSave){
-			Animation animation = new Animation();
-			animation.readFromNBT(Server.readNBT(buffer));
-			AnimationController.getInstance().saveAnimation(animation);
-			NoppesUtilServer.sendAnimationDataAll(player);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, animation.writeToNBT());
-		}
-		else
-			blockPackets(type, buffer, player);
-
-	}
-	private void mountPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws IOException{
-		if(type == EnumPacketServer.SpawnRider){
-			Entity entity = EntityList.createEntityFromNBT(Server.readNBT(buffer), player.worldObj);
-			player.worldObj.spawnEntityInWorld(entity);
-			entity.mountEntity(ServerEventsHandler.mounted);
-		}
-		else if(type == EnumPacketServer.PlayerRider){
-			player.mountEntity(ServerEventsHandler.mounted);
-		}
-		else if(type == EnumPacketServer.CloneList){
-			NBTTagList list = new NBTTagList();
-			int tab = buffer.readInt();
-			for(String name : ServerCloneController.Instance.getClones(tab))
-				list.appendTag(new NBTTagString(name));
-
-			NBTTagList listDate = new NBTTagList();
-			for(String name : ServerCloneController.Instance.getClonesDate(tab))
-				listDate.appendTag(new NBTTagString(name));
-
-			NBTTagCompound compound = new NBTTagCompound();
-			compound.setTag("List", list);
-			compound.setTag("ListDate", listDate);
-
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else
-			warn(player,"WE 1 tried todo something with the wrong tool, probably a hacker");
-	}
-
-	private void clonePackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws IOException {
-		if(type == EnumPacketServer.SpawnMob){
-			boolean server = buffer.readBoolean();
-			int x = buffer.readInt();
-			int y = buffer.readInt();
-			int z = buffer.readInt();
-			NBTTagCompound compound;
-			if(server)
-				compound = ServerCloneController.Instance.getCloneData(player, Server.readString(buffer), buffer.readInt());
-			else
-				compound = Server.readNBT(buffer);
-			if(compound == null)
-				return;
-			Entity entity = NoppesUtilServer.spawnClone(compound, x, y, z, player.worldObj);
-			if(entity == null){
-				player.addChatMessage(new ChatComponentText("Failed to create an entity out of your clone"));
-				return;
-			}
-
-            if (entity instanceof EntityNPCInterface && !ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) {
-                EntityNPCInterface npc = (EntityNPCInterface) entity;
-                npc.script.setEnabled(false);
-            }
-
-			if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
-				LogWriter.script(String.format("[%s] (Player) %s SPAWNED ENTITY %s", "CLONER", player.getCommandSenderName(), entity));
-			}
-		}
-		else if(type == EnumPacketServer.MobSpawner){
-			boolean server = buffer.readBoolean();
-			int x = buffer.readInt();
-			int y = buffer.readInt();
-			int z = buffer.readInt();
-			NBTTagCompound compound;
-			if(server)
-				compound = ServerCloneController.Instance.getCloneData(player, Server.readString(buffer), buffer.readInt());
-			else
-				compound = Server.readNBT(buffer);
-
-            if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) {
-                return;
-            }
-
-			if(compound != null)
-				NoppesUtilServer.createMobSpawner(x, y, z, compound, player);
-		}
-		else if(type == EnumPacketServer.ClonePreSave){
-			boolean bo = ServerCloneController.Instance.getCloneData(null, Server.readString(buffer), buffer.readInt()) != null;
-			NBTTagCompound compound = new NBTTagCompound();
-			compound.setBoolean("NameExists", bo);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else if(type == EnumPacketServer.CloneSave){
-			PlayerData data = PlayerDataController.Instance.getPlayerData(player);
-			if(data.cloned == null)
-				return;
-			String name = Server.readString(buffer);
-			int tab = buffer.readInt();
-			NBTTagCompound tagExtra = Server.readNBT(buffer);
-            NBTTagCompound tagCompound = Server.readNBT(buffer);
-
-            NBTTagList tagList = tagCompound.getTagList("TagUUIDs", 8);
-            data.cloned.setTag("TagUUIDs", tagList);
-			ServerCloneController.Instance.addClone(data.cloned, name, tab, tagExtra);
-		}
-		else if(type == EnumPacketServer.CloneRemove){
-			int tab = buffer.readInt();
-			ServerCloneController.Instance.removeClone(Server.readString(buffer), tab);
-
-			NBTTagList list = new NBTTagList();
-
-			for(String name : ServerCloneController.Instance.getClones(tab))
-				list.appendTag(new NBTTagString(name));
-
-			NBTTagList listDate = new NBTTagList();
-			for(String name : ServerCloneController.Instance.getClonesDate(tab))
-				listDate.appendTag(new NBTTagString(name));
-
-			NBTTagCompound compound = new NBTTagCompound();
-			compound.setTag("List", list);
-			compound.setTag("ListDate", listDate);
-
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else if(type == EnumPacketServer.CloneList){
-			NBTTagList list = new NBTTagList();
-			int tab = buffer.readInt();
-			for(String name : ServerCloneController.Instance.getClones(tab))
-				list.appendTag(new NBTTagString(name));
-
-			NBTTagList listDate = new NBTTagList();
-			for(String name : ServerCloneController.Instance.getClonesDate(tab))
-				listDate.appendTag(new NBTTagString(name));
-
-			NBTTagCompound compound = new NBTTagCompound();
-			compound.setTag("List", list);
-			compound.setTag("ListDate", listDate);
-
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else if (type == EnumPacketServer.CloneTagList) {
-			int tab = buffer.readInt();
-			TagMap tagMap = ServerTagMapController.Instance.getTagMap(tab);
-			NBTTagCompound compound = new NBTTagCompound();
-			compound.setTag("CloneTags", tagMap.writeNBT());
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else if (type == EnumPacketServer.CloneAllTags) {
-			NBTTagCompound compound = new NBTTagCompound();
-			HashSet<Tag> validTags = TagController.getInstance().getAllTags();
-			NBTTagList validTagList = new NBTTagList();
-			for(Tag tag : validTags){
-				NBTTagCompound tagCompound = new NBTTagCompound();
-				tag.writeNBT(tagCompound);
-				validTagList.appendTag(tagCompound);
-			}
-			compound.setTag("AllTags", validTagList);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else if (type == EnumPacketServer.CloneAllTagsShort) {
-			NBTTagCompound compound = new NBTTagCompound();
-			HashSet<Tag> validTags = TagController.getInstance().getAllTags();
-			NBTTagList validTagList = new NBTTagList();
-			for(Tag tag : validTags){
-				NBTTagCompound tagCompound = new NBTTagCompound();
-				tag.writeShortNBT(tagCompound);
-				validTagList.appendTag(tagCompound);
-			}
-			compound.setTag("ShortTags", validTagList);
-			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
-		}
-		else if (type == EnumPacketServer.TagSet) {
-			EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player);
-			this.setTags(npc,buffer);
-		}
-		else if (type != EnumPacketServer.NpcTagsGet && type != EnumPacketServer.TagsGet) {
-			warn(player, "WE 2 tried todo something with the wrong tool, probably a hacker");
-		}
-	}
-
-	private void setTags(EntityNPCInterface npc, ByteBuf buffer) throws IOException {
-		npc.advanced.tagUUIDs.removeIf(uuid -> TagController.getInstance().getTagFromUUID(uuid) != null);
-		NBTTagCompound compound = Server.readNBT(buffer);
-		NBTTagList list = compound.getTagList("TagNames",8);
-		for (int i = 0; i < list.tagCount(); i++) {
-			String tagName = list.getStringTagAt(i);
-			npc.advanced.tagUUIDs.add(((Tag)TagController.getInstance().getTagFromName(tagName)).uuid);
-		}
-	}
-
-	private void warn(EntityPlayer player, String warning){
-		MinecraftServer.getServer().logWarning(player.getCommandSenderName() + ": " + warning);
-	}
-}
diff --git a/src/main/java/noppes/npcs/ScriptItemEventHandler.java b/src/main/java/noppes/npcs/ScriptItemEventHandler.java
index f260b7ba8..8f91705cc 100644
--- a/src/main/java/noppes/npcs/ScriptItemEventHandler.java
+++ b/src/main/java/noppes/npcs/ScriptItemEventHandler.java
@@ -22,6 +22,7 @@ import noppes.npcs.entity.EntityCustomNpc;
 import noppes.npcs.items.ItemScripted;
 import noppes.npcs.scripted.NpcAPI;
 import noppes.npcs.scripted.event.ItemEvent;
+import noppes.npcs.scripted.item.ScriptCustomItem;
 
 import java.util.HashMap;
 
@@ -60,8 +61,9 @@ public class ScriptItemEventHandler {
         if(event.player.worldObj instanceof WorldServer) {
             try {
                 if (event.entityItem.getEntityItem().getItem() == CustomItems.scripted_item && !event.isCanceled()) {
-                    IItemCustom isw = ItemScripted.GetWrapper(event.entityItem.getEntityItem());
-                    event.setCanceled(EventHooks.onScriptItemTossed(isw, event.player, event.entityItem));
+                    IItemStack isw = NpcAPI.Instance().getIItemStack(event.entityItem.getEntityItem());
+                    if(isw instanceof IItemCustom)
+                        event.setCanceled(EventHooks.onScriptItemTossed((IItemCustom) isw, event.player, event.entityItem));
                 }
             } catch (Exception e) {}
         }
@@ -75,8 +77,9 @@ public class ScriptItemEventHandler {
         if(event.player.worldObj instanceof WorldServer) {
             try {
                 if (event.player.getHeldItem().getItem() == CustomItems.scripted_item && !event.isCanceled()) {
-                    IItemCustom isw = ItemScripted.GetWrapper(event.player.getHeldItem());
-                    EventHooks.onScriptItemPickedUp(isw, event.player);
+                    IItemStack isw = NpcAPI.Instance().getIItemStack(event.player.getHeldItem());
+                    if(isw instanceof IItemCustom)
+                        EventHooks.onScriptItemPickedUp((IItemCustom) isw, event.player);
                 }
             } catch(Exception e) {}
         }
@@ -89,8 +92,13 @@ public class ScriptItemEventHandler {
             ItemStack stack = entity.getEntityItem();
 
             try {
-                if (stack.stackSize > 0 && stack.getItem() == CustomItems.scripted_item && EventHooks.onScriptItemSpawn(ItemScripted.GetWrapper(stack), entity)) {
-                    event.setCanceled(true);
+                if (stack.stackSize > 0 && stack.getItem() == CustomItems.scripted_item) {
+                    IItemStack isw = NpcAPI.Instance().getIItemStack(stack);
+                    if(isw instanceof IItemCustom){
+                        if(EventHooks.onScriptItemSpawn((IItemCustom) isw, entity)){
+                            event.setCanceled(true);
+                        }
+                    }
                 }
             } catch(Exception e) {}
         }
@@ -104,12 +112,14 @@ public class ScriptItemEventHandler {
         if(!event.entityPlayer.worldObj.isRemote && event.entityPlayer.worldObj instanceof WorldServer) {
             try {
                 if (event.entityPlayer.getHeldItem().getItem() == CustomItems.scripted_item && !event.isCanceled()) {
-                    IItemCustom isw = ItemScripted.GetWrapper(event.entityPlayer.getHeldItem());
-                    ItemEvent.InteractEvent eve = new ItemEvent.InteractEvent(isw, (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer), 2, NpcAPI.Instance().getIEntity(event.target));
-                    event.setCanceled(EventHooks.onScriptItemInteract(isw, eve));
+                    IItemStack isw = NpcAPI.Instance().getIItemStack(event.entityPlayer.getHeldItem());
+                    if(isw instanceof IItemCustom){
+                        ItemEvent.InteractEvent eve = new ItemEvent.InteractEvent((IItemCustom) isw, (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer), 2, NpcAPI.Instance().getIEntity(event.target));
+                        event.setCanceled(EventHooks.onScriptItemInteract((IItemCustom) isw, eve));
 
-                    ItemEvent.RightClickEvent rightClickEvent = new ItemEvent.RightClickEvent(isw, (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer), 1,  NpcAPI.Instance().getIEntity(event.target));
-                    event.setCanceled(EventHooks.onScriptItemRightClick(isw, rightClickEvent));
+                        ItemEvent.RightClickEvent rightClickEvent = new ItemEvent.RightClickEvent((IItemCustom) isw, (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer), 1,  NpcAPI.Instance().getIEntity(event.target));
+                        event.setCanceled(EventHooks.onScriptItemRightClick((IItemCustom) isw, rightClickEvent));
+                    }
                 }
             } catch(Exception e) {}
         }
@@ -135,9 +145,11 @@ public class ScriptItemEventHandler {
                 }
                 try {
                     if (event.entityPlayer.getHeldItem().getItem() == CustomItems.scripted_item && !event.isCanceled()) {
-                        IItemCustom isw = ItemScripted.GetWrapper(event.entityPlayer.getHeldItem());
-                        ItemEvent.RightClickEvent eve = new ItemEvent.RightClickEvent(isw, (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer), 0, null);
-                        event.setCanceled(EventHooks.onScriptItemRightClick(isw, eve));
+                        IItemStack isw = NpcAPI.Instance().getIItemStack(event.entityPlayer.getHeldItem());
+                        if(isw instanceof IItemCustom){
+                            ItemEvent.RightClickEvent eve = new ItemEvent.RightClickEvent((IItemCustom) isw, (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer), 0, null);
+                            event.setCanceled(EventHooks.onScriptItemRightClick((IItemCustom) isw, eve));
+                        }
                     }
                 } catch(Exception e) {}
             }
@@ -149,9 +161,11 @@ public class ScriptItemEventHandler {
                 handler.hadInteract = true;
                 try {
                     if (event.entityPlayer.getHeldItem().getItem() == CustomItems.scripted_item && !event.isCanceled()) {
-                        IItemCustom isw = ItemScripted.GetWrapper(event.entityPlayer.getHeldItem());
-                        ItemEvent.RightClickEvent eve = new ItemEvent.RightClickEvent(isw, (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer), 2, NpcAPI.Instance().getIBlock((IWorld) NpcAPI.Instance().getIWorld(event.world), event.x, event.y, event.z));
-                        event.setCanceled(EventHooks.onScriptItemRightClick(isw, eve));
+                        IItemStack isw = NpcAPI.Instance().getIItemStack(event.entityPlayer.getHeldItem());
+                        if(isw instanceof IItemCustom){
+                            ItemEvent.RightClickEvent eve = new ItemEvent.RightClickEvent((IItemCustom) isw, (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer), 2, NpcAPI.Instance().getIBlock((IWorld) NpcAPI.Instance().getIWorld(event.world), event.x, event.y, event.z));
+                            event.setCanceled(EventHooks.onScriptItemRightClick((IItemCustom) isw, eve));
+                        }
                     }
                 } catch(Exception e) {}
             }
@@ -164,9 +178,12 @@ public class ScriptItemEventHandler {
             return;
 
         if(event.entityPlayer.worldObj instanceof WorldServer) {
-            IItemCustom handler = ItemScripted.GetWrapper(event.item);
-            IPlayer IPlayer = (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer);
-            event.setCanceled(EventHooks.onStartUsingCustomItem(handler, IPlayer, event.duration));
+
+            IItemStack isw = NpcAPI.Instance().getIItemStack(event.item);
+            if(isw instanceof IItemCustom){
+                IPlayer IPlayer = (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer);
+                event.setCanceled(EventHooks.onStartUsingCustomItem((IItemCustom) isw, IPlayer, event.duration));
+            }
         }
     }
     @SubscribeEvent
@@ -175,9 +192,12 @@ public class ScriptItemEventHandler {
             return;
 
         if(event.entityPlayer.worldObj instanceof WorldServer && event.item.getItem() == CustomItems.scripted_item) {
-            IItemCustom handler = ItemScripted.GetWrapper(event.item);
-            IPlayer IPlayer = (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer);
-            event.setCanceled(EventHooks.onUsingCustomItem(handler, IPlayer, event.duration));
+
+            IItemStack isw = NpcAPI.Instance().getIItemStack(event.item);
+            if(isw instanceof IItemCustom){
+                IPlayer IPlayer = (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer);
+                event.setCanceled(EventHooks.onUsingCustomItem((IItemCustom) isw, IPlayer, event.duration));
+            }
         }
     }
     @SubscribeEvent
@@ -186,9 +206,11 @@ public class ScriptItemEventHandler {
             return;
 
         if(event.entityPlayer.worldObj instanceof WorldServer && event.item.getItem() == CustomItems.scripted_item) {
-            IItemCustom handler = ItemScripted.GetWrapper(event.item);
-            IPlayer IPlayer = (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer);
-            event.setCanceled(EventHooks.onStopUsingCustomItem(handler, IPlayer, event.duration));
+            IItemStack isw = NpcAPI.Instance().getIItemStack(event.item);
+            if(isw instanceof IItemCustom){
+                IPlayer IPlayer = (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer);
+                event.setCanceled(EventHooks.onStopUsingCustomItem((IItemCustom) isw, IPlayer, event.duration));
+            }
         }
     }
     @SubscribeEvent
@@ -197,9 +219,11 @@ public class ScriptItemEventHandler {
             return;
 
         if(event.entityPlayer.worldObj instanceof WorldServer && event.item.getItem() == CustomItems.scripted_item) {
-            IItemCustom handler = ItemScripted.GetWrapper(event.item);
-            IPlayer IPlayer = (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer);
-            EventHooks.onFinishUsingCustomItem(handler, IPlayer, event.duration);
+            IItemStack isw = NpcAPI.Instance().getIItemStack(event.item);
+            if(isw instanceof IItemCustom){
+                IPlayer IPlayer = (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer);
+                EventHooks.onFinishUsingCustomItem((IItemCustom) isw, IPlayer, event.duration);
+            }
         }
     }
 }
diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java
index fb825beae..a9d420c8b 100644
--- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java
+++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java
@@ -5,6 +5,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.relauncher.Side;
+import kamkeel.npcs.controllers.SyncController;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -21,9 +22,8 @@ import net.minecraftforge.event.entity.living.*;
 import net.minecraftforge.event.entity.player.*;
 import net.minecraftforge.event.world.BlockEvent;
 import noppes.npcs.api.entity.IPlayer;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.constants.EnumQuestType;
-import noppes.npcs.constants.SyncType;
+import noppes.npcs.controllers.CustomEffectController;
 import noppes.npcs.controllers.PartyController;
 import noppes.npcs.controllers.PlayerDataController;
 import noppes.npcs.controllers.ScriptController;
@@ -64,7 +64,7 @@ public class ScriptPlayerEventHandler {
                 PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
 
                 if(playerData.updateClient) {
-                    NoppesUtilServer.sendPlayerDataCompound((EntityPlayerMP)player, playerData.getSyncNBT(), true);
+                    SyncController.syncPlayerData((EntityPlayerMP)player, true);
                     playerData.updateClient = false;
                 }
 
@@ -72,6 +72,16 @@ public class ScriptPlayerEventHandler {
                     playerData.timers.update();
                 }
 
+                if(player.ticksExisted % 10 == 0)
+                    SyncController.syncEffects((EntityPlayerMP) player);
+
+                // TODO: Fix Config
+                // player.ticksExisted % ConfigDBCGameplay.CheckEffectsTick == 0
+                if (player.ticksExisted % 10 == 0)
+                    CustomEffectController.Instance.runEffects(player);
+
+                if (player.ticksExisted % 20 == 0)
+                    CustomEffectController.Instance.decrementEffects(player);
 
                 Party party = playerData.getPlayerParty();
                 boolean trackingPartyQuest = playerData.questData.getTrackedQuest() != null && party != null && party.getQuest() != null && party.getQuest().getId() == playerData.questData.getTrackedQuest().getId();
@@ -423,6 +433,8 @@ public class ScriptPlayerEventHandler {
             PlayerDataScript handler = ScriptController.Instance.playerScripts;
             if(event.entityLiving instanceof EntityPlayer) {
                 try {
+                    CustomEffectController.getInstance().killEffects((EntityPlayer) event.entityLiving);
+
                     IPlayer scriptPlayer = (IPlayer) NpcAPI.Instance().getIEntity(event.entityLiving);
                     EventHooks.onPlayerDeath(handler,scriptPlayer, event.source, source);
                 } catch (Exception ignored) {}
diff --git a/src/main/java/noppes/npcs/Server.java b/src/main/java/noppes/npcs/Server.java
index e1aa4c361..ff7f73b0c 100644
--- a/src/main/java/noppes/npcs/Server.java
+++ b/src/main/java/noppes/npcs/Server.java
@@ -1,18 +1,10 @@
 package noppes.npcs;
 
-import com.google.common.base.Charsets;
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
-import cpw.mods.fml.common.network.internal.FMLProxyPacket;
 import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.CompressedStreamTools;
-import net.minecraft.nbt.NBTSizeTracker;
+import kamkeel.npcs.util.ByteBufUtils;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.village.MerchantRecipeList;
-import noppes.npcs.constants.EnumPacketClient;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -20,47 +12,6 @@ import java.util.List;
 import java.util.Map;
 
 public class Server {
-
-	public static void sendData(final EntityPlayerMP player, final EnumPacketClient enu, final Object... obs) {
-		sendDataChecked(player, enu, obs);
-	}
-
-	public static boolean sendDataChecked(EntityPlayerMP player, EnumPacketClient type, Object... obs) {
-		PacketBuffer buffer = new PacketBuffer(Unpooled.buffer());
-		try {
-			if(!fillBuffer(buffer, type, obs))
-				return false;
-			CustomNpcs.Channel.sendTo(new FMLProxyPacket(buffer, "CustomNPCs"), player);
-		} catch (IOException e) {
-			LogWriter.error(type + " Errored", e);
-		}
-		return true;
-	}
-
-	public static void sendAssociatedData(final Entity entity, final EnumPacketClient enu, final Object... obs) {
-		ByteBuf buffer = Unpooled.buffer();
-		try {
-			if(!fillBuffer(buffer, enu, obs))
-				return;
-			TargetPoint point = new TargetPoint(entity.dimension, entity.posX, entity.posY, entity.posZ, 60);
-			CustomNpcs.Channel.sendToAllAround(new FMLProxyPacket(buffer,"CustomNPCs"), point);
-		} catch (IOException e) {
-			e.printStackTrace();
-            LogWriter.error(enu + " Errored", e);
-		}
-	}
-	public static void sendToAll(EnumPacketClient enu, Object... obs) {
-		ByteBuf buffer = Unpooled.buffer();
-		try {
-			if(!fillBuffer(buffer, enu, obs))
-				return;
-			CustomNpcs.Channel.sendToAll(new FMLProxyPacket(buffer,"CustomNPCs"));
-		} catch (IOException e) {
-			e.printStackTrace();
-            LogWriter.error(enu + " Errored", e);
-		}
-	}
-
 	public static boolean fillBuffer(ByteBuf buffer, Enum enu, Object... obs) throws IOException{
 		buffer.writeInt(enu.ordinal());
 		for(Object ob : obs){
@@ -73,7 +24,7 @@ public class Server {
 				for(String key : map.keySet()){
 					int value = map.get(key);
 					buffer.writeInt(value);
-					writeString(buffer, key);
+					ByteBufUtils.writeString(buffer, key);
 				}
 			}
 			else if(ob instanceof MerchantRecipeList)
@@ -82,7 +33,7 @@ public class Server {
 				List<String> list = (List<String>) ob;
 				buffer.writeInt(list.size());
 				for(String s : list)
-					writeString(buffer, s);
+					ByteBufUtils.writeString(buffer, s);
 			}
 			else if(ob instanceof Enum)
 				buffer.writeInt(((Enum<?>) ob).ordinal());
@@ -91,7 +42,7 @@ public class Server {
 			else if(ob instanceof Boolean)
 				buffer.writeBoolean((Boolean) ob);
 			else if(ob instanceof String)
-				writeString(buffer, (String) ob);
+				ByteBufUtils.writeString(buffer, (String) ob);
 			else if(ob instanceof Float)
 				buffer.writeFloat((Float) ob);
 			else if(ob instanceof Long)
@@ -105,7 +56,7 @@ public class Server {
                 buffer.writeBytes(byteArray);
             }
 			else if(ob instanceof NBTTagCompound)
-				writeNBT(buffer, (NBTTagCompound) ob);
+				ByteBufUtils.writeNBT(buffer, (NBTTagCompound) ob);
 		}
 		if(buffer.array().length >= 32767){
 			LogWriter.error("Packet " + enu + " was too big to be send");
@@ -114,34 +65,4 @@ public class Server {
 		}
         return true;
 	}
-
-	public static void writeNBT(ByteBuf buffer, NBTTagCompound compound) throws IOException {
-		byte[] bytes = CompressedStreamTools.compress(compound);
-		buffer.writeShort((short)bytes.length);
-		buffer.writeBytes(bytes);
-	}
-
-	public static NBTTagCompound readNBT(ByteBuf buffer) throws IOException {
-		byte[] bytes = new byte[buffer.readShort()];
-		buffer.readBytes(bytes);
-		return CompressedStreamTools.func_152457_a(bytes, new NBTSizeTracker(2097152L));
-	}
-
-	public static void writeString(ByteBuf buffer, String s){
-        byte[] bytes = s.getBytes(Charsets.UTF_8);
-		buffer.writeShort((short)bytes.length);
-		buffer.writeBytes(bytes);
-	}
-
-	public static String readString(ByteBuf buffer){
-		try{
-			byte[] bytes = new byte[buffer.readShort()];
-			buffer.readBytes(bytes);
-			return new String(bytes, Charsets.UTF_8);
-		}
-		catch(IndexOutOfBoundsException ex){
-			return null;
-		}
-	}
-
 }
diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java
index a9ae6a84a..6a0bc8a39 100644
--- a/src/main/java/noppes/npcs/ServerEventsHandler.java
+++ b/src/main/java/noppes/npcs/ServerEventsHandler.java
@@ -3,6 +3,17 @@ package noppes.npcs;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
+import kamkeel.npcs.controllers.SyncController;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumSoundOperation;
+import kamkeel.npcs.network.enums.EnumSyncAction;
+import kamkeel.npcs.network.enums.EnumSyncType;
+import kamkeel.npcs.network.packets.data.MarkDataPacket;
+import kamkeel.npcs.network.packets.data.SoundManagementPacket;
+import kamkeel.npcs.network.packets.data.VillagerListPacket;
+import kamkeel.npcs.network.packets.data.gui.GuiOpenPacket;
+import kamkeel.npcs.network.packets.data.ClonerPacket;
+import kamkeel.npcs.network.packets.data.large.SyncPacket;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
@@ -11,22 +22,19 @@ import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.StatCollector;
 import net.minecraft.village.MerchantRecipeList;
-import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
 import net.minecraftforge.event.entity.player.EntityInteractEvent;
-import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action;
@@ -37,14 +45,12 @@ import noppes.npcs.config.ConfigMain;
 import noppes.npcs.constants.*;
 import noppes.npcs.controllers.PartyController;
 import noppes.npcs.controllers.PlayerDataController;
-import noppes.npcs.controllers.RecipeController;
 import noppes.npcs.controllers.ServerCloneController;
 import noppes.npcs.controllers.data.*;
 import noppes.npcs.entity.EntityNPCInterface;
 import noppes.npcs.items.ItemExcalibur;
 import noppes.npcs.items.ItemShield;
 import noppes.npcs.items.ItemSoulstoneEmpty;
-import noppes.npcs.quests.QuestItem;
 import noppes.npcs.quests.QuestKill;
 import noppes.npcs.roles.RoleFollower;
 
@@ -94,8 +100,7 @@ public class ServerEventsHandler {
 				return;
 			PlayerData data = PlayerDataController.Instance.getPlayerData(event.entityPlayer);
 			ServerCloneController.Instance.cleanTags(compound);
-			if(!Server.sendDataChecked((EntityPlayerMP)event.entityPlayer, EnumPacketClient.CLONE, compound))
-				event.entityPlayer.addChatMessage(new ChatComponentText("Entity too big to clone"));
+            PacketHandler.Instance.sendToPlayer(new ClonerPacket(compound), (EntityPlayerMP)event.entityPlayer);
 			data.cloned = compound;
 			if (event.target instanceof EntityNPCInterface) {
 				NoppesUtilServer.setEditingNpc(event.entityPlayer, (EntityNPCInterface) event.target);
@@ -107,8 +112,8 @@ public class ServerEventsHandler {
 				return;
 			NoppesUtilServer.setEditingNpc(event.entityPlayer, (EntityNPCInterface)event.target);
 			event.setCanceled(true);
-			Server.sendData((EntityPlayerMP)event.entityPlayer, EnumPacketClient.GUI, EnumGuiType.Script.ordinal());
-			if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
+            GuiOpenPacket.openGUI((EntityPlayerMP)event.entityPlayer, EnumGuiType.Script, 0, 0, 0);
+            if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
 				LogWriter.script(String.format("[%s] (Player) %s OPEN NPC %s (%s, %s, %s) [%s]", "SCRIPTER", event.entityPlayer.getCommandSenderName(), ((EntityNPCInterface)(event.target)).display.getName(), (int)(event.target).posX, (int)(event.target).posY, (int)(event.target).posZ,  (event.target).worldObj.getWorldInfo().getWorldName()));
 			}
 		}
@@ -133,7 +138,7 @@ public class ServerEventsHandler {
 
 				if (merchantrecipelist != null)
 				{
-					Server.sendData(player, EnumPacketClient.VILLAGER_LIST, merchantrecipelist);
+                    PacketHandler.Instance.sendToPlayer(new VillagerListPacket(merchantrecipelist), player);
 				}
 			}
 		}
@@ -193,48 +198,20 @@ public class ServerEventsHandler {
 		}
 
 		if(block == Blocks.crafting_table && event.action == Action.RIGHT_CLICK_BLOCK && !player.worldObj.isRemote){
-			RecipeController controller = RecipeController.Instance;
-			NBTTagList list = new NBTTagList();
-			int i = 0;
-			for(RecipeCarpentry recipe : controller.globalRecipes.values()){
-				list.appendTag(recipe.writeNBT());
-				i++;
-				if(i % 10 == 0){
-					NBTTagCompound compound = new NBTTagCompound();
-					compound.setTag("recipes", list);
-					Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_ADD, compound);
-					list = new NBTTagList();
-				}
-			}
-
-			if(i % 10 != 0){
-				NBTTagCompound compound = new NBTTagCompound();
-				compound.setTag("recipes", list);
-				Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_ADD, compound);
-			}
-			Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_WORKBENCH);
+            PacketHandler.Instance.sendToPlayer(new SyncPacket(
+                EnumSyncType.WORKBENCH_RECIPES,
+                EnumSyncAction.RELOAD,
+                -1,
+                SyncController.workbenchNBT()
+            ), (EntityPlayerMP) player);
 		}
 		if(block == CustomItems.carpentyBench && event.action == Action.RIGHT_CLICK_BLOCK && !player.worldObj.isRemote){
-			RecipeController controller = RecipeController.Instance;
-			NBTTagList list = new NBTTagList();
-			int i = 0;
-			for(RecipeCarpentry recipe : controller.anvilRecipes.values()){
-				list.appendTag(recipe.writeNBT());
-				i++;
-				if(i % 10 == 0){
-					NBTTagCompound compound = new NBTTagCompound();
-					compound.setTag("recipes", list);
-					Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_ADD, compound);
-					list = new NBTTagList();
-				}
-			}
-
-			if(i % 10 != 0){
-				NBTTagCompound compound = new NBTTagCompound();
-				compound.setTag("recipes", list);
-				Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_ADD, compound);
-			}
-			Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_CARPENTRYBENCH);
+            PacketHandler.Instance.sendToPlayer(new SyncPacket(
+                EnumSyncType.CARPENTRY_RECIPES,
+                EnumSyncAction.RELOAD,
+                -1,
+                SyncController.carpentryNBT()
+            ), (EntityPlayerMP) player);
 		}
 		if((block == CustomItems.banner || block == CustomItems.wallBanner || block == CustomItems.sign)  && event.action == Action.RIGHT_CLICK_BLOCK){
 			ItemStack item = player.inventory.getCurrentItem();
@@ -255,11 +232,23 @@ public class ServerEventsHandler {
 			}
 
 			if(!player.worldObj.isRemote){
+                if(block == CustomItems.banner || block == CustomItems.wallBanner){
+                    // If sneaking and using shear
+                    if(player.isSneaking() && item.getItem() == Items.shears){
+                        int currentVariantIndex = tile.variant.ordinal();
+                        int nextVariantIndex = (currentVariantIndex + 1) % EnumBannerVariant.values().length;
+                        tile.variant = EnumBannerVariant.values()[nextVariantIndex];
+
+                        player.worldObj.markBlockForUpdate(event.x, y, event.z);
+                        event.setCanceled(true);
+                        return;
+                    }
+                }
+
 				tile.icon = item.copy();
 				player.worldObj.markBlockForUpdate(event.x, y, event.z);
 				event.setCanceled(true);
 			}
-
 		}
 	}
 
@@ -314,7 +303,7 @@ public class ServerEventsHandler {
 		ItemStack item = player.getCurrentEquippedItem();
 		if(item == null || item.getItem() != CustomItems.excalibur)
 			return;
-		Server.sendData((EntityPlayerMP)player, EnumPacketClient.PLAY_MUSIC, "customnpcs:songs.excalibur");
+        PacketHandler.Instance.sendToPlayer(new SoundManagementPacket(EnumSoundOperation.PLAY_MUSIC, "customnpcs:songs.excalibur"), (EntityPlayerMP)player);
 		player.addChatMessage(new ChatComponentTranslation("<" + StatCollector.translateToLocal(item.getItem().getUnlocalizedName() + ".name") + "> " + ItemExcalibur.quotes[player.getRNG().nextInt(ItemExcalibur.quotes.length)]));
 	}
 
@@ -512,7 +501,7 @@ public class ServerEventsHandler {
             MarkData data = MarkData.get((EntityNPCInterface) event.target);
             if (data.marks.isEmpty())
                 return;
-            Server.sendData((EntityPlayerMP) event.entityPlayer, EnumPacketClient.MARK_DATA, event.target.getEntityId(), data.getNBT());
+            PacketHandler.Instance.sendToPlayer(new MarkDataPacket(event.target.getEntityId(), data.getNBT()), (EntityPlayerMP)event.entityPlayer);
         }
     }
 }
diff --git a/src/main/java/noppes/npcs/ServerTickHandler.java b/src/main/java/noppes/npcs/ServerTickHandler.java
index 14d33b0a1..e793e8db0 100644
--- a/src/main/java/noppes/npcs/ServerTickHandler.java
+++ b/src/main/java/noppes/npcs/ServerTickHandler.java
@@ -4,12 +4,13 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;
+import kamkeel.npcs.controllers.ProfileController;
+import kamkeel.npcs.controllers.SyncController;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.WorldServer;
 import noppes.npcs.client.AnalyticsTracking;
 import noppes.npcs.controllers.PlayerDataController;
-import noppes.npcs.controllers.SyncController;
 import noppes.npcs.controllers.data.PlayerData;
 
 import java.net.InetAddress;
@@ -52,6 +53,8 @@ public class ServerTickHandler {
 		}
 
         SyncController.syncPlayer(player);
+        SyncController.syncEffects(player);
+        ProfileController.login(player);
 	}
 
 	@SubscribeEvent
diff --git a/src/main/java/noppes/npcs/VersionCompatibility.java b/src/main/java/noppes/npcs/VersionCompatibility.java
index 23445f625..afa205d16 100644
--- a/src/main/java/noppes/npcs/VersionCompatibility.java
+++ b/src/main/java/noppes/npcs/VersionCompatibility.java
@@ -46,7 +46,7 @@ public class VersionCompatibility {
 		}
 		if(npc.npcVersion < 12){
 			CompatabilityFix(compound, npc.advanced.writeToNBT(new NBTTagCompound()));
-			CompatabilityFix(compound, npc.ai.writeToNBT(new NBTTagCompound()));
+			CompatabilityFix(compound, npc.ais.writeToNBT(new NBTTagCompound()));
 			CompatabilityFix(compound, npc.stats.writeToNBT(new NBTTagCompound()));
 			CompatabilityFix(compound, npc.display.writeToNBT(new NBTTagCompound()));
 			CompatabilityFix(compound, npc.inventory.writeEntityToNBT(new NBTTagCompound()));
@@ -101,7 +101,7 @@ public class VersionCompatibility {
 				int z = ((NBTTagInt) list.removeTag(2)).func_150287_d();
 				int y = ((NBTTagInt) list.removeTag(1)).func_150287_d();
 				int x = ((NBTTagInt) list.removeTag(0)).func_150287_d();
-				
+
 				compound.setIntArray("StartPosNew", new int[]{x,y,z});
 			}
 		}
@@ -112,7 +112,7 @@ public class VersionCompatibility {
 			bo = comp.getBoolean("HealthRegen");
 			comp.setInteger("HealthRegen", bo?1:0);
     		compound.setTag("TransformStats", comp);
-			
+
 		}
 		npc.npcVersion = ModRev;
 	}
@@ -200,7 +200,7 @@ public class VersionCompatibility {
 		if(compatibilty.getVersion() == ModRev)
 			return;
 		CompatabilityFix(compound, compatibilty.writeToNBT(new NBTTagCompound()));
-		
+
 		compatibilty.setVersion(ModRev);
 	}
 	private static void CompatabilityFix(NBTTagCompound compound,
diff --git a/src/main/java/noppes/npcs/ai/CombatHandler.java b/src/main/java/noppes/npcs/ai/CombatHandler.java
index eb980a959..310ec79dd 100644
--- a/src/main/java/noppes/npcs/ai/CombatHandler.java
+++ b/src/main/java/noppes/npcs/ai/CombatHandler.java
@@ -1,6 +1,6 @@
 package noppes.npcs.ai;
 
-import kamkeel.addon.DBCAddon;
+import kamkeel.npcs.addon.DBCAddon;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/noppes/npcs/ai/EntityAIAmbushTarget.java b/src/main/java/noppes/npcs/ai/EntityAIAmbushTarget.java
index 592647238..46f3825ca 100644
--- a/src/main/java/noppes/npcs/ai/EntityAIAmbushTarget.java
+++ b/src/main/java/noppes/npcs/ai/EntityAIAmbushTarget.java
@@ -80,7 +80,7 @@ public class EntityAIAmbushTarget extends EntityAIBase
     {
     	boolean shouldHide = this.targetEntity.getDistanceSqToEntity(this.theEntity) > this.distance;
     	boolean isSeen = this.theEntity.canSee(targetEntity);
-    	return (!this.theEntity.getNavigator().noPath() && shouldHide) || (!isSeen && (shouldHide || this.theEntity.ai.directLOS));
+    	return (!this.theEntity.getNavigator().noPath() && shouldHide) || (!isSeen && (shouldHide || this.theEntity.ais.directLOS));
     }
 
     /**
@@ -90,7 +90,7 @@ public class EntityAIAmbushTarget extends EntityAIBase
     {
         this.theEntity.getNavigator().tryMoveToXYZ(this.shelterX, this.shelterY, this.shelterZ, this.movementSpeed);
     }
-    
+
     /**
      * Resets the task
      */
@@ -114,9 +114,9 @@ public class EntityAIAmbushTarget extends EntityAIBase
     {
     	this.theEntity.getLookHelper().setLookPositionWithEntity(targetEntity, 30.0F, 30.0F);
     }
-    
+
     private Vec3 findHidingSpot()
-    {        
+    {
     	Random random = this.theEntity.getRNG();
     	Vec3 idealPos = null;
 
@@ -131,7 +131,7 @@ public class EntityAIAmbushTarget extends EntityAIBase
         				double j = MathHelper.floor_double(this.theEntity.posX + x) + 0.5D;
         	            double k = MathHelper.floor_double(this.theEntity.boundingBox.minY + y);
         	            double l = MathHelper.floor_double(this.theEntity.posZ + z) + 0.5D;
-        	            
+
         	            if (this.theWorld.getBlock((int)j, (int)k, (int)l).isOpaqueCube() && !this.theWorld.getBlock((int)j, (int)k + 1, (int)l).isOpaqueCube() && !this.theWorld.getBlock((int)j, (int)k + 2, (int)l).isOpaqueCube())
         	            {
         		            Vec3 vec1 = Vec3.createVectorHelper(this.targetEntity.posX, this.targetEntity.posY + (double)this.targetEntity.getEyeHeight(), this.targetEntity.posZ);
@@ -148,7 +148,7 @@ public class EntityAIAmbushTarget extends EntityAIBase
         			}
         		}
         	}
-        	
+
         	if (idealPos != null)
         	{
         		return idealPos;
diff --git a/src/main/java/noppes/npcs/ai/EntityAIAnimation.java b/src/main/java/noppes/npcs/ai/EntityAIAnimation.java
index dfdf8c648..3cd3a2300 100644
--- a/src/main/java/noppes/npcs/ai/EntityAIAnimation.java
+++ b/src/main/java/noppes/npcs/ai/EntityAIAnimation.java
@@ -24,21 +24,21 @@ public class EntityAIAnimation extends EntityAIBase
     	isDead = !npc.isEntityAlive();
     	if(isDead)
     		return npc.currentAnimation != EnumAnimation.LYING;
-    	
+
     	if(npc.stats.aimWhileShooting && npc.isAttacking())
     		return npc.currentAnimation != EnumAnimation.AIMING;
-    	if(npc.ai.animationType == EnumAnimation.NONE)
+    	if(npc.ais.animationType == EnumAnimation.NONE)
     		return npc.currentAnimation != EnumAnimation.NONE;
     	isAttacking = npc.isAttacking();
-    	if(npc.ai.returnToStart)
+    	if(npc.ais.returnToStart)
     		isAtStartpoint = npc.isVeryNearAssignedPlace();
     	hasPath = !npc.getNavigator().noPath();
-    	
-    	if(npc.ai.movingType == EnumMovingType.Standing && hasNavigation() && npc.currentAnimation.getWalkingAnimation() == 0){
+
+    	if(npc.ais.movingType == EnumMovingType.Standing && hasNavigation() && npc.currentAnimation.getWalkingAnimation() == 0){
     		return npc.currentAnimation != EnumAnimation.NONE;
     	}
-    	
-    	return npc.currentAnimation != npc.ai.animationType;
+
+    	return npc.currentAnimation != npc.ais.animationType;
     }
 
     @Override
@@ -47,21 +47,21 @@ public class EntityAIAnimation extends EntityAIBase
     		setAnimation(EnumAnimation.AIMING);
     		return;
     	}
-    	EnumAnimation type = npc.ai.animationType;
+    	EnumAnimation type = npc.ais.animationType;
     	if(isDead)
     		type = EnumAnimation.LYING;
-    	else if(npc.ai.movingType == EnumMovingType.Standing && npc.ai.animationType.getWalkingAnimation() == 0 && hasNavigation())
+    	else if(npc.ais.movingType == EnumMovingType.Standing && npc.ais.animationType.getWalkingAnimation() == 0 && hasNavigation())
     		type = EnumAnimation.NONE;
 		setAnimation(type);
     }
-    
+
     private void setAnimation(EnumAnimation animation){
     	npc.setCurrentAnimation(animation);
     	npc.updateHitbox();
     	npc.setPosition(npc.posX, npc.posY, npc.posZ);
     }
-    
+
     private boolean hasNavigation() {
-    	return (isAttacking || npc.ai.returnToStart && !isAtStartpoint && !npc.isFollower() || hasPath);
+    	return (isAttacking || npc.ais.returnToStart && !isAtStartpoint && !npc.isFollower() || hasPath);
     }
 }
diff --git a/src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java b/src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java
index dce5b5638..73e9f7ea3 100644
--- a/src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java
+++ b/src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java
@@ -1,6 +1,6 @@
 package noppes.npcs.ai;
 
-import kamkeel.addon.DBCAddon;
+import kamkeel.npcs.addon.DBCAddon;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.ai.EntityAIBase;
@@ -47,14 +47,14 @@ public class EntityAIAttackTarget extends EntityAIBase
         else if (!entitylivingbase.isEntityAlive()){
             return false;
         }
-        else if (this.npc.inventory.getProjectile() != null && this.npc.ai.useRangeMelee == 0){
+        else if (this.npc.inventory.getProjectile() != null && this.npc.ais.useRangeMelee == 0){
      	   return false;
         }
 
         double var2 = this.npc.getDistanceSq(entitylivingbase.posX, entitylivingbase.boundingBox.minY, entitylivingbase.posZ);
-        double var3 = this.npc.ai.distanceToMelee * this.npc.ai.distanceToMelee;
+        double var3 = this.npc.ais.distanceToMelee * this.npc.ais.distanceToMelee;
 
-        if (this.npc.ai.useRangeMelee == 1 && var2 > var3){
+        if (this.npc.ais.useRangeMelee == 1 && var2 > var3){
         	return false;
         }
         else{
@@ -81,7 +81,7 @@ public class EntityAIAttackTarget extends EntityAIBase
 
 		if(npc.getDistanceToEntity(entityTarget) > npc.stats.aggroRange)
 			return false;
-		if (this.npc.ai.useRangeMelee == 1 && npc.getDistanceSqToEntity(entityTarget) > (this.npc.ai.distanceToMelee * this.npc.ai.distanceToMelee))
+		if (this.npc.ais.useRangeMelee == 1 && npc.getDistanceSqToEntity(entityTarget) > (this.npc.ais.distanceToMelee * this.npc.ais.distanceToMelee))
 			return false;
 
 		return this.npc.isWithinHomeDistance(MathHelper.floor_double(entityTarget.posX), MathHelper.floor_double(entityTarget.posY), MathHelper.floor_double(entityTarget.posZ));
@@ -94,7 +94,7 @@ public class EntityAIAttackTarget extends EntityAIBase
     	if(!navOverride)
     		this.npc.getNavigator().setPath(this.entityPathEntity, 1.3D);
         this.field_75445_i = 0;
-        if (this.npc.getRangedTask() != null && this.npc.ai.useRangeMelee == 2)
+        if (this.npc.getRangedTask() != null && this.npc.ais.useRangeMelee == 2)
         {
         	this.npc.getRangedTask().navOverride(true);
         }
@@ -109,7 +109,7 @@ public class EntityAIAttackTarget extends EntityAIBase
     	this.entityTarget = null;
     	this.npc.setAttackTarget(null);
         this.npc.getNavigator().clearPathEntity();
-        if (this.npc.getRangedTask() != null && this.npc.ai.useRangeMelee == 2)
+        if (this.npc.getRangedTask() != null && this.npc.ais.useRangeMelee == 2)
         {
         	this.npc.getRangedTask().navOverride(false);
         }
diff --git a/src/main/java/noppes/npcs/ai/EntityAIAvoidTarget.java b/src/main/java/noppes/npcs/ai/EntityAIAvoidTarget.java
index 2ae0724a0..bb88bdd5d 100644
--- a/src/main/java/noppes/npcs/ai/EntityAIAvoidTarget.java
+++ b/src/main/java/noppes/npcs/ai/EntityAIAvoidTarget.java
@@ -19,7 +19,7 @@ public class EntityAIAvoidTarget extends EntityAIBase
     private EntityNPCInterface theEntity;
     private Entity closestLivingEntity;
     private float distanceFromEntity;
-    
+
     private float health;
 
     /** The PathEntity of our entity */
@@ -27,7 +27,7 @@ public class EntityAIAvoidTarget extends EntityAIBase
 
     /** The PathNavigate of our entity */
     private PathNavigate entityPathNavigate;
-    
+
     /** The class of the entity we should avoid */
     private Class targetEntityClass;
 
@@ -46,14 +46,14 @@ public class EntityAIAvoidTarget extends EntityAIBase
     public boolean shouldExecute()
     {
     	EntityLivingBase target = this.theEntity.getAttackTarget();
-    	
+
     	if (target == null)
         {
             return false;
         }
-        
+
     	targetEntityClass = target.getClass();
-    	
+
         if (this.targetEntityClass == EntityPlayer.class)
         {
             this.closestLivingEntity = this.theEntity.worldObj.getClosestPlayerToEntity(this.theEntity, (double)this.distanceFromEntity);
@@ -75,7 +75,7 @@ public class EntityAIAvoidTarget extends EntityAIBase
             this.closestLivingEntity = (Entity)var1.get(0);
         }
 
-        if (!this.theEntity.getEntitySenses().canSee(this.closestLivingEntity) && this.theEntity.ai.directLOS)
+        if (!this.theEntity.getEntitySenses().canSee(this.closestLivingEntity) && this.theEntity.ais.directLOS)
         {
             return false;
         }
@@ -83,10 +83,10 @@ public class EntityAIAvoidTarget extends EntityAIBase
         {
             Vec3 var2 = RandomPositionGeneratorAlt.findRandomTargetBlockAwayFrom(this.theEntity, 16, 7, Vec3.createVectorHelper(this.closestLivingEntity.posX, this.closestLivingEntity.posY, this.closestLivingEntity.posZ));
 
-            boolean var3 = this.theEntity.inventory.getProjectile() == null || this.theEntity.ai.useRangeMelee == 2;
-            
+            boolean var3 = this.theEntity.inventory.getProjectile() == null || this.theEntity.ais.useRangeMelee == 2;
+
             boolean var4 = var3 ? this.health == this.theEntity.getHealth() : this.theEntity.getRangedTask() != null && !this.theEntity.getRangedTask().hasFired();
-            
+
             if (var2 == null)
             {
                 return false;
@@ -95,7 +95,7 @@ public class EntityAIAvoidTarget extends EntityAIBase
             {
                 return false;
             }
-            else if (this.theEntity.ai.tacticalVariant == EnumNavType.HitNRun && var4)
+            else if (this.theEntity.ais.tacticalVariant == EnumNavType.HitNRun && var4)
             {
             	return false;
             }
@@ -145,13 +145,13 @@ public class EntityAIAvoidTarget extends EntityAIBase
         {
             this.theEntity.getNavigator().setSpeed(1.0D);
         }
-        if (this.theEntity.ai.tacticalVariant == EnumNavType.HitNRun)
+        if (this.theEntity.ais.tacticalVariant == EnumNavType.HitNRun)
         {
         	float dist = this.theEntity.getDistanceToEntity(this.closestLivingEntity);
-        	if (dist > this.distanceFromEntity || dist < this.theEntity.ai.tacticalRadius)
+        	if (dist > this.distanceFromEntity || dist < this.theEntity.ais.tacticalRadius)
         	{
         		this.health = this.theEntity.getHealth();
         	}
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/noppes/npcs/ai/EntityAIFollow.java b/src/main/java/noppes/npcs/ai/EntityAIFollow.java
index 173af0224..e1034c182 100644
--- a/src/main/java/noppes/npcs/ai/EntityAIFollow.java
+++ b/src/main/java/noppes/npcs/ai/EntityAIFollow.java
@@ -26,9 +26,9 @@ public class EntityAIFollow extends EntityAIBase
     		return false;
     	return distance > npc.followRange();
     }
-    
+
     public boolean excute(){
-    	if(!npc.isEntityAlive() || !npc.isFollower() || npc.isAttacking() || (owner = npc.getOwner()) == null || npc.ai.animationType == EnumAnimation.SITTING)
+    	if(!npc.isEntityAlive() || !npc.isFollower() || npc.isAttacking() || (owner = npc.getOwner()) == null || npc.ais.animationType == EnumAnimation.SITTING)
     		return false;
     	distance = npc.getDistanceSqToEntity(owner);
     	return true;
@@ -62,7 +62,7 @@ public class EntityAIFollow extends EntityAIBase
 			speed = 3;
         if (this.npc.getNavigator().tryMoveToEntityLiving(owner, speed) || distance < 225.0D)
         	return;
-        
+
         int i = MathHelper.floor_double(this.owner.posX) - 2;
         int j = MathHelper.floor_double(this.owner.posZ) - 2;
         int k = MathHelper.floor_double(this.owner.boundingBox.minY);
diff --git a/src/main/java/noppes/npcs/ai/EntityAILook.java b/src/main/java/noppes/npcs/ai/EntityAILook.java
index 9151ee625..938c8816b 100644
--- a/src/main/java/noppes/npcs/ai/EntityAILook.java
+++ b/src/main/java/noppes/npcs/ai/EntityAILook.java
@@ -28,15 +28,15 @@ public class EntityAILook extends EntityAIBase{
     public boolean shouldExecute(){
         return !npc.isAttacking() && npc.getNavigator().noPath() && !npc.isPlayerSleeping() && npc.isEntityAlive();
     }
-    
+
     /**
      * Execute a one shot task or start executing a continuous task
      */
     @Override
     public void startExecuting(){
-    	rotatebody = npc.ai.standingType == EnumStandingType.RotateBody || npc.ai.standingType == EnumStandingType.HeadRotation;
+    	rotatebody = npc.ais.standingType == EnumStandingType.RotateBody || npc.ais.standingType == EnumStandingType.HeadRotation;
     }
-    
+
     /**
      * Resets the task
      */
@@ -44,13 +44,13 @@ public class EntityAILook extends EntityAIBase{
     public void resetTask(){
     	rotatebody = false;
     }
-    
+
     /**
      * Updates the task
      */
     @Override
-    public void updateTask(){	
-    	if(npc.ai.standingType == EnumStandingType.Stalking){
+    public void updateTask(){
+    	if(npc.ais.standingType == EnumStandingType.Stalking){
     		EntityPlayer player = npc.worldObj.getClosestPlayerToEntity(npc, 16);
     		if(player == null)
     			rotatebody = true;
@@ -75,14 +75,14 @@ public class EntityAILook extends EntityAIBase{
     			npc.getLookHelper().setLookPositionWithEntity(closest, 10F, npc.getVerticalFaceSpeed());
     			return;
     		}
-    		
+
     	}
-    	
+
     	if(rotatebody){
 	    	if(idle == 0 && npc.getRNG().nextFloat() < 0.02F){
 	            double var1 = (Math.PI * 2D) * this.npc.getRNG().nextDouble();
-	        	if(npc.ai.standingType == EnumStandingType.HeadRotation)
-	        		var1 = Math.PI / 180 * npc.ai.orientation + Math.PI * 0.2 + Math.PI * 0.6 * this.npc.getRNG().nextDouble();
+	        	if(npc.ais.standingType == EnumStandingType.HeadRotation)
+	        		var1 = Math.PI / 180 * npc.ais.orientation + Math.PI * 0.2 + Math.PI * 0.6 * this.npc.getRNG().nextDouble();
 	            this.lookX = Math.cos(var1);
 	            this.lookZ = Math.sin(var1);
 	            this.idle = 20 + this.npc.getRNG().nextInt(20);
@@ -92,9 +92,9 @@ public class EntityAILook extends EntityAIBase{
 	            npc.getLookHelper().setLookPosition(npc.posX + lookX, npc.posY + npc.getEyeHeight(), npc.posZ + lookZ, 10F, npc.getVerticalFaceSpeed());
 	    	}
     	}
-    	
-    	if(npc.ai.standingType == EnumStandingType.NoRotation){
-    		npc.rotationYawHead = npc.rotationYaw = npc.renderYawOffset = npc.ai.orientation;
+
+    	if(npc.ais.standingType == EnumStandingType.NoRotation){
+    		npc.rotationYawHead = npc.rotationYaw = npc.renderYawOffset = npc.ais.orientation;
     	}
     }
 }
diff --git a/src/main/java/noppes/npcs/ai/EntityAIMovingPath.java b/src/main/java/noppes/npcs/ai/EntityAIMovingPath.java
index 37cfe103a..ae7a7db85 100644
--- a/src/main/java/noppes/npcs/ai/EntityAIMovingPath.java
+++ b/src/main/java/noppes/npcs/ai/EntityAIMovingPath.java
@@ -21,16 +21,16 @@ public class EntityAIMovingPath extends EntityAIBase
      */
     @Override
     public boolean shouldExecute(){
-        if (npc.isAttacking() || npc.isInteracting() || npc.getRNG().nextInt(40) != 0 && npc.ai.movingPause || !npc.getNavigator().noPath() || npc.isInteracting())
+        if (npc.isAttacking() || npc.isInteracting() || npc.getRNG().nextInt(40) != 0 && npc.ais.movingPause || !npc.getNavigator().noPath() || npc.isInteracting())
             return false;
-        
-        List<int[]> list = npc.ai.getMovingPath();
+
+        List<int[]> list = npc.ais.getMovingPath();
         if(list.size() < 2)
         	return false;
-        
-        npc.ai.incrementMovingPath();
-    	pos = npc.ai.getCurrentMovingPath();
-        
+
+        npc.ais.incrementMovingPath();
+    	pos = npc.ais.getCurrentMovingPath();
+
         return true;
     }
 
@@ -40,7 +40,7 @@ public class EntityAIMovingPath extends EntityAIBase
     @Override
     public boolean continueExecuting(){
     	if(npc.isAttacking() || npc.isInteracting()){
-    		npc.ai.decreaseMovingPath();
+    		npc.ais.decreaseMovingPath();
     		return false;
     	}
         return !this.npc.getNavigator().noPath();
diff --git a/src/main/java/noppes/npcs/ai/EntityAIRangedAttack.java b/src/main/java/noppes/npcs/ai/EntityAIRangedAttack.java
index 7e7aa75d3..0595872dd 100644
--- a/src/main/java/noppes/npcs/ai/EntityAIRangedAttack.java
+++ b/src/main/java/noppes/npcs/ai/EntityAIRangedAttack.java
@@ -54,16 +54,16 @@ public class EntityAIRangedAttack extends EntityAIBase
     	EntityLivingBase var1 = this.entityHost.getAttackTarget();
 
         if (var1 == null || !var1.isEntityAlive()) return false;
-        
+
 		if(entityHost.getDistanceToEntity(var1) > entityHost.stats.aggroRange) return false;
-		
+
         if (this.entityHost.inventory.getProjectile() == null)  return false;
-        
+
         double var2 = this.entityHost.getDistanceSq(var1.posX, var1.boundingBox.minY, var1.posZ);
-        double var3 = this.entityHost.ai.distanceToMelee * this.entityHost.ai.distanceToMelee;
-        
-        if (this.entityHost.ai.useRangeMelee >= 1 && var2 <= var3) return false;
-        
+        double var3 = this.entityHost.ais.distanceToMelee * this.entityHost.ais.distanceToMelee;
+
+        if (this.entityHost.ais.useRangeMelee >= 1 && var2 <= var3) return false;
+
         else
         {
             this.attackTarget = var1;
@@ -91,7 +91,7 @@ public class EntityAIRangedAttack extends EntityAIBase
         this.hasFired = false;
         this.rangedAttackTime = this.entityHost.stats.minDelay / 2;
     }
-    
+
     /**
      * Updates the task
      */
@@ -101,7 +101,7 @@ public class EntityAIRangedAttack extends EntityAIBase
         double var1 = this.entityHost.getDistanceSq(this.attackTarget.posX, this.attackTarget.boundingBox.minY, this.attackTarget.posZ);
 		float field_82642_h = this.entityHost.stats.rangedRange * this.entityHost.stats.rangedRange;
 
-		if (!navOverride && this.entityHost.ai.directLOS)
+		if (!navOverride && this.entityHost.ais.directLOS)
 		{
 			if (this.entityHost.getEntitySenses().canSee(this.attackTarget))
 		    {
@@ -111,7 +111,7 @@ public class EntityAIRangedAttack extends EntityAIBase
 			{
 				this.field_75318_f = 0;
 			}
-			int v = this.entityHost.ai.tacticalVariant == EnumNavType.Default ? 20 : 5;
+			int v = this.entityHost.ais.tacticalVariant == EnumNavType.Default ? 20 : 5;
 			if (var1 <= (double)field_82642_h && this.field_75318_f >= v)
 			{
 				this.entityHost.getNavigator().clearPathEntity();
@@ -123,10 +123,10 @@ public class EntityAIRangedAttack extends EntityAIBase
         }
 
         this.rangedAttackTime = Math.max(this.rangedAttackTime - 1, 0);
-        
+
         if (this.rangedAttackTime <= 0)
         {
-            if (var1 <= (double)field_82642_h && (this.entityHost.getEntitySenses().canSee(this.attackTarget) || this.entityHost.ai.canFireIndirect == 2))
+            if (var1 <= (double)field_82642_h && (this.entityHost.getEntitySenses().canSee(this.attackTarget) || this.entityHost.ais.canFireIndirect == 2))
             {
             	 if (this.field_70846_g++ <= this.entityHost.stats.burstCount)
                  {
@@ -138,34 +138,34 @@ public class EntityAIRangedAttack extends EntityAIBase
                 	 this.hasFired = true;
                 	 this.rangedAttackTime = (this.entityHost.stats.maxDelay - MathHelper.floor_float(this.entityHost.getRNG().nextFloat() * (this.entityHost.stats.maxDelay - this.entityHost.stats.minDelay)));
                  }
-            	 
+
             	 if (this.field_70846_g > 1)
                  {
             		 boolean indirect = false;
-            		 
-            		 switch(this.entityHost.ai.canFireIndirect)
+
+            		 switch(this.entityHost.ais.canFireIndirect)
             		 {
             		     case 1 : indirect = var1 > (double)field_82642_h / 2; break;
             		     case 2 : indirect = !this.entityHost.getEntitySenses().canSee(this.attackTarget);
             		 }
-            		 
+
             		 this.rangedAttackEntityHost.attackEntityWithRangedAttack(this.attackTarget, indirect ? 1 : 0);
             		 if (this.entityHost.currentAnimation != EnumAnimation.AIMING)
             		 {
             			 this.entityHost.swingItem();
             		 }
                  }
-            } 
+            }
         }
     }
-    
+
     public boolean hasFired()
     {
     	return this.hasFired;
     }
-    
+
     public void navOverride(boolean nav){
     	this.navOverride = nav;
         this.setMutexBits(this.navOverride ? AiMutex.PATHING : AiMutex.LOOK + AiMutex.PASSIVE);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/noppes/npcs/ai/EntityAIReturn.java b/src/main/java/noppes/npcs/ai/EntityAIReturn.java
index d3c42e426..936c2eb4c 100644
--- a/src/main/java/noppes/npcs/ai/EntityAIReturn.java
+++ b/src/main/java/noppes/npcs/ai/EntityAIReturn.java
@@ -29,25 +29,25 @@ public class EntityAIReturn extends EntityAIBase
      * Returns whether the EntityAIBase should begin execution.
      */
     public boolean shouldExecute() {
-		if (!npc.ai.returnToStart){
+		if (!npc.ais.returnToStart){
 			return false;
 		}
 
 		if(npc.hasOwner() || npc.isKilled() || npc.isInteracting()){
 			return false;
 		}
-    	
-    	if (npc.ai.findShelter == 0 && (!npc.worldObj.isDaytime() || npc.worldObj.isRaining()) && !npc.worldObj.provider.hasNoSky){
+
+    	if (npc.ais.findShelter == 0 && (!npc.worldObj.isDaytime() || npc.worldObj.isRaining()) && !npc.worldObj.provider.hasNoSky){
     		if (npc.worldObj.canBlockSeeTheSky((int)npc.getStartXPos(), (int)npc.getStartYPos(), (int)npc.getStartZPos()) || npc.worldObj.getFullBlockLightValue((int)npc.getStartXPos(), (int)npc.getStartYPos(), (int)npc.getStartZPos()) <= 8){
                 return false;
             }
         }
-    	else if (npc.ai.findShelter == 1 && npc.worldObj.isDaytime()){
+    	else if (npc.ais.findShelter == 1 && npc.worldObj.isDaytime()){
     		if (npc.worldObj.canBlockSeeTheSky((int)npc.getStartXPos(), (int)npc.getStartYPos(), (int)npc.getStartZPos())){
                 return false;
             }
     	}
-    	
+
     	if(npc.isAttacking()){
     		if(!wasAttacked){
 	    		wasAttacked = true;
@@ -56,33 +56,33 @@ public class EntityAIReturn extends EntityAIBase
     		return false;
     	}
 
-    	if(npc.ai.movingType == EnumMovingType.MovingPath && npc.ai.getDistanceSqToPathPoint() < ConfigMain.NpcNavRange * ConfigMain.NpcNavRange)
+    	if(npc.ais.movingType == EnumMovingType.MovingPath && npc.ais.getDistanceSqToPathPoint() < ConfigMain.NpcNavRange * ConfigMain.NpcNavRange)
     		return false;
 
 		if (npc.getNavigator().noPath() || (!npc.isAttacking() && wasAttacked)) {
 			return true;
 		}
 
-    	if(npc.ai.movingType == EnumMovingType.Wandering)
-    		return this.npc.getDistanceSq(npc.getStartXPos(), npc.getStartYPos(), npc.getStartZPos()) > npc.ai.walkingRange * npc.ai.walkingRange;
+    	if(npc.ais.movingType == EnumMovingType.Wandering)
+    		return this.npc.getDistanceSq(npc.getStartXPos(), npc.getStartYPos(), npc.getStartZPos()) > npc.ais.walkingRange * npc.ais.walkingRange;
 
-        if(npc.ai.movingType == EnumMovingType.Standing)
+        if(npc.ais.movingType == EnumMovingType.Standing)
         	return !this.npc.isVeryNearAssignedPlace();
-        
+
         return false;
     }
     public boolean continueExecuting(){
         return !npc.isFollower() && !npc.isKilled() && !npc.isAttacking() && !npc.isVeryNearAssignedPlace() && totalTicks <= MaxTotalTicks && !npc.isInteracting();
     }
-    
+
     public void updateTask(){
     	totalTicks++;
     	if(totalTicks > MaxTotalTicks){
 			npc.setPosition(endPosX, endPosY, endPosZ);
     		npc.getNavigator().clearPathEntity();
 			return;
-    	}	
-    	
+    	}
+
     	if(stuckTicks > 0){
     		stuckTicks--;
     	}
@@ -95,19 +95,19 @@ public class EntityAIReturn extends EntityAIBase
     		}
     		else
             	navigate(stuckCount % 2 == 1);
-    	}  
+    	}
     	else{
     		stuckCount = 0;
     	}
     }
     private boolean isTooFar(){
     	int allowedDistance = npc.stats.aggroRange * 2;
-    	if(npc.ai.movingType == EnumMovingType.Wandering)
-    		allowedDistance += npc.ai.walkingRange;
+    	if(npc.ais.movingType == EnumMovingType.Wandering)
+    		allowedDistance += npc.ais.walkingRange;
     	return npc.getDistanceSq(endPosX, endPosY, endPosZ) > allowedDistance * allowedDistance;
     }
-    
-    public void startExecuting() 
+
+    public void startExecuting()
     {
     	stuckTicks = 0;
     	totalTicks = 0;
@@ -133,7 +133,7 @@ public class EntityAIReturn extends EntityAIBase
     		int distance = (int) range;
     		if(distance > ConfigMain.NpcNavRange)
     			distance = ConfigMain.NpcNavRange / 2;
-    		else 
+    		else
     			distance /= 2;
     		if(distance > 2){
 	    		Vec3 start = Vec3.createVectorHelper(posX, posY, posZ);
diff --git a/src/main/java/noppes/npcs/ai/EntityAISprintToTarget.java b/src/main/java/noppes/npcs/ai/EntityAISprintToTarget.java
index 5449ba6a5..08a7b3337 100644
--- a/src/main/java/noppes/npcs/ai/EntityAISprintToTarget.java
+++ b/src/main/java/noppes/npcs/ai/EntityAISprintToTarget.java
@@ -22,7 +22,7 @@ public class EntityAISprintToTarget extends EntityAIBase
             return false;
         }
 
-        switch(this.npc.ai.onAttack){
+        switch(this.npc.ais.onAttack){
             case 0 : return !this.npc.isInRange(runTarget, 8)? (!this.npc.onGround ? false : true) : false;
             case 2 : return this.npc.isInRange(runTarget, 7)? (!this.npc.onGround ? false : true) : false;
             default : return false;
diff --git a/src/main/java/noppes/npcs/ai/EntityAIWander.java b/src/main/java/noppes/npcs/ai/EntityAIWander.java
index ee6ebbbcc..82e0aef0d 100644
--- a/src/main/java/noppes/npcs/ai/EntityAIWander.java
+++ b/src/main/java/noppes/npcs/ai/EntityAIWander.java
@@ -33,9 +33,9 @@ public class EntityAIWander extends EntityAIBase
         if (this.entity.getAge() >= 100 || !entity.getNavigator().noPath() || entity.isInteracting() || this.entity.getRNG().nextInt(80) != 0){
             return false;
         }
-        if(entity.ai.npcInteracting && entity.getRNG().nextInt(4) == 1)
+        if(entity.ais.npcInteracting && entity.getRNG().nextInt(4) == 1)
         	nearbyNPC = getNearbyNPC();
-        
+
         if(nearbyNPC != null){
             this.xPosition = MathHelper.floor_double(nearbyNPC.posX);
             this.yPosition = MathHelper.floor_double(nearbyNPC.posY);
@@ -52,7 +52,7 @@ public class EntityAIWander extends EntityAIBase
                 this.yPosition = vec.yCoord;
 
                 if(entity.canFly())
-                    this.yPosition = entity.getStartYPos() + entity.getRNG().nextFloat() * 0.75 * entity.ai.walkingRange;
+                    this.yPosition = entity.getStartYPos() + entity.getRNG().nextFloat() * 0.75 * entity.ais.walkingRange;
                 this.zPosition = vec.zCoord;
             }
         }
@@ -66,28 +66,28 @@ public class EntityAIWander extends EntityAIBase
     	}
     }
     private EntityNPCInterface getNearbyNPC() {
-		List<EntityNPCInterface> list = entity.worldObj.getEntitiesWithinAABBExcludingEntity(entity, entity.boundingBox.expand(entity.ai.walkingRange, entity.ai.walkingRange > 7?7:entity.ai.walkingRange, entity.ai.walkingRange), selector);
+		List<EntityNPCInterface> list = entity.worldObj.getEntitiesWithinAABBExcludingEntity(entity, entity.boundingBox.expand(entity.ais.walkingRange, entity.ais.walkingRange > 7?7:entity.ais.walkingRange, entity.ais.walkingRange), selector);
 		Iterator<EntityNPCInterface> ita = list.iterator();
 		while(ita.hasNext()){
 			EntityNPCInterface npc = ita.next();
-			if(!npc.ai.stopAndInteract || npc.isAttacking() || !npc.isEntityAlive() || entity.faction.isAggressiveToNpc(npc))
+			if(!npc.ais.stopAndInteract || npc.isAttacking() || !npc.isEntityAlive() || entity.faction.isAggressiveToNpc(npc))
 				ita.remove();
 		}
-		
+
 		if(list.isEmpty())
 			return null;
-		
+
 		return list.get(entity.getRNG().nextInt(list.size()));
 	}
 
 	private Vec3 getVec(){
-    	if(entity.ai.walkingRange > 0){
+    	if(entity.ais.walkingRange > 0){
             double distance = this.entity.getDistanceSq(this.entity.getStartXPos(), this.entity.getStartYPos(), this.entity.getStartZPos());
-            int range = (int) MathHelper.sqrt_double(this.entity.ai.walkingRange * this.entity.ai.walkingRange - distance);
+            int range = (int) MathHelper.sqrt_double(this.entity.ais.walkingRange * this.entity.ais.walkingRange - distance);
             if(range > ConfigMain.NpcNavRange)
             	range = ConfigMain.NpcNavRange;
             if(range < 3){
-                range = this.entity.ai.walkingRange;
+                range = this.entity.ais.walkingRange;
                 if(range > ConfigMain.NpcNavRange)
                 	range = ConfigMain.NpcNavRange;
                 Vec3 start = Vec3.createVectorHelper(this.entity.getStartXPos(), this.entity.getStartYPos(), this.entity.getStartZPos());
@@ -121,7 +121,7 @@ public class EntityAIWander extends EntityAIBase
     			entity.saySurrounding(line);
     		else
     			nearbyNPC.saySurrounding(line);
-    		
+
     		entity.addInteract(nearbyNPC);
     		nearbyNPC.addInteract(entity);
     	}
diff --git a/src/main/java/noppes/npcs/ai/EntityAIWaterNav.java b/src/main/java/noppes/npcs/ai/EntityAIWaterNav.java
index 42e34b43e..d11a02e80 100644
--- a/src/main/java/noppes/npcs/ai/EntityAIWaterNav.java
+++ b/src/main/java/noppes/npcs/ai/EntityAIWaterNav.java
@@ -20,7 +20,7 @@ public class EntityAIWaterNav extends EntityAIBase
     {
         if (this.theEntity.isInWater() || this.theEntity.handleLavaMovement())
         {
-        	if (this.theEntity.ai.canSwim)
+        	if (this.theEntity.ais.canSwim)
         	{
         		return true;
         	}
@@ -28,7 +28,7 @@ public class EntityAIWaterNav extends EntityAIBase
         	{
         		return true;
         	}
-        		
+
         }
         return false;
     }
diff --git a/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java b/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java
index c9bca0579..3cb10e62b 100644
--- a/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java
+++ b/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java
@@ -92,7 +92,7 @@ public class FlyPathFinder extends PathFinder
     {
         int i;
 
-        if (((EntityNPCInterface)theEntity).ai.canSwim && this.theEntity.isInWater())
+        if (((EntityNPCInterface)theEntity).ais.canSwim && this.theEntity.isInWater())
         {
             i = (int)this.theEntity.boundingBox.minY;
             BlockPos.MutableBlockPos muteBlock = new BlockPos.MutableBlockPos(MathHelper.floor_double(this.theEntity.posX), i, MathHelper.floor_double(this.theEntity.posZ));
@@ -132,7 +132,7 @@ public class FlyPathFinder extends PathFinder
 
         return openPoint(blockpos1.getX(), i, blockpos1.getZ());
     }
-    
+
 
     public NPCPathPoint getPathPointToCoords(Entity entityIn, double x, double y, double z)
     {
@@ -661,7 +661,7 @@ public class FlyPathFinder extends PathFinder
         int entitySizeX = MathHelper.floor_double(this.theEntity.width + 1.0F);
         int entitySizeY = MathHelper.floor_double(this.theEntity.height + 1.0F);
         int entitySizeZ = MathHelper.floor_double(this.theEntity.width + 1.0F);
-        return this.getPathNodeType(this.worldMap, p_192558_2_, p_192558_3_, p_192558_4_, p_192558_1_, entitySizeX, entitySizeY, entitySizeZ, ((EntityCustomNpc)this.theEntity).ai.doorInteract == 0, ((EntityCustomNpc)this.theEntity).ai.doorInteract == 1);
+        return this.getPathNodeType(this.worldMap, p_192558_2_, p_192558_3_, p_192558_4_, p_192558_1_, entitySizeX, entitySizeY, entitySizeZ, ((EntityCustomNpc)this.theEntity).ais.doorInteract == 0, ((EntityCustomNpc)this.theEntity).ais.doorInteract == 1);
     }
 
     public PathNodeType checkNeighborBlocks(IBlockAccess worldmap, int x, int y, int z, PathNodeType type)
@@ -735,7 +735,7 @@ public class FlyPathFinder extends PathFinder
             {
                 if (material == Material.water)
                 {
-                    return ((EntityNPCInterface)this.theEntity).ai.canSwim ? PathNodeType.OPEN :  PathNodeType.WATER;
+                    return ((EntityNPCInterface)this.theEntity).ais.canSwim ? PathNodeType.OPEN :  PathNodeType.WATER;
                 }
                 else if (material == Material.lava)
                 {
diff --git a/src/main/java/noppes/npcs/ai/pathfinder/FlyingMoveHelper.java b/src/main/java/noppes/npcs/ai/pathfinder/FlyingMoveHelper.java
index 59e4273bc..292b8158c 100644
--- a/src/main/java/noppes/npcs/ai/pathfinder/FlyingMoveHelper.java
+++ b/src/main/java/noppes/npcs/ai/pathfinder/FlyingMoveHelper.java
@@ -28,7 +28,7 @@ public class FlyingMoveHelper extends EntityMoveHelper{
             this.update = false;
 
             double speed = this.speed * this.entity.getEntityAttribute(SharedMonsterAttributes.movementSpeed).getAttributeValue();
-            double verticalSpeed = this.speed * this.entity.ai.flySpeed/8.0D;
+            double verticalSpeed = this.speed * this.entity.ais.flySpeed/8.0D;
             this.entity.setAIMoveSpeed((float)speed);
 
             double d0 = this.posX - this.entity.posX;
@@ -45,7 +45,7 @@ public class FlyingMoveHelper extends EntityMoveHelper{
                 this.entity.motionX += (speed * (d0 / d5) - this.entity.motionX) * speed;
                 this.entity.motionZ += (speed * (d2 / d5) - this.entity.motionZ) * speed;
 
-                if (((EntityNPCFlying)this.entity).flyLimitAllow || !this.entity.ai.hasFlyLimit) {
+                if (((EntityNPCFlying)this.entity).flyLimitAllow || !this.entity.ais.hasFlyLimit) {
                     this.entity.motionY = verticalSpeed * (d1 / d5);
                     if (this.entity.motionY > 0) {
                         this.entity.motionY += 0.1D;
diff --git a/src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java b/src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java
index 90d53919d..ea355009c 100644
--- a/src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java
+++ b/src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java
@@ -1,6 +1,6 @@
 package noppes.npcs.ai.selector;
 
-import kamkeel.addon.DBCAddon;
+import kamkeel.npcs.addon.DBCAddon;
 import net.minecraft.command.IEntitySelector;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -31,20 +31,20 @@ public class NPCAttackSelector implements IEntitySelector
     public boolean isEntityApplicable(Entity entity){
     	if(!entity.isEntityAlive() || entity == npc || npc.getDistanceToEntity(entity) > npc.stats.aggroRange || !(entity instanceof EntityLivingBase) || ((EntityLivingBase)entity).getHealth() < 1)
     		return false;
-        if (this.npc.ai.directLOS && !this.npc.getEntitySenses().canSee(entity))
+        if (this.npc.ais.directLOS && !this.npc.getEntitySenses().canSee(entity))
         	return false;
 
         if(!npc.stats.attackInvisible &&((EntityLivingBase)entity).isPotionActive(Potion.invisibility) && npc.getDistanceSqToEntity(entity) < 9)
         	return false;
 
     	//prevent the npc from going on an endless killing spree
-    	if(!npc.isFollower() && npc.ai.returnToStart){
+    	if(!npc.isFollower() && npc.ais.returnToStart){
 	    	int allowedDistance = npc.stats.aggroRange * 2;
-	    	if(npc.ai.movingType == EnumMovingType.Wandering)
-	    		allowedDistance += npc.ai.walkingRange;
+	    	if(npc.ais.movingType == EnumMovingType.Wandering)
+	    		allowedDistance += npc.ais.walkingRange;
 	    	double distance = entity.getDistanceSq(npc.getStartXPos(), npc.getStartYPos(), npc.getStartZPos());
-	    	if(npc.ai.movingType == EnumMovingType.MovingPath){
-	    		int[] arr = npc.ai.getCurrentMovingPath();
+	    	if(npc.ais.movingType == EnumMovingType.MovingPath){
+	    		int[] arr = npc.ais.getCurrentMovingPath();
 		    	distance = entity.getDistanceSq(arr[0], arr[1], arr[2]);
 	    	}
 
diff --git a/src/main/java/noppes/npcs/ai/selector/NPCInteractSelector.java b/src/main/java/noppes/npcs/ai/selector/NPCInteractSelector.java
index 5b4387b5f..a23c5e8b9 100644
--- a/src/main/java/noppes/npcs/ai/selector/NPCInteractSelector.java
+++ b/src/main/java/noppes/npcs/ai/selector/NPCInteractSelector.java
@@ -14,7 +14,7 @@ public class NPCInteractSelector implements IEntitySelector {
 		if(entity == npc || !(entity instanceof EntityNPCInterface) || !npc.isEntityAlive())
 			return false;
 		EntityNPCInterface selected = (EntityNPCInterface) entity;
-		if(selected.isAttacking() || npc.getFaction().isAggressiveToNpc(selected) || !npc.ai.stopAndInteract)
+		if(selected.isAttacking() || npc.getFaction().isAggressiveToNpc(selected) || !npc.ais.stopAndInteract)
 			return false;
 		return true;
 	}
diff --git a/src/main/java/noppes/npcs/blocks/BlockBook.java b/src/main/java/noppes/npcs/blocks/BlockBook.java
index e031f61b6..da673fe96 100644
--- a/src/main/java/noppes/npcs/blocks/BlockBook.java
+++ b/src/main/java/noppes/npcs/blocks/BlockBook.java
@@ -1,5 +1,7 @@
 package noppes.npcs.blocks;
 
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.packets.data.gui.GuiOpenBookPacket;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Blocks;
@@ -10,9 +12,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import noppes.npcs.CustomItems;
 import noppes.npcs.CustomNpcsPermissions;
-import noppes.npcs.Server;
 import noppes.npcs.blocks.tiles.TileBook;
-import noppes.npcs.constants.EnumPacketClient;
 
 public class BlockBook extends BlockRotated{
 
@@ -32,8 +32,8 @@ public class BlockBook extends BlockRotated{
 		if (currentItem != null	&& currentItem.getItem() == CustomItems.wand && CustomNpcsPermissions.hasPermission(player, CustomNpcsPermissions.EDIT_BOOK)) {
 			((TileBook)tile).book.func_150996_a(Items.writable_book);
 		}
-    	Server.sendData((EntityPlayerMP)player, EnumPacketClient.OPEN_BOOK, i, j, k, ((TileBook)tile).book.writeToNBT(new NBTTagCompound()));
-    	return true;
+        PacketHandler.Instance.sendToPlayer(new GuiOpenBookPacket(i, j, k, ((TileBook)tile).book.writeToNBT(new NBTTagCompound())), (EntityPlayerMP) player);
+        return true;
     }
 
     @Override
diff --git a/src/main/java/noppes/npcs/blocks/BlockCampfire.java b/src/main/java/noppes/npcs/blocks/BlockCampfire.java
index 12019ee2a..56d718863 100644
--- a/src/main/java/noppes/npcs/blocks/BlockCampfire.java
+++ b/src/main/java/noppes/npcs/blocks/BlockCampfire.java
@@ -14,6 +14,7 @@ import noppes.npcs.CustomItems;
 import noppes.npcs.CustomNpcs;
 import noppes.npcs.NoppesUtilServer;
 import noppes.npcs.blocks.tiles.TileCampfire;
+import noppes.npcs.config.ConfigClient;
 import org.lwjgl.opengl.GL11;
 
 import java.util.Random;
@@ -31,17 +32,16 @@ public class BlockCampfire extends BlockLightable{
 	public TileEntity createNewTileEntity(World var1, int var2) {
 		return new TileCampfire();
 	}
-	
-    @Override    
+
+    @Override
     public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9){
     	ItemStack item = player.inventory.getCurrentItem();
     	if(item == null)
     		return true;
         int meta = world.getBlockMetadata(x, y, z);
-    	
+
     	if((item.getItem() == Items.flint || item.getItem() == Items.flint_and_steel) && unlitBlock() == this){
-    		if(world.rand.nextInt(3) == 0 && !world.isRemote)
-            	super.onBlockActivated(world, x, y, z, player, par6, par7, par8, par9);
+            super.onBlockActivated(world, x, y, z, player, par6, par7, par8, par9);
     		CustomNpcs.proxy.spawnParticle("largesmoke", x + 0.5f, y + 0.5f, z + 0.5f, 0.0D, 0.0D, 0.0D, 2);
     		if(item.getItem() == Items.flint)
     			NoppesUtilServer.consumeItemStack(1, player);
@@ -49,11 +49,11 @@ public class BlockCampfire extends BlockLightable{
     			item.damageItem(1, player);
     		return true;
     	}
-    	
+
     	if(item.getItem() == Item.getItemFromBlock(Blocks.sand) && litBlock() == this){
         	super.onBlockActivated(world, x, y, z, player, par6, par7, par8, par9);
     	}
-    	
+
     	return true;
     }
 
@@ -68,24 +68,28 @@ public class BlockCampfire extends BlockLightable{
         int meta = world.getBlockMetadata(x, y, z);
         if(meta == 1)
         	return;
-		
+
 		if(random.nextInt(36) == 0){
     		world.playSound(x + 0.5F, y + 0.5F, z + 0.5F, "fire.fire", 1.0F + random.nextFloat(), 0.3F + random.nextFloat() * 0.7f , false);
 		}
-		
+
 		TileCampfire tile = (TileCampfire) world.getTileEntity(x, y, z);
-    	
+
     	float xOffset = 0.5f, yOffset = 0.7f, zOffset = 0.5f;
 
         double d0 = (double)((float)x + xOffset);
         double d1 = (double)((float)y + yOffset);
         double d2 = (double)((float)z + zOffset);
-        
-        GL11.glPushMatrix();
-        
-        CustomNpcs.proxy.spawnParticle("largesmoke", d0, d1, d2, 0.0D, 0.0D, 0.0D, 2);
-        CustomNpcs.proxy.spawnParticle("flame", d0, d1, d2, 0.0D, 0.0D, 0.0D, 4);
 
+        GL11.glPushMatrix();
+
+        if(ConfigClient.LegacyCampfire){
+            CustomNpcs.proxy.spawnParticle("largesmoke", d0, d1, d2, 0.0D, 0.0D, 0.0D, 2);
+            CustomNpcs.proxy.spawnParticle("flame", d0, d1, d2, 0.0D, 0.0D, 0.0D, 4);
+        }
+        else {
+            tile.updateEntity();
+        }
         GL11.glPopMatrix();
     }
 
diff --git a/src/main/java/noppes/npcs/blocks/BlockCarpentryBench.java b/src/main/java/noppes/npcs/blocks/BlockCarpentryBench.java
index a435939fb..5b579c406 100644
--- a/src/main/java/noppes/npcs/blocks/BlockCarpentryBench.java
+++ b/src/main/java/noppes/npcs/blocks/BlockCarpentryBench.java
@@ -2,9 +2,9 @@ package noppes.npcs.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -32,9 +32,14 @@ public class BlockCarpentryBench extends BlockContainer
 
     @Override
     public boolean onBlockActivated(World par1World, int i, int j, int k, EntityPlayer player, int par6, float par7, float par8, float par9)
-    {//onBlockActivated
+    {
     	if(!par1World.isRemote){
-    		player.openGui(CustomNpcs.instance, EnumGuiType.PlayerAnvil.ordinal(), par1World, i, j, k);
+            int meta = par1World.getBlockMetadata(i, j, k);
+            if(meta >= 4){
+                player.openGui(CustomNpcs.instance, EnumGuiType.PlayerAnvil.ordinal(), par1World, i, j, k);
+            } else {
+                player.openGui(CustomNpcs.instance, EnumGuiType.PlayerCarpentryBench.ordinal(), par1World, i, j, k);
+            }
     	}
 		return true;
     }
diff --git a/src/main/java/noppes/npcs/blocks/BlockLightable.java b/src/main/java/noppes/npcs/blocks/BlockLightable.java
index b0e8383e2..7c478b300 100644
--- a/src/main/java/noppes/npcs/blocks/BlockLightable.java
+++ b/src/main/java/noppes/npcs/blocks/BlockLightable.java
@@ -6,33 +6,49 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
 import java.util.Random;
 
-public abstract class BlockLightable extends BlockRotated{
+public abstract class BlockLightable extends BlockRotated {
 
 	protected BlockLightable(Block block, boolean lit) {
 		super(block);
-		
+
         if (lit)
             this.setLightLevel(1.0F);
 	}
 
 	public abstract Block unlitBlock();
 	public abstract Block litBlock();
-	
+
 
     @Override
     public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9){
-        TileEntity tile = world.getTileEntity(x, y, z);
-    	if(litBlock() == this)
-        	world.setBlock(x, y, z, unlitBlock(), world.getBlockMetadata(x, y, z), 2);
-        else
-        	world.setBlock(x, y, z, litBlock(), world.getBlockMetadata(x, y, z), 2);
-    	tile.validate();
-    	world.setTileEntity(x, y, z, tile);
+        // Get the current tile entity and store its NBT
+        TileEntity oldTile = world.getTileEntity(x, y, z);
+        NBTTagCompound compound = new NBTTagCompound();
+        oldTile.writeToNBT(compound);
+
+        // Determine which block to set (lit/unlit) based on the current one
+        Block newBlock = (litBlock() == this ? unlitBlock() : litBlock());
+        int meta = world.getBlockMetadata(x, y, z);
+
+        // Change the block; this creates a new tile entity instance
+        world.setBlock(x, y, z, newBlock, meta, 2);
+
+        // Get the new tile and load the stored NBT
+        TileEntity newTile = world.getTileEntity(x, y, z);
+        if(newTile != null){
+            newTile.readFromNBT(compound);
+            newTile.markDirty();
+        }
+
+        world.markBlockForUpdate(x, y, z);
+        world.notifyBlockOfNeighborChange(x, y, z, newBlock);
+
         return true;
     }
 
diff --git a/src/main/java/noppes/npcs/blocks/BlockMailbox.java b/src/main/java/noppes/npcs/blocks/BlockMailbox.java
index 062aec591..df28b6364 100644
--- a/src/main/java/noppes/npcs/blocks/BlockMailbox.java
+++ b/src/main/java/noppes/npcs/blocks/BlockMailbox.java
@@ -2,6 +2,7 @@ package noppes.npcs.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import kamkeel.npcs.network.packets.data.gui.GuiOpenPacket;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -16,38 +17,36 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
-import noppes.npcs.Server;
 import noppes.npcs.blocks.tiles.TileMailbox;
 import noppes.npcs.constants.EnumGuiType;
-import noppes.npcs.constants.EnumPacketClient;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class BlockMailbox extends BlockContainer{
-	
+
 	public int renderId = -1;
 
 	public BlockMailbox() {
         super(Material.iron);
 	}
 
-    @Override   
+    @Override
     public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List)
     {
         par3List.add(new ItemStack(par1, 1, 0));
         par3List.add(new ItemStack(par1, 1, 1));
     }
-    
-    @Override    
+
+    @Override
     public boolean onBlockActivated(World par1World, int i, int j, int k, EntityPlayer player, int par6, float par7, float par8, float par9){
     	if(!par1World.isRemote){
-    		Server.sendData((EntityPlayerMP)player, EnumPacketClient.GUI, EnumGuiType.PlayerMailbox, i, j, k);
+            GuiOpenPacket.openGUI((EntityPlayerMP)player, EnumGuiType.PlayerMailbox, i, j, k);
     	}
 		return true;
     }
 
-    @Override   
+    @Override
     public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
     {
         ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
@@ -56,40 +55,40 @@ public class BlockMailbox extends BlockContainer{
         return ret;
     }
 
-    @Override   
+    @Override
     public int damageDropped(int par1)
     {
         return par1 >> 2;
     }
 
-    @Override   
+    @Override
     public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack)
     {
         int l = MathHelper.floor_double((double)(par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
         l %= 4;
-        
+
         par1World.setBlockMetadataWithNotify(par2, par3, par4, l | par6ItemStack.getItemDamage() << 2, 2);
     }
 
-    @Override   
+    @Override
 	public boolean isOpaqueCube(){
 		return false;
 	}
 
-    @Override   
+    @Override
 	public boolean renderAsNormalBlock(){
 		return false;
 	}
-    @Override   
+    @Override
 	public int getRenderType(){
-		return renderId; 	
+		return renderId;
 	}
 
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister par1IconRegister)
     {
-    	
+
     }
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(int p_149691_1_, int p_149691_2_)
diff --git a/src/main/java/noppes/npcs/blocks/BlockNpcRedstone.java b/src/main/java/noppes/npcs/blocks/BlockNpcRedstone.java
index cf46229f2..70c5488a3 100644
--- a/src/main/java/noppes/npcs/blocks/BlockNpcRedstone.java
+++ b/src/main/java/noppes/npcs/blocks/BlockNpcRedstone.java
@@ -1,5 +1,7 @@
 package noppes.npcs.blocks;
 
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.packets.data.gui.GuiRedstonePacket;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityLivingBase;
@@ -13,10 +15,8 @@ import net.minecraft.world.World;
 import noppes.npcs.CustomItems;
 import noppes.npcs.CustomNpcs;
 import noppes.npcs.CustomNpcsPermissions;
-import noppes.npcs.Server;
 import noppes.npcs.blocks.tiles.TileRedstoneBlock;
 import noppes.npcs.constants.EnumGuiType;
-import noppes.npcs.constants.EnumPacketClient;
 
 public class BlockNpcRedstone extends BlockContainer{
     public BlockNpcRedstone(){
@@ -32,8 +32,8 @@ public class BlockNpcRedstone extends BlockContainer{
 			TileEntity tile = par1World.getTileEntity(i, j, k);
 			NBTTagCompound compound = new NBTTagCompound();
 			tile.writeToNBT(compound);
-			Server.sendData((EntityPlayerMP)player, EnumPacketClient.GUI_REDSTONE, compound);
-        	return true;
+            PacketHandler.Instance.sendToPlayer(new GuiRedstonePacket(compound), (EntityPlayerMP)player);
+            return true;
 		}
 		return false;
     }
diff --git a/src/main/java/noppes/npcs/blocks/BlockWaypoint.java b/src/main/java/noppes/npcs/blocks/BlockWaypoint.java
index f089c3f15..7920b46d9 100644
--- a/src/main/java/noppes/npcs/blocks/BlockWaypoint.java
+++ b/src/main/java/noppes/npcs/blocks/BlockWaypoint.java
@@ -1,5 +1,7 @@
 package noppes.npcs.blocks;
 
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.packets.data.gui.GuiWaypointPacket;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityLivingBase;
@@ -12,10 +14,8 @@ import net.minecraft.world.World;
 import noppes.npcs.CustomItems;
 import noppes.npcs.CustomNpcs;
 import noppes.npcs.CustomNpcsPermissions;
-import noppes.npcs.Server;
 import noppes.npcs.blocks.tiles.TileWaypoint;
 import noppes.npcs.constants.EnumGuiType;
-import noppes.npcs.constants.EnumPacketClient;
 
 public class BlockWaypoint extends BlockContainer{
 
@@ -34,7 +34,7 @@ public class BlockWaypoint extends BlockContainer{
 			TileEntity tile = par1World.getTileEntity(i, j, k);
 			NBTTagCompound compound = new NBTTagCompound();
 			tile.writeToNBT(compound);
-			Server.sendData((EntityPlayerMP)player, EnumPacketClient.GUI_WAYPOINT, compound);
+            PacketHandler.Instance.sendToPlayer(new GuiWaypointPacket(compound), (EntityPlayerMP)player);
         	return true;
 		}
 		return false;
diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileBanner.java b/src/main/java/noppes/npcs/blocks/tiles/TileBanner.java
index bb8075346..3cbc87b43 100644
--- a/src/main/java/noppes/npcs/blocks/tiles/TileBanner.java
+++ b/src/main/java/noppes/npcs/blocks/tiles/TileBanner.java
@@ -3,29 +3,39 @@ package noppes.npcs.blocks.tiles;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.AxisAlignedBB;
+import noppes.npcs.constants.EnumBannerVariant;
 
 public class TileBanner extends TileColorable {
-	
+
 	public ItemStack icon;
+    public EnumBannerVariant variant = EnumBannerVariant.Normal;
 	public long time = 0;
 
     public void readFromNBT(NBTTagCompound compound){
         super.readFromNBT(compound);
         icon = ItemStack.loadItemStackFromNBT(compound.getCompoundTag("BannerIcon"));
+
+        int variantIndex = compound.getInteger("BannerVariant");
+        if (variantIndex >= 0 && variantIndex < EnumBannerVariant.values().length) {
+            variant = EnumBannerVariant.values()[variantIndex];
+        } else {
+            variant = EnumBannerVariant.Normal;
+        }
     }
 
     public void writeToNBT(NBTTagCompound compound){
     	super.writeToNBT(compound);
     	if(icon != null)
     		compound.setTag("BannerIcon", icon.writeToNBT(new NBTTagCompound()));
+        compound.setInteger("BannerVariant", variant.ordinal());
     }
 
 	@Override
     public AxisAlignedBB getRenderBoundingBox(){
 		return AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 2, zCoord + 1);
     }
-	
+
 	public boolean canEdit(){
-		return System.currentTimeMillis() - time  < 10000;
+		return System.currentTimeMillis() - time  < 20000;
 	}
 }
diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileCampfire.java b/src/main/java/noppes/npcs/blocks/tiles/TileCampfire.java
index 178bc5d3d..17871fef0 100644
--- a/src/main/java/noppes/npcs/blocks/tiles/TileCampfire.java
+++ b/src/main/java/noppes/npcs/blocks/tiles/TileCampfire.java
@@ -1,7 +1,62 @@
 package noppes.npcs.blocks.tiles;
 
 
+import net.minecraft.block.Block;
+import net.minecraft.world.World;
+import noppes.npcs.CustomItems;
+import noppes.npcs.CustomNpcs;
+
+import java.util.Random;
 
 public class TileCampfire extends TileColorable {
-	
+
+    public static final Random RAND = new Random();
+    private boolean rainAndSky = false;
+    private boolean previousTickLit = false;
+
+    @Override
+    public void updateEntity()
+    {
+        if (getWorldObj().isRemote)
+        {
+            if (isLit())
+            {
+                if (!previousTickLit || distributedInterval(50L))
+                    rainAndSky = isBeingRainedOn();
+
+                addParticles();
+            }
+
+            previousTickLit = isLit();
+        }
+    }
+
+    public boolean distributedInterval(long interval)
+    {
+        if (hasWorldObj())
+            return (getWorldObj().getTotalWorldTime() + (long) (xCoord + yCoord + zCoord)) % interval == 0L;
+        else
+            return false;
+    }
+
+    protected void addParticles()
+    {
+        CustomNpcs.proxy.generateBigSmokeParticles(getWorldObj(), xCoord, yCoord, zCoord, false);
+        if (rainAndSky)
+        {
+            for (int i = 0; i < RAND.nextInt(3); ++i)
+                getWorldObj().spawnParticle("smoke", xCoord + RAND.nextDouble(), yCoord + 0.9, zCoord + RAND.nextDouble(), 0.0, 0.0, 0.0);
+        }
+    }
+    public boolean isBeingRainedOn()
+    {
+        return getWorldObj().isRaining() && getWorldObj().getPrecipitationHeight(xCoord, zCoord) <= yCoord + 1
+            && getWorldObj().getBiomeGenForCoords(xCoord, zCoord).canSpawnLightningBolt();
+    }
+
+    public boolean isLit()
+    {
+        Block block = this.getBlockType();
+        return block == CustomItems.campfire;
+    }
 }
diff --git a/src/main/java/noppes/npcs/client/Client.java b/src/main/java/noppes/npcs/client/Client.java
deleted file mode 100644
index c2fa8df37..000000000
--- a/src/main/java/noppes/npcs/client/Client.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package noppes.npcs.client;
-
-import cpw.mods.fml.common.network.internal.FMLProxyPacket;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import noppes.npcs.CustomNpcs;
-import noppes.npcs.Server;
-import noppes.npcs.constants.EnumPacketServer;
-
-import java.io.IOException;
-
-public class Client {
-
-	public static void sendData(final EnumPacketServer enu, final Object... obs) {
-		ByteBuf buffer = Unpooled.buffer();
-		try {
-			if(!Server.fillBuffer(buffer, enu, obs))
-				return;
-			CustomNpcs.Channel.sendToServer(new FMLProxyPacket(buffer, "CustomNPCs"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java
index bd80d8532..62a39cf2f 100644
--- a/src/main/java/noppes/npcs/client/ClientProxy.java
+++ b/src/main/java/noppes/npcs/client/ClientProxy.java
@@ -5,7 +5,7 @@ import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.ObfuscationReflectionHelper;
-import kamkeel.addon.client.DBCClient;
+import kamkeel.npcs.addon.client.DBCClient;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.model.ModelBiped;
@@ -32,6 +32,7 @@ import noppes.npcs.*;
 import noppes.npcs.api.IWorld;
 import noppes.npcs.blocks.tiles.*;
 import noppes.npcs.client.controllers.*;
+import noppes.npcs.client.fx.EntityBigSmokeFX;
 import noppes.npcs.client.fx.EntityElementalStaffFX;
 import noppes.npcs.client.fx.EntityEnderFX;
 import noppes.npcs.client.fx.EntityRainbowFX;
@@ -76,7 +77,7 @@ import java.util.Random;
 
 public class ClientProxy extends CommonProxy {
 	public static KeyBinding NPCButton;
-
+    public static final Random RAND = new Random();
 	public static FontContainer Font;
 
 	public void load() {
@@ -84,8 +85,6 @@ public class ClientProxy extends CommonProxy {
 
 		Font = new FontContainer(ConfigClient.FontType, ConfigClient.FontSize);
 		createFolders();
-		CustomNpcs.Channel.register(new PacketHandlerClient());
-		CustomNpcs.ChannelPlayer.register(new PacketHandlerPlayer());
 		new MusicController();
 		new ScriptSoundController();
 
@@ -246,7 +245,8 @@ public class ClientProxy extends CommonProxy {
 			return new GuiNpcPather(npc);
 
 		else if (gui == EnumGuiType.ManageFactions)
-			return new GuiNPCManageFactions(npc);
+            return new GuiNPCManageMagic(npc);
+			// return new GuiNPCManageFactions(npc);
 
         else if (gui == EnumGuiType.ManageCustomForms)
             return DBCClient.Instance.manageCustomForms(npc);
@@ -274,7 +274,7 @@ public class ClientProxy extends CommonProxy {
 			return new GuiNPCManageAnimations(animNpc, save);
 		}
 		else if (gui == EnumGuiType.ManageLinked)
-			return new GuiNPCManageLinkedNpc(npc);
+			return new GuiNPCManageLinked(npc);
 
 		else if (gui == EnumGuiType.ManageTransport)
 			return new GuiNPCManageTransporters(npc);
@@ -291,6 +291,9 @@ public class ClientProxy extends CommonProxy {
 		else if (gui == EnumGuiType.ManageBanks)
 			return new GuiNPCManageBanks(npc, (ContainerManageBanks) container);
 
+        else if (gui == EnumGuiType.ManageEffects)
+            return new GuiNPCManageEffects(npc);
+
 		else if (gui == EnumGuiType.MainMenuGlobal)
 			return new GuiNPCGlobalMainMenu(npc);
 
@@ -318,9 +321,12 @@ public class ClientProxy extends CommonProxy {
 		else if (gui == EnumGuiType.ScriptItem)
 			return new GuiScriptItem();
 
-		else if (gui == EnumGuiType.PlayerAnvil)
+		else if (gui == EnumGuiType.PlayerCarpentryBench)
 			return new GuiNpcCarpentryBench((ContainerCarpentryBench) container);
 
+        else if (gui == EnumGuiType.PlayerAnvil)
+            return new GuiNpcAnvil((ContainerAnvilRepair) container);
+
 		else if (gui == EnumGuiType.SetupFollower)
 			return new GuiNpcFollowerSetup(npc, (ContainerNPCFollowerSetup) container);
 
@@ -366,7 +372,7 @@ public class ClientProxy extends CommonProxy {
 		else if (gui == EnumGuiType.RedstoneBlock)
 			return new GuiNpcRedstoneBlock(x, y, z);
 
-		else if(gui == EnumGuiType.MobSpawner)
+		else if(gui == EnumGuiType.Cloner)
 			return new GuiNpcMobSpawner(x, y, z);
 
 		else if(gui == EnumGuiType.MobSpawnerMounter)
@@ -543,6 +549,17 @@ public class ClientProxy extends CommonProxy {
 		}
 	}
 
+    @Override
+    public void generateBigSmokeParticles(World world, int x, int y, int z, boolean signalFire)
+    {
+        if (RAND.nextFloat() < 0.11F)
+        {
+            float[] colours = new float[0];
+            for (int i = 0; i < RAND.nextInt(2) + 1; ++i)
+                Minecraft.getMinecraft().effectRenderer.addEffect(new EntityBigSmokeFX(world, x, y, z, signalFire, colours));
+        }
+    }
+
 	@Override
 	public String getAchievementDesc(Achievement achievement) {
 		return achievement.getDescription();
diff --git a/src/main/java/noppes/npcs/client/ClientTickHandler.java b/src/main/java/noppes/npcs/client/ClientTickHandler.java
index 6424ea4ad..d53bc21e5 100644
--- a/src/main/java/noppes/npcs/client/ClientTickHandler.java
+++ b/src/main/java/noppes/npcs/client/ClientTickHandler.java
@@ -5,11 +5,12 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.InputEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;
-import kamkeel.addon.DBCAddon;
-import kamkeel.addon.client.DBCClient;
+import kamkeel.npcs.addon.client.DBCClient;
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.player.CheckPlayerValue;
+import kamkeel.npcs.network.packets.player.InputDevicePacket;
+import kamkeel.npcs.network.packets.player.ScreenSizePacket;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.SoundHandler;
-import net.minecraft.client.audio.SoundManager;
 import net.minecraft.entity.Entity;
 import net.minecraft.inventory.ContainerPlayer;
 import net.minecraft.world.World;
@@ -49,7 +50,7 @@ public class ClientTickHandler{
 		}
 		if(mc.thePlayer != null && mc.thePlayer.openContainer instanceof ContainerPlayer){
 			if(otherContainer){
-		    	NoppesUtilPlayer.sendData(EnumPlayerPacket.CheckQuestCompletion);
+                PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.CheckQuestCompletion));
 				otherContainer = false;
 			}
 		}
@@ -74,7 +75,7 @@ public class ClientTickHandler{
 		if(Minecraft.getMinecraft().thePlayer!=null && (prevWidth!=mc.displayWidth || prevHeight!=mc.displayHeight)){
 			prevWidth = mc.displayWidth;
 			prevHeight = mc.displayHeight;
-			NoppesUtilPlayer.sendData(EnumPlayerPacket.ScreenSize,mc.displayWidth,mc.displayHeight);
+            PacketClient.sendClient(new ScreenSizePacket(mc.displayWidth,mc.displayHeight));
 		}
 	}
 
@@ -83,22 +84,7 @@ public class ClientTickHandler{
 		if(Mouse.getEventButton() == -1 && Mouse.getEventDWheel() == 0)
 			return;
 
-		boolean isCtrlPressed = Keyboard.isKeyDown(157) || Keyboard.isKeyDown(29);
-		boolean isShiftPressed = Keyboard.isKeyDown(54) || Keyboard.isKeyDown(42);
-		boolean isAltPressed = Keyboard.isKeyDown(184) || Keyboard.isKeyDown(56);
-		boolean isMetaPressed = Keyboard.isKeyDown(220) || Keyboard.isKeyDown(219);
-
-		StringBuilder keysDownString = new StringBuilder();
-		for (int i = 0; i < Keyboard.getKeyCount(); i++) {//Creates a comma separated string of the integer IDs of held keys
-			if (Keyboard.isKeyDown(i)) {
-				keysDownString.append(Integer.valueOf(i)).append(",");
-			}
-		}
-		if (keysDownString.length() > 0) {//Removes last comma for later parsing
-			keysDownString.deleteCharAt(keysDownString.length() - 1);
-		}
-
-		NoppesUtilPlayer.sendData(EnumPlayerPacket.MouseClicked, Mouse.getEventButton(),Mouse.getEventDWheel(),Mouse.isButtonDown(Mouse.getEventButton()), isCtrlPressed, isShiftPressed, isAltPressed, isMetaPressed, keysDownString.toString());
+		InputDevicePacket.sendMouse(Mouse.getEventButton(),Mouse.getEventDWheel(),Mouse.isButtonDown(Mouse.getEventButton()));
 	}
 
 	@SubscribeEvent
@@ -130,23 +116,9 @@ public class ClientTickHandler{
 
 		if(!Keyboard.isRepeatEvent()) {
 			int key = Keyboard.getEventKey();
-			boolean isCtrlPressed = Keyboard.isKeyDown(157) || Keyboard.isKeyDown(29);
-			boolean isShiftPressed = Keyboard.isKeyDown(54) || Keyboard.isKeyDown(42);
-			boolean isAltPressed = Keyboard.isKeyDown(184) || Keyboard.isKeyDown(56);
-			boolean isMetaPressed = Keyboard.isKeyDown(220) || Keyboard.isKeyDown(219);
 			boolean keyDown = Keyboard.isKeyDown(key);
 
-			StringBuilder keysDownString = new StringBuilder();
-			for (int i = 0; i < Keyboard.getKeyCount(); i++) {//Creates a comma separated string of the integer IDs of held keys
-				if (Keyboard.isKeyDown(i)) {
-					keysDownString.append(Integer.valueOf(i)).append(",");
-				}
-			}
-			if (keysDownString.length() > 0) {//Removes last comma for later parsing
-				keysDownString.deleteCharAt(keysDownString.length() - 1);
-			}
-
-			NoppesUtilPlayer.sendData(EnumPlayerPacket.KeyPressed, key, isCtrlPressed, isShiftPressed, isAltPressed, isMetaPressed, keyDown, keysDownString.toString());
+            InputDevicePacket.sendKeyboard(key, keyDown);
 		}
 	}
 
diff --git a/src/main/java/noppes/npcs/client/EntityUtil.java b/src/main/java/noppes/npcs/client/EntityUtil.java
index 824bb7dc2..2aadea2a4 100644
--- a/src/main/java/noppes/npcs/client/EntityUtil.java
+++ b/src/main/java/noppes/npcs/client/EntityUtil.java
@@ -1,7 +1,7 @@
 package noppes.npcs.client;
 
-import kamkeel.addon.DBCAddon;
-import kamkeel.addon.GeckoAddon;
+import kamkeel.npcs.addon.DBCAddon;
+import kamkeel.npcs.addon.GeckoAddon;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.boss.EntityDragon;
 import net.minecraft.entity.passive.EntityChicken;
diff --git a/src/main/java/noppes/npcs/client/NoppesUtil.java b/src/main/java/noppes/npcs/client/NoppesUtil.java
index 2d7a11fb4..2de2178d7 100644
--- a/src/main/java/noppes/npcs/client/NoppesUtil.java
+++ b/src/main/java/noppes/npcs/client/NoppesUtil.java
@@ -1,22 +1,20 @@
 package noppes.npcs.client;
 
 import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.GuiRequestPacket;
+import kamkeel.npcs.network.packets.request.IsGuiOpenInform;
+import kamkeel.npcs.util.ByteBufUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.CompressedStreamTools;
-import net.minecraft.nbt.NBTSizeTracker;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.Util;
-import net.minecraft.world.World;
 import noppes.npcs.CustomNpcs;
-import noppes.npcs.Server;
-import noppes.npcs.client.fx.CustomFX;
 import noppes.npcs.client.gui.player.GuiDialogInteract;
 import noppes.npcs.client.gui.player.GuiQuestCompletion;
 import noppes.npcs.client.gui.util.GuiContainerNPCInterface;
@@ -24,20 +22,16 @@ import noppes.npcs.client.gui.util.GuiNPCInterface;
 import noppes.npcs.client.gui.util.IScrollData;
 import noppes.npcs.client.gui.util.IScrollGroup;
 import noppes.npcs.constants.EnumGuiType;
-import noppes.npcs.constants.EnumPacketServer;
 import noppes.npcs.controllers.data.Dialog;
 import noppes.npcs.controllers.data.Quest;
 import noppes.npcs.controllers.data.SkinOverlay;
 import noppes.npcs.entity.EntityNPCInterface;
-import noppes.npcs.scripted.ScriptParticle;
 import org.lwjgl.Sys;
 
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.util.HashMap;
-import java.util.Random;
 import java.util.Vector;
 
 public class NoppesUtil {
@@ -47,31 +41,10 @@ public class NoppesUtil {
 	}
 
 	public static void requestOpenGUI(EnumGuiType gui, int i, int j, int k) {
-		Client.sendData(EnumPacketServer.Gui, gui.ordinal(), i, j, k);
+        PacketClient.sendClient(new GuiRequestPacket(gui.ordinal(), i, j, k));
 	}
 
-	public static void spawnParticle(ByteBuf buffer) throws IOException{
-		double posX = buffer.readDouble();
-		double posY = buffer.readDouble();
-		double posZ = buffer.readDouble();
-		float height = buffer.readFloat();
-		float width = buffer.readFloat();
-		float yOffset = buffer.readFloat();
-
-		String particle = Server.readString(buffer);
-		World worldObj = Minecraft.getMinecraft().theWorld;
-
-		Random rand = worldObj.rand;
-		if(particle.equals("heal")){
-	        for (int k = 0; k < 6; k++)
-	        {
-	        	worldObj.spawnParticle("instantSpell", posX + (rand.nextDouble() - 0.5D) * (double)width, (posY + rand.nextDouble() * (double)height) - (double)yOffset, posZ + (rand.nextDouble() - 0.5D) * (double)width, 0, 0, 0);
-	        	worldObj.spawnParticle("spell", posX + (rand.nextDouble() - 0.5D) * (double)width, (posY + rand.nextDouble() * (double)height) - (double)yOffset, posZ + (rand.nextDouble() - 0.5D) * (double)width, 0, 0, 0);
-	        }
-		}
-	}
-
-	public static void updateSkinOverlayData(EntityPlayer player, NBTTagCompound compound) {
+    public static void updateSkinOverlayData(EntityPlayer player, NBTTagCompound compound) {
 		HashMap<Integer, SkinOverlay> skinOverlays = new HashMap<>();
 		HashMap<Integer, SkinOverlay> oldOverlays = new HashMap<>();
 		NBTTagList skinOverlayList = compound.getTagList("SkinOverlayData",10);
@@ -90,39 +63,7 @@ public class NoppesUtil {
 		ClientCacheHandler.skinOverlays.put(player.getUniqueID(), skinOverlays);
 	}
 
-	public static void spawnScriptedParticle(EntityPlayer player, ByteBuf buffer){
-		Minecraft minecraft =  Minecraft.getMinecraft();
-
-		NBTTagCompound compound;
-		ScriptParticle particle;
-		try {
-			compound = Server.readNBT(buffer);
-			particle = ScriptParticle.fromNBT(compound);
-		} catch (IOException ignored) {
-			return;
-		}
-
-		World worldObj = player.worldObj;
-		if (worldObj == null) {
-			return;
-		}
-
-		Entity entity = null;
-		if (compound.hasKey("EntityID")) {
-			entity = worldObj.getEntityByID(compound.getInteger("EntityID"));
-			if (entity != null)
-				worldObj = entity.worldObj;
-			else return;
-		}
-
-		CustomFX fx = CustomFX.fromScriptedParticle(particle, worldObj, entity);
-
-		for(int i = 0; i < particle.amount; i++){
-			minecraft.effectRenderer.addEffect(fx);
-		}
-	}
-
-	public static void clickSound() {
+    public static void clickSound() {
         Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
 	}
 
@@ -202,7 +143,7 @@ public class NoppesUtil {
 		try {
 			int size = buffer.readInt();
 			for(int i = 0; i < size; i++){
-				data.add(Server.readString(buffer));
+				data.add(ByteBufUtils.readString(buffer));
 			}
 		} catch (Exception e) {
 
@@ -219,7 +160,7 @@ public class NoppesUtil {
 			int size = buffer.readInt();
 			for(int i = 0; i < size; i++){
 				int id = buffer.readInt();
-				String name = Server.readString(buffer);
+				String name = ByteBufUtils.readString(buffer);
 				group.put(name, id);
 			}
 		} catch (Exception ignored) {
@@ -234,7 +175,7 @@ public class NoppesUtil {
 			int size = buffer.readInt();
 			for(int i = 0; i < size; i++){
 				int id = buffer.readInt();
-				String name = Server.readString(buffer);
+				String name = ByteBufUtils.readString(buffer);
 				group.put(name, id);
 			}
 		} catch (Exception ignored) {
@@ -250,18 +191,6 @@ public class NoppesUtil {
 		group = new HashMap<String,Integer>();
 	}
 
-	public static void addScrollData(ByteBuf buffer) {
-		try {
-			int size = buffer.readInt();
-			for(int i = 0; i < size; i++){
-				int id = buffer.readInt();
-				String name = Server.readString(buffer);
-				data.put(name, id);
-			}
-		} catch (Exception e) {
-		}
-	}
-
 	public static void setScrollData(ByteBuf buffer) {
 		GuiScreen gui = Minecraft.getMinecraft().currentScreen;
 		if(gui == null)
@@ -270,7 +199,7 @@ public class NoppesUtil {
 			int size = buffer.readInt();
 			for(int i = 0; i < size; i++){
 				int id = buffer.readInt();
-				String name = Server.readString(buffer);
+				String name = ByteBufUtils.readString(buffer);
 				data.put(name, id);
 			}
 		} catch (Exception e) {
@@ -327,53 +256,6 @@ public class NoppesUtil {
 	}
 
 	public static void isGUIOpen(boolean isGUIOpen) {
-		Client.sendData(EnumPacketServer.IsGuiOpen, isGUIOpen);
+        PacketClient.sendClient(new IsGuiOpenInform(isGUIOpen));
 	}
-
-
-    private static byte[] accumulatedData = new byte[0];
-    public static void handleLargeData(byte[] chunk) {
-        // Append the chunk to the accumulated data
-        accumulatedData = concatByteArrays(accumulatedData, chunk);
-    }
-
-    public static void handlePlayerDataEnd(boolean sync) {
-        NBTTagCompound compound;
-        try {
-            compound = CompressedStreamTools.func_152457_a(accumulatedData, new NBTSizeTracker(2097152L));
-            if(sync){
-                ClientCacheHandler.playerData.setSyncNBT(compound);
-            }
-            else {
-                ClientCacheHandler.playerData.setSyncNBTFull(compound);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-            return;
-        } finally {
-            // Reset the accumulated data after processing
-            accumulatedData = new byte[0];
-        }
-    }
-
-    public static void handleFormEnd() {
-        NBTTagCompound compound;
-        try {
-            compound = CompressedStreamTools.func_152457_a(accumulatedData, new NBTSizeTracker(2097152L));
-            ClientCacheHandler.playerData.setDBCSync(compound);
-        } catch (IOException e) {
-            e.printStackTrace();
-            return;
-        } finally {
-            accumulatedData = new byte[0];
-        }
-    }
-
-    // Utility method to concatenate two byte arrays
-    private static byte[] concatByteArrays(byte[] a, byte[] b) {
-        byte[] result = new byte[a.length + b.length];
-        System.arraycopy(a, 0, result, 0, a.length);
-        System.arraycopy(b, 0, result, a.length, b.length);
-        return result;
-    }
 }
diff --git a/src/main/java/noppes/npcs/client/PacketHandlerClient.java b/src/main/java/noppes/npcs/client/PacketHandlerClient.java
deleted file mode 100644
index f9aa7dc8e..000000000
--- a/src/main/java/noppes/npcs/client/PacketHandlerClient.java
+++ /dev/null
@@ -1,448 +0,0 @@
-package noppes.npcs.client;
-
-import cpw.mods.fml.common.ObfuscationReflectionHelper;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.network.FMLNetworkEvent.ClientCustomPacketEvent;
-import io.netty.buffer.ByteBuf;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.achievement.GuiAchievement;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.stats.Achievement;
-import net.minecraft.util.ChatComponentTranslation;
-import net.minecraft.util.StatCollector;
-import net.minecraft.village.MerchantRecipeList;
-import noppes.npcs.*;
-import noppes.npcs.client.ClientProxy.FontContainer;
-import noppes.npcs.client.controllers.MusicController;
-import noppes.npcs.client.controllers.ScriptClientSound;
-import noppes.npcs.client.controllers.ScriptSoundController;
-import noppes.npcs.client.gui.GuiNpcMobSpawnerAdd;
-import noppes.npcs.client.gui.OverlayQuestTracking;
-import noppes.npcs.client.gui.customoverlay.OverlayCustom;
-import noppes.npcs.client.gui.player.GuiBook;
-import noppes.npcs.client.gui.util.*;
-import noppes.npcs.config.ConfigClient;
-import noppes.npcs.constants.EnumGuiType;
-import noppes.npcs.constants.EnumPacketClient;
-import noppes.npcs.constants.EnumPacketServer;
-import noppes.npcs.controllers.RecipeController;
-import noppes.npcs.controllers.SyncController;
-import noppes.npcs.controllers.data.Animation;
-import noppes.npcs.controllers.data.AnimationData;
-import noppes.npcs.controllers.data.MarkData;
-import noppes.npcs.controllers.data.RecipeCarpentry;
-import noppes.npcs.entity.EntityDialogNpc;
-import noppes.npcs.entity.EntityNPCInterface;
-
-import java.io.IOException;
-import java.util.HashMap;
-
-public class PacketHandlerClient extends PacketHandlerServer{
-
-	@SubscribeEvent
-	public void onPacketData(ClientCustomPacketEvent event) {
-		EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-		ByteBuf buffer = event.packet.payload();
-		try {
-			client(buffer,(EntityPlayer) player,EnumPacketClient.values()[buffer.readInt()]);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	private void client(ByteBuf buffer, final EntityPlayer player, EnumPacketClient type) throws IOException{
-		if(type == EnumPacketClient.CHATBUBBLE){
-			Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(buffer.readInt());
-			if(entity == null || !(entity instanceof EntityNPCInterface))
-				return;
-			EntityNPCInterface npc = (EntityNPCInterface) entity;
-			if(npc.messages == null)
-				npc.messages = new RenderChatMessages();
-			String text = NoppesStringUtils.formatText(Server.readString(buffer), player, npc);
-			npc.messages.addMessage(text, npc);
-
-			if(buffer.readBoolean())
-				player.addChatMessage(new ChatComponentTranslation(npc.getCommandSenderName() + ": " + text));
-		}
-		else if(type == EnumPacketClient.CHAT){
-            if(!ConfigClient.ChatAlerts)
-                return;
-
-			String message = "";
-			String str;
-			while((str = Server.readString(buffer)) != null && !str.isEmpty())
-				message += StatCollector.translateToLocal(str);
-
-			player.addChatMessage(new ChatComponentTranslation(message));
-		}
-		else if(type == EnumPacketClient.MESSAGE || type == EnumPacketClient.PARTY_MESSAGE){
-            if(!ConfigClient.BannerAlerts)
-                return;
-
-			String description = StatCollector.translateToLocal(Server.readString(buffer));
-			String message = Server.readString(buffer);
-			Achievement ach = type == EnumPacketClient.MESSAGE ? new MessageAchievement(message, description) : new MessageAchievement(CustomItems.bag == null ? Items.paper : CustomItems.bag, message, description);
-			Minecraft.getMinecraft().guiAchievement.func_146256_a(ach);
-			ObfuscationReflectionHelper.setPrivateValue(GuiAchievement.class, Minecraft.getMinecraft().guiAchievement, ach.getDescription(), 4);
-		}
-		else if(type == EnumPacketClient.SYNCRECIPES_ADD){
-			NBTTagList list = Server.readNBT(buffer).getTagList("recipes", 10);
-	        if(list == null)
-	        	return;
-            for(int i = 0; i < list.tagCount(); i++)
-            {
-        		RecipeCarpentry recipe = RecipeCarpentry.read(list.getCompoundTagAt(i));
-            	RecipeController.syncRecipes.put(recipe.id,recipe);
-            }
-
-		}
-		else if(type == EnumPacketClient.SYNCRECIPES_WORKBENCH){
-            RecipeController.reloadGlobalRecipes(RecipeController.syncRecipes);
-            RecipeController.syncRecipes = new HashMap<Integer, RecipeCarpentry>();
-		}
-		else if(type == EnumPacketClient.SYNCRECIPES_CARPENTRYBENCH){
-            RecipeController.Instance.anvilRecipes = RecipeController.syncRecipes;
-            RecipeController.syncRecipes = new HashMap<Integer, RecipeCarpentry>();
-		}
-        else if(type == EnumPacketClient.LARGE_NBT_PART){
-            byte[] chunk = new byte[buffer.readShort()];
-            buffer.readBytes(chunk);
-            NoppesUtil.handleLargeData(chunk);
-        }
-        else if(type == EnumPacketClient.SYNC_PLAYER){
-            boolean sync = buffer.readBoolean();
-            NoppesUtil.handlePlayerDataEnd(sync);
-        }
-        else if(type == EnumPacketClient.SYNC_ADD || type == EnumPacketClient.SYNC_END){
-            int synctype = buffer.readInt();
-            NBTTagCompound compound = Server.readNBT(buffer);
-            SyncController.clientSync(synctype, compound, type == EnumPacketClient.SYNC_END);
-        }
-        else if(type == EnumPacketClient.SYNC_UPDATE){
-            int synctype = buffer.readInt();
-            NBTTagCompound compound = Server.readNBT(buffer);
-            SyncController.clientSyncUpdate(synctype, compound, buffer);
-        }
-        else if(type == EnumPacketClient.SYNC_REMOVE){
-            int synctype = buffer.readInt();
-            int id = buffer.readInt();
-
-            SyncController.clientSyncRemove(synctype, id);
-        }
-        else if(type == EnumPacketClient.MARK_DATA){
-            Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(buffer.readInt());
-            if(!(entity instanceof EntityNPCInterface))
-                return;
-            MarkData data = MarkData.get((EntityNPCInterface) entity);
-            data.setNBT(Server.readNBT(buffer));
-        }
-		else if(type == EnumPacketClient.DIALOG){
-			Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(buffer.readInt());
-			if(entity == null || !(entity instanceof EntityNPCInterface))
-				return;
-			NoppesUtil.openDialog(Server.readNBT(buffer), (EntityNPCInterface) entity, player);
-		}
-		else if(type == EnumPacketClient.DIALOG_DUMMY){
-			EntityDialogNpc npc = new EntityDialogNpc(player.worldObj);
-			npc.display.name = Server.readString(buffer);
-			EntityUtil.Copy(player, npc);
-			NoppesUtil.openDialog(Server.readNBT(buffer), npc, player);
-		}
-		else if(type == EnumPacketClient.QUEST_COMPLETION){
-			NoppesUtil.guiQuestCompletion(player, Server.readNBT(buffer));
-		}
-		else if(type == EnumPacketClient.EDIT_NPC){
-			Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(buffer.readInt());
-			if(entity == null || !(entity instanceof EntityNPCInterface))
-				return;
-			NoppesUtil.setLastNpc((EntityNPCInterface) entity);
-		}
-		else if(type == EnumPacketClient.PLAY_MUSIC){
-			MusicController.Instance.playMusicBackground(Server.readString(buffer), player, Integer.MAX_VALUE);
-		}
-		else if(type == EnumPacketClient.PLAY_SOUND){
-			MusicController.Instance.playSound(Server.readString(buffer),buffer.readFloat(),buffer.readFloat(),buffer.readFloat());
-		}
-		else if(type == EnumPacketClient.UPDATE_NPC){
-			NBTTagCompound compound = Server.readNBT(buffer);
-			Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(compound.getInteger("EntityId"));
-			if(entity == null || !(entity instanceof EntityNPCInterface))
-				return;
-			((EntityNPCInterface)entity).readSpawnData(compound);
-		}
-		else if(type == EnumPacketClient.ROLE){
-			NBTTagCompound compound = Server.readNBT(buffer);
-			Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(compound.getInteger("EntityId"));
-			if(entity == null || !(entity instanceof EntityNPCInterface))
-				return;
-			((EntityNPCInterface)entity).advanced.setRole(compound.getInteger("Role"));
-			((EntityNPCInterface)entity).roleInterface.readFromNBT(compound);
-			NoppesUtil.setLastNpc((EntityNPCInterface) entity);
-		}
-		else if(type == EnumPacketClient.GUI){
-			EnumGuiType gui = EnumGuiType.values()[buffer.readInt()];
-			CustomNpcs.proxy.openGui(NoppesUtil.getLastNpc(), gui, buffer.readInt(), buffer.readInt(), buffer.readInt());
-		}
-		else if(type == EnumPacketClient.SCRIPTED_PARTICLE){
-			NoppesUtil.spawnScriptedParticle(player, buffer);
-		}
-		else if(type == EnumPacketClient.PARTICLE){
-			NoppesUtil.spawnParticle(buffer);
-		}
-		else if(type == EnumPacketClient.DELETE_NPC){
-			Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(buffer.readInt());
-			if(entity == null || !(entity instanceof EntityNPCInterface))
-				return;
-			((EntityNPCInterface)entity).delete();
-		}
-		else if(type == EnumPacketClient.SCROLL_LIST){
-			NoppesUtil.setScrollList(buffer);
-		}
-		else if(type == EnumPacketClient.SCROLL_DATA){
-			NoppesUtil.setScrollData(buffer);
-		}
-		else if(type == EnumPacketClient.SCROLL_DATA_PART){
-			NoppesUtil.addScrollData(buffer);
-		}
-		else if(type == EnumPacketClient.SCROLL_GROUP){
-			NoppesUtil.setScrollGroup(buffer);
-		}
-		else if(type == EnumPacketClient.SCROLL_GROUP_PART){
-			NoppesUtil.addScrollGroup(buffer);
-		}
-		else if(type == EnumPacketClient.SCROLL_SELECTED){
-			GuiScreen gui = Minecraft.getMinecraft().currentScreen;
-			if(gui == null || !(gui instanceof IScrollData))
-				return;
-			String selected = Server.readString(buffer);
-
-			((IScrollData)gui).setSelected(selected);
-		}
-		else if(type == EnumPacketClient.GUI_REDSTONE){
-			NoppesUtil.saveRedstoneBlock(player, Server.readNBT(buffer));
-		}
-		else if(type == EnumPacketClient.GUI_WAYPOINT){
-			NoppesUtil.saveWayPointBlock(player, Server.readNBT(buffer));
-		}
-		else if(type == EnumPacketClient.CLONE){
-			NBTTagCompound compound = Server.readNBT(buffer);
-			NoppesUtil.openGUI(player, new GuiNpcMobSpawnerAdd(compound));
-		}
-        else if(type == EnumPacketClient.CLONER){
-            int x = buffer.readInt();
-            int y = buffer.readInt();
-            int z = buffer.readInt();
-            CustomNpcs.proxy.openGui(x, y, z, EnumGuiType.MobSpawner, player);
-        }
-        else if(type == EnumPacketClient.TELEPORTER){
-            CustomNpcs.proxy.openGui((EntityNPCInterface)null,EnumGuiType.NpcDimensions);
-        }
-		else if(type == EnumPacketClient.GUI_DATA){
-			GuiScreen gui = Minecraft.getMinecraft().currentScreen;
-			if(gui == null)
-				return;
-
-			if(gui instanceof GuiNPCInterface && ((GuiNPCInterface)gui).hasSubGui()){
-				gui = (GuiScreen) ((GuiNPCInterface)gui).getSubGui();
-			}
-			else if(gui instanceof GuiContainerNPCInterface && ((GuiContainerNPCInterface)gui).hasSubGui()){
-				gui = (GuiScreen) ((GuiContainerNPCInterface)gui).getSubGui();
-			}
-			if(gui instanceof IGuiData)
-				((IGuiData)gui).setGuiData(Server.readNBT(buffer));
-		}
-		else if(type == EnumPacketClient.GUI_ERROR){
-			GuiScreen gui = Minecraft.getMinecraft().currentScreen;
-			if(gui == null || !(gui instanceof IGuiError))
-				return;
-
-			int i = buffer.readInt();
-			NBTTagCompound compound = Server.readNBT(buffer);
-
-			((IGuiError)gui).setError(i, compound);
-		}
-		else if(type == EnumPacketClient.GUI_CLOSE){
-			GuiScreen gui = Minecraft.getMinecraft().currentScreen;
-			if(gui == null)
-				return;
-
-			if(gui instanceof IGuiClose){
-				int i = buffer.readInt();
-				NBTTagCompound compound = Server.readNBT(buffer);
-					((IGuiClose)gui).setClose(i, compound);
-			}
-
-			Minecraft mc = Minecraft.getMinecraft();
-	        mc.displayGuiScreen(null);
-	        mc.setIngameFocus();
-		}
-		else if(type == EnumPacketClient.VILLAGER_LIST){
-            MerchantRecipeList merchantrecipelist = MerchantRecipeList.func_151390_b(new PacketBuffer(buffer));
-            ServerEventsHandler.Merchant.setRecipes(merchantrecipelist);
-		}
-		else if(type == EnumPacketClient.OPEN_BOOK){
-			int x = buffer.readInt(), y = buffer.readInt(), z = buffer.readInt();
-
-			NoppesUtil.openGUI(player, new GuiBook(player, ItemStack.loadItemStackFromNBT(Server.readNBT(buffer)), x, y, z));
-		}
-		else if(type == EnumPacketClient.CONFIG){
-			int config = buffer.readInt();
-			if(config == 0){//Font
-				String font = Server.readString(buffer);
-				int size = buffer.readInt();
-				if(!font.isEmpty()){
-					ConfigClient.FontType = font;
-					ConfigClient.FontSize = size;
-					ClientProxy.Font = new FontContainer(ConfigClient.FontType, ConfigClient.FontSize);
-
-					ConfigClient.FontTypeProperty.set(ConfigClient.FontType);
-					ConfigClient.FontSizeProperty.set(ConfigClient.FontSize);
-					if(ConfigClient.config.hasChanged()){
-						ConfigClient.config.save();
-					}
-
-					player.addChatMessage(new ChatComponentTranslation("Font set to %s", ClientProxy.Font.getName()));
-				}
-				else
-					player.addChatMessage(new ChatComponentTranslation("Current font is %s", ClientProxy.Font.getName()));
-			}
-		}
-		else if(type == EnumPacketClient.ISGUIOPEN){
-			boolean isGUIOpen = Minecraft.getMinecraft().currentScreen != null;
-
-			NoppesUtil.isGUIOpen(isGUIOpen);
-		}
-		else if(type == EnumPacketClient.SCRIPT_OVERLAY_DATA){
-			OverlayCustom overlayCustom = new OverlayCustom(Minecraft.getMinecraft());
-			overlayCustom.setOverlayData(Server.readNBT(buffer));
-
-			ClientCacheHandler.customOverlays.put(overlayCustom.overlay.getID(),overlayCustom);
-		}
-		else if(type == EnumPacketClient.SCRIPT_OVERLAY_CLOSE){
-			int id = buffer.readInt();
-			ClientCacheHandler.customOverlays.remove(id);
-		}
-		else if(type == EnumPacketClient.OVERLAY_QUEST_TRACKING){
-			try {
-				NBTTagCompound compound = Server.readNBT(buffer);
-				ClientCacheHandler.questTrackingOverlay = new OverlayQuestTracking(Minecraft.getMinecraft());
-				ClientCacheHandler.questTrackingOverlay.setOverlayData(compound);
-			} catch (IOException e) {
-				ClientCacheHandler.questTrackingOverlay = null;
-			}
-		}
-		else if(type == EnumPacketClient.SWING_PLAYER_ARM){
-			Minecraft.getMinecraft().thePlayer.swingItem();
-		}
-		else if(type == EnumPacketClient.PLAYER_UPDATE_SKIN_OVERLAYS) {
-			EntityPlayer sendingPlayer = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(Server.readString(buffer));
-			NBTTagCompound compound = Server.readNBT(buffer);
-			if (sendingPlayer != null) {
-				NoppesUtil.updateSkinOverlayData(sendingPlayer, compound);
-			}
-		}
-		else if(type == EnumPacketClient.UPDATE_ANIMATIONS) {
-			NBTTagCompound compound = Server.readNBT(buffer);
-			AnimationData animationData = null;
-			if (compound.hasKey("EntityId")) {
-				Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(compound.getInteger("EntityId"));
-				if (entity instanceof EntityNPCInterface) {
-					animationData = ((EntityNPCInterface) entity).display.animationData;
-				}
-			} else {
-				EntityPlayer sendingPlayer = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(Server.readString(buffer));
-				if (sendingPlayer != null) {
-					if (!ClientCacheHandler.playerAnimations.containsKey(sendingPlayer.getUniqueID())) {
-						ClientCacheHandler.playerAnimations.put(sendingPlayer.getUniqueID(), new AnimationData(sendingPlayer));
-					}
-					animationData = ClientCacheHandler.playerAnimations.get(sendingPlayer.getUniqueID());
-                    animationData.parent = sendingPlayer;
-				}
-			}
-
-			if (animationData != null) {
-                if (compound.hasKey("Animation")) {
-                    Animation animation = new Animation();
-                    animation.readFromNBT(compound.getCompoundTag("Animation"));
-                    animationData.setAnimation(animation);
-                } else {
-                    animationData.setAnimation(null);
-                }
-				animationData.readFromNBT(compound);
-			}
-		}
-		else if(type == EnumPacketClient.DISABLE_MOUSE_INPUT) {
-			long length = buffer.readLong();
-			try {
-				String parsedButtons = Server.readString(buffer);
-				if (parsedButtons == null || parsedButtons.isEmpty()) {
-					ClientEventHandler.disabledButtonTimes.put(-1, length);
-					return;
-				}
-
-				String[] splitIds = parsedButtons.split(";");
-				for (String s : splitIds) {
-					ClientEventHandler.disabledButtonTimes.put(Integer.parseInt(s), length);
-				}
-			} catch (Exception ignored) {}
-		}
-		else if(type == EnumPacketClient.PLAY_SOUND_TO) {
-			int id = buffer.readInt();
-			NBTTagCompound compound = Server.readNBT(buffer);
-			ScriptClientSound sound = ScriptClientSound.fromScriptSound(compound, player.worldObj);
-
-			ScriptSoundController.Instance.playSound(id,sound);
-		}
-		else if(type == EnumPacketClient.PLAY_SOUND_TO_NO_ID) {
-			NBTTagCompound compound = Server.readNBT(buffer);
-			ScriptClientSound sound = ScriptClientSound.fromScriptSound(compound, player.worldObj);
-			ScriptSoundController.Instance.playSound(sound);
-		}
-		else if(type == EnumPacketClient.STOP_SOUND_FOR) {
-			int id = buffer.readInt();
-			ScriptSoundController.Instance.stopSound(id);
-		}
-		else if(type == EnumPacketClient.PAUSE_SOUNDS) {
-			ScriptSoundController.Instance.pauseAllSounds();
-		}
-		else if(type == EnumPacketClient.CONTINUE_SOUNDS) {
-			ScriptSoundController.Instance.continueAllSounds();
-		}
-		else if(type == EnumPacketClient.STOP_SOUNDS) {
-			ScriptSoundController.Instance.stopAllSounds();
-		}
-		else if(type == EnumPacketClient.SYNC_WEAPON) {
-			Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(buffer.readInt());
-			if(!(entity instanceof EntityNPCInterface))
-				return;
-			EntityNPCInterface npc = (EntityNPCInterface) entity;
-			int weaponSlotIndex = buffer.readInt();
-			ItemStack stack = ItemStack.loadItemStackFromNBT(Server.readNBT(buffer));
-			npc.inventory.weapons.put(weaponSlotIndex,stack);
-		}
-        else if(type == EnumPacketClient.PARTY_DATA){
-            GuiScreen gui = Minecraft.getMinecraft().currentScreen;
-            if(gui == null)
-                return;
-
-            if(gui instanceof GuiNPCInterface && ((GuiNPCInterface)gui).hasSubGui()){
-                gui = (GuiScreen) ((GuiNPCInterface)gui).getSubGui();
-            }
-            else if(gui instanceof GuiContainerNPCInterface && ((GuiContainerNPCInterface)gui).hasSubGui()){
-                gui = (GuiScreen) ((GuiContainerNPCInterface)gui).getSubGui();
-            }
-            if(gui instanceof IPartyData)
-                ((IPartyData)gui).setPartyData(Server.readNBT(buffer));
-        }
-        else if(type == EnumPacketClient.DBC_FORM){
-            NoppesUtil.handleFormEnd();
-        }
-	}
-}
diff --git a/src/main/java/noppes/npcs/client/TranslateUtil.java b/src/main/java/noppes/npcs/client/TranslateUtil.java
index b4e26426b..88b23ca6e 100644
--- a/src/main/java/noppes/npcs/client/TranslateUtil.java
+++ b/src/main/java/noppes/npcs/client/TranslateUtil.java
@@ -18,7 +18,7 @@ public class TranslateUtil {
 	private static final String AudioUrl = "http://translate.google.com/translate_tts?q=%s&tl=%s";
 
 	public static String Translate(String text){
-		
+
 		try {
 			String urlStr = String.format(TranslateUrl, URLEncoder.encode(text,"utf8"), "auto", "nl");
 			URL url = new URL(urlStr);
@@ -45,10 +45,10 @@ public class TranslateUtil {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		
+
 		return text;
 	}
-	
+
 //	public static void PlayAudio(String text){
 //		try {
 //			String urlStr = String.format(AudioUrl, URLEncoder.encode(text,"utf8"), "en");
@@ -59,12 +59,12 @@ public class TranslateUtil {
 //		    //connection.setDoOutput(true);
 //		    connection.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-GB;     rv:1.9.2.13) Gecko/20101203 Firefox/3.6.13 (.NET CLR 3.5.30729)");
 //		    connection.setRequestProperty("X-HTTP-Method-Override", "GET");
-//		    
+//
 //	        InputStream audioSrc = new BufferedInputStream(connection.getInputStream());
 //	        //DataInputStream read = new DataInputStream(audioSrc);
 //	        AudioInputStream audioIn = AudioSystem.getAudioInputStream(audioSrc);
 //	        Clip clip = AudioSystem.getClip();
-//		    
+//
 //		} catch (UnsupportedEncodingException e) {
 //			e.printStackTrace();
 //		} catch (MalformedURLException e) {
@@ -72,10 +72,10 @@ public class TranslateUtil {
 //		} catch (IOException e) {
 //			e.printStackTrace();
 //		} catch (UnsupportedAudioFileException e) {
-//			// TODO Auto-generated catch block
+//
 //			e.printStackTrace();
 //		} catch (LineUnavailableException e) {
-//			// TODO Auto-generated catch block
+//
 //			e.printStackTrace();
 //		}
 //	}
diff --git a/src/main/java/noppes/npcs/client/fx/EntityBigSmokeFX.java b/src/main/java/noppes/npcs/client/fx/EntityBigSmokeFX.java
new file mode 100644
index 000000000..c645c637e
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/fx/EntityBigSmokeFX.java
@@ -0,0 +1,218 @@
+package noppes.npcs.client.fx;
+
+import org.lwjgl.opengl.GL11;
+
+import cpw.mods.fml.common.eventhandler.Cancelable;
+import cpw.mods.fml.relauncher.Side;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.particle.EntityFX;
+import net.minecraft.client.renderer.ActiveRenderInfo;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.EntityEvent.EntityConstructing;
+
+public class EntityBigSmokeFX extends EntityFX
+{
+
+    /** there are 12 smoke textures. */
+    public static final int TEXTURE_COUNT = 12;
+    public static final ResourceLocation[] TEXTURES = new ResourceLocation[TEXTURE_COUNT];
+    static
+    {
+        for (int i = 0; i < TEXTURE_COUNT; i++)
+            TEXTURES[i] = new ResourceLocation("customnpcs" + ":" + "textures/particle/big_smoke_" + i + ".png");
+    }
+
+    protected final int texIndex;
+    protected boolean alphaFading = false;
+    protected float alphaFadePerTick = -0.015F;
+    protected boolean localizedCombustion = true;
+    protected boolean isColored = false;
+
+    /**
+     * Posts a {@link EntityBigSmokeFXConstructingEvent}.
+     */
+    public EntityBigSmokeFX(World world, int x, int y, int z, boolean signalFire, float[] colours) {
+        super(world, x, y, z);
+
+        // Position: Centered above the spawn point with slight randomness
+        this.setPosition(
+            x + 0.5 + (rand.nextDouble() / 10.0 * (rand.nextBoolean() ? 1 : -1)), // Small horizontal offset
+            y + 0.1 + (rand.nextDouble() * 0.1), // Start slightly above y
+            z + 0.5 + (rand.nextDouble() / 10.0 * (rand.nextBoolean() ? 1 : -1))
+        );
+
+        // Scale: Smoke size
+        this.particleScale = 4.0F * (rand.nextFloat() * 0.5F + 0.5F); // Smaller size
+        this.setSize(0.25F, 0.25F);
+
+        // Gravity: Slows upward motion gradually
+        this.particleGravity = 0.005F;
+
+        // Upward motion: Slow, with slight randomness
+        this.motionX = 0; // No horizontal motion
+        this.motionY = 0.02F + rand.nextFloat() * 0.01F;
+        this.motionZ = 0; // No horizontal motion
+
+        this.particleMaxAge = rand.nextInt(50) + 100; // Shorter lifetime for normal smoke
+        this.particleAlpha = 0.8F;
+
+        if (colours.length == 3) {
+            this.setRBGColorF(colours[0], colours[1], colours[2]);
+        }
+
+        // Smoke appearance
+        this.texIndex = rand.nextInt(TEXTURE_COUNT);
+        this.isColored = this.particleRed != 1.0F || this.particleGreen != 1.0F || this.particleBlue != 1.0F;
+    }
+
+    @Override
+    public void renderParticle(Tessellator tess, float partialTicks, float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY)
+    {
+        rotX = ActiveRenderInfo.rotationX;
+        rotXZ = ActiveRenderInfo.rotationXZ;
+        rotZ = ActiveRenderInfo.rotationZ;
+        rotYZ = ActiveRenderInfo.rotationYZ;
+        rotXY = ActiveRenderInfo.rotationXY;
+
+        EntityLivingBase view = Minecraft.getMinecraft().renderViewEntity;
+        double interpX = view.lastTickPosX + (view.posX - view.lastTickPosX) * partialTicks;
+        double interpY = view.lastTickPosY + (view.posY - view.lastTickPosY) * partialTicks;
+        double interpZ = view.lastTickPosZ + (view.posZ - view.lastTickPosZ) * partialTicks;
+
+        float partialPosX = (float) (prevPosX + (posX - prevPosX) * partialTicks - interpX);
+        float partialPosY = (float) (prevPosY + (posY - prevPosY) * partialTicks - interpY);
+        float partialPosZ = (float) (prevPosZ + (posZ - prevPosZ) * partialTicks - interpZ);
+
+        float scale = 0.1F * particleScale;
+
+        double minU = this.particleTextureIndexX * 0.25;
+        double maxU = minU + 0.25;
+        double minV = this.particleTextureIndexY * 0.125;
+        double maxV = minV + 0.125;
+
+        GL11.glEnable(GL11.GL_BLEND);
+        OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
+        GL11.glDepthMask(true);
+        GL11.glEnable(GL11.GL_ALPHA_TEST);
+        GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F);
+
+        Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURES[this.texIndex % TEXTURES.length]);
+
+        tess.startDrawingQuads();
+
+        tess.setColorRGBA_F(particleRed, particleGreen, particleBlue, particleAlpha);
+        tess.setBrightness(15 << 20 | 14 << 4); // slightly less than MiscUtil.MAX_LIGHT_BRIGHTNESS so that smoke doesn't glow super bright with shaders
+
+        tess.addVertexWithUV(partialPosX - rotX * scale - rotYZ * scale, partialPosY - rotXZ * scale, partialPosZ - rotZ * scale - rotXY * scale, 1, 1);
+        tess.addVertexWithUV(partialPosX - rotX * scale + rotYZ * scale, partialPosY + rotXZ * scale, partialPosZ - rotZ * scale + rotXY * scale, 1, 0);
+        tess.addVertexWithUV(partialPosX + rotX * scale + rotYZ * scale, partialPosY + rotXZ * scale, partialPosZ + rotZ * scale + rotXY * scale, 0, 0);
+        tess.addVertexWithUV(partialPosX + rotX * scale - rotYZ * scale, partialPosY - rotXZ * scale, partialPosZ + rotZ * scale - rotXY * scale, 0, 1);
+
+        tess.draw();
+        GL11.glDisable(GL11.GL_BLEND);
+        GL11.glDepthMask(false);
+        GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F);
+    }
+
+    @Override
+    public int getFXLayer()
+    {
+        return 3;
+    }
+
+    @Override
+    public void onUpdate() {
+        this.prevPosX = this.posX;
+        this.prevPosY = this.posY;
+        this.prevPosZ = this.posZ;
+
+        // Age-based behavior: Fade out near the end of lifetime
+        if (this.particleAge++ >= this.particleMaxAge - 40) {
+            this.alphaFading = true;
+        }
+
+        if (this.particleAge < this.particleMaxAge && this.particleAlpha > 0.0F) {
+            // Minimal horizontal drift for slight randomness
+            float horizontalMotionScale = 0.001F; // Very small horizontal movement
+            this.motionX += this.rand.nextFloat() * horizontalMotionScale * (this.rand.nextBoolean() ? 1 : -1);
+            this.motionZ += this.rand.nextFloat() * horizontalMotionScale * (this.rand.nextBoolean() ? 1 : -1);
+
+            // Move the particle
+            this.moveEntity(this.motionX, this.motionY, this.motionZ);
+
+            // Fade out alpha if needed
+            if (this.alphaFading) {
+                this.particleAlpha = MathHelper.clamp_float(this.particleAlpha + this.alphaFadePerTick, 0.0F, 1.0F);
+            }
+        } else {
+            // Kill the particle if it has faded out or reached max age
+            this.setDead();
+        }
+    }
+
+
+
+    /**
+     * Allows you to change various aspects of campfire smoke particles:<br>
+     * - {@link #particleRed}, {@link #particleGreen}, and {@link #particleBlue} are the float r, g, b values of the smoke. <br>
+     * - {@link #motionX}, {@link #motionY}, and {@link #motionZ} are the x, y, z motion of the smoke.<br>
+     * - {@link #particleGravity} is the amount the smoke's y motion changes per tick. <br>
+     * - {@link #particleAlpha} is the smoke's initial alpha. <br>
+     * - {@link #alphaFading} is whether the smoke's alpha should currently be changing (fading in or out). <br>
+     * - {@link #alphaFadePerTick} is the amount the smoke's alpha changes per tick if {@link #alphaFading} is true. Negative values make it fade out, positive values make it fade
+     * back in. <br>
+     * - {@link #particleMaxAge} is the maximum number of ticks the particle will live for. <br>
+     * <br>
+     * You're also given {@link #campfirePosition}, which is the x, y, z position of the campfire tile entity where the smoke was created. <br>
+     * <br>
+     * Also, {@link EntityBigSmokeFX} are only created on the client side, so you should mark your subscribe event with {@link Side#CLIENT}. <br>
+     * <br>
+     * This event is posted from {@link EntityBigSmokeFX#EntityBigSmokeFX} on the {@link MinecraftForge#EVENT_BUS}.<br>
+     * This event is {@link Cancelable}. If canceled, the entity will be removed.<br>
+     */
+    @Cancelable
+    public static class EntityBigSmokeFXConstructingEvent extends EntityConstructing
+    {
+        public final int[] campfirePosition;
+
+        public float particleRed;
+        public float particleGreen;
+        public float particleBlue;
+        public double motionX;
+        public double motionY;
+        public double motionZ;
+        public float particleGravity;
+        public float particleAlpha;
+        public boolean alphaFading;
+        public float alphaFadePerTick;
+        public int particleMaxAge;
+
+        public EntityBigSmokeFXConstructingEvent(EntityBigSmokeFX entity, int x, int y, int z)
+        {
+            super(entity);
+
+            campfirePosition = new int[] { x, y, z };
+
+            particleRed = entity.particleRed;
+            particleGreen = entity.particleGreen;
+            particleBlue = entity.particleBlue;
+            motionX = entity.motionX;
+            motionY = entity.motionY;
+            motionZ = entity.motionZ;
+            particleGravity = entity.particleGravity;
+            particleAlpha = entity.particleAlpha;
+            alphaFading = entity.alphaFading;
+            alphaFadePerTick = entity.alphaFadePerTick;
+            particleMaxAge = entity.particleMaxAge;
+        }
+
+    }
+
+}
diff --git a/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java b/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java
index ded3070c3..290385537 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java
@@ -1,36 +1,38 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.TileEntityGetPacket;
+import kamkeel.npcs.network.packets.request.TileEntitySavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
 import noppes.npcs.blocks.tiles.TileBorder;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
 
 public class GuiBorderBlock extends GuiNPCInterface implements IGuiData{
 
 	private TileBorder tile;
-	
+
     public GuiBorderBlock(int x, int y, int z) {
 		super();
 		tile = (TileBorder) player.worldObj.getTileEntity(x, y, z);
-		
-		Client.sendData(EnumPacketServer.GetTileEntity, x, y, z);
+
+        PacketClient.sendClient(new TileEntityGetPacket(x, y, z));
 	}
 	public void initGui()
     {
     	super.initGui();
-    	
+
 		this.addButton(new GuiNpcButton(4, guiLeft + 40, guiTop + 40, 120, 20, "Availability Options"));
-    	
-    	addLabel(new GuiNpcLabel(0,"Height", guiLeft+ 1, guiTop + 76, 0xffffff));    	
+
+    	addLabel(new GuiNpcLabel(0,"Height", guiLeft+ 1, guiTop + 76, 0xffffff));
     	addTextField(new GuiNpcTextField(0, this, fontRendererObj, guiLeft+ 60, guiTop + 71,40,20, tile.height + ""));
     	getTextField(0).integersOnly = true;
-    	getTextField(0).setMinMaxDefault(0, 500, 6); 	
+    	getTextField(0).setMinMaxDefault(0, 500, 6);
 
-    	addLabel(new GuiNpcLabel(1,"Message", guiLeft+ 1, guiTop + 100, 0xffffff));    	
+    	addLabel(new GuiNpcLabel(1,"Message", guiLeft+ 1, guiTop + 100, 0xffffff));
     	addTextField(new GuiNpcTextField(1, this, fontRendererObj, guiLeft+ 60, guiTop + 95,200,20, tile.message));
-    	
+
         addButton(new GuiNpcButton(0, guiLeft + 40, guiTop + 190,120,20, "Done"));
     }
 	protected void actionPerformed(GuiButton guibutton) {
@@ -48,10 +50,10 @@ public class GuiBorderBlock extends GuiNPCInterface implements IGuiData{
 			return;
 		tile.height = getTextField(0).getInteger();
 		tile.message = getTextField(1).getText();
-		
+
 		NBTTagCompound compound = new NBTTagCompound();
 		tile.writeToNBT(compound);
-		Client.sendData(EnumPacketServer.SaveTileEntity, compound);
+        PacketClient.sendClient(new TileEntitySavePacket(compound));
 	}
 	@Override
 	public void setGuiData(NBTTagCompound compound) {
diff --git a/src/main/java/noppes/npcs/client/gui/GuiMagicMap.java b/src/main/java/noppes/npcs/client/gui/GuiMagicMap.java
new file mode 100644
index 000000000..67f4a58de
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/gui/GuiMagicMap.java
@@ -0,0 +1,131 @@
+package noppes.npcs.client.gui;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import noppes.npcs.client.gui.util.GuiDiagram;
+import noppes.npcs.client.gui.util.GuiNPCInterface;
+import noppes.npcs.controllers.MagicController;
+import noppes.npcs.controllers.data.Magic;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
+
+public class GuiMagicMap extends GuiDiagram {
+
+    private List<Magic> magics;
+
+    // Single RenderItem instance for efficiency.
+    private RenderItem renderItem = new RenderItem();
+
+    public GuiMagicMap(GuiNPCInterface parent, int x, int y, int width, int height) {
+        super(parent, x, y, width, height);
+        magics = new ArrayList<>();
+
+        // Cache all magics from the MagicController.
+        for (Magic magic : MagicController.getInstance().magics.values()) {
+            magics.add(magic);
+        }
+        setLayout(DiagramLayout.CHART);
+        this.setCurvedArrows(true);
+        this.setCurveAngle(-20);
+    }
+
+    @Override
+    protected List<DiagramIcon> createIcons() {
+        List<DiagramIcon> icons = new ArrayList<>();
+        for (Magic magic : magics) {
+            MagicIcon icon = new MagicIcon(magic);
+            // Set your desired flags (for example, enabled and pressable).
+            icon.enabled = true;
+            icon.pressable = true;
+            icons.add(icon);
+        }
+        return icons;
+    }
+
+    @Override
+    protected List<DiagramConnection> createConnections() {
+        List<DiagramConnection> conns = new ArrayList<>();
+        // For each Magic, generate connections from each weakness (attacker) to this magic.
+        for (Magic magic : magics) {
+            if (magic.weaknesses == null)
+                continue;
+            for (Map.Entry<Integer, Float> entry : magic.weaknesses.entrySet()) {
+                int attackerId = entry.getKey();
+                float percent = entry.getValue();
+                String hover = "+" + (int) (percent * 100) + "%";
+                conns.add(new DiagramConnection(attackerId, magic.id, percent, hover));
+            }
+        }
+        return conns;
+    }
+
+    @Override
+    protected void renderIcon(DiagramIcon icon, int posX, int posY, IconRenderState state) {
+        Magic magic = ((MagicIcon) icon).magic;
+        Minecraft mc = Minecraft.getMinecraft();
+        FontRenderer fontRenderer = mc.fontRenderer;
+        int size = this.iconSize;
+        int iconX = posX - size / 2;
+        int iconY = posY - size / 2;
+
+        RenderHelper.enableGUIStandardItemLighting();
+
+        if (magic.iconItem != null) {
+            renderItem.renderItemAndEffectIntoGUI(fontRenderer, mc.getTextureManager(), magic.iconItem, iconX, iconY);
+        } else if (magic.iconTexture != null && !magic.iconTexture.isEmpty()) {
+            mc.getTextureManager().bindTexture(new ResourceLocation(magic.iconTexture));
+            this.drawTexturedModalRect(iconX, iconY, 0, 0, size, size);
+        } else {
+            ItemStack sword = new ItemStack(Items.iron_sword);
+            renderItem.renderItemAndEffectIntoGUI(fontRenderer, mc.getTextureManager(), sword, iconX, iconY);
+        }
+        RenderHelper.disableStandardItemLighting();
+
+        // If the icon is not highlighted, draw a translucent overlay.
+        if (state == IconRenderState.NOT_HIGHLIGHTED) {
+            drawRect(iconX, iconY, iconX + size, iconY + size, 0x80202020);
+        }
+
+        // Reset color.
+        GL11.glColor4f(1f, 1f, 1f, 1f);
+    }
+
+    @Override
+    protected List<String> getIconTooltip(DiagramIcon icon) {
+        Magic magic = ((MagicIcon) icon).magic;
+        List<String> tooltip = new ArrayList<>();
+        tooltip.add(magic.getName());
+        return tooltip;
+    }
+
+    @Override
+    protected void drawHoveringText(List<String> text, int mouseX, int mouseY, FontRenderer fontRenderer) {
+        parent.renderHoveringText(text, mouseX, mouseY, fontRenderer);
+    }
+
+    /**
+     * Override getIconName so that connection tooltips can show Magic names.
+     */
+    @Override
+    protected String getIconName(DiagramIcon icon) {
+        Magic magic = ((MagicIcon) icon).magic;
+        return magic.getName();
+    }
+
+    // Wrap a Magic object as a DiagramIcon.
+    private class MagicIcon extends DiagramIcon {
+        public Magic magic;
+        public MagicIcon(Magic magic) {
+            super(magic.id, magic.index, magic.priority);
+            this.magic = magic;
+        }
+    }
+}
diff --git a/src/main/java/noppes/npcs/client/gui/GuiMerchantAdd.java b/src/main/java/noppes/npcs/client/gui/GuiMerchantAdd.java
index 7ca893a4e..9979ecf1f 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiMerchantAdd.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiMerchantAdd.java
@@ -4,6 +4,8 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.MerchantUpdatePacket;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -16,10 +18,10 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.village.MerchantRecipe;
 import net.minecraft.village.MerchantRecipeList;
 import noppes.npcs.ServerEventsHandler;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.CustomNpcResourceListener;
 import noppes.npcs.client.gui.util.GuiNpcButton;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.containers.ContainerMerchantAdd;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
@@ -109,7 +111,7 @@ public class GuiMerchantAdd extends GuiContainer
             	merchantrecipelist.remove(currentRecipeIndex);
             	if(currentRecipeIndex > 0)
             		currentRecipeIndex--;
-            	Client.sendData(EnumPacketServer.MerchantUpdate, ServerEventsHandler.Merchant.getEntityId(), merchantrecipelist);
+                PacketClient.sendClient(new MerchantUpdatePacket(ServerEventsHandler.Merchant.getEntityId(), merchantrecipelist));
             }
         }
 
@@ -132,7 +134,7 @@ public class GuiMerchantAdd extends GuiContainer
 
                 MerchantRecipeList merchantrecipelist = this.theIMerchant.getRecipes(mc.thePlayer);
                 merchantrecipelist.add(recipe);
-            	Client.sendData(EnumPacketServer.MerchantUpdate, ServerEventsHandler.Merchant.getEntityId(), merchantrecipelist);
+                PacketClient.sendClient(new MerchantUpdatePacket(ServerEventsHandler.Merchant.getEntityId(), merchantrecipelist));
         	}
 
         }
diff --git a/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java b/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java
index 1b21e3911..b3ba50227 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java
@@ -1,11 +1,13 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.faction.FactionsGetPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.Quest;
 import noppes.npcs.entity.EntityNPCInterface;
 
@@ -28,7 +30,7 @@ public class GuiNPCFactionSelection extends GuiNPCInterface implements IScrollDa
     	this.parent = parent;
     	this.factionId = dialog;
 
-    	Client.sendData(EnumPacketServer.FactionsGet);
+        PacketClient.sendClient(new FactionsGetPacket());
 
     	if(parent instanceof GuiSelectionListener){
     		listener = (GuiSelectionListener) parent;
diff --git a/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java b/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java
index dbd63a655..ea0bffc3e 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java
@@ -1,11 +1,14 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedGetPacket;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.select.GuiSoundSelection;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.Line;
 import noppes.npcs.controllers.data.Lines;
 import noppes.npcs.entity.EntityNPCInterface;
@@ -22,7 +25,8 @@ public class GuiNPCLinesEdit extends GuiNPCInterface2 implements IGuiData, ISubG
     {
     	super(npc);
     	this.lines = lines;
-    	Client.sendData(EnumPacketServer.MainmenuAdvancedGet);
+
+        PacketClient.sendClient(new MainmenuAdvancedGetPacket());
     }
 
     public void initGui()
@@ -73,7 +77,8 @@ public class GuiNPCLinesEdit extends GuiNPCInterface2 implements IGuiData, ISubG
 
 	public void save() {
 		saveLines();
-		Client.sendData(EnumPacketServer.MainmenuAdvancedSave, npc.advanced.writeToNBT(new NBTTagCompound()));
+
+        PacketClient.sendClient(new MainmenuAdvancedSavePacket(npc.advanced.writeToNBT(new NBTTagCompound())));
 	}
 
     @Override
diff --git a/src/main/java/noppes/npcs/client/gui/GuiNPCTransportCategoryEdit.java b/src/main/java/noppes/npcs/client/gui/GuiNPCTransportCategoryEdit.java
index 247110b02..c25e59dbf 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiNPCTransportCategoryEdit.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiNPCTransportCategoryEdit.java
@@ -1,14 +1,17 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.transport.TransportCategoriesGetPacket;
+import kamkeel.npcs.network.packets.request.transport.TransportCategorySavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.util.GuiNPCInterface;
 import noppes.npcs.client.gui.util.GuiNpcButton;
 import noppes.npcs.client.gui.util.GuiNpcLabel;
 import noppes.npcs.client.gui.util.GuiNpcTextField;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 
 public class GuiNPCTransportCategoryEdit extends GuiNPCInterface
@@ -30,7 +33,7 @@ public class GuiNPCTransportCategoryEdit extends GuiNPCInterface
         super.initGui();
     	this.addTextField(new GuiNpcTextField(1, this, this.fontRendererObj, width / 2 - 40, 100, 140, 20, name));
         addLabel(new GuiNpcLabel(1,"Title:", width / 2 - 100+4, 105, 0xffffff));
-        
+
     	this.addButton(new GuiNpcButton(2, width / 2 - 100, 210,98, 20, "gui.back"));
     	this.addButton(new GuiNpcButton(3, width / 2 +2, 210,98, 20, "Save"));
     }
@@ -47,25 +50,20 @@ public class GuiNPCTransportCategoryEdit extends GuiNPCInterface
         if(id == 2)
         {
         	NoppesUtil.openGUI(player, parent);
-    		Client.sendData(EnumPacketServer.TransportCategoriesGet);
+            PacketClient.sendClient(new TransportCategoriesGetPacket());
         }
         if(id == 3)
         {
         	save();
         	NoppesUtil.openGUI(player, parent);
-        	Client.sendData(EnumPacketServer.TransportCategoriesGet);
+            PacketClient.sendClient(new TransportCategoriesGetPacket());
         }
     }
 	public void save() {
 		String name = getTextField(1).getText();
 		if(name.trim().isEmpty())
 			return;
-		Client.sendData(EnumPacketServer.TransportCategorySave,name,id);
-	}
-//	@Override
-//    public void drawDefaultBackground()
-//    {
-//		drawBackground(0);
-//    }
 
+        PacketClient.sendClient(new TransportCategorySavePacket(name, id));
+	}
 }
diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java b/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java
index 8f8c463b7..2aa64b412 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java
@@ -1,24 +1,28 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.DimensionsGetPacket;
+import kamkeel.npcs.network.packets.request.feather.DimensionTeleportPacket;
+import kamkeel.npcs.network.packets.request.npc.RemoteDeletePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.util.StatCollector;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 
 import java.util.HashMap;
 import java.util.Vector;
 
 public class GuiNpcDimension extends GuiNPCInterface implements IScrollData{
-    
+
     private GuiCustomScroll scroll;
     private HashMap<String, Integer> data = new HashMap<String, Integer>();
 	public GuiNpcDimension() {
 		super();
         xSize = 256;
         setBackground("menubg.png");
-        Client.sendData(EnumPacketServer.DimensionsGet);
+        PacketClient.sendClient(new DimensionsGetPacket());
 	}
     public void initGui()
     {
@@ -30,10 +34,10 @@ public class GuiNpcDimension extends GuiNPCInterface implements IScrollData{
         scroll.guiLeft = guiLeft + 4;
         scroll.guiTop = guiTop + 4;
         addScroll(scroll);
-        
+
         String title = StatCollector.translateToLocal("Dimensions");
         int x = (xSize - this.fontRendererObj.getStringWidth(title)) / 2;
-        
+
         this.addLabel(new GuiNpcLabel(0, title, guiLeft + x, guiTop - 8));
 
         this.addButton(new GuiNpcButton(4, guiLeft + 170, guiTop + 72,82,20, "remote.tp"));
@@ -43,23 +47,23 @@ public class GuiNpcDimension extends GuiNPCInterface implements IScrollData{
     public void confirmClicked(boolean flag, int i)
     {
 		if(flag){
-			Client.sendData(EnumPacketServer.RemoteDelete,data.get(scroll.getSelected()));
+            PacketClient.sendClient(new RemoteDeletePacket(data.get(scroll.getSelected())));
 		}
 		NoppesUtil.openGUI(player, this);
     }
 	protected void actionPerformed(GuiButton guibutton)
     {
 		int id = guibutton.id;
-    	
+
     	if(!data.containsKey(scroll.getSelected()))
     		return;
-    	
+
     	if(id == 4){
-    		Client.sendData(EnumPacketServer.DimensionTeleport, data.get(scroll.getSelected()));
+            PacketClient.sendClient(new DimensionTeleportPacket(data.get(scroll.getSelected())));
     		close();
     	}
     }
-	
+
     @Override
     public void mouseClicked(int i, int j, int k)
     {
@@ -76,8 +80,8 @@ public class GuiNpcDimension extends GuiNPCInterface implements IScrollData{
     }
 	@Override
 	public void save() {
-		// TODO Auto-generated method stub
-		
+
+
 	}
 	@Override
 	public void setData(Vector<String> list, HashMap<String, Integer> data) {
diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java
index f17b47e84..b467640dc 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java
@@ -1,5 +1,7 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.clone.*;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.Entity;
@@ -9,11 +11,11 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.controllers.ClientCloneController;
 import noppes.npcs.client.controllers.ClientTagMapController;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.Tag;
 import noppes.npcs.controllers.data.TagMap;
 
@@ -62,7 +64,7 @@ public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData {
 		this.closeOnEsc = true;
 
 		setBackground("menubg.png");
-		Client.sendData(EnumPacketServer.CloneAllTags, activeTab);
+        PacketClient.sendClient(new CloneAllTagsPacket());
 	}
 	public void initGui()
 	{
@@ -187,8 +189,8 @@ public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData {
 	}
 	private void showClones() {
 		if(showingClones == 2){
-			Client.sendData(EnumPacketServer.CloneTagList, activeTab);
-			Client.sendData(EnumPacketServer.CloneList, activeTab);
+            PacketClient.sendClient(new CloneTagListPacket(activeTab));
+            PacketClient.sendClient(new CloneListPacket(activeTab));
 			return;
 		}
 
@@ -377,14 +379,14 @@ public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData {
 				String sel = scroll.getSelected();
 				if(sel == null)
 					return;
-				Client.sendData(EnumPacketServer.SpawnMob, true, posX, posY, posZ, sel, activeTab);
+                SpawnMobPacket.Server(posX, posY, posZ, sel, activeTab);
 				close();
 			}
 			else{
 				NBTTagCompound compound = getCompound();
 				if(compound == null)
 					return;
-				Client.sendData(EnumPacketServer.SpawnMob, false, posX, posY, posZ, compound);
+                SpawnMobPacket.Client(posX, posY, posZ, compound);
 				close();
 			}
 		}
@@ -393,14 +395,14 @@ public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData {
 				String sel = scroll.getSelected();
 				if(sel == null)
 					return;
-				Client.sendData(EnumPacketServer.MobSpawner, true, posX, posY, posZ, sel, activeTab);
+                MobSpawnerPacket.Server(posX, posY, posZ, sel, activeTab);
 				close();
 			}
 			else{
 				NBTTagCompound compound = getCompound();
 				if(compound == null)
 					return;
-				Client.sendData(EnumPacketServer.MobSpawner, false, posX, posY, posZ, compound);
+                MobSpawnerPacket.Client(posX, posY, posZ, compound);
 				close();
 
 			}
@@ -427,7 +429,7 @@ public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData {
 		if(id == 6){
 			if(scroll.getSelected() != null){
 				if(showingClones == 2){
-					Client.sendData(EnumPacketServer.CloneRemove, activeTab, scroll.getSelected());
+                    PacketClient.sendClient(new CloneRemovePacket(activeTab, scroll.getSelected()));
 					return;
 				}
 				ClientCloneController.Instance.removeClone(scroll.getSelected(), activeTab);
@@ -464,7 +466,7 @@ public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData {
 
 	@Override
 	public void save() {
-		// TODO Auto-generated method stub
+
 	}
 
 	@Override
@@ -534,4 +536,4 @@ public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java
index 877d06866..4215e59d3 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java
@@ -1,5 +1,10 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.packets.request.clone.CloneAllTagsShortPacket;
+import kamkeel.npcs.network.packets.request.clone.ClonePreSavePacket;
+import kamkeel.npcs.network.packets.request.clone.CloneSavePacket;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiYesNo;
@@ -9,10 +14,10 @@ import net.minecraft.entity.EntityList;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.nbt.NBTTagString;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.controllers.ClientCloneController;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.TagController;
 import noppes.npcs.controllers.data.Tag;
 import noppes.npcs.entity.EntityNPCInterface;
@@ -58,7 +63,7 @@ public class GuiNpcMobSpawnerAdd extends GuiNPCInterface implements GuiYesNoCall
             addTagUUIDs = new HashSet<>();
         }
 		if(isNPC){
-			Client.sendData(EnumPacketServer.CloneAllTagsShort);
+            PacketClient.sendClient(new CloneAllTagsShortPacket());
 		}
 	}
 
@@ -102,7 +107,7 @@ public class GuiNpcMobSpawnerAdd extends GuiNPCInterface implements GuiYesNoCall
 					confirmClicked(true, 0);
 			}
 			else
-				Client.sendData(EnumPacketServer.ClonePreSave, name, tab);
+                PacketClient.sendClient(new ClonePreSavePacket(name, tab));
 		}
 		if(id == 1){
 			close();
@@ -145,7 +150,7 @@ public class GuiNpcMobSpawnerAdd extends GuiNPCInterface implements GuiYesNoCall
                 if(isNPC){
                     compounder.setTag("TagUUIDs", tagsCompound);
                 }
-				Client.sendData(EnumPacketServer.CloneSave, name, tab, extraTags, compounder);
+                PacketClient.sendClient(new CloneSavePacket(name, tab, extraTags, compounder));
 			}
 
 			close();
diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java
index 78c9bda74..fff76deda 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java
@@ -1,5 +1,8 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.MountPacket;
+import kamkeel.npcs.network.packets.request.clone.CloneListPacket;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.Entity;
@@ -9,10 +12,10 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagDouble;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.world.World;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.controllers.ClientCloneController;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
@@ -20,19 +23,19 @@ import java.util.List;
 import java.util.Map;
 
 public class GuiNpcMobSpawnerMounter extends GuiNPCInterface implements IGuiData{
-    
+
     private GuiCustomScroll scroll;
-    
+
     private int posX,posY,posZ;
-    
+
     private List<String> list;
-    
+
     private static int showingClones = 0;
 
 	private static String search = "";
-	
+
 	private int activeTab =  1;
-    
+
 	public GuiNpcMobSpawnerMounter(int i, int j, int k) {
 		super();
         xSize = 256;
@@ -40,16 +43,16 @@ public class GuiNpcMobSpawnerMounter extends GuiNPCInterface implements IGuiData
         posX = i;
         posY = j;
         posZ = k;
-        
+
         this.closeOnEsc = true;
-        
+
         setBackground("menubg.png");
 	}
     public void initGui()
     {
         super.initGui();
         guiTop += 10;
-        
+
         if(scroll == null){
 	        scroll = new GuiCustomScroll(this,0);
 	        scroll.setSize(165, 188);
@@ -59,7 +62,7 @@ public class GuiNpcMobSpawnerMounter extends GuiNPCInterface implements IGuiData
         scroll.guiLeft = guiLeft + 4;
         scroll.guiTop = guiTop + 26;
         addScroll(scroll);
-        
+
     	addTextField(new GuiNpcTextField(1, this, fontRendererObj, guiLeft + 4, guiTop + 4, 165, 20, search));
 
         GuiMenuTopButton button;
@@ -90,7 +93,7 @@ public class GuiNpcMobSpawnerMounter extends GuiNPCInterface implements IGuiData
 			addSideButton(new GuiMenuSideButton(33,guiLeft - 90, this.guiTop + 170, 45,22, "13"));
 			addSideButton(new GuiMenuSideButton(34,guiLeft - 45, this.guiTop + 191, 45,22, "14"));
 			addSideButton(new GuiMenuSideButton(35,guiLeft - 90, this.guiTop + 191, 45,22, "15"));
-        	
+
         	getSideButton(20 + activeTab).active = true;
         	showClones();
         }
@@ -109,17 +112,17 @@ public class GuiNpcMobSpawnerMounter extends GuiNPCInterface implements IGuiData
 				e.printStackTrace();
 			} catch (NoSuchMethodException e) {
 			}
-        }  
+        }
         this.list = list;
         scroll.setList(getSearchList());
 	}
 	private void showClones() {
 
 		if(showingClones == 2){
-			Client.sendData(EnumPacketServer.CloneList, activeTab);
+            PacketClient.sendClient(new CloneListPacket(activeTab));
 			return;
 		}
-        
+
         ArrayList<String> list = new ArrayList<String>();
         this.list = ClientCloneController.Instance.getClones(activeTab);
         scroll.setList(getSearchList());
@@ -127,7 +130,7 @@ public class GuiNpcMobSpawnerMounter extends GuiNPCInterface implements IGuiData
     public void keyTyped(char c, int i)
     {
     	super.keyTyped(c, i);
-    	
+
     	if(search.equals(getTextField(1).getText()))
     		return;
     	search = getTextField(1).getText().toLowerCase();
@@ -147,7 +150,7 @@ public class GuiNpcMobSpawnerMounter extends GuiNPCInterface implements IGuiData
     	String sel = scroll.getSelected();
     	if(sel == null)
     		return null;
-    	
+
     	if(showingClones == 0){
     		return ClientCloneController.Instance.getCloneData(player, sel, activeTab);
     	}
@@ -159,9 +162,9 @@ public class GuiNpcMobSpawnerMounter extends GuiNPCInterface implements IGuiData
     		entity.writeToNBTOptional(compound);
     		return compound;
     	}
-		
+
 	}
-	
+
 	protected void actionPerformed(GuiButton guibutton)
     {
 		int id = guibutton.id;
@@ -172,12 +175,12 @@ public class GuiNpcMobSpawnerMounter extends GuiNPCInterface implements IGuiData
     		NBTTagCompound compound = getCompound();
     		if(compound != null){
     			compound.setTag("Pos", this.newDoubleNBTList(new double[] {this.posX + 0.5, this.posY + 1, this.posZ + 0.5}));
-    			Client.sendData(EnumPacketServer.SpawnRider, compound);
+                MountPacket.Spawn(compound);
 	    		close();
     		}
     	}
     	if(id == 2){
-			Client.sendData(EnumPacketServer.PlayerRider);
+            MountPacket.Player();
     		close();
     	}
     	if(id == 3){
@@ -211,11 +214,11 @@ public class GuiNpcMobSpawnerMounter extends GuiNPCInterface implements IGuiData
 
         return nbttaglist;
     }
-	
+
 	@Override
 	public void save() {
-		// TODO Auto-generated method stub
-		
+
+
 	}
 	@Override
 	public void setGuiData(NBTTagCompound compound) {
diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java
index b3a8fe562..16d58c93d 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java
@@ -1,36 +1,38 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.clone.CloneListPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagDouble;
 import net.minecraft.nbt.NBTTagList;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.controllers.ClientCloneController;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class GuiNpcMobSpawnerSelector extends SubGuiInterface implements IGuiData{
-    
+
     private GuiCustomScroll scroll;
     private List<String> list;
-    
+
 	private static String search = "";
 	public int activeTab =  1;
 	public boolean isServer = false;
-    
+
 	public GuiNpcMobSpawnerSelector() {
 		super();
         xSize = 256;
         this.closeOnEsc = true;
         setBackground("menubg.png");
 	}
-	
-	
+
+
     public void initGui(){
-        super.initGui();        
+        super.initGui();
         if(scroll == null){
 	        scroll = new GuiCustomScroll(this,0);
 	        scroll.setSize(165, 188);
@@ -40,7 +42,7 @@ public class GuiNpcMobSpawnerSelector extends SubGuiInterface implements IGuiDat
         scroll.guiLeft = guiLeft + 4;
         scroll.guiTop = guiTop + 26;
         addScroll(scroll);
-        
+
     	addTextField(new GuiNpcTextField(1, this, fontRendererObj, guiLeft + 4, guiTop + 4, 165, 20, search));
 
     	addButton(new GuiNpcButton(0, guiLeft + 171, guiTop + 80, 80, 20, "gui.done"));
@@ -61,30 +63,30 @@ public class GuiNpcMobSpawnerSelector extends SubGuiInterface implements IGuiDat
 		addSideButton(new GuiMenuSideButton(33,guiLeft - 90, this.guiTop + 170, 45,22, "13"));
 		addSideButton(new GuiMenuSideButton(34,guiLeft - 45, this.guiTop + 191, 45,22, "14"));
 		addSideButton(new GuiMenuSideButton(35,guiLeft - 90, this.guiTop + 191, 45,22, "15"));
-    	
+
     	getSideButton(20 + activeTab).active = true;
     	showClones();
     }
-    
+
     public String getSelected(){
     	return scroll.getSelected();
     }
 	private void showClones() {
 
 		if(isServer){
-			Client.sendData(EnumPacketServer.CloneList, activeTab);
+            PacketClient.sendClient(new CloneListPacket(activeTab));
 			return;
 		}
-        
+
         ArrayList<String> list = new ArrayList<String>();
-        
+
         this.list = new ArrayList<String>(ClientCloneController.Instance.getClones(activeTab));
         scroll.setList(getSearchList());
 	}
     public void keyTyped(char c, int i)
     {
     	super.keyTyped(c, i);
-    	
+
     	if(search.equals(getTextField(1).getText()))
     		return;
     	search = getTextField(1).getText().toLowerCase();
@@ -109,7 +111,7 @@ public class GuiNpcMobSpawnerSelector extends SubGuiInterface implements IGuiDat
 		compound.setString("ClonedName", sel);
 		return compound;
 	}
-	
+
 	public void buttonEvent(GuiButton guibutton)
     {
 		int id = guibutton.id;
@@ -139,11 +141,11 @@ public class GuiNpcMobSpawnerSelector extends SubGuiInterface implements IGuiDat
 
         return nbttaglist;
     }
-	
+
 	@Override
 	public void save() {
-		// TODO Auto-generated method stub
-		
+
+
 	}
 
 
diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcPather.java b/src/main/java/noppes/npcs/client/gui/GuiNpcPather.java
index 4e812a348..916748f08 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiNpcPather.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiNpcPather.java
@@ -1,15 +1,18 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.pather.MovingPathGetPacket;
+import kamkeel.npcs.network.packets.request.pather.MovingPathSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
 import noppes.npcs.DataAI;
 import noppes.npcs.NBTTags;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.GuiCustomScroll;
 import noppes.npcs.client.gui.util.GuiNPCInterface;
 import noppes.npcs.client.gui.util.GuiNpcButton;
 import noppes.npcs.client.gui.util.IGuiData;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 
 import java.util.ArrayList;
@@ -17,19 +20,19 @@ import java.util.HashMap;
 import java.util.List;
 
 public class GuiNpcPather extends GuiNPCInterface implements IGuiData{
-    
+
     private GuiCustomScroll scroll;
     private HashMap<String, Integer> data = new HashMap<String, Integer>();
     private DataAI ai;
-    
+
 	public GuiNpcPather(EntityNPCInterface npc) {
 		super();
 		drawDefaultBackground = false;
         xSize = 176;
         title = "Npc Pather";
         setBackground("smallbg.png");
-        ai = npc.ai;
-        Client.sendData(EnumPacketServer.MovingPathGet);
+        ai = npc.ais;
+        PacketClient.sendClient(new MovingPathGetPacket());
 	}
 	@Override
     public void initGui()
@@ -44,7 +47,7 @@ public class GuiNpcPather extends GuiNPCInterface implements IGuiData{
         scroll.setUnsortedList(list);
         scroll.guiLeft = guiLeft + 7;
         scroll.guiTop = guiTop + 12;
-        
+
         addScroll(scroll);
         this.addButton(new GuiNpcButton(0, guiLeft + 6, guiTop + 178,52,20, "gui.down"));
         this.addButton(new GuiNpcButton(1, guiLeft + 62, guiTop + 178,52,20, "gui.up"));
@@ -55,7 +58,7 @@ public class GuiNpcPather extends GuiNPCInterface implements IGuiData{
     {
     	if(scroll.selected < 0)
     		return;
-    	
+
     	int id = guibutton.id;
     	if(id == 0){
     		List<int[]> list = ai.getMovingPath();
@@ -109,12 +112,12 @@ public class GuiNpcPather extends GuiNPCInterface implements IGuiData{
             close();
         }
     }
-    
+
 	@Override
 	public void save() {
 		NBTTagCompound compound = new NBTTagCompound();
 		compound.setTag("MovingPathNew", NBTTags.nbtIntegerArraySet(ai.getMovingPath()));
-		Client.sendData(EnumPacketServer.MovingPathSave, compound);
+        PacketClient.sendClient(new MovingPathSavePacket(compound));
 	}
 
 	@Override
diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcRedstoneBlock.java b/src/main/java/noppes/npcs/client/gui/GuiNpcRedstoneBlock.java
index b965a877c..114af0fb6 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiNpcRedstoneBlock.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiNpcRedstoneBlock.java
@@ -1,71 +1,73 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.TileEntitySavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
 import noppes.npcs.blocks.tiles.TileRedstoneBlock;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.GuiNPCInterface;
 import noppes.npcs.client.gui.util.GuiNpcButton;
 import noppes.npcs.client.gui.util.GuiNpcLabel;
 import noppes.npcs.client.gui.util.GuiNpcTextField;
-import noppes.npcs.constants.EnumPacketServer;
+
 
 public class GuiNpcRedstoneBlock extends GuiNPCInterface{
 
 	private TileRedstoneBlock tile;
-	
+
     public GuiNpcRedstoneBlock(int x, int y, int z) {
 		super();
 		tile = (TileRedstoneBlock) player.worldObj.getTileEntity(x, y, z);
 	}
-    
+
     @Override
 	public void initGui(){
     	super.initGui();
 
 		this.addButton(new GuiNpcButton(4, guiLeft + 40, guiTop + 20, 120, 20, "availability.options"));
 
-    	addLabel(new GuiNpcLabel(11,"gui.detailed", guiLeft+ 40, guiTop + 47, 0xffffff)); 
+    	addLabel(new GuiNpcLabel(11,"gui.detailed", guiLeft+ 40, guiTop + 47, 0xffffff));
 		this.addButton(new GuiNpcButton(1, guiLeft + 110, guiTop + 42, 50, 20, new String[]{"gui.no", "gui.yes"},tile.isDetailed?1:0));
-    	
+
 		if(tile.isDetailed){
-	    	addLabel(new GuiNpcLabel(0,StatCollector.translateToLocal("bard.ondistance") + " X:", guiLeft+ 1, guiTop + 76, 0xffffff));    	
+	    	addLabel(new GuiNpcLabel(0,StatCollector.translateToLocal("bard.ondistance") + " X:", guiLeft+ 1, guiTop + 76, 0xffffff));
 	    	addTextField(new GuiNpcTextField(0, this, fontRendererObj, guiLeft+ 80, guiTop + 71,30,20, tile.onRangeX + ""));
 	    	getTextField(0).integersOnly = true;
-	    	getTextField(0).setMinMaxDefault(0, 50, 6); 	
-	    	addLabel(new GuiNpcLabel(1,"Y:", guiLeft+ 113, guiTop + 76, 0xffffff)); 
+	    	getTextField(0).setMinMaxDefault(0, 50, 6);
+	    	addLabel(new GuiNpcLabel(1,"Y:", guiLeft+ 113, guiTop + 76, 0xffffff));
 	    	addTextField(new GuiNpcTextField(1, this, fontRendererObj, guiLeft+ 122, guiTop + 71,30,20, tile.onRangeY + ""));
 	    	getTextField(1).integersOnly = true;
-	    	getTextField(1).setMinMaxDefault(0, 50, 6); 
-	    	addLabel(new GuiNpcLabel(2,"Z:", guiLeft+ 155, guiTop + 76, 0xffffff)); 
+	    	getTextField(1).setMinMaxDefault(0, 50, 6);
+	    	addLabel(new GuiNpcLabel(2,"Z:", guiLeft+ 155, guiTop + 76, 0xffffff));
 	    	addTextField(new GuiNpcTextField(2, this, fontRendererObj, guiLeft+ 164, guiTop + 71,30,20, tile.onRangeZ + ""));
 	    	getTextField(2).integersOnly = true;
 	    	getTextField(2).setMinMaxDefault(0, 50, 6);
-	    	
-	    	addLabel(new GuiNpcLabel(3,StatCollector.translateToLocal("bard.offdistance") + " X:", guiLeft - 3, guiTop + 99, 0xffffff));    	
+
+	    	addLabel(new GuiNpcLabel(3,StatCollector.translateToLocal("bard.offdistance") + " X:", guiLeft - 3, guiTop + 99, 0xffffff));
 	    	addTextField(new GuiNpcTextField(3, this, fontRendererObj, guiLeft+ 80, guiTop + 94,30,20, tile.offRangeX + ""));
 	    	getTextField(3).integersOnly = true;
-	    	getTextField(3).setMinMaxDefault(0, 50, 10);  	
-	    	addLabel(new GuiNpcLabel(4,"Y:", guiLeft+ 113, guiTop + 99, 0xffffff)); 
+	    	getTextField(3).setMinMaxDefault(0, 50, 10);
+	    	addLabel(new GuiNpcLabel(4,"Y:", guiLeft+ 113, guiTop + 99, 0xffffff));
 	    	addTextField(new GuiNpcTextField(4, this, fontRendererObj, guiLeft+ 122, guiTop + 94,30,20, tile.offRangeY + ""));
 	    	getTextField(4).integersOnly = true;
-	    	getTextField(4).setMinMaxDefault(0, 50, 10);  	
-	    	addLabel(new GuiNpcLabel(5,"Z:", guiLeft+ 155, guiTop + 99, 0xffffff)); 
+	    	getTextField(4).setMinMaxDefault(0, 50, 10);
+	    	addLabel(new GuiNpcLabel(5,"Z:", guiLeft+ 155, guiTop + 99, 0xffffff));
 	    	addTextField(new GuiNpcTextField(5, this, fontRendererObj, guiLeft+ 164, guiTop + 94,30,20, tile.offRangeZ + ""));
 	    	getTextField(5).integersOnly = true;
 	    	getTextField(5).setMinMaxDefault(0, 50, 10);
 		}
 		else{
-	    	addLabel(new GuiNpcLabel(0,"bard.ondistance", guiLeft+ 1, guiTop + 76, 0xffffff));    	
+	    	addLabel(new GuiNpcLabel(0,"bard.ondistance", guiLeft+ 1, guiTop + 76, 0xffffff));
 	    	addTextField(new GuiNpcTextField(0, this, fontRendererObj, guiLeft+ 80, guiTop + 71,30,20, tile.onRange + ""));
 	    	getTextField(0).integersOnly = true;
-	    	getTextField(0).setMinMaxDefault(0, 50, 6); 	
-	    	
-	    	addLabel(new GuiNpcLabel(3,"bard.offdistance", guiLeft - 3, guiTop + 99, 0xffffff));    	
+	    	getTextField(0).setMinMaxDefault(0, 50, 6);
+
+	    	addLabel(new GuiNpcLabel(3,"bard.offdistance", guiLeft - 3, guiTop + 99, 0xffffff));
 	    	addTextField(new GuiNpcTextField(3, this, fontRendererObj, guiLeft+ 80, guiTop + 94,30,20, tile.offRange + ""));
 	    	getTextField(3).integersOnly = true;
-	    	getTextField(3).setMinMaxDefault(0, 50, 10);  
+	    	getTextField(3).setMinMaxDefault(0, 50, 10);
 		}
         addButton(new GuiNpcButton(0, guiLeft + 40, guiTop + 190,120,20, "Done"));
     }
@@ -96,7 +98,7 @@ public class GuiNpcRedstoneBlock extends GuiNPCInterface{
 			tile.offRangeX = getTextField(3).getInteger();
 			tile.offRangeY = getTextField(4).getInteger();
 			tile.offRangeZ = getTextField(5).getInteger();
-			
+
 			if(tile.onRangeX > tile.offRangeX)
 				tile.offRangeX = tile.onRangeX;
 			if(tile.onRangeY > tile.offRangeY)
@@ -111,10 +113,10 @@ public class GuiNpcRedstoneBlock extends GuiNPCInterface{
 				tile.offRange = tile.onRange;
 		}
 		tile.isActivated = false;
-		
+
 		NBTTagCompound compound = new NBTTagCompound();
 		tile.writeToNBT(compound);
-		Client.sendData(EnumPacketServer.SaveTileEntity, compound);
+        PacketClient.sendClient(new TileEntitySavePacket(compound));
 	}
 
 }
diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java b/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java
index e466b0ea4..a35484e1b 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java
@@ -1,36 +1,42 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.npc.*;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiYesNo;
 import net.minecraft.client.gui.GuiYesNoCallback;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.StatCollector;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Vector;
 
 public class GuiNpcRemoteEditor extends GuiNPCInterface implements IScrollData, GuiYesNoCallback{
 
     private GuiCustomScroll scroll;
     private HashMap<String, Integer> data = new HashMap<String, Integer>();
+    private String search = "";
+
 	public GuiNpcRemoteEditor() {
 		super();
         xSize = 256;
         setBackground("menubg.png");
-        Client.sendData(EnumPacketServer.RemoteNpcsGet);
-        Client.sendData(EnumPacketServer.RemoteFreezeGet);
+        PacketClient.sendClient(new RemoteNpcsGetPacket());
+        PacketClient.sendClient(new RemoteFreezeGetPacket());
 	}
     public void initGui()
     {
         super.initGui();
         if(scroll == null){
 	        scroll = new GuiCustomScroll(this,0, 0);
-	        scroll.setSize(165, 208);
+	        scroll.setSize(165, 188);
         }
         scroll.guiLeft = guiLeft + 4;
         scroll.guiTop = guiTop + 4;
@@ -39,6 +45,8 @@ public class GuiNpcRemoteEditor extends GuiNPCInterface implements IScrollData,
         String title = StatCollector.translateToLocal("remote.title");
         int x = (xSize - this.fontRendererObj.getStringWidth(title)) / 2;
 
+        addTextField(new GuiNpcTextField(66, this, fontRendererObj, guiLeft + 4, guiTop + 5 + scroll.ySize, scroll.xSize, 20, search));
+
         this.addLabel(new GuiNpcLabel(0, title, guiLeft + x, guiTop - 8));
 
         this.addButton(new GuiNpcButton(0, guiLeft + 170, guiTop + 6,82,20, "selectServer.edit"));
@@ -53,7 +61,7 @@ public class GuiNpcRemoteEditor extends GuiNPCInterface implements IScrollData,
     @Override
     public void confirmClicked(boolean flag, int i){
 		if(flag){
-			Client.sendData(EnumPacketServer.RemoteDelete,data.get(scroll.getSelected()));
+            PacketClient.sendClient(new RemoteDeletePacket(data.get(scroll.getSelected())));
 		}
 		NoppesUtil.openGUI(player, this);
     }
@@ -61,11 +69,11 @@ public class GuiNpcRemoteEditor extends GuiNPCInterface implements IScrollData,
     {
 		int id = guibutton.id;
     	if(id == 3){
-    		Client.sendData(EnumPacketServer.RemoteFreeze);
+            PacketClient.sendClient(new RemoteFreezePacket());
     	}
     	if(id == 5){
     		for(int ids : data.values()){
-    			Client.sendData(EnumPacketServer.RemoteReset, ids);
+                PacketClient.sendClient(new RemoteResetPacket(ids));
 	    		Entity entity  = player.worldObj.getEntityByID(ids);
 	    		if(entity != null && entity instanceof EntityNPCInterface)
 	    			((EntityNPCInterface)entity).reset();
@@ -73,27 +81,28 @@ public class GuiNpcRemoteEditor extends GuiNPCInterface implements IScrollData,
     	}
 		if(id == 6){
 			NoppesUtil.setLastNpc(null);
-            Client.sendData(EnumPacketServer.RemoteGlobalMenu);
+            PacketClient.sendClient(new RemoteGlobalMenuPacket());
 		}
 
     	if(!data.containsKey(scroll.getSelected()))
     		return;
 
     	if(id == 0){
-    		Client.sendData(EnumPacketServer.RemoteMainMenu,data.get(scroll.getSelected()));
+            PacketClient.sendClient(new RemoteMainMenuPacket(data.get(scroll.getSelected())));
     	}
     	if(id == 1){
             GuiYesNo guiyesno = new GuiYesNo(this, "Confirm", StatCollector.translateToLocal("gui.delete"), 0);
             displayGuiScreen(guiyesno);
     	}
     	if(id == 2){
-    		Client.sendData(EnumPacketServer.RemoteReset,data.get(scroll.getSelected()));
-    		Entity entity  = player.worldObj.getEntityByID(data.get(scroll.getSelected()));
+            int selected = data.get(scroll.getSelected());
+            PacketClient.sendClient(new RemoteResetPacket(selected));
+    		Entity entity  = player.worldObj.getEntityByID(selected);
     		if(entity != null && entity instanceof EntityNPCInterface)
     			((EntityNPCInterface)entity).reset();
     	}
     	if(id == 4){
-    		Client.sendData(EnumPacketServer.RemoteTpToNpc,data.get(scroll.getSelected()));
+            PacketClient.sendClient(new RemoteTpToNpcPacket(data.get(scroll.getSelected())));
     		close();
     	}
     }
@@ -107,20 +116,47 @@ public class GuiNpcRemoteEditor extends GuiNPCInterface implements IScrollData,
     @Override
     public void keyTyped(char c, int i)
     {
-        if (i == 1 || isInventoryKey(i))
+        super.keyTyped(c, i);
+        if(getTextField(66) != null){
+            if(getTextField(66).isFocused()){
+                if (i == 1)
+                {
+                    close();
+                    return;
+                }
+                if(search.equals(getTextField(66).getText()))
+                    return;
+                search = getTextField(66).getText().toLowerCase();
+                scroll.resetScroll();
+                scroll.setList(getNPCSearch());
+            }
+        }
+        if (i == 1)
         {
             close();
         }
     }
-	@Override
-	public void save() {
-		// TODO Auto-generated method stub
 
-	}
+    private List<String> getNPCSearch(){
+        if(search.isEmpty()){
+            return new ArrayList<String>(this.data.keySet());
+        }
+        List<String> list = new ArrayList<String>();
+        for(String name : this.data.keySet()){
+            if(name.toLowerCase().contains(search))
+                list.add(name);
+        }
+        return list;
+    }
+
+	@Override
+	public void save() {}
+
 	@Override
 	public void setData(Vector<String> list, HashMap<String, Integer> data) {
-		scroll.setList(list);
-		this.data = data;
+        this.data = data;
+        scroll.resetScroll();
+        scroll.setList(getNPCSearch());
 	}
 	@Override
 	public void setSelected(String selected) {
diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcWaypoint.java b/src/main/java/noppes/npcs/client/gui/GuiNpcWaypoint.java
index bd1c40785..c8fdc959d 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiNpcWaypoint.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiNpcWaypoint.java
@@ -1,19 +1,21 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.TileEntitySavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
 import noppes.npcs.blocks.tiles.TileWaypoint;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.GuiNPCInterface;
 import noppes.npcs.client.gui.util.GuiNpcButton;
 import noppes.npcs.client.gui.util.GuiNpcLabel;
 import noppes.npcs.client.gui.util.GuiNpcTextField;
-import noppes.npcs.constants.EnumPacketServer;
+
 
 public class GuiNpcWaypoint extends GuiNPCInterface{
 
 	private TileWaypoint tile;
-	
+
     public GuiNpcWaypoint(int x, int y, int z) {
 		super();
 		tile = (TileWaypoint) player.worldObj.getTileEntity(x, y, z);
@@ -23,11 +25,11 @@ public class GuiNpcWaypoint extends GuiNPCInterface{
     {
     	super.initGui();
 
-    	
-    	addLabel(new GuiNpcLabel(0,"gui.name", guiLeft+ 1, guiTop + 76, 0xffffff));    	
+
+    	addLabel(new GuiNpcLabel(0,"gui.name", guiLeft+ 1, guiTop + 76, 0xffffff));
     	addTextField(new GuiNpcTextField(0, this, fontRendererObj, guiLeft+ 60, guiTop + 71,200,20, tile.name));
-    	
-    	addLabel(new GuiNpcLabel(1,"gui.range", guiLeft+ 1, guiTop + 97, 0xffffff));    	
+
+    	addLabel(new GuiNpcLabel(1,"gui.range", guiLeft+ 1, guiTop + 97, 0xffffff));
     	addTextField(new GuiNpcTextField(1, this, fontRendererObj, guiLeft+ 60, guiTop + 92,200,20, tile.range + ""));
     	getTextField(1).integersOnly = true;
     	getTextField(1).setMinMaxDefault(2, 60, 10);
@@ -43,10 +45,10 @@ public class GuiNpcWaypoint extends GuiNPCInterface{
 	public void save() {
 		tile.name = getTextField(0).getText();
 		tile.range = getTextField(1).getInteger();
-		
+
 		NBTTagCompound compound = new NBTTagCompound();
 		tile.writeToNBT(compound);
-		Client.sendData(EnumPacketServer.SaveTileEntity, compound);
+        PacketClient.sendClient(new TileEntitySavePacket(compound));
 	}
 
 }
diff --git a/src/main/java/noppes/npcs/client/gui/GuiScript.java b/src/main/java/noppes/npcs/client/gui/GuiScript.java
index 8169cdcd3..cd444d038 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiScript.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiScript.java
@@ -1,5 +1,6 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.packets.request.script.NPCScriptPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiConfirmOpenLink;
 import net.minecraft.client.gui.GuiYesNo;
@@ -9,11 +10,11 @@ import net.minecraft.nbt.NBTTagList;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.StatCollector;
 import noppes.npcs.NoppesStringUtils;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.script.GuiNPCEventScripts;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.ScriptContainer;
 import noppes.npcs.controllers.ScriptController;
 import noppes.npcs.controllers.data.DataScript;
@@ -38,7 +39,7 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall
 		xSize = 420;
 
 		setBackground("menubg.png");
-		Client.sendData(EnumPacketServer.ScriptDataGet);
+        NPCScriptPacket.Get();
 	}
 
 	public void initGui() {
@@ -267,7 +268,7 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall
 	@Override
 	public void save() {
 		setScript();
-		Client.sendData(EnumPacketServer.ScriptDataSave, script.writeToNBT(new NBTTagCompound()));
+        NPCScriptPacket.Save(script.writeToNBT(new NBTTagCompound()));
 	}
 
 	@Override
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java b/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java
index 4ebbc086c..d8512eba9 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java
@@ -1,16 +1,15 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.tags.TagsGetPacket;
+import kamkeel.npcs.network.packets.request.tags.TagsNpcGetPacket;
+import kamkeel.npcs.network.packets.request.tags.TagSetPacket;
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.nbt.NBTTagString;
 import net.minecraft.util.StatCollector;
-import noppes.npcs.client.Client;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
-import noppes.npcs.controllers.TagController;
-import noppes.npcs.controllers.data.Tag;
 import noppes.npcs.entity.EntityNPCInterface;
 
 import java.util.ArrayList;
@@ -31,8 +30,8 @@ public class SubGuiClonerNPCTags extends SubGuiInterface implements IGuiData,ISc
     {
         this.parent = guiNpcMobSpawnerAdd;
         this.mobSpawnerAdd = guiNpcMobSpawnerAdd;
-        Client.sendData(EnumPacketServer.TagsGet);
-        Client.sendData(EnumPacketServer.NpcTagsGet);
+        PacketClient.sendClient(new TagsGetPacket());
+        PacketClient.sendClient(new TagsNpcGetPacket());
         setBackground("menubg.png");
         xSize = 305;
         ySize = 220;
@@ -146,7 +145,7 @@ public class SubGuiClonerNPCTags extends SubGuiInterface implements IGuiData,ISc
 
         GuiNpcMobSpawnerAdd.tagsCompound = UUIDTagList;
         tagCompound.setTag("TagNames",tagList);
-        Client.sendData(EnumPacketServer.TagSet, tagCompound);
+        PacketClient.sendClient(new TagSetPacket(tagCompound));
     }
 
     public void keyTyped(char c, int i)
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java b/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java
new file mode 100644
index 000000000..4e851ab65
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java
@@ -0,0 +1,255 @@
+package noppes.npcs.client.gui;
+
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.effects.EffectSavePacket;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.util.ResourceLocation;
+import noppes.npcs.client.ClientCacheHandler;
+import noppes.npcs.client.gui.global.GuiNPCManageEffects;
+import noppes.npcs.client.gui.script.GuiScriptEffect;
+import noppes.npcs.client.gui.util.*;
+import noppes.npcs.client.renderer.ImageData;
+import noppes.npcs.controllers.data.CustomEffect;
+import org.lwjgl.opengl.GL11;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SubGuiEffectGeneral extends SubGuiInterface implements ITextfieldListener {
+    private final GuiNPCManageEffects parent;
+    public CustomEffect effect;
+    private final String originalName;
+
+    private List<GuiMenuTopButton> topButtons = new ArrayList<>();
+
+    public SubGuiEffectGeneral(GuiNPCManageEffects parent, CustomEffect effect) {
+        this.effect = effect;
+        this.parent = parent;
+        this.originalName = effect.name;
+        this.closeOnEsc = true;
+
+        setBackground("menubg.png");
+        xSize = 360;
+        ySize = 216;
+    }
+
+    @Override
+    public void initGui() {
+        super.initGui();
+        GuiMenuTopButton close = new GuiMenuTopButton(-5, guiLeft + xSize - 22, guiTop - 10, "X");
+
+        GuiMenuTopButton general = new GuiMenuTopButton(-1, guiLeft + 4, guiTop - 10, "display.general");
+        GuiMenuTopButton scripts = new GuiMenuTopButton(-2, general.xPosition + general.getWidth(), guiTop - 10, "script.scripts");
+
+        close.active = false;
+        general.active = true;
+        scripts.active = false;
+
+        addTopButton(close);
+        addTopButton(general);
+        addTopButton(scripts);
+
+        guiTop += 7;
+        int y = guiTop + 7;
+        int x = guiLeft + 4 + 4;
+        addTextField(new GuiNpcTextField(1, this, this.fontRendererObj, x + 36, y, 280, 20, effect.name));
+        getTextField(1).setMaxStringLength(40);
+        addLabel(new GuiNpcLabel(1, "gui.name", x, y + 5));
+
+        addLabel(new GuiNpcLabel(-1, "ID", x + 320, y + 1));
+        addLabel(new GuiNpcLabel(-2, effect.id + "", x + 320, y + 11));
+
+        y += 23;
+
+        addTextField(new GuiNpcTextField(2, this, x + 70, y, 246, 20, effect.menuName.replaceAll("§", "&")));
+        getTextField(2).setMaxStringLength(40);
+        addLabel(new GuiNpcLabel(2, "general.menuName", x, y + 5));
+
+        y += 23;
+
+        addTextField(setIntegerOnly(
+            new GuiNpcTextField(3, this, x + 70, y, 83, 20, ""+effect.everyXTick),
+            10,
+            1200,
+            effect.everyXTick
+        ));
+        getTextField(3).setMaxStringLength(6);
+        getTextField(3).integersOnly = true;
+        addLabel(new GuiNpcLabel(3, "effect.editor.runsEveryX", x, y + 5));
+
+        int oldX = x;
+        int xEnd = guiLeft+xSize-10;
+        x = getTextField(3).xPosition + getTextField(3).width;
+        addButton(new GuiNpcButtonYesNo(10, (x+xEnd - 83) / 2, y + 23, 83, 20, effect.lossOnDeath));
+        GuiNpcLabel label = new GuiNpcLabel(10, "effect.editor.lossOnDeath", x, y + 5);
+        label.x = (x+xEnd - fontRendererObj.getStringWidth(label.label))/2;
+        addLabel(label);
+        x = oldX;
+        y += 23;
+
+        addTextField(setIntegerOnly(
+            new GuiNpcTextField(4, this, x + 70, y, 83, 20, ""+effect.length),
+            -100,
+            86400,
+                effect.length
+        ));
+
+        addLabel(new GuiNpcLabel(4, "effect.editor.defaultLength", x, y + 5));
+
+        x = oldX - 4;
+        y += 23;
+        GuiScrollWindow scrollWindow = new GuiScrollWindow(this, x + 5, y, xSize - 20, ySize - 10 - (y - guiTop), 0) {
+            @Override
+            public void drawComponents(int mouseX, int mouseY, float partialTicks) {
+                super.drawComponents(mouseX, mouseY, partialTicks);
+
+                int iconRenderSize = 96;
+
+                int x = 10, y = (clipHeight - 96) / 2;
+
+                TextureManager textureManager = mc.getTextureManager();
+                GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+                ImageData data = ClientCacheHandler.getImageData(effect.icon);
+                if (data.imageLoaded()) {
+                    data.bindTexture();
+                    int iconX = effect.iconX;
+                    int iconY = effect.iconY;
+                    int iconWidth = effect.getWidth();
+                    int iconHeight = effect.getHeight();
+                    int width = data.getTotalWidth();
+                    int height = data.getTotalWidth();
+
+
+                    func_152125_a(x, y, iconX, iconY, iconWidth, iconHeight, iconRenderSize, iconRenderSize, width, height);
+
+                } else {
+                    textureManager.bindTexture(new ResourceLocation("customnpcs", "textures/marks/question.png"));
+                    func_152125_a(x, y, 0, 0, 1, 1, iconRenderSize, iconRenderSize, 1, 1);
+                }
+                GL11.glDisable(GL11.GL_DEPTH_TEST);
+
+                // TODO: FIX TEXTURE
+                // textureManager.bindTexture(new ResourceLocation(CustomNpcPlusDBC.ID + ":textures/gui/icons.png"));
+                func_152125_a(x, y, 0, 240, 16, 16, iconRenderSize, iconRenderSize, 256, 256);
+                GL11.glEnable(GL11.GL_DEPTH_TEST);
+            }
+        };
+        addScrollableGui(0, scrollWindow);
+
+        y = (scrollWindow.clipHeight - 96) / 2 + 5;
+        x = 116;
+        scrollWindow.addLabel(new GuiNpcLabel(5, "display.texture", x, y, 0xFFFFFF));
+        y += 12;
+        scrollWindow.addTextField(new GuiNpcTextField(5, this, x, y, scrollWindow.clipWidth-x-10, 20, effect.icon));
+        scrollWindow.getTextField(5).setMaxStringLength(100);
+
+        y += 25;
+
+        scrollWindow.addLabel(new GuiNpcLabel(6, "effect.editor.xPos", x, y + 6, 0xFFFFFF));
+        scrollWindow.addTextField(setIntegerOnly(
+            new GuiNpcTextField(6, this, x + 43, y, 60, 20, ""+effect.iconX),
+            0,
+            10240,
+            effect.iconX
+        ));
+        scrollWindow.addTextField(setIntegerOnly(
+            new GuiNpcTextField(7, this, scrollWindow.clipWidth - 60 - 10, y, 60, 20, ""+effect.iconY),
+            0,
+            10240,
+            effect.iconY
+        ));
+        scrollWindow.addLabel(new GuiNpcLabel(7, "effect.editor.yPos", scrollWindow.getTextField(7).xPosition - 43, y + 6, 0xFFFFFF));
+        y += 23;
+
+        scrollWindow.addLabel(new GuiNpcLabel(8, "effect.editor.width", x, y + 6, 0xFFFFFF));
+        scrollWindow.addTextField(setIntegerOnly(
+            new GuiNpcTextField(8, this, x + 43, y, 60, 20, ""+effect.width),
+            0,
+            10240,
+            effect.width
+        ));
+        scrollWindow.addTextField(setIntegerOnly(
+            new GuiNpcTextField(9, this, scrollWindow.clipWidth - 60 - 10, y, 60, 20, ""+effect.height),
+            0,
+            10240,
+            effect.height
+        ));
+        scrollWindow.addLabel(new GuiNpcLabel(9, "effect.editor.height", scrollWindow.getTextField(9).xPosition - 43, y + 6, 0xFFFFFF));
+
+    }
+
+    private GuiNpcTextField setIntegerOnly(GuiNpcTextField field, int min, int max, int def) {
+        field.integersOnly = true;
+        field.setMinMaxDefault(min, max, def);
+        field.setMaxStringLength(6);
+        return field;
+    }
+
+    @Override
+    protected void actionPerformed(GuiButton guibutton) {
+        int id = guibutton.id;
+
+        if (id == -5) {
+            close();
+            return;
+        }
+        if (id == -2) {
+            PacketClient.sendClient(new EffectSavePacket(effect.writeToNBT(false), originalName));
+            GuiScriptEffect scriptGUI = new GuiScriptEffect(parent, effect);
+            scriptGUI.setWorldAndResolution(mc, width, height);
+            scriptGUI.initGui();
+            mc.currentScreen = scriptGUI;
+        }
+        if (id == 10) {
+            GuiNpcButtonYesNo button = (GuiNpcButtonYesNo) guibutton;
+            effect.lossOnDeath = button.getBoolean();
+        }
+    }
+
+    @Override
+    public void unFocused(GuiNpcTextField guiNpcTextField) {
+        int id = guiNpcTextField.id;
+
+        switch (id) {
+            case 1:
+                effect.setName(guiNpcTextField.getText());
+                break;
+            case 2:
+                effect.setMenuName(guiNpcTextField.getText());
+                break;
+            case 3:
+                effect.setEveryXTick(guiNpcTextField.getInteger());
+                guiNpcTextField.setText(effect.everyXTick+"");
+                break;
+            case 4:
+                int length = guiNpcTextField.getInteger();
+                if (length < 0)
+                    length = -100;
+                guiNpcTextField.setText(length+"");
+                effect.length = length;
+                break;
+            case 5:
+                effect.icon = guiNpcTextField.getText();
+                break;
+            case 6:
+                effect.iconX = guiNpcTextField.getInteger();
+                break;
+            case 7:
+                effect.iconY = guiNpcTextField.getInteger();
+                break;
+            case 8:
+                effect.width = guiNpcTextField.getInteger();
+                break;
+            case 9:
+                effect.height = guiNpcTextField.getInteger();
+                break;
+        }
+    }
+
+    @Override
+    public void close() {
+        super.close();
+        PacketClient.sendClient(new EffectSavePacket(effect.writeToNBT(false), originalName));
+    }
+}
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java b/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java
index fe72e3f8e..0dadea474 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java
@@ -1,13 +1,15 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.MailOpenSetupPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.player.GuiMailmanWrite;
 import noppes.npcs.client.gui.select.GuiQuestSelection;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.containers.ContainerMail;
 import noppes.npcs.controllers.data.PlayerMail;
 
@@ -63,7 +65,7 @@ public class SubGuiMailmanSendSetup extends SubGuiInterface implements ITextfiel
 			GuiMailmanWrite.parent = getParent();
 			GuiMailmanWrite.mail = mail;
 
-    		Client.sendData(EnumPacketServer.MailOpenSetup, mail.writeNBT());
+            PacketClient.sendClient(new MailOpenSetupPacket(mail.writeNBT()));
 		}
     	if(id == 3){
             setSubGui(new GuiQuestSelection(mail.questId));
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java
index d6ec32d26..6d4b5bc4a 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java
@@ -1,21 +1,22 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.packets.request.faction.FactionGetPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.util.*;
 import noppes.npcs.constants.EnumAvailabilityFactionType;
 import noppes.npcs.constants.EnumDayTime;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.Availability;
 import noppes.npcs.controllers.data.Faction;
 
-public class SubGuiNpcAvailability extends SubGuiInterface implements ITextfieldListener, GuiSelectionListener, IGuiData 
+public class SubGuiNpcAvailability extends SubGuiInterface implements ITextfieldListener, GuiSelectionListener, IGuiData
 {
 	private Availability availabitily;
 	private int slot = 0;
-	
+
     public SubGuiNpcAvailability(Availability availabitily)
     {
     	this.availabitily = availabitily;
@@ -34,14 +35,14 @@ public class SubGuiNpcAvailability extends SubGuiInterface implements ITextfield
         this.addButton(new GuiNpcButton(0, guiLeft + 34, guiTop + 12, 180, 20, "availability.selectdialog"));
         this.addButton(new GuiNpcButton(1, guiLeft + 34, guiTop + 35, 180, 20, "availability.selectquest"));
 
-        
+
         this.addButton(new GuiNpcButton(20, guiLeft + 4, guiTop + 104, 50, 20, new String[]{"availability.always","availability.is","availability.isnot"},availabitily.factionAvailable.ordinal()));
         this.addButton(new GuiNpcButton(22, guiLeft + 56, guiTop + 104, 60, 20, new String[]{"faction.friendly","faction.neutral","faction.unfriendly"},availabitily.factionStance.ordinal()));
     	this.addButton(new GuiNpcButton(21, guiLeft + 118, guiTop + 104, 110, 20, "availability.selectfaction"));
     	getButton(21).setEnabled(availabitily.factionAvailable != EnumAvailabilityFactionType.Always);
     	getButton(22).setEnabled(availabitily.factionAvailable != EnumAvailabilityFactionType.Always);
     	this.addButton(new GuiNpcButton(23, guiLeft + 230, guiTop + 104,20, 20, "X"));
-    	
+
         this.addButton(new GuiNpcButton(24, guiLeft + 4, guiTop + 126, 50, 20, new String[]{"availability.always","availability.is","availability.isnot"},availabitily.faction2Available.ordinal()));
         this.addButton(new GuiNpcButton(27, guiLeft + 56, guiTop + 126, 60, 20, new String[]{"faction.friendly","faction.neutral","faction.unfriendly"},availabitily.faction2Stance.ordinal()));
     	this.addButton(new GuiNpcButton(25, guiLeft + 118, guiTop + 126, 110, 20, "availability.selectfaction"));
@@ -56,19 +57,19 @@ public class SubGuiNpcAvailability extends SubGuiInterface implements ITextfield
     	this.addTextField(new GuiNpcTextField(51, this, fontRendererObj, guiLeft + 50, guiTop + 170,90, 20, availabitily.minPlayerLevel + ""));
     	this.getTextField(51).integersOnly = true;
     	this.getTextField(51).setMinMaxDefault(0, Integer.MAX_VALUE, 0);
-    	
+
     	this.addButton(new GuiNpcButton(66, guiLeft + 82, guiTop + 192,98, 20, "gui.done"));
-    	
+
     	updateGuiButtons();
     }
 
 
     private void updateGuiButtons() {
 		if(availabitily.factionId >= 0){
-			Client.sendData(EnumPacketServer.FactionGet, availabitily.factionId);
+            FactionGetPacket.getFaction(availabitily.factionId);
 		}
 		if(availabitily.faction2Id >= 0){
-			Client.sendData(EnumPacketServer.FactionGet, availabitily.faction2Id);
+            FactionGetPacket.getFaction(availabitily.faction2Id);
 		}
 	}
 
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java
index 65ca11e53..35ee2158f 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java
@@ -1,12 +1,13 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.packets.request.dialog.DialogGetPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.select.GuiDialogSelection;
 import noppes.npcs.client.gui.util.*;
 import noppes.npcs.constants.EnumAvailabilityDialog;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.Availability;
 import noppes.npcs.controllers.data.Dialog;
 
@@ -66,16 +67,16 @@ public class SubGuiNpcAvailabilityDialog extends SubGuiInterface implements GuiS
 		getButton(13).setDisplayText("availability.selectdialog");
 
 		if(availabitily.dialogId >= 0){
-			Client.sendData(EnumPacketServer.DialogGet, availabitily.dialogId);
+            DialogGetPacket.getDialog(availabitily.dialogId);
 		}
 		if(availabitily.dialog2Id >= 0){
-			Client.sendData(EnumPacketServer.DialogGet, availabitily.dialog2Id);
+            DialogGetPacket.getDialog(availabitily.dialog2Id);
 		}
 		if(availabitily.dialog3Id >= 0){
-			Client.sendData(EnumPacketServer.DialogGet, availabitily.dialog3Id);
+            DialogGetPacket.getDialog(availabitily.dialog3Id);
 		}
 		if(availabitily.dialog4Id >= 0){
-			Client.sendData(EnumPacketServer.DialogGet, availabitily.dialog4Id);
+            DialogGetPacket.getDialog(availabitily.dialog4Id);
 		}
 	}
 
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java
index a1d41e304..c993936db 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java
@@ -1,12 +1,13 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.packets.request.quest.QuestGetPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.select.GuiQuestSelection;
 import noppes.npcs.client.gui.util.*;
 import noppes.npcs.constants.EnumAvailabilityQuest;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.Availability;
 import noppes.npcs.controllers.data.Quest;
 
@@ -66,16 +67,16 @@ public class SubGuiNpcAvailabilityQuest extends SubGuiInterface implements GuiSe
 		getButton(13).setDisplayText("availability.selectquest");
 
 		if(availabitily.questId >= 0){
-			Client.sendData(EnumPacketServer.QuestGet, availabitily.questId);
+            QuestGetPacket.getQuest(availabitily.questId);
 		}
 		if(availabitily.quest2Id >= 0){
-			Client.sendData(EnumPacketServer.QuestGet, availabitily.quest2Id);
+            QuestGetPacket.getQuest(availabitily.quest2Id);
 		}
 		if(availabitily.quest3Id >= 0){
-			Client.sendData(EnumPacketServer.QuestGet, availabitily.quest3Id);
+            QuestGetPacket.getQuest(availabitily.quest3Id);
 		}
 		if(availabitily.quest4Id >= 0){
-			Client.sendData(EnumPacketServer.QuestGet, availabitily.quest4Id);
+            QuestGetPacket.getQuest(availabitily.quest4Id);
 		}
 	}
 
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java
index e98aaf32a..0e09356c3 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java
@@ -1,8 +1,10 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.dialog.DialogSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.EntityUtil;
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.global.GuiNPCManageDialogs;
@@ -10,7 +12,7 @@ import noppes.npcs.client.gui.player.GuiDialogInteract;
 import noppes.npcs.client.gui.select.GuiQuestSelection;
 import noppes.npcs.client.gui.select.GuiSoundSelection;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.Dialog;
 import noppes.npcs.controllers.data.PlayerMail;
 import noppes.npcs.entity.EntityDialogNpc;
@@ -196,10 +198,10 @@ public class SubGuiNpcDialog extends SubGuiInterface implements ISubGuiListener,
 		dialog.quest = ob;
 		parent.dialogQuestName = name;
 		initGui();
-		Client.sendData(EnumPacketServer.DialogSave, this.dialogCategoryID, dialog.writeToNBT(new NBTTagCompound()));
+        PacketClient.sendClient(new DialogSavePacket(this.dialogCategoryID, dialog.writeToNBT(new NBTTagCompound()), false));
 	}
 
 	public void save(){
-		Client.sendData(EnumPacketServer.DialogSave, this.dialogCategoryID, dialog.writeToNBT(new NBTTagCompound()));
+        PacketClient.sendClient(new DialogSavePacket(this.dialogCategoryID, dialog.writeToNBT(new NBTTagCompound()), false));
 	}
 }
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java
index 55193a0de..f5565e43f 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java
@@ -1,12 +1,13 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.packets.request.dialog.DialogGetPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.select.GuiDialogSelection;
 import noppes.npcs.client.gui.util.*;
 import noppes.npcs.constants.EnumOptionType;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.Dialog;
 import noppes.npcs.controllers.data.DialogOption;
 
@@ -44,7 +45,7 @@ public class SubGuiNpcDialogOption extends SubGuiInterface implements IGuiData,
     	if(option.optionType == EnumOptionType.DialogOption){
     		this.addButton(new GuiNpcButton(3, guiLeft + 4, guiTop + 84, "availability.selectdialog"));
     		if(option.dialogId >= 0)
-    			Client.sendData(EnumPacketServer.DialogGet, option.dialogId);
+                DialogGetPacket.getDialog(option.dialogId);
     	}
     	if(option.optionType == EnumOptionType.CommandBlock){
 	    	this.addTextField(new GuiNpcTextField(4, this, this.fontRendererObj, guiLeft + 4,  guiTop + 84, 248, 20, option.command));
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java
index e1d3efb15..bd7092d50 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java
@@ -1,12 +1,14 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.dialog.DialogSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.util.*;
 import noppes.npcs.config.ConfigMain;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.Dialog;
 import noppes.npcs.controllers.data.DialogImage;
 
@@ -419,7 +421,7 @@ public class SubGuiNpcDialogVisual extends SubGuiInterface implements ISubGuiLis
     public void save() {
         GuiNpcTextField.unfocus();
         if(dialog.id >= 0)
-            Client.sendData(EnumPacketServer.DialogSave, ((SubGuiNpcDialog)parent).dialogCategoryID, dialog.writeToNBT(new NBTTagCompound()));
+            PacketClient.sendClient(new DialogSavePacket(((SubGuiNpcDialog)parent).dialogCategoryID, dialog.writeToNBT(new NBTTagCompound()), false));
     }
 
     private DialogImage getSelectedImage() {
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java
index 8af8a10c1..f90cc61b1 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java
@@ -1,9 +1,11 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.DimensionsGetPacket;
 import net.minecraft.client.gui.GuiButton;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.SpawnData;
 
 import java.util.*;
@@ -14,14 +16,14 @@ public class SubGuiNpcDimensions extends SubGuiInterface implements IScrollData
 	private GuiCustomScroll allDimensions;
 	private HashMap<String, Integer> dimensionMap = new HashMap<>();
 	private GuiCustomScroll dataDimensions;
-	
+
     public SubGuiNpcDimensions(SpawnData data){
     	this.data = data;
 		setBackground("menubg.png");
 		xSize = 346;
 		ySize = 216;
 		closeOnEsc = true;
-		Client.sendData(EnumPacketServer.DimensionsGet);
+        PacketClient.sendClient(new DimensionsGetPacket());
     }
 
     public void initGui(){
@@ -34,7 +36,7 @@ public class SubGuiNpcDimensions extends SubGuiInterface implements IScrollData
         allDimensions.guiTop = guiTop + 14;
         this.addScroll(allDimensions);
         addLabel(new GuiNpcLabel(1, "spawning.availableDimensions", guiLeft + 4, guiTop + 4));
-        
+
         if(dataDimensions == null){
         	dataDimensions = new GuiCustomScroll(this,1);
         	dataDimensions.setSize(140, 180);
@@ -58,8 +60,8 @@ public class SubGuiNpcDimensions extends SubGuiInterface implements IScrollData
 
     	addButton(new GuiNpcButton(3, guiLeft + 145, guiTop + 90, 55, 20, ">>"));
     	addButton(new GuiNpcButton(4, guiLeft + 145, guiTop + 112, 55, 20, "<<"));
-        
-        
+
+
     	addButton(new GuiNpcButton(66, guiLeft + 260, guiTop + 194, 60, 20, "gui.done"));
     }
 
@@ -70,14 +72,14 @@ public class SubGuiNpcDimensions extends SubGuiInterface implements IScrollData
 				data.dimensions.add(dimensionMap.get(allDimensions.getSelected()));
 				allDimensions.selected = -1;
 				initGui();
-			}				
+			}
 		}
 		if(button.id == 2){
 			if(dataDimensions.hasSelected()){
 				data.dimensions.remove(dimensionMap.get(dataDimensions.getSelected()));
 				dataDimensions.selected = -1;
 				initGui();
-			}				
+			}
 		}
 		if(button.id == 3){
 			data.dimensions.clear();
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java
index fcfd6becd..d3cce58c2 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java
@@ -1,10 +1,12 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.faction.FactionsGetPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.util.StatCollector;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.FactionOptions;
 
 import java.util.HashMap;
@@ -15,9 +17,9 @@ public class SubGuiNpcFactionOptions extends SubGuiInterface implements IScrollD
 	private FactionOptions options;
 	private HashMap<String,Integer> data = new HashMap<String,Integer>();
 	private GuiCustomScroll scrollFactions;
-	
+
 	private int selected = -1;
-	
+
     public SubGuiNpcFactionOptions(FactionOptions options)
     {
     	this.options = options;
@@ -25,7 +27,7 @@ public class SubGuiNpcFactionOptions extends SubGuiInterface implements IScrollD
 		xSize = 256;
 		ySize = 216;
 		closeOnEsc = true;
-    	Client.sendData(EnumPacketServer.FactionsGet);
+        PacketClient.sendClient(new FactionsGetPacket());
     }
 
     public void initGui()
@@ -42,7 +44,7 @@ public class SubGuiNpcFactionOptions extends SubGuiInterface implements IScrollD
         addLabel(new GuiNpcLabel(0, "1: ", guiLeft + 4,  guiTop + 12));
         if(data.containsValue(options.factionId)){
             addLabel(new GuiNpcLabel(1, getFactionName(options.factionId), guiLeft + 12,  guiTop + 8));
-            
+
             String label = "";
             if(options.decreaseFactionPoints)
             	label += StatCollector.translateToLocal("gui.decrease");
@@ -69,14 +71,14 @@ public class SubGuiNpcFactionOptions extends SubGuiInterface implements IScrollD
             addButton(new GuiNpcButton(1, guiLeft + 110, guiTop + 35, 20, 20, "X"));
         }
 
-        
+
         if(selected >= 0 && (!data.containsValue(options.faction2Id) || !data.containsValue(options.factionId)) && !options.hasFaction(selected)){
             addButton(new GuiNpcButton(2, guiLeft + 4, guiTop + 60, 90, 20, new String[]{"gui.increase","gui.decrease"},0));
-            
+
             addTextField(new GuiNpcTextField(1, this, fontRendererObj, guiLeft + 4, guiTop + 82, 110, 20, "10"));
             getTextField(1).integersOnly = true;
             getTextField(1).setMinMaxDefault(1, 100000, 10);
-            
+
             addButton(new GuiNpcButton(3, guiLeft + 4, guiTop + 104, 60, 20, "gui.add"));
         }
 
@@ -88,7 +90,7 @@ public class SubGuiNpcFactionOptions extends SubGuiInterface implements IScrollD
     			return s;
     	return null;
     }
-    
+
 	protected void actionPerformed(GuiButton guibutton)
     {
 		int id = guibutton.id;
@@ -135,16 +137,16 @@ public class SubGuiNpcFactionOptions extends SubGuiInterface implements IScrollD
 		String name = scroll.getSelected();
 		this.data = data;
 		scroll.setList(list);
-		
+
 		if(name != null)
 			scroll.setSelected(name);
-		
+
 		initGui();
 	}
 
 	@Override
 	public void setSelected(String selected) {
-		
+
 	}
 
 }
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java
index e1c32be0f..8b1b70319 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java
@@ -1,8 +1,11 @@
 package noppes.npcs.client.gui;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.quest.QuestOpenGuiPacket;
+import kamkeel.npcs.network.packets.request.quest.QuestSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.global.GuiNPCManageQuest;
 import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeDialog;
 import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeKill;
@@ -101,7 +104,7 @@ public class SubGuiNpcQuest extends SubGuiInterface implements ISubGuiListener,
 			setSubGui(new SubGuiNpcTextArea(quest.logText));
 		}
 		if(button.id == 5 && quest.id >= 0){
-			Client.sendData(EnumPacketServer.QuestOpenGui, EnumGuiType.QuestReward, quest.writeToNBT(new NBTTagCompound()));
+            PacketClient.sendClient(new QuestOpenGuiPacket(EnumGuiType.QuestReward, quest.writeToNBT(new NBTTagCompound())));
 		}
 		if(button.id == 6 && quest.id >= 0){
 			quest.setType(EnumQuestType.values()[button.getValue()]);
@@ -109,7 +112,7 @@ public class SubGuiNpcQuest extends SubGuiInterface implements ISubGuiListener,
 		if(button.id == 7)
 		{
 			if(quest.type == EnumQuestType.Item)
-				Client.sendData(EnumPacketServer.QuestOpenGui, EnumGuiType.QuestItem, quest.writeToNBT(new NBTTagCompound()));
+                PacketClient.sendClient(new QuestOpenGuiPacket(EnumGuiType.QuestItem, quest.writeToNBT(new NBTTagCompound())));
 
 			if(quest.type == EnumQuestType.Dialog)
 				setSubGui(new GuiNpcQuestTypeDialog(npc, quest, this));
@@ -218,10 +221,10 @@ public class SubGuiNpcQuest extends SubGuiInterface implements ISubGuiListener,
 		quest.nextQuestTitle = name;
 		parent.nextQuestName = name;
 		initGui();
-		Client.sendData(EnumPacketServer.QuestSave, this.questCategoryID, quest.writeToNBT(new NBTTagCompound()));
+        PacketClient.sendClient(new QuestSavePacket(this.questCategoryID, quest.writeToNBT(new NBTTagCompound()), false));
 	}
 
 	public void save(){
-		Client.sendData(EnumPacketServer.QuestSave, this.questCategoryID, quest.writeToNBT(new NBTTagCompound()));
+        PacketClient.sendClient(new QuestSavePacket(this.questCategoryID, quest.writeToNBT(new NBTTagCompound()), false));
 	}
 }
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java
index 505c5246c..97341b4e6 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java
@@ -60,7 +60,7 @@ public class SubGuiNpcResistanceProperties extends SubGuiInterface implements IS
 
 	@Override
 	public void mousePressed(GuiNpcSlider slider) {
-		// TODO Auto-generated method stub
+
 
 	}
 
diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java
index e5faca9e9..f9d6a1bba 100644
--- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java
+++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java
@@ -1,10 +1,13 @@
 package noppes.npcs.client.gui.advanced;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.linked.LinkedGetAllPacket;
+import kamkeel.npcs.network.packets.request.linked.LinkedSetPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 
 import java.util.ArrayList;
@@ -15,21 +18,21 @@ import java.util.Vector;
 public class GuiNPCAdvancedLinkedNpc extends GuiNPCInterface2 implements IScrollData, ICustomScrollListener{
 	private GuiCustomScroll scroll;
 	private List<String> data = new ArrayList<String>();
-	
+
 	public static GuiScreen Instance;
-	
+
     public GuiNPCAdvancedLinkedNpc(EntityNPCInterface npc){
     	super(npc);
     	Instance = this;
-		Client.sendData(EnumPacketServer.LinkedGetAll);
+        PacketClient.sendClient(new LinkedGetAllPacket());
     }
 
     @Override
     public void initGui(){
         super.initGui();
-        
+
        	this.addButton(new GuiNpcButton(1,guiLeft + 358, guiTop + 38, 58, 20, "gui.clear"));
-    	
+
         if(scroll == null){
 	        scroll = new GuiCustomScroll(this,0);
 	        scroll.setSize(143, 208);
@@ -44,9 +47,9 @@ public class GuiNPCAdvancedLinkedNpc extends GuiNPCInterface2 implements IScroll
     @Override
 	public void buttonEvent(GuiButton button){
         if(button.id == 1){
-        	Client.sendData(EnumPacketServer.LinkedSet, "");
+            PacketClient.sendClient(new LinkedSetPacket(""));
         }
-        
+
     }
 
 	@Override
@@ -62,13 +65,13 @@ public class GuiNPCAdvancedLinkedNpc extends GuiNPCInterface2 implements IScroll
 
 	@Override
 	public void save() {
-		
+
 	}
 
 	@Override
 	public void customScrollClicked(int i, int j, int k,
 			GuiCustomScroll guiCustomScroll) {
-    	Client.sendData(EnumPacketServer.LinkedSet, guiCustomScroll.getSelected());
+        PacketClient.sendClient(new LinkedSetPacket(guiCustomScroll.getSelected()));
 	}
 
 }
diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java
index 02a4f83e9..88dd27c92 100644
--- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java
+++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java
@@ -1,12 +1,16 @@
 package noppes.npcs.client.gui.advanced;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.dialog.DialogNpcGetPacket;
+import kamkeel.npcs.network.packets.request.dialog.DialogNpcRemovePacket;
+import kamkeel.npcs.network.packets.request.dialog.DialogNpcSetPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.select.GuiDialogSelection;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.DialogOption;
 import noppes.npcs.entity.EntityNPCInterface;
 
@@ -21,7 +25,7 @@ public class GuiNPCDialogNpcOptions extends GuiNPCInterface2 implements GuiSelec
 		super(npc);
 		this.parent = parent;
 		this.drawDefaultBackground = true;
-		Client.sendData(EnumPacketServer.DialogNpcGet);
+        PacketClient.sendClient(new DialogNpcGetPacket());
 	}
 
 	public void initGui() {
@@ -55,7 +59,7 @@ public class GuiNPCDialogNpcOptions extends GuiNPCInterface2 implements GuiSelec
 		if (id >= 20 && id < 40) {
 			int slot = id - 20;
 			data.remove(slot);
-			Client.sendData(EnumPacketServer.DialogNpcRemove,slot);
+            PacketClient.sendClient(new DialogNpcRemovePacket(slot));
 			initGui();
 		}
 	}
@@ -66,7 +70,7 @@ public class GuiNPCDialogNpcOptions extends GuiNPCInterface2 implements GuiSelec
 
 	@Override
 	public void selected(int id, String name) {
-		Client.sendData(EnumPacketServer.DialogNpcSet, selectedSlot, id);
+        PacketClient.sendClient(new DialogNpcSetPacket(selectedSlot, id));
 	}
 
 
diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java
index e8f9069fa..e7aab677e 100644
--- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java
+++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java
@@ -1,11 +1,15 @@
 package noppes.npcs.client.gui.advanced;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.faction.FactionSetPacket;
+import kamkeel.npcs.network.packets.request.faction.FactionsGetPacket;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.SubGuiNpcFactionOptions;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 
 import java.util.HashMap;
@@ -15,11 +19,11 @@ public class GuiNPCFactionSetup extends GuiNPCInterface2 implements IScrollData,
 {
 	private GuiCustomScroll scrollFactions;
 	private HashMap<String,Integer> data = new HashMap<String,Integer>();
-	
+
     public GuiNPCFactionSetup(EntityNPCInterface npc)
     {
     	super(npc);
-    	Client.sendData(EnumPacketServer.FactionsGet);
+        PacketClient.sendClient(new FactionsGetPacket());
     }
 
     public void initGui()
@@ -34,7 +38,7 @@ public class GuiNPCFactionSetup extends GuiNPCInterface2 implements IScrollData,
 
         this.addLabel(new GuiNpcLabel(12, "faction.ondeath", guiLeft + 4, guiTop + 69));
         addButton(new GuiNpcButton(12, guiLeft + 90, guiTop + 64, 80, 20, "faction.points"));
-        
+
         if(scrollFactions == null){
 	        scrollFactions = new GuiCustomScroll(this,0,0);
 	        scrollFactions.setSize(180, 200);
@@ -59,41 +63,41 @@ public class GuiNPCFactionSetup extends GuiNPCInterface2 implements IScrollData,
     	if(button.id == 12)
         	setSubGui(new SubGuiNpcFactionOptions(npc.advanced.factions));
     }
-    
+
     }
-	
+
 	@Override
-	public void setData(Vector<String> list, HashMap<String, Integer> data) 
+	public void setData(Vector<String> list, HashMap<String, Integer> data)
 	{
 		String name = npc.getFaction().name;
 		this.data = data;
 		scrollFactions.setList(list);
-		
+
 		if(name != null)
 			setSelected(name);
 	}
-	
+
     public void mouseClicked(int i, int j, int k)
     {
     	super.mouseClicked(i, j, k);
     	if(k == 0 && scrollFactions != null)
     		scrollFactions.mouseClicked(i, j, k);
     }
-	
+
 	@Override
 	public void setSelected(String selected) {
 		scrollFactions.setSelected(selected);
 	}
-	
+
 	@Override
 	public void customScrollClicked(int i, int j, int k, GuiCustomScroll guiCustomScroll) {
 		if(guiCustomScroll.id == 0)
 		{
-			Client.sendData(EnumPacketServer.FactionSet, data.get(scrollFactions.getSelected()));
+            PacketClient.sendClient(new FactionSetPacket(data.get(scrollFactions.getSelected())));
 		}
 	}
-	
+
 	public void save() {
-		Client.sendData(EnumPacketServer.MainmenuAdvancedSave, npc.advanced.writeToNBT(new NBTTagCompound()));
-	}
+        PacketClient.sendClient(new MainmenuAdvancedSavePacket(npc.advanced.writeToNBT(new NBTTagCompound())));
+    }
 }
diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCLinesMenu.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCLinesMenu.java
index 48ab6be4e..92d5c49dd 100644
--- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCLinesMenu.java
+++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCLinesMenu.java
@@ -1,19 +1,21 @@
 package noppes.npcs.client.gui.advanced;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.GuiNPCLinesEdit;
 import noppes.npcs.client.gui.util.GuiNPCInterface2;
 import noppes.npcs.client.gui.util.GuiNpcButton;
 import noppes.npcs.client.gui.util.GuiNpcButtonYesNo;
 import noppes.npcs.client.gui.util.GuiNpcLabel;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 
 public class GuiNPCLinesMenu extends GuiNPCInterface2 {
-	
+
     public GuiNPCLinesMenu(EntityNPCInterface npc) {
     	super(npc);
     }
@@ -54,10 +56,10 @@ public class GuiNPCLinesMenu extends GuiNPCInterface2 {
         	npc.advanced.orderedLines = !((GuiNpcButtonYesNo)guibutton).getBoolean();
         }
     }
-	
+
 	@Override
 	public void save() {
-		Client.sendData(EnumPacketServer.MainmenuAdvancedSave, npc.advanced.writeToNBT(new NBTTagCompound()));
+        PacketClient.sendClient(new MainmenuAdvancedSavePacket(npc.advanced.writeToNBT(new NBTTagCompound())));
 	}
 
 
diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java
index 1be2ab503..bad32b76b 100644
--- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java
+++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java
@@ -1,11 +1,14 @@
 package noppes.npcs.client.gui.advanced;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedGetPacket;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedMarkDataPacket;
 import net.minecraft.client.gui.GuiButton;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.SubGuiColorSelector;
 import noppes.npcs.client.gui.SubGuiNpcAvailability;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.constants.MarkType;
 import noppes.npcs.controllers.data.MarkData;
 import noppes.npcs.entity.EntityNPCInterface;
@@ -78,7 +81,7 @@ public class GuiNPCMarks extends GuiNPCInterface2 implements ISubGuiListener {
 
 	@Override
 	public void save() {
-		Client.sendData(EnumPacketServer.MainmenuAdvancedMarkData, data.getNBT());
+        PacketClient.sendClient(new MainmenuAdvancedMarkDataPacket(data.getNBT()));
 	}
 
 }
diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCNightSetup.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCNightSetup.java
index a501d6b2b..cbe94b524 100644
--- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCNightSetup.java
+++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCNightSetup.java
@@ -1,25 +1,29 @@
 package noppes.npcs.client.gui.advanced;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.transform.TransformGetPacket;
+import kamkeel.npcs.network.packets.request.transform.TransformLoadPacket;
+import kamkeel.npcs.network.packets.request.transform.TransformSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.GuiNPCInterface2;
 import noppes.npcs.client.gui.util.GuiNpcButton;
 import noppes.npcs.client.gui.util.GuiNpcLabel;
 import noppes.npcs.client.gui.util.IGuiData;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.DataTransform;
 import noppes.npcs.entity.EntityNPCInterface;
 
 public class GuiNPCNightSetup extends GuiNPCInterface2 implements IGuiData
 {
 	private DataTransform data;
-	
+
     public GuiNPCNightSetup(EntityNPCInterface npc)
     {
     	super(npc);
     	data = npc.transform;
-    	Client.sendData(EnumPacketServer.TransformGet);
+        PacketClient.sendClient(new TransformGetPacket());
     }
 
     public void initGui()
@@ -40,16 +44,16 @@ public class GuiNPCNightSetup extends GuiNPCInterface2 implements IGuiData
 
         this.addLabel(new GuiNpcLabel(4, "menu.advanced", guiLeft + 4, guiTop + 113));
         this.addButton(new GuiNpcButton(4, guiLeft + 104, guiTop + 108, 50, 20, new String[]{"gui.no","gui.yes"}, data.hasAdvanced?1:0));
-        
+
         this.addLabel(new GuiNpcLabel(5, "role.name", guiLeft + 4, guiTop + 135));
         this.addButton(new GuiNpcButton(5, guiLeft + 104, guiTop + 130, 50, 20, new String[]{"gui.no","gui.yes"}, data.hasRole?1:0));
-        
+
         this.addLabel(new GuiNpcLabel(6, "job.name", guiLeft + 4, guiTop + 157));
         this.addButton(new GuiNpcButton(6, guiLeft + 104, guiTop + 152, 50, 20, new String[]{"gui.no","gui.yes"}, data.hasJob?1:0));
-    
+
         this.addLabel(new GuiNpcLabel(10, "advanced.editingmode", guiLeft + 170, guiTop + 9));
         this.addButton(new GuiNpcButton(10, guiLeft + 244, guiTop + 4, 50, 20, new String[]{"gui.no","gui.yes"}, data.editingModus?1:0));
-    
+
         if(data.editingModus){
         	this.addButton(new GuiNpcButton(11, guiLeft + 170, guiTop + 34, "advanced.loadday"));
         	this.addButton(new GuiNpcButton(12, guiLeft + 170, guiTop + 56, "advanced.loadnight"));
@@ -80,16 +84,16 @@ public class GuiNPCNightSetup extends GuiNPCInterface2 implements IGuiData
         	initGui();
         }
         if(button.id == 11){
-        	Client.sendData(EnumPacketServer.TransformLoad, false);
+            PacketClient.sendClient(new TransformLoadPacket(false));
         }
         if(button.id == 12){
-        	Client.sendData(EnumPacketServer.TransformLoad, true);
+            PacketClient.sendClient(new TransformLoadPacket(true));
         }
     }
-    
-		
+
+
 	public void save() {
-		Client.sendData(EnumPacketServer.TransformSave, data.writeOptions(new NBTTagCompound()));
+        PacketClient.sendClient(new TransformSavePacket(data.writeOptions(new NBTTagCompound())));
 	}
 
 	@Override
diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java
index 2634b9ddf..efd0e5d0b 100644
--- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java
+++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java
@@ -1,11 +1,13 @@
 package noppes.npcs.client.gui.advanced;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.select.GuiSoundSelection;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 
 public class GuiNPCSoundsMenu extends GuiNPCInterface2 implements  ITextfieldListener, ISubGuiListener
@@ -77,7 +79,7 @@ public class GuiNPCSoundsMenu extends GuiNPCInterface2 implements  ITextfieldLis
 
 	@Override
 	public void save() {
-		Client.sendData(EnumPacketServer.MainmenuAdvancedSave, npc.advanced.writeToNBT(new NBTTagCompound()));
+        PacketClient.sendClient(new MainmenuAdvancedSavePacket(npc.advanced.writeToNBT(new NBTTagCompound())));
 	}
 
 }
diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java
index d3c04b74f..54c5abecf 100644
--- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java
+++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java
@@ -1,13 +1,15 @@
 package noppes.npcs.client.gui.advanced;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.tags.TagsGetPacket;
+import kamkeel.npcs.network.packets.request.tags.TagsNpcGetPacket;
+import kamkeel.npcs.network.packets.request.tags.TagSetPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.nbt.NBTTagString;
 import net.minecraft.util.StatCollector;
-import noppes.npcs.client.Client;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
 import noppes.npcs.entity.EntityNPCInterface;
 
 import java.util.ArrayList;
@@ -26,8 +28,8 @@ public class GuiNPCTagSetup extends GuiNPCInterface2 implements IScrollData,ICus
     public GuiNPCTagSetup(EntityNPCInterface npc)
     {
     	super(npc);
-    	Client.sendData(EnumPacketServer.TagsGet);
-		Client.sendData(EnumPacketServer.NpcTagsGet);
+        PacketClient.sendClient(new TagsGetPacket());
+        PacketClient.sendClient(new TagsNpcGetPacket());
     }
 
     public void initGui()
@@ -120,7 +122,7 @@ public class GuiNPCTagSetup extends GuiNPCInterface2 implements IScrollData,ICus
 			tagList.appendTag(new NBTTagString(string));
 		}
 		tagCompound.setTag("TagNames",tagList);
-		Client.sendData(EnumPacketServer.TagSet, tagCompound);
+        PacketClient.sendClient(new TagSetPacket(tagCompound));
 	}
 
 	public void keyTyped(char c, int i)
diff --git a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java
index 91df8f5ef..6bf025ae3 100644
--- a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java
+++ b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java
@@ -1,5 +1,10 @@
 package noppes.npcs.client.gui.custom;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.customgui.CustomGuiButtonPacket;
+import kamkeel.npcs.network.packets.request.customgui.CustomGuiClosePacket;
+import kamkeel.npcs.network.packets.request.customgui.CustomGuiUnfocusedPacket;
+import kamkeel.npcs.network.packets.request.customgui.CustomScrollClickPacket;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
@@ -20,7 +25,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
 import noppes.npcs.api.gui.ICustomGuiComponent;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.custom.components.*;
 import noppes.npcs.client.gui.custom.interfaces.IClickListener;
 import noppes.npcs.client.gui.custom.interfaces.IDataHolder;
@@ -28,7 +33,7 @@ import noppes.npcs.client.gui.custom.interfaces.IGuiComponent;
 import noppes.npcs.client.gui.util.GuiCustomScroll;
 import noppes.npcs.client.gui.util.ICustomScrollListener;
 import noppes.npcs.client.gui.util.IGuiData;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.containers.ContainerCustomGui;
 import noppes.npcs.scripted.gui.*;
 import org.lwjgl.input.Keyboard;
@@ -449,25 +454,25 @@ public class GuiCustom extends GuiScreen implements ICustomScrollListener, IGuiD
 
     protected void actionPerformed(GuiButton button) {
         super.actionPerformed(button);
-        Client.sendData(EnumPacketServer.CustomGuiButton, new Object[]{this.updateGui().toNBT(), button.id});
+        PacketClient.sendClient(new CustomGuiButtonPacket(button.id, this.updateGui().toNBT()));
     }
 
     public void buttonClick(CustomGuiButton button) {
-        Client.sendData(EnumPacketServer.CustomGuiButton, new Object[]{this.updateGui().toNBT(), button.id});
+        PacketClient.sendClient(new CustomGuiButtonPacket(button.id, this.updateGui().toNBT()));
     }
 
     public String prevScrollClicked = null;
     public void customScrollClicked(int i, int j, int k, GuiCustomScroll scroll) {
-        Client.sendData(EnumPacketServer.CustomGuiScrollClick, new Object[]{this.updateGui().toNBT(), scroll.id, scroll.selected, this.getScrollSelection((CustomGuiScrollComponent)scroll), false});
+        PacketClient.sendClient(new CustomScrollClickPacket(this.updateGui().toNBT(), scroll.id, scroll.selected, this.getScrollSelection((CustomGuiScrollComponent)scroll), false));
         if(Integer.toString(scroll.selected).equals(prevScrollClicked)){
-            Client.sendData(EnumPacketServer.CustomGuiScrollClick, new Object[]{this.updateGui().toNBT(), scroll.id, scroll.selected, this.getScrollSelection((CustomGuiScrollComponent)scroll), true});
+            PacketClient.sendClient(new CustomScrollClickPacket(this.updateGui().toNBT(), scroll.id, scroll.selected, this.getScrollSelection((CustomGuiScrollComponent)scroll), true));
         }
         prevScrollClicked = Integer.toString(scroll.selected);
     }
 
     public void onGuiClosed() {
         if (this.gui != null) {
-            Client.sendData(EnumPacketServer.CustomGuiClose, new Object[]{this.updateGui().toNBT()});
+            PacketClient.sendClient(new CustomGuiClosePacket(this.updateGui().toNBT()));
         }
 
         if (this.mc.thePlayer != null)
@@ -477,10 +482,10 @@ public class GuiCustom extends GuiScreen implements ICustomScrollListener, IGuiD
     }
 
     public void onTextFieldUnfocused(CustomGuiTextField textField){
-        Client.sendData(EnumPacketServer.CustomGuiUnfocused, new Object[]{this.updateGui().toNBT(), textField.getID()});
+        PacketClient.sendClient(new CustomGuiUnfocusedPacket(textField.getID(), this.updateGui().toNBT()));
     }
 
-    ScriptGui updateGui() {
+    public ScriptGui updateGui() {
         Iterator var1 = this.dataHolders.iterator();
 
         while(var1.hasNext()) {
@@ -491,7 +496,7 @@ public class GuiCustom extends GuiScreen implements ICustomScrollListener, IGuiD
         return this.gui;
     }
 
-    NBTTagCompound getScrollSelection(CustomGuiScrollComponent scroll) {
+    public NBTTagCompound getScrollSelection(CustomGuiScrollComponent scroll) {
         NBTTagList list = new NBTTagList();
         if (scroll.multiSelect) {
             Iterator var3 = scroll.getSelectedList().iterator();
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java
index 73541f2d0..96dcd38a6 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java
@@ -1,14 +1,16 @@
 package noppes.npcs.client.gui.global;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.animation.AnimationSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.SubGuiAnimationFrame;
 import noppes.npcs.client.gui.SubGuiAnimationOptions;
 import noppes.npcs.client.gui.SubGuiColorSelector;
 import noppes.npcs.client.gui.util.*;
 import noppes.npcs.constants.EnumAnimationPart;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.Animation;
 import noppes.npcs.controllers.data.AnimationData;
 import noppes.npcs.controllers.data.Frame;
@@ -591,7 +593,7 @@ public class GuiNPCEditAnimation extends GuiModelInterface implements ITextfield
     public void close() {
         if (!this.hasSubGui()) {
             if (animation != null) {
-                Client.sendData(EnumPacketServer.AnimationSave, animation.writeToNBT());
+                PacketClient.sendClient(new AnimationSavePacket(animation.writeToNBT()));
             }
             displayGuiScreen(parent);
         } else {
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java
index 312e5a5e8..76d94e116 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java
@@ -1,14 +1,19 @@
 package noppes.npcs.client.gui.global;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.animation.AnimationGetPacket;
+import kamkeel.npcs.network.packets.request.animation.AnimationRemovePacket;
+import kamkeel.npcs.network.packets.request.animation.AnimationSavePacket;
+import kamkeel.npcs.network.packets.request.animation.AnimationsGetPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiYesNo;
 import net.minecraft.client.gui.GuiYesNoCallback;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.*;
 import noppes.npcs.entity.EntityNPCInterface;
 
@@ -33,7 +38,7 @@ public class GuiNPCManageAnimations extends GuiModelInterface2 implements IScrol
         this.setSave(save);
         this.xOffset = -148 + 70;
         this.yOffset = -170 + 137;
-        Client.sendData(EnumPacketServer.AnimationsGet);
+        PacketClient.sendClient(new AnimationsGetPacket());
 
         AnimationData data = npc.display.animationData;
         data.setEnabled(true);
@@ -155,12 +160,12 @@ public class GuiNPCManageAnimations extends GuiModelInterface2 implements IScrol
         GuiNpcButton button = (GuiNpcButton) guibutton;
 
         if(button.id == 0){
-            save();
-            String name = "New";
-            while(data.containsKey(name))
-                name += "_";
-            Animation animation = new Animation(-1, name);
-            Client.sendData(EnumPacketServer.AnimationSave, animation.writeToNBT());
+        	save();
+        	String name = "New";
+        	while(data.containsKey(name))
+        		name += "_";
+        	Animation animation = new Animation(-1, name);
+            PacketClient.sendClient(new AnimationSavePacket(animation.writeToNBT()));
         }
         if(button.id == 1){
             if(data.containsKey(scrollAnimations.getSelected())) {
@@ -225,20 +230,20 @@ public class GuiNPCManageAnimations extends GuiModelInterface2 implements IScrol
         scrollAnimations.setSelected(selected);
     }
 
-    @Override
-    public void customScrollClicked(int i, int j, int k, GuiCustomScroll guiCustomScroll) {
-        if(guiCustomScroll.id == 0)
-        {
-            selected = scrollAnimations.getSelected();
-            Client.sendData(EnumPacketServer.AnimationGet, data.get(selected));
-        }
-    }
+	@Override
+	public void customScrollClicked(int i, int j, int k, GuiCustomScroll guiCustomScroll) {
+		if(guiCustomScroll.id == 0)
+		{
+			selected = scrollAnimations.getSelected();
+            PacketClient.sendClient(new AnimationGetPacket(data.get(selected)));
+		}
+	}
 
-    public void save() {
-        if(selected != null && data.containsKey(selected) && animation != null){
-            Client.sendData(EnumPacketServer.AnimationSave, animation.writeToNBT());
-        }
-    }
+	public void save() {
+		if(selected != null && data.containsKey(selected) && animation != null){
+            PacketClient.sendClient(new AnimationSavePacket(animation.writeToNBT()));
+		}
+	}
 
     @Override
     public void unFocused(GuiNpcTextField guiNpcTextField) {
@@ -268,7 +273,7 @@ public class GuiNPCManageAnimations extends GuiModelInterface2 implements IScrol
             return;
         if(id == 1) {
             if(data.containsKey(scrollAnimations.getSelected())) {
-                Client.sendData(EnumPacketServer.AnimationRemove, data.get(selected));
+                PacketClient.sendClient(new AnimationRemovePacket(data.get(selected)));
                 scrollAnimations.clear();
                 animation = new Animation();
                 initGui();
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java
index d2a0949aa..ec0f581b1 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java
@@ -1,11 +1,16 @@
 package noppes.npcs.client.gui.global;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.bank.BankGetPacket;
+import kamkeel.npcs.network.packets.request.bank.BankRemovePacket;
+import kamkeel.npcs.network.packets.request.bank.BankSavePacket;
+import kamkeel.npcs.network.packets.request.bank.BanksGetPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.CustomNpcResourceListener;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.containers.ContainerManageBanks;
 import noppes.npcs.controllers.data.Bank;
 import noppes.npcs.entity.EntityNPCInterface;
@@ -23,13 +28,13 @@ public class GuiNPCManageBanks extends GuiContainerNPCInterface2 implements IScr
 	private Bank bank = new Bank();
 	private String selected = null;
 	private String search = "";
-	
+
     public GuiNPCManageBanks(EntityNPCInterface npc,ContainerManageBanks container)
     {
     	super(npc,container);
     	this.container = container;
     	drawDefaultBackground = false;
-    	Client.sendData(EnumPacketServer.BanksGet);
+        PacketClient.sendClient(new BanksGetPacket());
     	setBackground("npcbanksetup.png");
     	ySize = 200;
     }
@@ -37,7 +42,7 @@ public class GuiNPCManageBanks extends GuiContainerNPCInterface2 implements IScr
     public void initGui()
     {
         super.initGui();
-        
+
        	this.addButton(new GuiNpcButton(6,guiLeft + 340, guiTop + 10, 45, 20, "gui.add"));
     	this.addButton(new GuiNpcButton(7,guiLeft + 340, guiTop + 32, 45, 20, "gui.remove"));
     	if(scroll == null)
@@ -46,21 +51,21 @@ public class GuiNPCManageBanks extends GuiContainerNPCInterface2 implements IScr
     	scroll.guiLeft = guiLeft + 174;
     	scroll.guiTop = guiTop + 8;
     	addScroll(scroll);
-    	
+
         for(int i = 0; i < 6; i++){
         	int x = guiLeft + 6;
         	int y = (guiTop + 36) + (i * 22);
             addButton(new GuiNpcButton(i, x + 50, y,80, 20, new String[]{"Can Upgrade","Can't Upgrade","Upgraded"},0));
             getButton(i).setEnabled(false);
         }
-        
+
         addTextField(new GuiNpcTextField(0,this, this.fontRendererObj, guiLeft+8, guiTop + 8, 160, 16, ""));
         getTextField(0).setMaxStringLength(20);
-        
+
         addTextField(new GuiNpcTextField(1,this, this.fontRendererObj, guiLeft+10, guiTop + 80, 16, 16, ""));
         getTextField(1).integersOnly = true;
         getTextField(1).setMaxStringLength(1);
-        
+
         addTextField(new GuiNpcTextField(2,this, this.fontRendererObj, guiLeft+10, guiTop + 110, 16, 16, ""));
         getTextField(2).integersOnly = true;
         getTextField(2).setMaxStringLength(1);
@@ -85,15 +90,15 @@ public class GuiNPCManageBanks extends GuiContainerNPCInterface2 implements IScr
         		name += "_";
         	Bank bank = new Bank();
         	bank.name = name;
-        	
+
 			NBTTagCompound compound = new NBTTagCompound();
 			bank.writeEntityToNBT(compound);
-			Client.sendData(EnumPacketServer.BankSave, compound);
+            PacketClient.sendClient(new BankSavePacket(compound));
         }
         else if(button.id == 7)
         {
         	if(data.containsKey(scroll.getSelected()))
-        		Client.sendData(EnumPacketServer.BankRemove, data.get(selected));
+                PacketClient.sendClient(new BankRemovePacket(data.get(selected)));
         }
         else if(button.id >= 0 && button.id < 6)
         {
@@ -103,7 +108,7 @@ public class GuiNPCManageBanks extends GuiContainerNPCInterface2 implements IScr
 
     @Override
     protected void drawGuiContainerForegroundLayer(int par1, int par2)
-    { 
+    {
     	fontRendererObj.drawString("Tab Cost", 23, 28, CustomNpcResourceListener.DefaultTextColor);
     	fontRendererObj.drawString("Upg. Cost", 123, 28, CustomNpcResourceListener.DefaultTextColor);
     	fontRendererObj.drawString("Start", 6, 70, CustomNpcResourceListener.DefaultTextColor);
@@ -115,28 +120,28 @@ public class GuiNPCManageBanks extends GuiContainerNPCInterface2 implements IScr
 		Bank bank = new Bank();
 		bank.readEntityFromNBT(compound);
 		this.bank = bank;
-		
+
 		if (bank.id == -1) {
 			getTextField(0).setText("");
 			getTextField(1).setText("");
-			getTextField(2).setText("");		
-			
+			getTextField(2).setText("");
+
 	        for(int i = 0; i < 6; i++)
 	        {
-	        	getButton(i).setDisplay(0); 
+	        	getButton(i).setDisplay(0);
 	        	getButton(i).setEnabled(false);
 	        }
-		} else {			
+		} else {
 			getTextField(0).setText(bank.name);
 			getTextField(1).setText(Integer.toString(bank.startSlots));
-			getTextField(2).setText(Integer.toString(bank.maxSlots));		
-			
+			getTextField(2).setText(Integer.toString(bank.maxSlots));
+
 	        for(int i = 0; i < 6; i++)
 	        {
 	        	int type = 0;
 	        	if(bank.slotTypes.containsKey(i))
 	        		type = bank.slotTypes.get(i);
-	        	getButton(i).setDisplay(type); 
+	        	getButton(i).setDisplay(type);
 	        	getButton(i).setEnabled(true);
 	        }
 		}
@@ -173,27 +178,27 @@ public class GuiNPCManageBanks extends GuiContainerNPCInterface2 implements IScr
 		String name = scroll.getSelected();
 		this.data = data;
 		scroll.setList(getSearchList());
-		
+
 		if(name != null)
 			scroll.setSelected(name);
 	}
-	
+
 	@Override
 	public void setSelected(String selected) {
 		this.selected = selected;
 		scroll.setSelected(selected);
 	}
-	
+
 	@Override
 	public void customScrollClicked(int i, int j, int k, GuiCustomScroll guiCustomScroll) {
 		if(guiCustomScroll.id == 0)
 		{
 			save();
 			selected = scroll.getSelected();
-			Client.sendData(EnumPacketServer.BankGet, data.get(selected));
+            PacketClient.sendClient(new BankGetPacket(data.get(selected)));
 		}
 	}
-	
+
 	@Override
 	public void save() {
 		if(selected != null && data.containsKey(selected) && bank != null){
@@ -201,7 +206,7 @@ public class GuiNPCManageBanks extends GuiContainerNPCInterface2 implements IScr
 			bank.currencyInventory = container.bank.currencyInventory;
 			bank.upgradeInventory = container.bank.upgradeInventory;
 			bank.writeEntityToNBT(compound);
-			Client.sendData(EnumPacketServer.BankSave, compound);
+            PacketClient.sendClient(new BankSavePacket(compound));
 		}
 	}
 
@@ -220,27 +225,27 @@ public class GuiNPCManageBanks extends GuiContainerNPCInterface2 implements IScr
 				}
 			} else if(guiNpcTextField.id == 1 || guiNpcTextField.id == 2) {
 				int num = 1;
-				
+
 				if(!guiNpcTextField.isEmpty())
 					num = guiNpcTextField.getInteger();
-				
+
 		        if(num > 6)
 		        	num = 6;
-		        
+
 		        if(num < 0)
 		        	num = 0;
-				
+
 		        if(guiNpcTextField.id == 1) {
 		        	bank.startSlots = num;
 		        } else if(guiNpcTextField.id == 2) {
 			        bank.maxSlots = num;
 		        }
-		        
+
 		        if(bank.startSlots > bank.maxSlots)
 		        	bank.maxSlots = bank.startSlots;
-		        
+
 		        guiNpcTextField.setText(Integer.toString(num));
-			} 
+			}
 		}
 	}
 
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java
index c6d41387d..0dafe3325 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java
@@ -1,16 +1,18 @@
 package noppes.npcs.client.gui.global;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.dialog.*;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiYesNo;
 import net.minecraft.client.gui.GuiYesNoCallback;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.SubGuiEditText;
 import noppes.npcs.client.gui.SubGuiNpcDialog;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.Dialog;
 import noppes.npcs.controllers.data.DialogCategory;
 import noppes.npcs.entity.EntityNPCInterface;
@@ -38,42 +40,61 @@ public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollGrou
 	private String catSearch = "";
 	private String diagSearch = "";
 
+    private boolean isResizing = false;
+    private int initialDragX = 0;
+    private int dividerOffset = 143;
+
+    private final int dividerWidth = 5;
+    private final int minScrollWidth = 50;
+
+    private int dividerLineHeight = 20;
+    private int dividerLineYOffset = 0;
+
     public GuiNPCManageDialogs(EntityNPCInterface npc)
     {
     	super(npc);
-    	Client.sendData(EnumPacketServer.DialogCategoriesGet);
+        PacketClient.sendClient(new DialogCategoriesGetPacket());
     }
 
     public void initGui()
     {
         super.initGui();
 
-		if(catScroll == null){
-			catScroll = new GuiCustomScroll(this,0, 0);
-			catScroll.setSize(143, 185);
-		}
-		catScroll.guiLeft = guiLeft + 64;
-		catScroll.guiTop = guiTop + 4;
-		this.addScroll(catScroll);
+        // Define overall horizontal region.
+        int regionLeft = guiLeft + 64;
+        int regionRight = guiLeft + 355;
 
-		if(dialogScroll == null){
-			dialogScroll = new GuiCustomScroll(this,1, 0);
-			dialogScroll.setSize(143, 185);
-		}
-		dialogScroll.guiLeft = guiLeft + 212;
-		dialogScroll.guiTop = guiTop + 4;
-		this.addScroll(dialogScroll);
+        // Recalculate dividerX using the stored offset:
+        int dividerX = regionLeft + dividerOffset;
 
-		addTextField(new GuiNpcTextField(55, this, fontRendererObj, guiLeft + 64, guiTop + 4 + 3 + 185, 143, 20, catSearch));
+        // Left scroll (catScroll)
+        if (catScroll == null) {
+            catScroll = new GuiCustomScroll(this, 0, 0);
+        }
+        catScroll.guiLeft = regionLeft;
+        catScroll.guiTop = guiTop + 4;
+        catScroll.setSize(dividerX - regionLeft, 185);
+        this.addScroll(catScroll);
 
-		this.addButton(new GuiNpcButton(44,guiLeft + 3, guiTop + 8, 58, 20, "gui.categories"));
+        // Right scroll (dialogScroll)
+        if (dialogScroll == null) {
+            dialogScroll = new GuiCustomScroll(this, 1, 0);
+        }
+        dialogScroll.guiLeft = dividerX + dividerWidth;
+        dialogScroll.guiTop = guiTop + 4;
+        dialogScroll.setSize(regionRight - (dividerX + dividerWidth), 185);
+        this.addScroll(dialogScroll);
+
+        // Adjust text fields:
+        addTextField(new GuiNpcTextField(55, this, fontRendererObj, regionLeft, guiTop + 4 + 3 + 185, dividerX - regionLeft, 20, catSearch));
+        addTextField(new GuiNpcTextField(66, this, fontRendererObj, dividerX + dividerWidth, guiTop + 4 + 3 + 185, regionRight - (dividerX + dividerWidth), 20, diagSearch));
+
+        this.addButton(new GuiNpcButton(44,guiLeft + 3, guiTop + 8, 58, 20, "gui.categories"));
 		getButton(44).setEnabled(false);
 		this.addButton(new GuiNpcButton(4,guiLeft + 3, guiTop + 38, 58, 20, "gui.add"));
 		this.addButton(new GuiNpcButton(5,guiLeft + 3, guiTop + 61, 58, 20, "gui.remove"));
 		this.addButton(new GuiNpcButton(6,guiLeft + 3, guiTop + 94, 58, 20, "gui.edit"));
 
-		addTextField(new GuiNpcTextField(66, this, fontRendererObj, guiLeft + 212, guiTop + 4 + 3 + 185, 143, 20, diagSearch));
-
 		this.addButton(new GuiNpcButton(33,guiLeft + 358, guiTop + 8, 58, 20, "dialog.dialogs"));
 		getButton(33).setEnabled(false);
 		this.addButton(new GuiNpcButton(0,guiLeft + 358, guiTop + 94, 58, 20, "gui.edit"));
@@ -91,6 +112,86 @@ public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollGrou
 		updateButtons();
 	}
 
+    @Override
+    public void drawScreen(int mouseX, int mouseY, float partialTicks) {
+        super.drawScreen(mouseX, mouseY, partialTicks);
+        if(!hasSubGui()){
+            int regionLeft = guiLeft + 64;
+            int dividerX = regionLeft + dividerOffset;  // dividerOffset remains your left-scroll width
+            int regionTop = guiTop + 4;
+            int regionHeight = 185;
+            // Calculate the vertical position for the handle (centered by default)
+            int handleTop = regionTop + (regionHeight - dividerLineHeight) / 2 + dividerLineYOffset;
+            drawRect(dividerX + 1, handleTop, dividerX + dividerWidth - 1, handleTop + dividerLineHeight, 0xFF707070);
+        }
+    }
+
+    @Override
+    public void mouseClicked(int mouseX, int mouseY, int mouseButton) {
+        if(!hasSubGui()){
+            int regionLeft = guiLeft + 64;
+            int dividerX = regionLeft + dividerOffset;
+            int regionTop = guiTop + 4;
+            int regionHeight = 185;
+            int handleTop = regionTop + (regionHeight - dividerLineHeight) / 2 + dividerLineYOffset;
+            int handleBottom = handleTop + dividerLineHeight;
+            if (mouseX >= dividerX && mouseX <= dividerX + dividerWidth &&
+                mouseY >= handleTop && mouseY <= handleBottom) {
+                isResizing = true;
+                resizingActive = true;
+                initialDragX = mouseX;
+                return;
+            }
+        }
+        super.mouseClicked(mouseX, mouseY, mouseButton);
+    }
+
+    @Override
+    public void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) {
+        if (isResizing) {
+            int dx = mouseX - initialDragX;
+            initialDragX = mouseX;
+            dividerOffset += dx;
+            int regionLeft = guiLeft + 64;
+            int regionRight = guiLeft + 355;
+            // Clamp dividerOffset so each scroll remains at least minScrollWidth:
+            int minOffset = minScrollWidth;
+            int maxOffset = (regionRight - regionLeft) - dividerWidth - minScrollWidth;
+            if (dividerOffset < minOffset) {
+                dividerOffset = minOffset;
+            }
+            if (dividerOffset > maxOffset) {
+                dividerOffset = maxOffset;
+            }
+            int dividerX = regionLeft + dividerOffset;
+            // Update left scroll:
+            catScroll.setSize(dividerX - regionLeft, 185);
+            // Update right scroll:
+            dialogScroll.guiLeft = dividerX + dividerWidth;
+            dialogScroll.setSize(regionRight - (dividerX + dividerWidth), 185);
+            // Update text fields:
+            if (getTextField(55) != null) {
+                getTextField(55).width = dividerX - regionLeft;
+            }
+            if (getTextField(66) != null) {
+                getTextField(66).width = regionRight - (dividerX + dividerWidth);
+                getTextField(66).xPosition = dividerX + dividerWidth;
+            }
+            return;
+        }
+        super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick);
+    }
+
+    @Override
+    protected void mouseMovedOrUp(int mouseX, int mouseY, int state) {
+        if (isResizing) {
+            isResizing = false;
+            resizingActive = false;
+            return;
+        }
+        super.mouseMovedOrUp(mouseX, mouseY, state);
+    }
+
 	@Override
 	public void keyTyped(char c, int i)
 	{
@@ -181,7 +282,7 @@ public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollGrou
 			}
 			DialogCategory category = new DialogCategory();
 			category.title = name;
-			Client.sendData(EnumPacketServer.DialogCategorySave, category.writeNBT(new NBTTagCompound()));
+            PacketClient.sendClient(new DialogCategorySavePacket(category.writeNBT(new NBTTagCompound())));
 		}
 		// Remove Cat
 		if(id == 5){
@@ -202,7 +303,7 @@ public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollGrou
 				}
 				Dialog dialog = new Dialog();
 				dialog.title = name;
-				Client.sendData(EnumPacketServer.DialogSave, category.id, dialog.writeToNBT(new NBTTagCompound()), true);
+                PacketClient.sendClient(new DialogSavePacket(category.id, dialog.writeToNBT(new NBTTagCompound()), true));
 			}
 			// Remove Dialog
 			if(id == 2) {
@@ -231,7 +332,7 @@ public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollGrou
 					Dialog dialog = new Dialog();
 					dialog.readNBTPartial(this.dialog.writeToNBT(new NBTTagCompound()));
 					dialog.title = name;
-					Client.sendData(EnumPacketServer.DialogSave, category.id, dialog.writeToNBT(new NBTTagCompound()), true);
+                    PacketClient.sendClient(new DialogSavePacket(category.id, dialog.writeToNBT(new NBTTagCompound()), true));
 				}
 			}
         }
@@ -276,7 +377,7 @@ public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollGrou
 		else {
 			category.readNBT(compound);
 			setPrevCatName(category.title);
-			Client.sendData(EnumPacketServer.DialogsGet, category.id, true);
+            PacketClient.sendClient(new DialogsGetPacket(category.id, true));
 			resetDiagList();
 		}
 		initGui();
@@ -341,7 +442,7 @@ public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollGrou
                 dialog = null;
                 getTextField(66).setText("");
 
-				Client.sendData(EnumPacketServer.DialogCategoryGet, catData.get(selected));
+                PacketClient.sendClient(new DialogCategoryGetPacket(catData.get(selected)));
 				setPrevCatName(selected);
 			}
 		}
@@ -352,7 +453,7 @@ public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollGrou
 			String selected = dialogScroll.getSelected();
 			if(!selected.equals(prevDialogName) || override){
 				dialog = new Dialog();
-				Client.sendData(EnumPacketServer.DialogGet, dialogData.get(selected));
+                DialogGetPacket.getDialog(dialogData.get(selected));
 				setPrevDialogName(selected);
 			}
 		}
@@ -371,13 +472,13 @@ public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollGrou
 		if(saveDiag){
 			if(dialogScroll.selected != -1 && dialog.id >= 0){
 				if(catScroll.selected != -1 && category.id >= 0){
-					Client.sendData(EnumPacketServer.DialogSave, category.id, dialog.writeToNBT(new NBTTagCompound()), true);
+                    PacketClient.sendClient(new DialogSavePacket(category.id, dialog.writeToNBT(new NBTTagCompound()), true));
 				}
 			}
 		}
 		else{
 			if(catScroll.selected != -1 && category.id >= 0)
-				Client.sendData(EnumPacketServer.DialogCategorySave, category.writeNBT(new NBTTagCompound()));
+                PacketClient.sendClient(new DialogCategorySavePacket(category.writeNBT(new NBTTagCompound())));
 		}
 	}
 
@@ -426,13 +527,13 @@ public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollGrou
             return;
         if(id == 5) {
             if(catData.containsKey(catScroll.getSelected())) {
-                Client.sendData(EnumPacketServer.DialogCategoryRemove, category.id);
+                PacketClient.sendClient(new DialogCategoryRemovePacket(category.id));
                 clearCategory();
             }
         }
         if(id == 2) {
             if (dialogData.containsKey(dialogScroll.getSelected())) {
-                Client.sendData(EnumPacketServer.DialogRemove, dialog.id, true);
+                PacketClient.sendClient(new DialogRemovePacket(dialog.id, true));
                 dialog = new Dialog();
                 dialogData.clear();
             }
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java
new file mode 100644
index 000000000..8e5c10739
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java
@@ -0,0 +1,302 @@
+package noppes.npcs.client.gui.global;
+
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.effects.EffectGetPacket;
+import kamkeel.npcs.network.packets.request.effects.EffectRemovePacket;
+import kamkeel.npcs.network.packets.request.effects.EffectSavePacket;
+import kamkeel.npcs.network.packets.request.effects.EffectsGetPacket;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiYesNo;
+import net.minecraft.client.gui.GuiYesNoCallback;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import noppes.npcs.client.ClientCacheHandler;
+import noppes.npcs.client.CustomNpcResourceListener;
+import noppes.npcs.client.NoppesUtil;
+import noppes.npcs.client.gui.SubGuiEffectGeneral;
+import noppes.npcs.client.gui.util.*;
+import noppes.npcs.client.renderer.ImageData;
+import noppes.npcs.controllers.CustomEffectController;
+import noppes.npcs.controllers.data.CustomEffect;
+import noppes.npcs.entity.EntityNPCInterface;
+import org.lwjgl.opengl.GL11;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Vector;
+
+public class GuiNPCManageEffects extends GuiNPCInterface2 implements ICustomScrollListener, IScrollData, IGuiData, ISubGuiListener, GuiYesNoCallback {
+    public GuiCustomScroll scrollEffects;
+    public HashMap<String, Integer> data = new HashMap<>();
+    public CustomEffect effect = new CustomEffect();
+    public String selected = null;
+    public String search = "";
+    public String originalName = "";
+    boolean setNormalSound = true;
+
+    public GuiNPCManageEffects(EntityNPCInterface npc) {
+        super(npc);
+
+        PacketClient.sendClient(new EffectsGetPacket(-1));
+    }
+
+    public void initGui() {
+        super.initGui();
+        addButton(new GuiNpcButton(0, guiLeft + 368, guiTop + 8, 45, 20, "gui.add"));
+
+        addButton(new GuiNpcButton(1, guiLeft + 368, guiTop + 32, 45, 20, "gui.remove"));
+        getButton(1).enabled = effect != null && effect.id != -1;
+
+        addButton(new GuiNpcButton(2, guiLeft + 368, guiTop + 56, 45, 20, "gui.clone"));
+        getButton(2).enabled = effect != null && effect.id != -1;
+
+        addButton(new GuiNpcButton(3, guiLeft + 368, guiTop + 80, 45, 20, "gui.edit"));
+        getButton(3).enabled = effect != null && effect.id != -1;
+
+        if (scrollEffects == null) {
+            scrollEffects = new GuiCustomScroll(this, 0, 0);
+            scrollEffects.setSize(143, 185);
+        }
+        scrollEffects.guiLeft = guiLeft + 220;
+        scrollEffects.guiTop = guiTop + 4;
+        addScroll(scrollEffects);
+        scrollEffects.setList(getSearchList());
+
+        addTextField(new GuiNpcTextField(55, this, fontRendererObj, guiLeft + 220, guiTop + 4 + 3 + 185, 143, 20, search));
+        if (effect != null && effect.id != -1) {
+            addLabel(new GuiNpcLabel(10, "ID", guiLeft + 368, guiTop + 4 + 3 + 185));
+            addLabel(new GuiNpcLabel(11, effect.id + "", guiLeft + 368, guiTop + 4 + 3 + 195));
+        }
+    }
+
+    @Override
+    protected void actionPerformed(GuiButton guibutton) {
+        GuiNpcButton button = (GuiNpcButton) guibutton;
+        if (button.id == 0) {
+            save();
+            String name = "New";
+            while (data.containsKey(name))
+                name += "_";
+            CustomEffect effect = new CustomEffect(-1, name);
+            PacketClient.sendClient(new EffectSavePacket(effect.writeToNBT(false), ""));
+        } else if (button.id == 1) {
+            if (data.containsKey(scrollEffects.getSelected())) {
+                GuiYesNo guiyesno = new GuiYesNo(this, scrollEffects.getSelected(), StatCollector.translateToLocal("gui.delete"), 1);
+                displayGuiScreen(guiyesno);
+            }
+        } else if (button.id == 2) {
+            CustomEffect effect = this.effect.cloneEffect();
+            while (data.containsKey(effect.name))
+                effect.name += "_";
+            PacketClient.sendClient(new EffectSavePacket(effect.writeToNBT(false), ""));
+        }
+
+        if (effect == null)
+            return;
+
+        if (button.id == 3) {
+            if (data.containsKey(scrollEffects.getSelected()) && effect != null && effect.id >= 0) {
+                setSubGui(new SubGuiEffectGeneral(this, effect));
+            }
+        }
+
+
+    }
+
+    @Override
+    public void setGuiData(NBTTagCompound compound) {
+        this.effect = new CustomEffect();
+        effect.readFromNBT(compound);
+        setSelected(effect.name);
+        if (effect.id != -1) {
+            CustomEffectController.getInstance().customEffects.replace(effect.id, effect);
+        }
+        initGui();
+    }
+
+
+
+    @Override
+    public void drawScreen(int i, int j, float f) {
+        super.drawScreen(i, j, f);
+    }
+
+    @Override
+    public void drawBackground() {
+        super.drawBackground();
+        renderScreen();
+    }
+
+    private void renderScreen() {
+        drawGradientRect(guiLeft + 5, guiTop + 4, guiLeft + 218, guiTop + 24, 0xC0101010, 0xC0101010);
+        drawHorizontalLine(guiLeft + 5, guiLeft + 218, guiTop + 25, 0xFF000000 + CustomNpcResourceListener.DefaultTextColor);
+        drawGradientRect(guiLeft + 5, guiTop + 27, guiLeft + 218, guiTop + ySize + 9, 0xA0101010, 0xA0101010);
+
+
+        if (effect == null)
+            return;
+        if (effect.id == -1)
+            return;
+
+        String drawString = effect.getMenuName();
+        int textWidth = getStringWidthWithoutColor(drawString);
+        int centerX = guiLeft + 5 + ((218 - 10 - textWidth) / 2); // Adjusted centerX calculation
+        fontRendererObj.drawString(drawString, centerX, guiTop + 10, CustomNpcResourceListener.DefaultTextColor, true);
+        int y = guiTop + 33;
+        int x = guiLeft + 12;
+
+        int iconRenderSize = 48;
+
+        TextureManager textureManager = mc.getTextureManager();
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        ImageData data = ClientCacheHandler.getImageData(effect.icon);
+        if (data.imageLoaded()) {
+            data.bindTexture();
+            int iconX = effect.iconX;
+            int iconY = effect.iconY;
+            int iconWidth = effect.getWidth();
+            int iconHeight = effect.getHeight();
+            int width = data.getTotalWidth();
+            int height = data.getTotalWidth();
+
+
+            func_152125_a(x, y, iconX, iconY, iconWidth, iconHeight, iconRenderSize, iconRenderSize, width, height);
+
+        } else {
+            textureManager.bindTexture(new ResourceLocation("customnpcs", "textures/marks/question.png"));
+            func_152125_a(x, y, 0, 0, 1, 1, iconRenderSize, iconRenderSize, 1, 1);
+        }
+        GL11.glDisable(GL11.GL_DEPTH_TEST);
+
+        // TODO: Fix ICONS
+        // textureManager.bindTexture(new ResourceLocation(CustomNpcPlusDBC.ID + ":textures/gui/icons.png"));
+        func_152125_a(x, y, 0, 240, 16, 16, iconRenderSize, iconRenderSize, 256, 256);
+        GL11.glEnable(GL11.GL_DEPTH_TEST);
+
+        x += iconRenderSize + 3;
+        y += 2;
+
+        String translated = StatCollector.translateToLocal("gui.name") + ": " + effect.name;
+        fontRendererObj.drawString(translated, x, y, 0xFFFFFF, false);
+        int transLength = getStringWidthWithoutColor(translated);
+        fontRendererObj.drawString(" (ID: "+ effect.id+ ")", x + transLength, y, 0xB5B5B5, false);
+        y += 12;
+        fontRendererObj.drawString(StatCollector.translateToLocal("general.menuName") + ": " + effect.menuName, x, y, 0xFFFFFF, false);
+        y += 12;
+        fontRendererObj.drawString(StatCollector.translateToLocal("effect.runsEveryX") + ": " + effect.everyXTick + "t", x, y, 0xB5B5B5, false);
+        y += 12;
+        fontRendererObj.drawString(StatCollector.translateToLocal("effect.defaultLength") + ": " + effect.length + "s", x, y, 0xB5B5B5, false);
+
+    }
+
+
+    @Override
+    public void keyTyped(char c, int i) {
+        super.keyTyped(c, i);
+
+        if (getTextField(55) != null) {
+            if (getTextField(55).isFocused()) {
+                if (search.equals(getTextField(55).getText()))
+                    return;
+                search = getTextField(55).getText().toLowerCase();
+                scrollEffects.resetScroll();
+                scrollEffects.setList(getSearchList());
+            }
+        }
+    }
+
+    private List<String> getSearchList() {
+        if (search.isEmpty()) {
+            return new ArrayList<String>(this.data.keySet());
+        }
+        List<String> list = new ArrayList<String>();
+        for (String name : this.data.keySet()) {
+            if (name.toLowerCase().contains(search))
+                list.add(name);
+        }
+        return list;
+    }
+
+    @Override
+    public void setData(Vector<String> list, HashMap<String, Integer> data) {
+        String name = scrollEffects.getSelected();
+        this.data = data;
+        scrollEffects.setList(getSearchList());
+
+        if (name != null)
+            scrollEffects.setSelected(name);
+    }
+
+    @Override
+    public void setSelected(String selected) {
+        this.selected = selected;
+        scrollEffects.setSelected(selected);
+        originalName = scrollEffects.getSelected();
+    }
+
+    @Override
+    public void customScrollClicked(int i, int j, int k, GuiCustomScroll guiCustomScroll) {
+        if (guiCustomScroll.id == 0) {
+            save();
+            effect = null;
+            selected = scrollEffects.getSelected();
+            originalName = scrollEffects.getSelected();
+            if (selected != null && !selected.isEmpty()) {
+                PacketClient.sendClient(new EffectGetPacket(data.get(selected)));
+            }
+        }
+    }
+
+    @Override
+    public void customScrollDoubleClicked(String selection, GuiCustomScroll scroll) {
+//        ICustomScrollListener.super.customScrollDoubleClicked(selection, scroll);
+    }
+
+    @Override
+    public void save() {
+        if (this.selected != null && this.data.containsKey(this.selected) && this.effect != null) {
+            PacketClient.sendClient(new EffectSavePacket(effect.writeToNBT(false), originalName));
+        }
+    }
+
+
+    @Override
+    public void subGuiClosed(SubGuiInterface subgui) {
+
+    }
+
+    @Override
+    public void confirmClicked(boolean result, int id) {
+        NoppesUtil.openGUI(player, this);
+        if (!result)
+            return;
+        if (id == 1) {
+            if (data.containsKey(scrollEffects.getSelected())) {
+                PacketClient.sendClient(new EffectRemovePacket(data.get(scrollEffects.getSelected())));
+                scrollEffects.clear();
+                effect = new CustomEffect();
+                initGui();
+            }
+        }
+    }
+
+    public int getStringWidthWithoutColor(String text) {
+        int width = 0;
+        for (int i = 0; i < text.length(); i++) {
+            char c = text.charAt(i);
+
+            if (c == '§') {
+                if (i < text.length() - 1) {
+                    i += 1;
+                }
+            } else {
+                // If not a color code, calculate the width
+                width += fontRendererObj.getCharWidth(c);
+            }
+        }
+        return width;
+    }
+}
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java
index fb206e9b4..c2cc01330 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java
@@ -1,16 +1,21 @@
 package noppes.npcs.client.gui.global;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.faction.FactionGetPacket;
+import kamkeel.npcs.network.packets.request.faction.FactionRemovePacket;
+import kamkeel.npcs.network.packets.request.faction.FactionSavePacket;
+import kamkeel.npcs.network.packets.request.faction.FactionsGetPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiYesNo;
 import net.minecraft.client.gui.GuiYesNoCallback;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.SubGuiColorSelector;
 import noppes.npcs.client.gui.SubGuiNpcFactionPoints;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.Faction;
 import noppes.npcs.controllers.data.Quest;
 import noppes.npcs.entity.EntityNPCInterface;
@@ -28,7 +33,7 @@ public class GuiNPCManageFactions extends GuiNPCInterface2 implements IScrollDat
     public GuiNPCManageFactions(EntityNPCInterface npc)
     {
     	super(npc);
-    	Client.sendData(EnumPacketServer.FactionsGet);
+        PacketClient.sendClient(new FactionsGetPacket());
     }
 
     public void initGui()
@@ -106,7 +111,7 @@ public class GuiNPCManageFactions extends GuiNPCInterface2 implements IScrollDat
 
 			NBTTagCompound compound = new NBTTagCompound();
 			faction.writeNBT(compound);
-			Client.sendData(EnumPacketServer.FactionSave, compound);
+            PacketClient.sendClient(new FactionSavePacket(compound));
         }
         if(button.id == 1){
         	if(data.containsKey(scrollFactions.getSelected())) {
@@ -186,7 +191,7 @@ public class GuiNPCManageFactions extends GuiNPCInterface2 implements IScrollDat
 		{
 			save();
 			selected = scrollFactions.getSelected();
-			Client.sendData(EnumPacketServer.FactionGet, data.get(selected));
+            FactionGetPacket.getFaction(data.get(selected));
 		}
 		else if(guiCustomScroll.id == 1)
 		{
@@ -205,7 +210,7 @@ public class GuiNPCManageFactions extends GuiNPCInterface2 implements IScrollDat
 			NBTTagCompound compound = new NBTTagCompound();
 			faction.writeNBT(compound);
 
-			Client.sendData(EnumPacketServer.FactionSave, compound);
+            PacketClient.sendClient(new FactionSavePacket(compound));
 		}
 	}
 
@@ -253,7 +258,7 @@ public class GuiNPCManageFactions extends GuiNPCInterface2 implements IScrollDat
             return;
         if(id == 1) {
             if(data.containsKey(scrollFactions.getSelected())) {
-                Client.sendData(EnumPacketServer.FactionRemove, data.get(selected));
+                PacketClient.sendClient(new FactionRemovePacket(data.get(selected)));
                 scrollFactions.clear();
                 faction = new Faction();
                 initGui();
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinkedNpc.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java
similarity index 79%
rename from src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinkedNpc.java
rename to src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java
index 165207e6e..4ddd059d8 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinkedNpc.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java
@@ -1,11 +1,15 @@
 package noppes.npcs.client.gui.global;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.linked.LinkedAddPacket;
+import kamkeel.npcs.network.packets.request.linked.LinkedGetAllPacket;
+import kamkeel.npcs.network.packets.request.linked.LinkedRemovePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.SubGuiEditText;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 
 import java.util.ArrayList;
@@ -13,17 +17,17 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Vector;
 
-public class GuiNPCManageLinkedNpc extends GuiNPCInterface2 implements IScrollData, ISubGuiListener{
+public class GuiNPCManageLinked extends GuiNPCInterface2 implements IScrollData, ISubGuiListener{
 	private GuiCustomScroll scroll;
 	private List<String> data = new ArrayList<String>();
 	private String search = "";
 
 	public static GuiScreen Instance;
 
-    public GuiNPCManageLinkedNpc(EntityNPCInterface npc){
+    public GuiNPCManageLinked(EntityNPCInterface npc){
     	super(npc);
     	Instance = this;
-		Client.sendData(EnumPacketServer.LinkedGetAll);
+        PacketClient.sendClient(new LinkedGetAllPacket());
     }
 
     @Override
@@ -79,7 +83,7 @@ public class GuiNPCManageLinkedNpc extends GuiNPCInterface2 implements IScrollDa
         }
         if(button.id == 2){
         	if(scroll.hasSelected())
-        		Client.sendData(EnumPacketServer.LinkedRemove, scroll.getSelected());
+                PacketClient.sendClient(new LinkedRemovePacket(scroll.getSelected()));
         }
 
     }
@@ -87,7 +91,7 @@ public class GuiNPCManageLinkedNpc extends GuiNPCInterface2 implements IScrollDa
 	@Override
 	public void subGuiClosed(SubGuiInterface subgui) {
 		if(!((SubGuiEditText)subgui).cancelled){
-			Client.sendData(EnumPacketServer.LinkedAdd, ((SubGuiEditText)subgui).text);
+            PacketClient.sendClient(new LinkedAddPacket(((SubGuiEditText)subgui).text));
 		}
 	}
 
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageMagic.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageMagic.java
new file mode 100644
index 000000000..b5ccdc8e6
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageMagic.java
@@ -0,0 +1,53 @@
+package noppes.npcs.client.gui.global;
+
+import noppes.npcs.client.gui.GuiMagicMap;
+import noppes.npcs.client.gui.util.GuiNPCInterface2;
+import noppes.npcs.entity.EntityNPCInterface;
+
+public class GuiNPCManageMagic extends GuiNPCInterface2 {
+
+    private GuiMagicMap magicMap;
+
+    public GuiNPCManageMagic(EntityNPCInterface npc) {
+        super(npc);
+    }
+
+    @Override
+    public void initGui() {
+        super.initGui();
+        // Position the map in a designated area (e.g., right panel)
+        int mapX = guiLeft + xSize - 230 + 10;
+        int mapY = guiTop + 10;
+        int mapWidth = 210;
+        int mapHeight = 200;
+
+        magicMap = new GuiMagicMap(this, mapX, mapY, mapWidth, mapHeight);
+        addDiagram(0, magicMap);
+    }
+
+    @Override
+    protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) {
+        if (magicMap != null) {
+            magicMap.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick);
+        }
+        super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick);
+    }
+
+    @Override
+    protected void mouseMovedOrUp(int mouseX, int mouseY, int state) {
+        if (magicMap != null) {
+            magicMap.mouseReleased(mouseX, mouseY, state);
+        }
+        super.mouseMovedOrUp(mouseX, mouseY, state);
+    }
+
+    @Override
+    protected void actionPerformed(net.minecraft.client.gui.GuiButton button) {
+        // your existing action handling
+    }
+
+    @Override
+    public void save() {
+        // your save logic
+    }
+}
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java
index 2b4f29078..c31792185 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java
@@ -1,18 +1,19 @@
 package noppes.npcs.client.gui.global;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.quest.*;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiYesNo;
 import net.minecraft.client.gui.GuiYesNoCallback;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.SubGuiEditText;
 import noppes.npcs.client.gui.SubGuiNpcQuest;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
-import noppes.npcs.controllers.data.Dialog;
+
 import noppes.npcs.controllers.data.Quest;
 import noppes.npcs.controllers.data.QuestCategory;
 import noppes.npcs.entity.EntityNPCInterface;
@@ -22,421 +23,492 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Vector;
 
-public class GuiNPCManageQuest extends GuiNPCInterface2 implements IScrollGroup, IScrollData, ISubGuiListener, ICustomScrollListener, IGuiData, GuiYesNoCallback
-{
-	private GuiCustomScroll catScroll;
-	public GuiCustomScroll questScroll;
+public class GuiNPCManageQuest extends GuiNPCInterface2 implements IScrollGroup, IScrollData, ISubGuiListener, ICustomScrollListener, IGuiData, GuiYesNoCallback {
 
-	private String prevCatName = "";
-	private String prevQuestName = "";
+    private GuiCustomScroll catScroll;
+    public GuiCustomScroll questScroll;
 
-	public QuestCategory category = new QuestCategory();
-	public static Quest quest = new Quest();
-	public String nextQuestName = "";
+    private String prevCatName = "";
+    private String prevQuestName = "";
 
-	private HashMap<String,Integer> catData = new HashMap<String,Integer>();
-	public HashMap<String,Integer> questData = new HashMap<String,Integer>();
+    public QuestCategory category = new QuestCategory();
+    public static Quest quest = new Quest();
+    public String nextQuestName = "";
 
-	private String catSearch = "";
-	private String questSearch = "";
+    private HashMap<String, Integer> catData = new HashMap<String, Integer>();
+    public HashMap<String, Integer> questData = new HashMap<String, Integer>();
 
-	public static GuiScreen Instance;
+    private String catSearch = "";
+    private String questSearch = "";
 
-	public GuiNPCManageQuest(EntityNPCInterface npc)
-	{
-		super(npc);
-		Instance = this;
-		quest = new Quest();
-		Client.sendData(EnumPacketServer.QuestCategoriesGet);
-	}
+    public static GuiScreen Instance;
 
-	public void initGui()
-	{
-		super.initGui();
+    // Divider variables
+    private boolean isResizing = false;
+    private int initialDragX = 0;
+    private int dividerOffset = 143;
+    private final int dividerWidth = 5;
+    private final int minScrollWidth = 50;
+    private int dividerLineHeight = 20;
+    private int dividerLineYOffset = 0;
 
-		if(questScroll == null){
-			questScroll = new GuiCustomScroll(this,1, 0);
-			questScroll.setSize(143, 185);
-		}
-		questScroll.guiLeft = guiLeft + 212;
-		questScroll.guiTop = guiTop + 4;
-		this.addScroll(questScroll);
+    public GuiNPCManageQuest(EntityNPCInterface npc) {
+        super(npc);
+        Instance = this;
+        quest = new Quest();
+        PacketClient.sendClient(new QuestCategoriesGetPacket());
+    }
 
-		if(catScroll == null){
-			catScroll = new GuiCustomScroll(this,0, 0);
-			catScroll.setSize(143, 185);
-		}
-		catScroll.guiLeft = guiLeft + 64;
-		catScroll.guiTop = guiTop + 4;
-		this.addScroll(catScroll);
-		addTextField(new GuiNpcTextField(55, this, fontRendererObj, guiLeft + 64, guiTop + 4 + 3 + 185, 143, 20, catSearch));
+    public void initGui() {
+        super.initGui();
 
-		this.addButton(new GuiNpcButton(44,guiLeft + 3, guiTop + 8, 58, 20, "gui.categories"));
-		getButton(44).setEnabled(false);
-		this.addButton(new GuiNpcButton(4,guiLeft + 3, guiTop + 38, 58, 20, "gui.add"));
-		this.addButton(new GuiNpcButton(5,guiLeft + 3, guiTop + 61, 58, 20, "gui.remove"));
-		this.addButton(new GuiNpcButton(6,guiLeft + 3, guiTop + 94, 58, 20, "gui.edit"));
+        // Define overall horizontal region.
+        int regionLeft = guiLeft + 64;
+        int regionRight = guiLeft + 355;
+        int dividerX = regionLeft + dividerOffset;
 
-		addTextField(new GuiNpcTextField(66, this, fontRendererObj, guiLeft + 212, guiTop + 4 + 3 + 185, 143, 20, questSearch));
+        // Left scroll (catScroll)
+        if (catScroll == null) {
+            catScroll = new GuiCustomScroll(this, 0, 0);
+        }
+        catScroll.guiLeft = regionLeft;
+        catScroll.guiTop = guiTop + 4;
+        catScroll.setSize(dividerX - regionLeft, 185);
+        this.addScroll(catScroll);
 
-		this.addButton(new GuiNpcButton(33,guiLeft + 358, guiTop + 8, 58, 20, "quest.quests"));
-		getButton(33).setEnabled(false);
-		this.addButton(new GuiNpcButton(0,guiLeft + 358, guiTop + 94, 58, 20, "gui.edit"));
-		this.addButton(new GuiNpcButton(1,guiLeft + 358, guiTop + 38, 58, 20, "gui.add"));
-		this.addButton(new GuiNpcButton(2,guiLeft + 358, guiTop + 61, 58, 20, "gui.remove"));
-		this.addButton(new GuiNpcButton(3,guiLeft + 358, guiTop + 117, 58, 20, "gui.copy"));
+        // Right scroll (questScroll)
+        if (questScroll == null) {
+            questScroll = new GuiCustomScroll(this, 1, 0);
+        }
+        questScroll.guiLeft = dividerX + dividerWidth;
+        questScroll.guiTop = guiTop + 4;
+        questScroll.setSize(regionRight - (dividerX + dividerWidth), 185);
+        this.addScroll(questScroll);
 
-		if(quest != null) {
-			if(quest.id != -1){
-				addLabel(new GuiNpcLabel(0, "ID", guiLeft + 358, guiTop + 4 + 3 + 185));
-				addLabel(new GuiNpcLabel(1, quest.id + "", guiLeft + 358, guiTop + 4 + 3 + 195));
-			}
-		}
+        // Adjust text fields:
+        addTextField(new GuiNpcTextField(55, this, fontRendererObj, regionLeft, guiTop + 4 + 3 + 185, dividerX - regionLeft, 20, catSearch));
+        addTextField(new GuiNpcTextField(66, this, fontRendererObj, dividerX + dividerWidth, guiTop + 4 + 3 + 185, regionRight - (dividerX + dividerWidth), 20, questSearch));
 
-		updateButtons();
-	}
+        this.addButton(new GuiNpcButton(44, guiLeft + 3, guiTop + 8, 58, 20, "gui.categories"));
+        getButton(44).setEnabled(false);
+        this.addButton(new GuiNpcButton(4, guiLeft + 3, guiTop + 38, 58, 20, "gui.add"));
+        this.addButton(new GuiNpcButton(5, guiLeft + 3, guiTop + 61, 58, 20, "gui.remove"));
+        this.addButton(new GuiNpcButton(6, guiLeft + 3, guiTop + 94, 58, 20, "gui.edit"));
 
-	@Override
-	public void keyTyped(char c, int i)
-	{
-		super.keyTyped(c, i);
-		if(getTextField(55) != null){
-			if(getTextField(55).isFocused()){
-				if(catSearch.equals(getTextField(55).getText()))
-					return;
-				catSearch = getTextField(55).getText().toLowerCase();
+        this.addButton(new GuiNpcButton(33, guiLeft + 358, guiTop + 8, 58, 20, "quest.quests"));
+        getButton(33).setEnabled(false);
+        this.addButton(new GuiNpcButton(0, guiLeft + 358, guiTop + 94, 58, 20, "gui.edit"));
+        this.addButton(new GuiNpcButton(1, guiLeft + 358, guiTop + 38, 58, 20, "gui.add"));
+        this.addButton(new GuiNpcButton(2, guiLeft + 358, guiTop + 61, 58, 20, "gui.remove"));
+        this.addButton(new GuiNpcButton(3, guiLeft + 358, guiTop + 117, 58, 20, "gui.copy"));
+
+        if (quest != null) {
+            if (quest.id != -1) {
+                addLabel(new GuiNpcLabel(0, "ID", guiLeft + 358, guiTop + 4 + 3 + 185));
+                addLabel(new GuiNpcLabel(1, quest.id + "", guiLeft + 358, guiTop + 4 + 3 + 195));
+            }
+        }
+
+        updateButtons();
+    }
+
+    @Override
+    public void drawScreen(int mouseX, int mouseY, float partialTicks) {
+        super.drawScreen(mouseX, mouseY, partialTicks);
+        if (!hasSubGui()) {
+            int regionLeft = guiLeft + 64;
+            int dividerX = regionLeft + dividerOffset;
+            int regionTop = guiTop + 4;
+            int regionHeight = 185;
+            int handleTop = regionTop + (regionHeight - dividerLineHeight) / 2 + dividerLineYOffset;
+            drawRect(dividerX + 1, handleTop, dividerX + dividerWidth - 1, handleTop + dividerLineHeight, 0xFF707070);
+        }
+    }
+
+    @Override
+    public void mouseClicked(int mouseX, int mouseY, int mouseButton) {
+        if (!hasSubGui()) {
+            int regionLeft = guiLeft + 64;
+            int dividerX = regionLeft + dividerOffset;
+            int regionTop = guiTop + 4;
+            int regionHeight = 185;
+            int handleTop = regionTop + (regionHeight - dividerLineHeight) / 2 + dividerLineYOffset;
+            int handleBottom = handleTop + dividerLineHeight;
+            if (mouseX >= dividerX && mouseX <= dividerX + dividerWidth &&
+                mouseY >= handleTop && mouseY <= handleBottom) {
+                isResizing = true;
+                resizingActive = true;
+                initialDragX = mouseX;
+                return;
+            }
+        }
+        super.mouseClicked(mouseX, mouseY, mouseButton);
+    }
+
+    @Override
+    public void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) {
+        if (isResizing) {
+            int dx = mouseX - initialDragX;
+            initialDragX = mouseX;
+            dividerOffset += dx;
+            int regionLeft = guiLeft + 64;
+            int regionRight = guiLeft + 355;
+            int minOffset = minScrollWidth;
+            int maxOffset = (regionRight - regionLeft) - dividerWidth - minScrollWidth;
+            if (dividerOffset < minOffset) {
+                dividerOffset = minOffset;
+            }
+            if (dividerOffset > maxOffset) {
+                dividerOffset = maxOffset;
+            }
+            int dividerX = regionLeft + dividerOffset;
+            catScroll.setSize(dividerX - regionLeft, 185);
+            questScroll.guiLeft = dividerX + dividerWidth;
+            questScroll.setSize(regionRight - (dividerX + dividerWidth), 185);
+            if (getTextField(55) != null) {
+                getTextField(55).width = dividerX - regionLeft;
+            }
+            if (getTextField(66) != null) {
+                getTextField(66).width = regionRight - (dividerX + dividerWidth);
+                getTextField(66).xPosition = dividerX + dividerWidth;
+            }
+            return;
+        }
+        super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick);
+    }
+
+    @Override
+    protected void mouseMovedOrUp(int mouseX, int mouseY, int state) {
+        if (isResizing) {
+            isResizing = false;
+            resizingActive = false;
+            return;
+        }
+        super.mouseMovedOrUp(mouseX, mouseY, state);
+    }
+
+    @Override
+    public void keyTyped(char c, int i) {
+        super.keyTyped(c, i);
+        if (getTextField(55) != null) {
+            if (getTextField(55).isFocused()) {
+                if (catSearch.equals(getTextField(55).getText()))
+                    return;
+                catSearch = getTextField(55).getText().toLowerCase();
                 catScroll.resetScroll();
-				catScroll.setList(getCatSearch());
-			}
-		}
-		if(getTextField(66) != null){
-			if(getTextField(66).isFocused()){
-				if(questSearch.equals(getTextField(66).getText()))
-					return;
-				questSearch = getTextField(66).getText().toLowerCase();
+                catScroll.setList(getCatSearch());
+            }
+        }
+        if (getTextField(66) != null) {
+            if (getTextField(66).isFocused()) {
+                if (questSearch.equals(getTextField(66).getText()))
+                    return;
+                questSearch = getTextField(66).getText().toLowerCase();
                 questScroll.resetScroll();
-				questScroll.setList(getQuestSearch());
-			}
-		}
-	}
+                questScroll.setList(getQuestSearch());
+            }
+        }
+    }
 
-	public void resetQuestList(){
-		if(questScroll != null){
-			questSearch = "";
-			if(getTextField(66) != null){
-				getTextField(66).setText("");
-			}
-			questScroll.setList(getQuestSearch());
-		}
-	}
+    public void resetQuestList() {
+        if (questScroll != null) {
+            questSearch = "";
+            if (getTextField(66) != null) {
+                getTextField(66).setText("");
+            }
+            questScroll.setList(getQuestSearch());
+        }
+    }
 
-	private List<String> getCatSearch(){
-		if(catSearch.isEmpty()){
-			return new ArrayList<String>(this.catData.keySet());
-		}
-		List<String> list = new ArrayList<String>();
-		for(String name : this.catData.keySet()){
-			if(name.toLowerCase().contains(catSearch))
-				list.add(name);
-		}
-		return list;
-	}
+    private List<String> getCatSearch() {
+        if (catSearch.isEmpty()) {
+            return new ArrayList<String>(this.catData.keySet());
+        }
+        List<String> list = new ArrayList<String>();
+        for (String name : this.catData.keySet()) {
+            if (name.toLowerCase().contains(catSearch))
+                list.add(name);
+        }
+        return list;
+    }
 
-	private List<String> getQuestSearch(){
-		if(category != null){
-			if(category.id < 0){
-				return new ArrayList<String>();
-			}
-		}
-		else {
-			return new ArrayList<String>();
-		}
+    private List<String> getQuestSearch() {
+        if (category != null) {
+            if (category.id < 0) {
+                return new ArrayList<String>();
+            }
+        } else {
+            return new ArrayList<String>();
+        }
+        if (questSearch.isEmpty()) {
+            return new ArrayList<String>(this.questData.keySet());
+        }
+        List<String> list = new ArrayList<String>();
+        for (String name : this.questData.keySet()) {
+            if (name.toLowerCase().contains(questSearch))
+                list.add(name);
+        }
+        return list;
+    }
 
-		if(questSearch.isEmpty()){
-			return new ArrayList<String>(this.questData.keySet());
-		}
-		List<String> list = new ArrayList<String>();
-		for(String name : this.questData.keySet()){
-			if(name.toLowerCase().contains(questSearch))
-				list.add(name);
-		}
-		return list;
-	}
-
-	public void buttonEvent(GuiButton guibutton)
-	{
-		int id = guibutton.id;
-		// Edit Cat
-		if(id == 6){
-			if(category != null && category.id > -1){
-				setSubGui(new SubGuiEditText(category.title));
-			}
-			else {
-				getCategory(false);
-			}
-		}
-		// Add Cat
-		if(id == 4){
-			String name = "New";
-			while(catData.containsKey(name))
-				name += "_";
-
-			if(catScroll != null){
-				setPrevCatName(name);
-			}
-			QuestCategory category = new QuestCategory();
-			category.title = name;
-			Client.sendData(EnumPacketServer.QuestCategorySave, category.writeNBT(new NBTTagCompound()));
-		}
-		// Remove Cat
-		if(id == 5){
-			if(catData.containsKey(catScroll.getSelected())) {
+    public void buttonEvent(GuiButton guibutton) {
+        int id = guibutton.id;
+        // Edit Category
+        if (id == 6) {
+            if (category != null && category.id > -1) {
+                setSubGui(new SubGuiEditText(category.title));
+            } else {
+                getCategory(false);
+            }
+        }
+        // Add Category
+        if (id == 4) {
+            String name = "New";
+            while (catData.containsKey(name))
+                name += "_";
+            if (catScroll != null) {
+                setPrevCatName(name);
+            }
+            QuestCategory category = new QuestCategory();
+            category.title = name;
+            PacketClient.sendClient(new QuestCategorySavePacket(category.writeNBT(new NBTTagCompound())));
+        }
+        // Remove Category
+        if (id == 5) {
+            if (catData.containsKey(catScroll.getSelected())) {
                 GuiYesNo guiyesno = new GuiYesNo(this, catScroll.getSelected(), StatCollector.translateToLocal("gui.delete"), 5);
                 displayGuiScreen(guiyesno);
-			}
-		}
-		if(category != null && category.id >= 0){
-			// Add Quest
-			if(id == 1){
-				String name = "New";
-				while(questData.containsKey(name))
-					name += "_";
-
-				if(questScroll != null){
-					setPrevQuestName(name);
-				}
-				Quest quest = new Quest();
-				quest.title = name;
-				Client.sendData(EnumPacketServer.QuestSave, category.id, quest.writeToNBT(new NBTTagCompound()), true);
-			}
-			// Remove Quest
-			if(id == 2) {
-				if (questData.containsKey(questScroll.getSelected())) {
+            }
+        }
+        if (category != null && category.id >= 0) {
+            // Add Quest
+            if (id == 1) {
+                String name = "New";
+                while (questData.containsKey(name))
+                    name += "_";
+                if (questScroll != null) {
+                    setPrevQuestName(name);
+                }
+                Quest quest = new Quest();
+                quest.title = name;
+                PacketClient.sendClient(new QuestSavePacket(category.id, quest.writeToNBT(new NBTTagCompound()), true));
+            }
+            // Remove Quest
+            if (id == 2) {
+                if (questData.containsKey(questScroll.getSelected())) {
                     GuiYesNo guiyesno = new GuiYesNo(this, questScroll.getSelected(), StatCollector.translateToLocal("gui.delete"), 2);
                     displayGuiScreen(guiyesno);
-				}
-			}
-			// Edit Quest
-			if(id == 0) {
-				if (questData.containsKey(questScroll.getSelected()) && quest != null && quest.id >= 0) {
-					setSubGui(new SubGuiNpcQuest(this, quest, category.id));
-				}
-			}
-			// Clone Quest
-			if(id == 3) {
-				if (questData.containsKey(questScroll.getSelected()) && quest != null && quest.id >= 0) {
-					String name = quest.title;
-					while(questData.containsKey(name))
-						name += "_";
+                }
+            }
+            // Edit Quest
+            if (id == 0) {
+                if (questData.containsKey(questScroll.getSelected()) && quest != null && quest.id >= 0) {
+                    setSubGui(new SubGuiNpcQuest(this, quest, category.id));
+                }
+            }
+            // Clone Quest
+            if (id == 3) {
+                if (questData.containsKey(questScroll.getSelected()) && quest != null && quest.id >= 0) {
+                    String name = quest.title;
+                    while (questData.containsKey(name))
+                        name += "_";
+                    if (questScroll != null) {
+                        setPrevQuestName(name);
+                    }
+                    Quest quest = new Quest();
+                    quest.readNBTPartial(this.quest.writeToNBT(new NBTTagCompound()));
+                    quest.title = name;
+                    PacketClient.sendClient(new QuestSavePacket(category.id, quest.writeToNBT(new NBTTagCompound()), true));
+                }
+            }
+        }
+        updateButtons();
+    }
 
-					if(questScroll != null){
-						setPrevQuestName(name);
-					}
+    public void updateButtons() {
+        boolean enabled = category != null;
+        if (enabled) {
+            if (!(category.id >= 0)) {
+                enabled = false;
+            }
+        }
+        boolean questEnabled = questData != null;
+        if (questEnabled) {
+            if (quest == null || !(quest.id >= 0)) {
+                questEnabled = false;
+            }
+        }
+        getButton(6).setEnabled(enabled);
+        getButton(1).setEnabled(enabled);
+        getButton(2).setEnabled(enabled);
+        getButton(0).setEnabled(enabled && questEnabled);
+        getButton(3).setEnabled(enabled && questEnabled);
+    }
 
-					Quest quest = new Quest();
-					quest.readNBTPartial(this.quest.writeToNBT(new NBTTagCompound()));
-					quest.title = name;
-					Client.sendData(EnumPacketServer.QuestSave, category.id, quest.writeToNBT(new NBTTagCompound()), true);
-				}
-			}
-		}
-		updateButtons();
-	}
+    @Override
+    public void setGuiData(NBTTagCompound compound) {
+        if (compound.hasKey("NextQuestId")) {
+            quest.readNBT(compound);
+            setPrevQuestName(quest.title);
+            if (compound.hasKey("NextQuestTitle")) {
+                nextQuestName = compound.getString("NextQuestTitle");
+            } else {
+                nextQuestName = "";
+            }
+        } else {
+            category.readNBT(compound);
+            setPrevCatName(category.title);
+            PacketClient.sendClient(new QuestsGetPacket(category.id, true));
+            resetQuestList();
+        }
+        initGui();
+    }
 
-	public void updateButtons(){
-		boolean enabled = category != null;
-		if(enabled){
-			if(!(category.id >= 0)){
-				enabled = false;
-			}
-		}
-
-		boolean questEnabled = questData != null;
-		if(questEnabled){
-			if(quest == null || !(quest.id >= 0)){
-				questEnabled = false;
-			}
-		}
-		getButton(6).setEnabled(enabled);
-
-		getButton(1).setEnabled(enabled);
-		getButton(2).setEnabled(enabled);
-
-		getButton(0).setEnabled(enabled && questEnabled);
-		getButton(3).setEnabled(enabled && questEnabled);
-	}
-
-	@Override
-	public void setGuiData(NBTTagCompound compound) {
-		if(compound.hasKey("NextQuestId")){
-			quest.readNBT(compound);
-			setPrevQuestName(quest.title);
-			if(compound.hasKey("NextQuestTitle")){
-				nextQuestName = compound.getString("NextQuestTitle");
-			}
-			else {
-				nextQuestName = "";
-			}
-		}
-		else {
-			category.readNBT(compound);
-			setPrevCatName(category.title);
-			Client.sendData(EnumPacketServer.QuestsGet, category.id, true);
-			resetQuestList();
-		}
-		initGui();
-	}
-
-	@Override
-	public void subGuiClosed(SubGuiInterface subgui){
-		if(subgui instanceof SubGuiEditText){
-			if(!((SubGuiEditText)subgui).cancelled){
-				if(category != null && category.id > -1){
-					String name = ((SubGuiEditText)subgui).text;
-					if(name != null && !name.equalsIgnoreCase(category.title)){
-						if(!(name.isEmpty() || catData.containsKey(name))){
-							String old = category.title;
-							catData.remove(category.title);
-							category.title = name;
-							catData.put(category.title, category.id);
-							catScroll.replace(old,category.title);
-						}
+    @Override
+    public void subGuiClosed(SubGuiInterface subgui) {
+        if (subgui instanceof SubGuiEditText) {
+            if (!((SubGuiEditText) subgui).cancelled) {
+                if (category != null && category.id > -1) {
+                    String name = ((SubGuiEditText) subgui).text;
+                    if (name != null && !name.equalsIgnoreCase(category.title)) {
+                        if (!(name.isEmpty() || catData.containsKey(name))) {
+                            String old = category.title;
+                            catData.remove(category.title);
+                            category.title = name;
+                            catData.put(category.title, category.id);
+                            catScroll.replace(old, category.title);
+                        }
                         saveType(false);
-					}
-				}
-			}
-			clearCategory();
-		}
-		if(subgui instanceof SubGuiNpcQuest){
-			saveType(true);
-		}
-	}
+                    }
+                }
+            }
+            clearCategory();
+        }
+        if (subgui instanceof SubGuiNpcQuest) {
+            saveType(true);
+        }
+    }
 
-	public void setPrevCatName(String selectedCat){
-		prevCatName = selectedCat;
-		this.catScroll.setSelected(prevCatName);
-	}
+    public void setPrevCatName(String selectedCat) {
+        prevCatName = selectedCat;
+        this.catScroll.setSelected(prevCatName);
+    }
 
-	public void setPrevQuestName(String selectedCat){
-		prevQuestName = selectedCat;
-		this.questScroll.setSelected(prevQuestName);
-	}
+    public void setPrevQuestName(String selectedQuest) {
+        prevQuestName = selectedQuest;
+        this.questScroll.setSelected(prevQuestName);
+    }
 
-	@Override
-	public void customScrollClicked(int i, int j, int k, GuiCustomScroll guiCustomScroll) {
-		if(guiCustomScroll.id == 0)
-		{
-			getCategory(false);
-		}
-		if(guiCustomScroll.id == 1)
-		{
-			getQuest(false);
-		}
-	}
-
-	public void getCategory(boolean override){
-		if(catScroll.selected != -1){
-			String selected = catScroll.getSelected();
-			if(!selected.equals(prevCatName) || override){
-				category = new QuestCategory();
+    @Override
+    public void customScrollClicked(int i, int j, int k, GuiCustomScroll guiCustomScroll) {
+        if (guiCustomScroll.id == 0) {
+            getCategory(false);
+        }
+        if (guiCustomScroll.id == 1) {
+            getQuest(false);
+        }
+    }
 
+    public void getCategory(boolean override) {
+        if (catScroll.selected != -1) {
+            String selected = catScroll.getSelected();
+            if (!selected.equals(prevCatName) || override) {
+                category = new QuestCategory();
                 questScroll.selected = -1;
                 questScroll.resetScroll();
                 questSearch = "";
                 quest = null;
                 getTextField(66).setText("");
+                PacketClient.sendClient(new QuestCategoryGetPacket(catData.get(selected)));
+                setPrevCatName(selected);
+            }
+        }
+    }
 
-				Client.sendData(EnumPacketServer.QuestCategoryGet, catData.get(selected));
-				setPrevCatName(selected);
-			}
-		}
-	}
+    public void getQuest(boolean override) {
+        if (questScroll.selected != -1) {
+            String selected = questScroll.getSelected();
+            if (!selected.equals(prevQuestName) || override) {
+                quest = new Quest();
+                QuestGetPacket.getQuest(questData.get(selected));
+                setPrevQuestName(selected);
+            }
+        }
+    }
 
-	public void getQuest(boolean override){
-		if(questScroll.selected != -1){
-			String selected = questScroll.getSelected();
-			if(!selected.equals(prevQuestName) || override){
-				quest = new Quest();
-				Client.sendData(EnumPacketServer.QuestGet, questData.get(selected));
-				setPrevQuestName(selected);
-			}
-		}
-	}
+    public void clearCategory() {
+        catScroll.setList(getCatSearch());
+        catScroll.selected = -1;
+        prevCatName = "";
+        category = new QuestCategory();
+        this.questData.clear();
+        resetQuestList();
+    }
 
-	public void clearCategory(){
-		catScroll.setList(getCatSearch());
-		catScroll.selected = -1;
-		prevCatName = "";
-		category = new QuestCategory();
-		this.questData.clear();
-		resetQuestList();
-	}
+    public void saveType(boolean saveQuest) {
+        if (saveQuest) {
+            if (questScroll.selected != -1 && quest.id >= 0) {
+                if (catScroll.selected != -1 && category.id >= 0) {
+                    PacketClient.sendClient(new QuestSavePacket(category.id, quest.writeToNBT(new NBTTagCompound()), true));
+                }
+            }
+        } else {
+            if (catScroll.selected != -1 && category.id >= 0)
+                PacketClient.sendClient(new QuestCategorySavePacket(category.writeNBT(new NBTTagCompound())));
+        }
+    }
 
-	public void saveType(boolean saveQuest){
-		if(saveQuest){
-			if(questScroll.selected != -1 && quest.id >= 0){
-				if(catScroll.selected != -1 && category.id >= 0){
-					Client.sendData(EnumPacketServer.QuestSave, category.id, quest.writeToNBT(new NBTTagCompound()), true);
-				}
-			}
-		}
-		else{
-			if(catScroll.selected != -1 && category.id >= 0)
-				Client.sendData(EnumPacketServer.QuestCategorySave, category.writeNBT(new NBTTagCompound()));
-		}
-	}
+    public void save() {}
 
-	public void save() {}
+    @Override
+    public void setData(Vector<String> list, HashMap<String, Integer> data) {
+        String name = catScroll.getSelected();
+        this.catData = data;
+        catScroll.setList(getCatSearch());
+        if (name != null) {
+            catScroll.setSelected(name);
+            getCategory(false);
+        } else {
+            catScroll.setSelected(prevCatName);
+            getCategory(true);
+        }
+        initGui();
+    }
 
-	@Override
-	public void setData(Vector<String> list, HashMap<String, Integer> data) {
-		String name = catScroll.getSelected();
-		this.catData = data;
-		catScroll.setList(getCatSearch());
-		if(name != null){
-			catScroll.setSelected(name);
-			getCategory(false);
-		} else {
-			catScroll.setSelected(prevCatName);
-			getCategory(true);
-		}
-		initGui();
-	}
+    @Override
+    public void setSelected(String selected) {}
 
-	@Override
-	public void setSelected(String selected) {}
+    @Override
+    public void setScrollGroup(Vector<String> list, HashMap<String, Integer> data) {
+        String name = questScroll.getSelected();
+        this.questData = data;
+        questScroll.setList(getQuestSearch());
+        if (name != null) {
+            questScroll.setSelected(name);
+            getQuest(false);
+        } else {
+            questScroll.setSelected(prevQuestName);
+            getQuest(true);
+        }
+        initGui();
+    }
 
-	@Override
-	public void setScrollGroup(Vector<String> list, HashMap<String, Integer> data) {
-		String name = questScroll.getSelected();
-		this.questData = data;
-		questScroll.setList(getQuestSearch());
-		if(name != null){
-			questScroll.setSelected(name);
-			getQuest(false);
-		} else {
-			questScroll.setSelected(prevQuestName);
-			getQuest(true);
-		}
-		initGui();
-	}
-
-	@Override
-	public void setSelectedGroup(String selected) {}
+    @Override
+    public void setSelectedGroup(String selected) {}
 
     @Override
     public void confirmClicked(boolean result, int id) {
         NoppesUtil.openGUI(player, this);
-        if(!result)
+        if (!result)
             return;
-        if(id == 5) {
-            if(catData.containsKey(catScroll.getSelected())) {
-                Client.sendData(EnumPacketServer.QuestCategoryRemove, category.id);
+        if (id == 5) {
+            if (catData.containsKey(catScroll.getSelected())) {
+                PacketClient.sendClient(new QuestCategoryRemovePacket(category.id));
                 clearCategory();
             }
         }
-        if(id == 2) {
-            Client.sendData(EnumPacketServer.QuestRemove, quest.id, true);
+        if (id == 2) {
+            PacketClient.sendClient(new QuestRemovePacket(quest.id, true));
             quest = new Quest();
             questData.clear();
         }
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java
index d36ed526e..1d9bc3e13 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java
@@ -1,11 +1,16 @@
 package noppes.npcs.client.gui.global;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.tags.TagGetPacket;
+import kamkeel.npcs.network.packets.request.tags.TagsGetPacket;
+import kamkeel.npcs.network.packets.request.tags.TagRemovePacket;
+import kamkeel.npcs.network.packets.request.tags.TagSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.SubGuiColorSelector;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.Tag;
 import noppes.npcs.entity.EntityNPCInterface;
 
@@ -25,7 +30,7 @@ public class GuiNPCManageTags extends GuiNPCInterface2 implements IScrollData,IC
     public GuiNPCManageTags(EntityNPCInterface npc)
     {
     	super(npc);
-    	Client.sendData(EnumPacketServer.TagsGet);
+        PacketClient.sendClient(new TagsGetPacket());
     }
 
     public void initGui()
@@ -104,11 +109,11 @@ public class GuiNPCManageTags extends GuiNPCInterface2 implements IScrollData,IC
 
 			NBTTagCompound compound = new NBTTagCompound();
 			tag.writeNBT(compound);
-			Client.sendData(EnumPacketServer.TagSave, compound);
+            PacketClient.sendClient(new TagSavePacket(compound));
         }
         if(button.id == 1){
         	if(data.containsKey(scrollTags.getSelected())) {
-        		Client.sendData(EnumPacketServer.TagRemove, data.get(selected));
+                PacketClient.sendClient(new TagRemovePacket(data.get(selected)));
         		scrollTags.clear();
         		tag = new Tag();
         		initGui();
@@ -154,7 +159,7 @@ public class GuiNPCManageTags extends GuiNPCInterface2 implements IScrollData,IC
 		{
 			save();
 			selected = scrollTags.getSelected();
-			Client.sendData(EnumPacketServer.TagGet, data.get(selected));
+            PacketClient.sendClient(new TagGetPacket(data.get(selected)));
 		}
 	}
 
@@ -163,7 +168,7 @@ public class GuiNPCManageTags extends GuiNPCInterface2 implements IScrollData,IC
 			NBTTagCompound compound = new NBTTagCompound();
 			tag.writeNBT(compound);
 
-			Client.sendData(EnumPacketServer.TagSave, compound);
+            PacketClient.sendClient(new TagSavePacket(compound));
 		}
 	}
 
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTransporters.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTransporters.java
index 78d04026e..dfec90df5 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTransporters.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTransporters.java
@@ -1,7 +1,12 @@
 package noppes.npcs.client.gui.global;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.transport.TransportCategoriesGetPacket;
+import kamkeel.npcs.network.packets.request.transport.TransportCategoryRemovePacket;
+import kamkeel.npcs.network.packets.request.transport.TransportRemovePacket;
+import kamkeel.npcs.network.packets.request.transport.TransportsGetPacket;
 import net.minecraft.client.gui.GuiButton;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.GuiNPCTransportCategoryEdit;
 import noppes.npcs.client.gui.mainmenu.GuiNPCGlobalMainMenu;
@@ -9,7 +14,7 @@ import noppes.npcs.client.gui.util.GuiNPCInterface;
 import noppes.npcs.client.gui.util.GuiNPCStringSlot;
 import noppes.npcs.client.gui.util.GuiNpcButton;
 import noppes.npcs.client.gui.util.IScrollData;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 
 import java.util.HashMap;
@@ -24,7 +29,7 @@ public class GuiNPCManageTransporters extends GuiNPCInterface implements IScroll
     public GuiNPCManageTransporters(EntityNPCInterface npc)
     {
     	super(npc);
-    	Client.sendData(EnumPacketServer.TransportCategoriesGet);
+        PacketClient.sendClient(new TransportCategoriesGetPacket());
     	drawDefaultBackground = false;
 		title = "Transport Categories";
 		data = new HashMap<String, Integer>();
@@ -36,7 +41,7 @@ public class GuiNPCManageTransporters extends GuiNPCInterface implements IScroll
         Vector<String> list = new Vector<String>();
         slot = new GuiNPCStringSlot(list,this,false,18);
         slot.registerScrollButtons(4, 5);
-        
+
 
     	this.addButton(new GuiNpcButton(0,width / 2 - 100, height - 52, 65, 20, "gui.add"));
     	this.addButton(new GuiNpcButton(1,width / 2 - 33 , height - 52, 65, 20, "selectServer.edit"));
@@ -63,7 +68,7 @@ public class GuiNPCManageTransporters extends GuiNPCInterface implements IScroll
     		if(selectCategory){
     			NoppesUtil.openGUI(player, new GuiNPCTransportCategoryEdit(npc, this, "", -1));
     		}else{
-    			
+
     		}
         }
         if(id == 1)
@@ -73,7 +78,7 @@ public class GuiNPCManageTransporters extends GuiNPCInterface implements IScroll
     		if(selectCategory){
     			NoppesUtil.openGUI(player, new GuiNPCTransportCategoryEdit(npc, this,slot.selected, data.get(slot.selected)));
     		}else{
-    			
+
     		}
         }
         if(id == 4)
@@ -84,7 +89,7 @@ public class GuiNPCManageTransporters extends GuiNPCInterface implements IScroll
         	}else{
     			title = "Transport Categories";
         		selectCategory = true;
-        		Client.sendData(EnumPacketServer.TransportCategoriesGet);
+                PacketClient.sendClient(new TransportCategoriesGetPacket());
         		initGui();
         	}
         }
@@ -94,10 +99,10 @@ public class GuiNPCManageTransporters extends GuiNPCInterface implements IScroll
         		return;
         	save();
         	if(selectCategory){
-        		Client.sendData(EnumPacketServer.TransportCategoryRemove,data.get(slot.selected));
+                PacketClient.sendClient(new TransportCategoryRemovePacket(data.get(slot.selected)));
         	}
         	else{
-        		Client.sendData(EnumPacketServer.TransportRemove,data.get(slot.selected));
+                PacketClient.sendClient(new TransportRemovePacket(data.get(slot.selected)));
         	}
         	initGui();
         }
@@ -112,10 +117,10 @@ public class GuiNPCManageTransporters extends GuiNPCInterface implements IScroll
 		if(selectCategory){
 			selectCategory = false;
 			title = "TransportLocations";
-    		Client.sendData(EnumPacketServer.TransportsGet,data.get(slot.selected));
+            PacketClient.sendClient(new TransportsGetPacket(data.get(slot.selected)));
     		initGui();
 		}
-		
+
 	}
 	public void save() {
 	}
@@ -128,8 +133,8 @@ public class GuiNPCManageTransporters extends GuiNPCInterface implements IScroll
 
 	@Override
 	public void setSelected(String selected) {
-		// TODO Auto-generated method stub
-		
+
+
 	}
 
 
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java
index 8dfa283af..4b505c9d3 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java
@@ -1,11 +1,15 @@
 package noppes.npcs.client.gui.global;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.playerdata.PlayerDataGetPacket;
+import kamkeel.npcs.network.packets.request.playerdata.PlayerDataMapRegenPacket;
+import kamkeel.npcs.network.packets.request.playerdata.PlayerDataRemovePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiYesNo;
 import net.minecraft.client.gui.GuiYesNoCallback;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.constants.EnumPlayerData;
 import noppes.npcs.entity.EntityNPCInterface;
 
@@ -26,7 +30,7 @@ public class GuiNpcManagePlayerData extends GuiNPCInterface2 implements IScrollD
     public GuiNpcManagePlayerData(EntityNPCInterface npc)
     {
     	super(npc);
-    	Client.sendData(EnumPacketServer.PlayerDataGet,selection);
+        PacketClient.sendClient(new PlayerDataGetPacket(selection, ""));
     }
 
     public void initGui()
@@ -115,9 +119,9 @@ public class GuiNpcManagePlayerData extends GuiNPCInterface2 implements IScrollD
 			{
 				if(selected != null){
 					if(selection == EnumPlayerData.Players)
-						Client.sendData(EnumPacketServer.PlayerDataRemove, selection,selectedPlayer,selected);
+                        PacketClient.sendClient(new PlayerDataRemovePacket(selection, selectedPlayer, selected));
 					else
-						Client.sendData(EnumPacketServer.PlayerDataRemove, selection,selectedPlayer,data.get(selected));
+                        PacketClient.sendClient(new PlayerDataRemovePacket(selection, selectedPlayer, data.get(selected)));
 					data.clear();
 				}
 				selected = null;
@@ -130,8 +134,9 @@ public class GuiNpcManagePlayerData extends GuiNPCInterface2 implements IScrollD
 				initButtons();
 				scroll.clear();
 				data.clear();
-				Client.sendData(EnumPacketServer.PlayerDataGet, selection, selectedPlayer);
-				selected = null;
+
+                PacketClient.sendClient(new PlayerDataGetPacket(selection, selectedPlayer));
+                selected = null;
 			}
 		}
 		if(id == 7){
@@ -169,7 +174,7 @@ public class GuiNpcManagePlayerData extends GuiNPCInterface2 implements IScrollD
 	@Override
 	public void confirmClicked(boolean confirm, int id){
 		if(confirm){
-			Client.sendData(EnumPacketServer.PlayerDataMapRegen);
+            PacketClient.sendClient(new PlayerDataMapRegenPacket());
 			close();
 		}
 		else
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java
index 14bb9ad52..76dd1b840 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java
@@ -1,14 +1,23 @@
 package noppes.npcs.client.gui.global;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.recipe.RecipeGetPacket;
+import kamkeel.npcs.network.packets.request.recipe.RecipeRemovePacket;
+import kamkeel.npcs.network.packets.request.recipe.RecipeSavePacket;
+import kamkeel.npcs.network.packets.request.recipe.RecipesGetPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
-import noppes.npcs.client.Client;
+
+import net.minecraft.util.StatCollector;
+import noppes.npcs.client.CustomNpcResourceListener;
 import noppes.npcs.client.NoppesUtil;
+import noppes.npcs.client.gui.SubGuiNpcAvailability;
 import noppes.npcs.client.gui.util.*;
 import noppes.npcs.constants.EnumGuiType;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.containers.ContainerManageRecipes;
+import noppes.npcs.controllers.data.RecipeAnvil;
 import noppes.npcs.controllers.data.RecipeCarpentry;
 import noppes.npcs.entity.EntityNPCInterface;
 import org.lwjgl.opengl.GL11;
@@ -18,9 +27,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Vector;
 
-public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IScrollData, IGuiData, ICustomScrollListener,ITextfieldListener{
-    private GuiCustomScroll scroll;
-	private HashMap<String,Integer> data = new HashMap<String,Integer>();
+public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IScrollData, IGuiData, ICustomScrollListener, ITextfieldListener, ISubGuiListener  {
+    public static int tab = 1;
+    public GuiCustomScroll scroll;
+	public HashMap<String,Integer> data = new HashMap<String,Integer>();
 	private ContainerManageRecipes container;
 	private String selected = null;
 	private ResourceLocation slot;
@@ -30,10 +40,18 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS
     	super(npc,container);
     	this.container = container;
     	drawDefaultBackground = false;
-    	Client.sendData(EnumPacketServer.RecipesGet,container.width);
+        PacketClient.sendClient(new RecipesGetPacket(container.width));
         setBackground("inventorymenu.png");
         slot = getResource("slot.png");
         ySize = 200;
+
+        if(container.width == 1){
+            tab = 2;
+        } else if (container.width == 3){
+            tab = 0;
+        } else {
+            tab = 1;
+        }
     }
 
 	@Override
@@ -42,49 +60,100 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS
 
         if(scroll == null)
         	scroll = new GuiCustomScroll(this,0,0);
-        scroll.setSize(130, 180);
-        scroll.guiLeft = guiLeft + 172;
-        scroll.guiTop = guiTop + 8;
+        scroll.setSize(130, 150);
+        scroll.guiLeft = guiLeft + 280;
+        scroll.guiTop = guiTop + 38;
         addScroll(scroll);
 
-		this.addButton(new GuiNpcButton(0,guiLeft + 306, guiTop + 10, 84, 20, "menu.global"));
-		this.addButton(new GuiNpcButton(1,guiLeft + 306, guiTop + 32, 84, 20, "tile.npcCarpentyBench.name"));
-		this.getButton(0).setEnabled(container.width == 4);
-		this.getButton(1).setEnabled(container.width == 3);
+        int y = guiTop + 10;
 
-		this.addButton(new GuiNpcButton(3,guiLeft + 306, guiTop + 60, 84, 20, "gui.add"));
-		this.addButton(new GuiNpcButton(4,guiLeft + 306, guiTop + 82, 84, 20, "gui.remove"));
+		this.addButton(new GuiButtonBiDirectional(0,guiLeft + 280, y, 130, 20, new String[]{"menu.global", "tile.npcCarpentyBench.name", "tile.anvil.name"}, tab));
 
-    	this.addLabel(new GuiNpcLabel(0, "gui.ignoreDamage", guiLeft + 86, guiTop + 32));
-    	this.addButton(new GuiNpcButtonYesNo(5,guiLeft + 114, guiTop + 40, 50, 20, container.recipe.ignoreDamage));
+        y+= 106;
 
-    	this.addLabel(new GuiNpcLabel(1, "gui.ignoreNBT", guiLeft + 86, guiTop + 82));
-    	this.addButton(new GuiNpcButtonYesNo(6,guiLeft + 114, guiTop + 90, 50, 20, container.recipe.ignoreNBT));
+        this.addButton(new GuiNpcButton(3,guiLeft + 226, y += 22, 50, 20, "gui.add"));
+        this.addButton(new GuiNpcButton(4,guiLeft + 226, y += 22, 50, 20, "gui.remove"));
+        this.addButton(new GuiNpcButton(10,guiLeft + 226, y += 30, 50, 20, "gui.copy"));
 
-		this.addTextField(new GuiNpcTextField(0, this, fontRendererObj, guiLeft + 8, guiTop + 8, 160, 20, container.recipe.name));
-		this.getTextField(0).enabled = false;
-		this.getButton(5).setEnabled(false);
-		this.getButton(6).setEnabled(false);
+        if (container.width != 1) {
+            int buttonPos = guiTop + 72;
+            this.addLabel(new GuiNpcLabel(0, "gui.ignoreDamage", guiLeft + 131, buttonPos));
+            this.addButton(new GuiNpcButtonYesNo(5, guiLeft + 235, buttonPos - 5, 40, 20, container.recipe.ignoreDamage));
+            this.addLabel(new GuiNpcLabel(1, "gui.ignoreNBT", guiLeft + 131, buttonPos += 22));
+            this.addButton(new GuiNpcButtonYesNo(6, guiLeft + 235, buttonPos - 5, 40, 20, container.recipe.ignoreNBT));
 
-		this.addTextField(new GuiNpcTextField(55, this, fontRendererObj, guiLeft + 172, guiTop + 8 + 3 + 180, 130, 20, search));
+            buttonPos += 22;
+            this.addButton(new GuiNpcButton(15, guiLeft + 172, buttonPos - 5, 103, 20, "availability.options"));
+
+            this.getButton(5).setEnabled(false);
+            this.getButton(6).setEnabled(false);
+            this.getButton(15).setEnabled(false);
+
+            this.addTextField(new GuiNpcTextField(0, this, fontRendererObj, guiLeft + 8, guiTop + 8, 160, 20, container.recipe.name));
+            this.getTextField(0).enabled = false;
+        } else {
+            int buttonPos = guiTop + 50;
+            this.addLabel(new GuiNpcLabel(0, "gui.ignoreMatDamage", guiLeft + 131, buttonPos));
+            this.addButton(new GuiNpcButtonYesNo(7, guiLeft + 235, buttonPos - 5, 40, 20, container.recipeAnvil.ignoreRepairMaterialDamage));
+
+
+            this.addLabel(new GuiNpcLabel(1, "gui.ignoreMatNBT", guiLeft + 131, buttonPos += 22));
+            this.addButton(new GuiNpcButtonYesNo(8, guiLeft + 235, buttonPos - 5, 40, 20, container.recipeAnvil.ignoreRepairMaterialNBT));
+
+            this.addLabel(new GuiNpcLabel(11, "gui.repairPercent", guiLeft + 8, buttonPos));
+            this.addTextField(new GuiNpcTextField(1, this, fontRendererObj, guiLeft + 90, buttonPos - 5, 35, 20, container.recipeAnvil.getRepairPercentage() + ""));
+            this.getTextField(1).floatsOnly = true;
+            this.getTextField(1).setMinMaxDefaultFloat(1, 100, container.recipeAnvil.getRepairPercentage());
+            this.getTextField(1).enabled = false;
+
+            this.addLabel(new GuiNpcLabel(2, "gui.ignoreItemNBT", guiLeft + 131, buttonPos += 22));
+            this.addButton(new GuiNpcButtonYesNo(9, guiLeft + 235, buttonPos - 5, 40, 20, container.recipeAnvil.ignoreRepairItemNBT));
+
+            this.addLabel(new GuiNpcLabel(12, "gui.xpCost", guiLeft + 8, buttonPos));
+            this.addTextField(new GuiNpcTextField(2, this, fontRendererObj, guiLeft + 70, buttonPos - 5, 55, 20, container.recipeAnvil.getXpCost() + ""));
+            this.getTextField(2).integersOnly = true;
+            this.getTextField(2).setMinMaxDefault(0, Integer.MAX_VALUE, container.recipeAnvil.getXpCost());
+            this.getTextField(2).enabled = false;
+
+            buttonPos += 22;
+            this.addButton(new GuiNpcButton(15, guiLeft + 172, buttonPos - 5, 103, 20, "availability.options"));
+
+            this.getButton(7).setEnabled(false);
+            this.getButton(8).setEnabled(false);
+            this.getButton(9).setEnabled(false);
+            this.getButton(15).setEnabled(false);
+
+            this.addTextField(new GuiNpcTextField(0, this, fontRendererObj, guiLeft + 8, guiTop + 8, 160, 20, container.recipeAnvil.name));
+            this.getTextField(0).enabled = false;
+        }
+		this.addTextField(new GuiNpcTextField(55, this, fontRendererObj, guiLeft + 280, guiTop + 8 + 3 + 180, 130, 20, search));
 	}
 
 	@Override
 	protected void actionPerformed(GuiButton guibutton){
 		GuiNpcButton button = (GuiNpcButton) guibutton;
         if(button.id == 0){
-			getTextField(55).setText("");
-			search = "";
-			scroll.clear();
-        	save();
-        	NoppesUtil.requestOpenGUI(EnumGuiType.ManageRecipes,3,0,0);
-        }
-        if(button.id == 1){
-			getTextField(55).setText("");
-			search = "";
-			scroll.clear();
-        	save();
-        	NoppesUtil.requestOpenGUI(EnumGuiType.ManageRecipes,4,0,0);
+            GuiButtonBiDirectional buttonBiDirectional = (GuiButtonBiDirectional) button;
+            tab = buttonBiDirectional.getValue();
+            if(tab == 0){
+                getTextField(55).setText("");
+                search = "";
+                scroll.clear();
+                save();
+                NoppesUtil.requestOpenGUI(EnumGuiType.ManageRecipes,3,0,0);
+            } else if (tab == 1){
+                getTextField(55).setText("");
+                search = "";
+                scroll.clear();
+                save();
+                NoppesUtil.requestOpenGUI(EnumGuiType.ManageRecipes,4,0,0);
+            } else {
+                getTextField(55).setText("");
+                search = "";
+                scroll.clear();
+                save();
+                NoppesUtil.requestOpenGUI(EnumGuiType.ManageRecipes,1,0,0);
+            }
         }
         if(button.id == 3){
         	save();
@@ -92,13 +161,21 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS
         	String name = "New";
         	while(data.containsKey(name))
         		name += "_";
-        	RecipeCarpentry recipe = new RecipeCarpentry(name);
-        	recipe.isGlobal = container.width == 3;
-        	Client.sendData(EnumPacketServer.RecipeSave,recipe.writeNBT());
+
+            if(container.width == 1){
+                RecipeAnvil recipe = new RecipeAnvil();
+                recipe.name = name;
+                PacketClient.sendClient(new RecipeSavePacket(recipe.writeNBT()));
+            }
+            else {
+                RecipeCarpentry recipe = new RecipeCarpentry(name);
+                recipe.isGlobal = container.width == 3;
+                PacketClient.sendClient(new RecipeSavePacket(recipe.writeNBT()));
+            }
         }
         if(button.id == 4){
         	if(data.containsKey(scroll.getSelected())){
-        		Client.sendData(EnumPacketServer.RecipeRemove, data.get(scroll.getSelected()));
+                PacketClient.sendClient(new RecipeRemovePacket(data.get(scroll.getSelected()), container.width == 1));
         		scroll.clear();
         	}
         }
@@ -108,6 +185,23 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS
         if(button.id == 6){
         	container.recipe.ignoreNBT = button.getValue() == 1;
         }
+        if (button.id == 7) {
+            container.recipeAnvil.ignoreRepairMaterialDamage = button.getValue() == 1;
+        }
+        if (button.id == 8) {
+            container.recipeAnvil.ignoreRepairMaterialNBT = button.getValue() == 1;
+        }
+        if (button.id == 9) {
+            container.recipeAnvil.ignoreRepairItemNBT = button.getValue() == 1;
+        }
+        if(button.id == 15){
+            save();
+            if(container.width == 1){
+                setSubGui(new SubGuiNpcAvailability(container.recipeAnvil.availability));
+            } else {
+                setSubGui(new SubGuiNpcAvailability(container.recipe.availability));
+            }
+        }
     }
 
 	@Override
@@ -137,18 +231,68 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS
 		return list;
 	}
 
-	@Override
-	public void setGuiData(NBTTagCompound compound) {
-		RecipeCarpentry recipe = RecipeCarpentry.read(compound);
-		getTextField(0).setText(recipe.name);
-		container.setRecipe(recipe);
-		this.getTextField(0).enabled = true;
-    	this.getButton(5).setEnabled(true);
-    	this.getButton(5).setDisplay(recipe.ignoreDamage?1:0);
-    	this.getButton(6).setEnabled(true);
-    	this.getButton(6).setDisplay(recipe.ignoreNBT?1:0);
-		setSelected(recipe.name);
-	}
+    @Override
+    public void setGuiData(NBTTagCompound compound) {
+        if (compound.hasKey("IsAnvil")) {
+            RecipeAnvil recipe = RecipeAnvil.read(compound);
+            container.setRecipe(recipe);
+            container.width = 1;
+            tab = 2;
+            fixButtons();
+        } else {
+            RecipeCarpentry recipe = RecipeCarpentry.read(compound);
+            container.setRecipe(recipe);
+            fixButtons();
+        }
+    }
+
+    private void fixButtons(){
+        if(tab == 2){
+            getTextField(0).setText(container.recipeAnvil.name);
+            getTextField(1).setText(container.recipeAnvil.getRepairPercentage() + "");
+            getTextField(2).setText(container.recipeAnvil.getXpCost() + "");
+
+            setSelected(container.recipeAnvil.name);
+            getTextField(0).enabled = true;
+            getTextField(1).enabled = true;
+            getTextField(2).enabled = true;
+
+            GuiNpcButtonYesNo btnMatDamage = (GuiNpcButtonYesNo)this.getButton(7);
+            GuiNpcButtonYesNo btnMatNBT = (GuiNpcButtonYesNo)this.getButton(8);
+            GuiNpcButtonYesNo btnItemNBT = (GuiNpcButtonYesNo)this.getButton(9);
+            if (btnMatDamage != null) {
+                btnMatDamage.setDisplay(container.recipeAnvil.ignoreRepairMaterialDamage ? 1 : 0);
+                btnMatDamage.setEnabled(true);
+            }
+            if (btnMatNBT != null) {
+                btnMatNBT.setDisplay(container.recipeAnvil.ignoreRepairMaterialNBT ? 1 : 0);
+                btnMatNBT.setEnabled(true);
+            }
+            if (btnItemNBT != null) {
+                btnItemNBT.setDisplay(container.recipeAnvil.ignoreRepairItemNBT ? 1 : 0);
+                btnItemNBT.setEnabled(true);
+            }
+
+            GuiNpcButton avail = this.getButton(15);
+            if(avail != null)
+                avail.setEnabled(true);
+        } else {
+            getTextField(0).setText(container.recipe.name);
+
+            this.getTextField(0).enabled = true;
+            this.getButton(5).setEnabled(true);
+            this.getButton(5).setDisplay(container.recipe.ignoreDamage ? 1 : 0);
+            this.getButton(6).setEnabled(true);
+            this.getButton(6).setDisplay(container.recipe.ignoreNBT ? 1 : 0);
+            setSelected(container.recipe.name);
+
+            if(!container.recipe.isGlobal){
+                GuiNpcButton avail = this.getButton(15);
+                if(avail != null)
+                    avail.setEnabled(true);
+            }
+        }
+    }
 
 	@Override
     protected void drawGuiContainerBackgroundLayer(float f, int x, int y){
@@ -161,16 +305,29 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS
         		drawTexturedModalRect(guiLeft + i*18 + 7, guiTop + j*18 + 34, 0, 0, 18, 18);
         	}
     	}
-		drawTexturedModalRect(guiLeft + 86, guiTop + 60, 0, 0, 18, 18);
+
+        if(container.width == 1){
+            drawTexturedModalRect(guiLeft + 101, guiTop + 34, 0, 0, 18, 18);
+            this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.material"), guiLeft + 28, guiTop + 38, CustomNpcResourceListener.DefaultTextColor);
+        } else {
+            drawTexturedModalRect(guiLeft + 86, guiTop + 60, 0, 0, 18, 18);
+        }
     }
 	@Override
 	public void setData(Vector<String> list, HashMap<String, Integer> data) {
 		String name = scroll.getSelected();
 		this.data = data;
 		scroll.setList(getSearchList());
+        this.getTextField(0).enabled = name != null;
 
-		this.getTextField(0).enabled = name != null;
-		this.getButton(5).setEnabled(name != null);
+        if(container.width == 1){
+            this.getButton(7).setEnabled(name != null);
+            this.getButton(8).setEnabled(name != null);
+            this.getButton(9).setEnabled(name != null);
+        } else {
+            this.getButton(5).setEnabled(name != null);
+            this.getButton(6).setEnabled(name != null);
+        }
 
 		if(name != null)
 			scroll.setSelected(name);
@@ -186,7 +343,11 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS
 	public void customScrollClicked(int i, int j, int k, GuiCustomScroll guiCustomScroll) {
 		save();
 		selected = scroll.getSelected();
-		Client.sendData(EnumPacketServer.RecipeGet, data.get(selected));
+        if(container.width == 1){
+            PacketClient.sendClient(new RecipeGetPacket(data.get(selected), true));
+        } else {
+            PacketClient.sendClient(new RecipeGetPacket(data.get(selected), false));
+        }
 	}
 
 	@Override
@@ -194,7 +355,11 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS
 		GuiNpcTextField.unfocus();
 		if(selected != null && data.containsKey(selected)){
 			container.saveRecipe();
-			Client.sendData(EnumPacketServer.RecipeSave, container.recipe.writeNBT());
+            if(container.width == 1){
+                PacketClient.sendClient(new RecipeSavePacket(container.recipeAnvil.writeNBT()));
+            } else {
+                PacketClient.sendClient(new RecipeSavePacket(container.recipe.writeNBT()));
+            }
 		}
 	}
 
@@ -203,13 +368,40 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS
 		if(guiNpcTextField.id == 0){
 			String name = guiNpcTextField.getText();
 			if(!name.isEmpty() && !data.containsKey(name)){
-				String old = container.recipe.name;
-				data.remove(container.recipe.name);
-				container.recipe.name = name;
-				data.put(container.recipe.name, container.recipe.id);
-				selected = name;
-				scroll.replace(old,container.recipe.name);
+                if(container.width == 1){
+                    String old = container.recipeAnvil.name;
+                    data.remove(container.recipeAnvil.name);
+                    container.recipeAnvil.name = name;
+                    data.put(container.recipeAnvil.name, container.recipeAnvil.id);
+                    selected = name;
+                    scroll.replace(old,container.recipeAnvil.name);
+                } else {
+                    String old = container.recipe.name;
+                    data.remove(container.recipe.name);
+                    container.recipe.name = name;
+                    data.put(container.recipe.name, container.recipe.id);
+                    selected = name;
+                    scroll.replace(old,container.recipe.name);
+                }
 			}
 		}
+        if(guiNpcTextField.id == 1){
+            float percent = guiNpcTextField.getFloat();
+            if(container.width == 1){
+                container.recipeAnvil.repairPercentage = percent;
+            }
+        }
+        if(guiNpcTextField.id == 2){
+            int xpCost = guiNpcTextField.getInteger();
+            if(container.width == 1){
+                container.recipeAnvil.xpCost = xpCost;
+            }
+        }
 	}
+
+    @Override
+    public void subGuiClosed(SubGuiInterface subgui){
+        if(subgui instanceof SubGuiNpcAvailability)
+            fixButtons();
+    }
 }
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java
index fef642732..bd3b4e9e5 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java
@@ -1,15 +1,20 @@
 package noppes.npcs.client.gui.global;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnGetAllPacket;
+import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnGetPacket;
+import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnRemovePacket;
+import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.GuiNpcMobSpawnerSelector;
 import noppes.npcs.client.gui.SubGuiNpcBiomes;
 import noppes.npcs.client.gui.SubGuiNpcDimensions;
 import noppes.npcs.client.gui.SubGuiSpawningOptions;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.SpawnData;
 import noppes.npcs.entity.EntityNPCInterface;
 
@@ -25,7 +30,7 @@ public class GuiNpcNaturalSpawns extends GuiNPCInterface2 implements IGuiData, I
 
 	public GuiNpcNaturalSpawns(EntityNPCInterface npc) {
 		super(npc);
-    	Client.sendData(EnumPacketServer.NaturalSpawnGetAll);
+        PacketClient.sendClient(new NaturalSpawnGetAllPacket());
 	}
 
 	@Override
@@ -129,12 +134,12 @@ public class GuiNpcNaturalSpawns extends GuiNPCInterface2 implements IGuiData, I
 
         	SpawnData spawn = new SpawnData();
         	spawn.name = name;
-        	Client.sendData(EnumPacketServer.NaturalSpawnSave, spawn.writeNBT(new NBTTagCompound()));
+            PacketClient.sendClient(new NaturalSpawnSavePacket(spawn.writeNBT(new NBTTagCompound())));
 			this.spawnEntryScroll.selected = -1;
         }
         if(id == 2){
         	if(data.containsKey(scrollNaturalSpawns.getSelected())) {
-				Client.sendData(EnumPacketServer.NaturalSpawnRemove, spawn.id);
+                PacketClient.sendClient(new NaturalSpawnRemovePacket(spawn.id));
 				spawn = new SpawnData();
         		scrollNaturalSpawns.clear();
 				this.spawnEntryScroll.selected = -1;
@@ -224,7 +229,7 @@ public class GuiNpcNaturalSpawns extends GuiNPCInterface2 implements IGuiData, I
 			save();
 			String selected = scrollNaturalSpawns.getSelected();
 			spawn = new SpawnData();
-			Client.sendData(EnumPacketServer.NaturalSpawnGet, data.get(selected));
+            PacketClient.sendClient(new NaturalSpawnGetPacket(data.get(selected)));
 		}
 		if (guiCustomScroll.id == 20) {
 			initGui();
@@ -235,7 +240,7 @@ public class GuiNpcNaturalSpawns extends GuiNPCInterface2 implements IGuiData, I
 	public void save() {
     	GuiNpcTextField.unfocus();
 		if(spawn.id >= 0)
-			Client.sendData(EnumPacketServer.NaturalSpawnSave, spawn.writeNBT(new NBTTagCompound()));
+            PacketClient.sendClient(new NaturalSpawnSavePacket(spawn.writeNBT(new NBTTagCompound())));
 	}
 
 	@Override
diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java
index e28d96658..a70e427da 100644
--- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java
+++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java
@@ -1,83 +1,237 @@
 package noppes.npcs.client.gui.mainmenu;
 
-import cpw.mods.fml.common.Loader;
 import net.minecraft.client.gui.GuiButton;
 import noppes.npcs.NoppesStringUtils;
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.global.GuiNpcManagePlayerData;
 import noppes.npcs.client.gui.global.GuiNpcNaturalSpawns;
-import noppes.npcs.client.gui.util.*;
+import noppes.npcs.client.gui.util.GuiNPCInterface2;
+import noppes.npcs.client.gui.util.GuiNpcButton;
+import noppes.npcs.client.gui.util.GuiNpcSquareButton;
 import noppes.npcs.constants.EnumGuiType;
 import noppes.npcs.entity.EntityNPCInterface;
 
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
 
-public class GuiNPCGlobalMainMenu extends GuiNPCInterface2{
-    public GuiNPCGlobalMainMenu(EntityNPCInterface npc){
-    	super(npc,5);
+import static noppes.npcs.client.gui.player.inventory.GuiCNPCInventory.specialIcons;
+
+public class GuiNPCGlobalMainMenu extends GuiNPCInterface2 {
+
+    // Store all composite buttons keyed by their IDs.
+    private Map<Integer, GuiNpcSquareButton> buttonMap = new HashMap<>();
+
+    private GuiNpcSquareButton bankButton;
+    private GuiNpcSquareButton factionButton;
+    private GuiNpcSquareButton dialogButton;
+    private GuiNpcSquareButton questButton;
+    private GuiNpcSquareButton transportButton;
+    private GuiNpcSquareButton playerdataButton;
+    private GuiNpcSquareButton recipeButton;
+    private GuiNpcSquareButton spawnButton;
+    private GuiNpcSquareButton linkedButton;
+    private GuiNpcSquareButton animationButton;
+    private GuiNpcSquareButton tagButton;
+    private GuiNpcSquareButton effectsButton;
+
+    public GuiNPCGlobalMainMenu(EntityNPCInterface npc) {
+        super(npc, 5);
+    }
+
+    /**
+     * Register a new composite button.
+     */
+    public void registerButton(GuiNpcSquareButton button) {
+        buttonMap.put(button.id, button);
     }
 
     @Override
-    public void initGui(){
-    	super.initGui();
-    	int y = guiTop + 10;
-    	this.addButton(new GuiNpcButton(2, guiLeft + 5, y, "global.banks"));
-    	this.addButton(new GuiNpcButton(3, guiLeft + 5, y += 22, "menu.factions"));
-    	this.addButton(new GuiNpcButton(4, guiLeft + 5, y += 22, "dialog.dialogs"));
-    	this.addButton(new GuiNpcButton(11, guiLeft + 5, y += 22, "quest.quests"));
-    	this.addButton(new GuiNpcButton(12, guiLeft + 5, y += 22, "global.transport"));
-    	this.addButton(new GuiNpcButton(13, guiLeft + 5, y += 22, "global.playerdata"));
-    	this.addButton(new GuiNpcButton(14, guiLeft + 5, y += 22, "global.recipes"));
-    	this.addButton(new GuiNpcButton(15, guiLeft + 5, y += 22, NoppesStringUtils.translate("global.naturalspawn")));
-    	this.addButton(new GuiNpcButton(16, guiLeft + 5, y += 22, "global.linked"));
-		y = guiTop + 10;
-		this.addButton(new GuiNpcButton(18, guiLeft + 210, y, "menu.animations"));
-		this.addButton(new GuiNpcButton(17, guiLeft + 210, y += 22, "menu.tags"));
+    public void initGui() {
+        super.initGui();
 
+        // Create and register composite buttons.
+        registerButton(bankButton = new GuiNpcSquareButton(2, 0, 0, 20, "global.banks", 0xFF333333));
+        bankButton.setIconPos(24, 24, 72, 32).setIconTexture(specialIcons);
+
+        registerButton(factionButton = new GuiNpcSquareButton(3, 0, 0, 20, "menu.factions", 0xFF333333));
+        factionButton.setIconPos(24, 24, 0, 32).setIconTexture(specialIcons);
+
+        registerButton(dialogButton = new GuiNpcSquareButton(4, 0, 0, 20, "dialog.dialogs", 0xFF333333));
+        dialogButton.setIconPos(24, 24, 24, 32).setIconTexture(specialIcons);
+
+        registerButton(questButton = new GuiNpcSquareButton(11, 0, 0, 20, "quest.quests", 0xFF333333));
+        questButton.setIconPos(24, 24, 0, 56).setIconTexture(specialIcons);
+
+        registerButton(transportButton = new GuiNpcSquareButton(12, 0, 0, 20, "global.transport", 0xFF333333));
+        transportButton.setIconPos(24, 24, 96, 32).setIconTexture(specialIcons);
+
+        registerButton(playerdataButton = new GuiNpcSquareButton(13, 0, 0, 20, "global.playerdata", 0xFF333333));
+        playerdataButton.setIconPos(24, 24, 216, 32).setIconTexture(specialIcons);
+
+        registerButton(recipeButton = new GuiNpcSquareButton(14, 0, 0, 20, "global.recipes", 0xFF333333));
+        recipeButton.setIconPos(24, 24, 48, 32).setIconTexture(specialIcons);
+
+        registerButton(spawnButton = new GuiNpcSquareButton(15, 0, 0, 20, NoppesStringUtils.translate("global.naturalspawn"), 0xFF333333));
+        spawnButton.setIconPos(24, 24, 144, 32).setIconTexture(specialIcons);
+
+        registerButton(linkedButton = new GuiNpcSquareButton(16, 0, 0, 20, "global.linked", 0xFF333333));
+        linkedButton.setIconPos(24, 24, 168, 32).setIconTexture(specialIcons);
+
+        registerButton(animationButton = new GuiNpcSquareButton(18, 0, 0, 20, "menu.animations", 0xFF333333));
+        animationButton.setIconPos(24, 24, 120, 32).setIconTexture(specialIcons);
+
+        registerButton(tagButton = new GuiNpcSquareButton(17, 0, 0, 20, "menu.tags", 0xFF333333));
+        tagButton.setIconPos(24, 24, 192, 32).setIconTexture(specialIcons);
+
+        registerButton(effectsButton = new GuiNpcSquareButton(19, 0, 0, 20, "global.customeffects", 0xFF333333));
+        effectsButton.setIconPos(24, 24, 192, 32).setIconTexture(specialIcons);
+
+        // Layout composite buttons optimally.
+        layoutButtons();
+        // Add all composite buttons to the GUI.
+        for (GuiNpcButton btn : buttonMap.values()) {
+            this.addButton(btn);
+        }
+    }
+
+    /**
+     * Compute the optimal layout by iterating over candidate row counts from 1 to total.
+     * For each candidate:
+     *   - Let c = ceil(total / r)
+     *   - candidateHoriz = (availWidth - (c+1)*padding) / c
+     *   - candidateVert  = (availHeight - (r+1)*padding) / r
+     *   - candidate = min(candidateHoriz, candidateVert)
+     *   - usedWidth = candidate * c + (c+1)*padding
+     *   - usedHeight = candidate * r + (r+1)*padding
+     *   - ratio = (usedWidth * usedHeight) / (availWidth * availHeight)
+     *
+     * We choose the candidate (r, candidate) that maximizes this ratio.
+     *
+     * @param total   Total number of buttons.
+     * @param padding Padding in pixels.
+     * @return An array {optimalRows, candidateSize}.
+     */
+    private int[] computeOptimalLayout(int total, int padding) {
+        int availWidth = xSize - 2 * padding;
+        int availHeight = ySize - 2 * padding;
+        double bestRatio = -1;
+        int bestRows = 1;
+        int bestCandidate = 0;
+        for (int r = 1; r <= total; r++) {
+            int cols = (int) Math.ceil(total / (double) r);
+            int candidateHoriz = (availWidth - (cols + 1) * padding) / cols;
+            int candidateVert = (availHeight - (r + 1) * padding) / r;
+            int candidate = Math.min(candidateHoriz, candidateVert);
+            if (candidate <= 0)
+                continue;
+            int usedWidth = candidate * cols + (cols + 1) * padding;
+            int usedHeight = candidate * r + (r + 1) * padding;
+            double ratio = (double)(usedWidth * usedHeight) / (availWidth * availHeight);
+            if (ratio > bestRatio || (Math.abs(ratio - bestRatio) < 0.0001 && candidate > bestCandidate)) {
+                bestRatio = ratio;
+                bestCandidate = candidate;
+                bestRows = r;
+            }
+        }
+        if (bestCandidate <= 0) {
+            bestCandidate = availHeight - 2 * padding;
+            bestRows = 1;
+        }
+        return new int[]{bestRows, bestCandidate};
+    }
+
+    /**
+     * Layout composite buttons using the optimal configuration.
+     */
+    private void layoutButtons() {
+        List<GuiNpcSquareButton> buttons = new ArrayList<>(buttonMap.values());
+        Collections.sort(buttons, new Comparator<GuiNpcSquareButton>() {
+            @Override
+            public int compare(GuiNpcSquareButton b1, GuiNpcSquareButton b2) {
+                return Integer.compare(b1.id, b2.id);
+            }
+        });
+        int total = buttons.size();
+        if (total == 0)
+            return;
+        int padding = 2;
+        int[] optimal = computeOptimalLayout(total, padding);
+        int rows = optimal[0];
+        int buttonSize = optimal[1]; // composite button is square with side "buttonSize"
+
+        // Distribute buttons evenly among the rows.
+        int base = total / rows;
+        int extra = total % rows;
+        int[] rowCounts = new int[rows];
+        for (int i = 0; i < rows; i++) {
+            rowCounts[i] = base + (i < extra ? 1 : 0);
+        }
+        int totalHeight = rows * buttonSize + (rows + 1) * padding;
+        int startY = guiTop + (ySize - totalHeight) / 2;
+        int index = 0;
+        for (int row = 0; row < rows; row++) {
+            int count = rowCounts[row];
+            int rowWidth = count * buttonSize + (count + 1) * padding;
+            int rowStartX = guiLeft + (xSize - rowWidth) / 2;
+            int yPos = startY + padding + row * (buttonSize + padding);
+            for (int col = 0; col < count; col++) {
+                if (index >= total)
+                    break;
+                GuiNpcSquareButton btn = buttons.get(index);
+                btn.updatePositionAndSize(rowStartX + padding + col * (buttonSize + padding), yPos, buttonSize);
+                index++;
+            }
+        }
+    }
+
+
+    @Override
+    protected void actionPerformed(GuiButton guibutton) {
+        int id = guibutton.id;
+        if (id == 11) {
+            NoppesUtil.requestOpenGUI(EnumGuiType.ManageQuests);
+        }
+        if (id == 2) {
+            NoppesUtil.requestOpenGUI(EnumGuiType.ManageBanks);
+        }
+        if (id == 3) {
+            NoppesUtil.requestOpenGUI(EnumGuiType.ManageFactions);
+        }
+        if (id == 17) {
+            NoppesUtil.requestOpenGUI(EnumGuiType.ManageTags);
+        }
+        if (id == 18) {
+            NoppesUtil.requestOpenGUI(EnumGuiType.ManageAnimations);
+        }
+        if (id == 4) {
+            NoppesUtil.requestOpenGUI(EnumGuiType.ManageDialogs);
+        }
+        if (id == 12) {
+            NoppesUtil.requestOpenGUI(EnumGuiType.ManageTransport);
+        }
+        if (id == 13) {
+            NoppesUtil.openGUI(player, new GuiNpcManagePlayerData(npc));
+        }
+        if (id == 14) {
+            NoppesUtil.requestOpenGUI(EnumGuiType.ManageRecipes, 4, 0, 0);
+        }
+        if (id == 15) {
+            NoppesUtil.openGUI(player, new GuiNpcNaturalSpawns(npc));
+        }
+        if (id == 16) {
+            NoppesUtil.requestOpenGUI(EnumGuiType.ManageLinked);
+        }
+        if (id == 19) {
+            NoppesUtil.requestOpenGUI(EnumGuiType.ManageEffects);
+        }
     }
 
     @Override
-	protected void actionPerformed(GuiButton guibutton) {
-		int id = guibutton.id;
-		if (id == 11) {
-			NoppesUtil.requestOpenGUI(EnumGuiType.ManageQuests);
-		}
-		if (id == 2) {
-			NoppesUtil.requestOpenGUI(EnumGuiType.ManageBanks);
-		}
-		if (id == 3) {
-			NoppesUtil.requestOpenGUI(EnumGuiType.ManageFactions);
-		}
-		if (id == 17) {
-			NoppesUtil.requestOpenGUI(EnumGuiType.ManageTags);
-		}
-		if (id == 18) {
-			NoppesUtil.requestOpenGUI(EnumGuiType.ManageAnimations);
-		}
-		if (id == 4) {
-			NoppesUtil.requestOpenGUI(EnumGuiType.ManageDialogs);
-		}
-		if (id == 12) {
-			NoppesUtil.requestOpenGUI(EnumGuiType.ManageTransport);
-		}
-		if (id == 13) {
-			NoppesUtil.openGUI(player, new GuiNpcManagePlayerData(npc));
-		}
-		if (id == 14) {
-			NoppesUtil.requestOpenGUI(EnumGuiType.ManageRecipes, 4, 0, 0);
-		}
-		if (id == 15) {
-			NoppesUtil.openGUI(player, new GuiNpcNaturalSpawns(npc));
-		}
-		if (id == 16) {
-			NoppesUtil.requestOpenGUI(EnumGuiType.ManageLinked);
-		}
-
-
-	}
-	@Override
-	public void save() {
-	}
-
-
+    public void save() {
+        // No saving logic needed.
+    }
 }
diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java
index 4f44f52da..d4b033b4d 100644
--- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java
+++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java
@@ -1,5 +1,8 @@
 package noppes.npcs.client.gui.mainmenu;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuInvGetPacket;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuInvSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.RenderHelper;
@@ -7,9 +10,9 @@ import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.inventory.Slot;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.containers.ContainerNPCInv;
 import noppes.npcs.entity.EntityNPCInterface;
 import org.lwjgl.opengl.GL11;
@@ -30,7 +33,7 @@ public class GuiNPCInv extends GuiContainerNPCInterface2 implements IGuiData, IT
         this.container = container;
         ySize = 200;
         slot = getResource("slot.png");
-        Client.sendData(EnumPacketServer.MainmenuInvGet);
+        PacketClient.sendClient(new MainmenuInvGetPacket());
     }
 
     public void initGui()
@@ -178,8 +181,8 @@ public class GuiNPCInv extends GuiContainerNPCInterface2 implements IGuiData, IT
         npc.inventory.dropchance = chances;
     	npc.inventory.minExp = getTextField(0).getInteger();
     	npc.inventory.maxExp = getTextField(1).getInteger();
-    	Client.sendData(EnumPacketServer.MainmenuInvSave, npc.inventory.writeEntityToNBT(new NBTTagCompound()));
-	}
+        PacketClient.sendClient(new MainmenuInvSavePacket(npc.inventory.writeEntityToNBT(new NBTTagCompound())));
+    }
 
 	@Override
 	public void setGuiData(NBTTagCompound compound) {
diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java
index cf3b0070f..dafe8f50d 100644
--- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java
+++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java
@@ -1,46 +1,49 @@
 package noppes.npcs.client.gui.mainmenu;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAIGetPacket;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAISavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
 import noppes.npcs.DataAI;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.SubGuiNpcMovement;
 import noppes.npcs.client.gui.util.*;
 import noppes.npcs.constants.EnumCombatPolicy;
 import noppes.npcs.constants.EnumNavType;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 
 public class GuiNpcAI extends GuiNPCInterface2 implements ITextfieldListener, IGuiData{
 	private DataAI ai;
 	public GuiNpcAI(EntityNPCInterface npc) {
 		super(npc,6);
-		ai = npc.ai;
-    	Client.sendData(EnumPacketServer.MainmenuAIGet);
+		ai = npc.ais;
+    	PacketClient.sendClient(new MainmenuAIGetPacket());
 	}
 
     public void initGui()
     {
         super.initGui();
         addLabel(new GuiNpcLabel(0,"ai.enemyresponse", guiLeft + 5, guiTop + 17));
-    	addButton(new GuiNpcButton(0,guiLeft + 86, guiTop + 10, 60, 20, new String[]{"gui.retaliate","gui.panic","gui.retreat","gui.nothing"} ,npc.ai.onAttack));
+    	addButton(new GuiNpcButton(0,guiLeft + 86, guiTop + 10, 60, 20, new String[]{"gui.retaliate","gui.panic","gui.retreat","gui.nothing"} ,npc.ais.onAttack));
     	addLabel(new GuiNpcLabel(1,"ai.door", guiLeft + 5, guiTop + 40));
-    	addButton(new GuiNpcButton(1,guiLeft + 86, guiTop + 35, 60, 20, new String[]{"gui.break","gui.open","gui.disabled"} ,npc.ai.doorInteract));
+    	addButton(new GuiNpcButton(1,guiLeft + 86, guiTop + 35, 60, 20, new String[]{"gui.break","gui.open","gui.disabled"} ,npc.ais.doorInteract));
     	addLabel(new GuiNpcLabel(12,"ai.swim", guiLeft + 5, guiTop + 65));
-    	addButton(new GuiNpcButton(7,guiLeft + 86, guiTop + 60, 60, 20, new String[]{"gui.no", "gui.yes"} ,npc.ai.canSwim ? 1:0));
+    	addButton(new GuiNpcButton(7,guiLeft + 86, guiTop + 60, 60, 20, new String[]{"gui.no", "gui.yes"} ,npc.ais.canSwim ? 1:0));
     	addLabel(new GuiNpcLabel(13,"ai.shelter", guiLeft + 5, guiTop + 90));
-    	addButton(new GuiNpcButton(9,guiLeft + 86, guiTop + 85, 60, 20, new String[]{"gui.darkness","gui.sunlight","gui.disabled"} ,npc.ai.findShelter));
+    	addButton(new GuiNpcButton(9,guiLeft + 86, guiTop + 85, 60, 20, new String[]{"gui.darkness","gui.sunlight","gui.disabled"} ,npc.ais.findShelter));
     	addLabel(new GuiNpcLabel(14,"ai.clearlos", guiLeft + 5, guiTop + 115));
-    	addButton(new GuiNpcButton(10,guiLeft + 86, guiTop + 110, 60, 20, new String[]{"gui.no", "gui.yes"} ,npc.ai.directLOS ? 1:0));
+    	addButton(new GuiNpcButton(10,guiLeft + 86, guiTop + 110, 60, 20, new String[]{"gui.no", "gui.yes"} ,npc.ais.directLOS ? 1:0));
     	addLabel(new GuiNpcLabel(18,"ai.sprint", guiLeft + 5, guiTop + 140));
-    	addButton(new GuiNpcButton(16,guiLeft + 86, guiTop + 135, 60, 20, new String[]{"gui.no", "gui.yes"} ,npc.ai.canSprint ? 1:0));
+    	addButton(new GuiNpcButton(16,guiLeft + 86, guiTop + 135, 60, 20, new String[]{"gui.no", "gui.yes"} ,npc.ais.canSprint ? 1:0));
 
     	addLabel(new GuiNpcLabel(10,"ai.avoidwater", guiLeft + 150, guiTop + 17));
-    	addButton(new GuiNpcButton(5, guiLeft + 230, guiTop + 10, 60, 20, new String[]{"gui.no","gui.yes"} ,npc.ai.avoidsWater ? 1:0));
+    	addButton(new GuiNpcButton(5, guiLeft + 230, guiTop + 10, 60, 20, new String[]{"gui.no","gui.yes"} ,npc.ais.avoidsWater ? 1:0));
     	addLabel(new GuiNpcLabel(11,"ai.return", guiLeft + 150, guiTop + 40));
-    	addButton(new GuiNpcButton(6, guiLeft + 230, guiTop + 35, 60, 20, new String[]{"gui.no","gui.yes"} ,npc.ai.returnToStart ? 1:0));
+    	addButton(new GuiNpcButton(6, guiLeft + 230, guiTop + 35, 60, 20, new String[]{"gui.no","gui.yes"} ,npc.ais.returnToStart ? 1:0));
     	addLabel(new GuiNpcLabel(17,"ai.leapattarget", guiLeft + 150, guiTop + 65));
-        addButton(new GuiNpcButton(15,guiLeft + 230, guiTop + 60, 60, 20, new String[]{"gui.no", "ai.jump", "ai.pounce"} ,npc.ai.leapType));
+        addButton(new GuiNpcButton(15,guiLeft + 230, guiTop + 60, 60, 20, new String[]{"gui.no", "ai.jump", "ai.pounce"} ,npc.ais.leapType));
 		addLabel(new GuiNpcLabel(15, "ai.indirect", guiLeft + 150, guiTop + 90));
     	addButton(new GuiNpcButton(13, guiLeft + 230, guiTop + 85, 60, 20, new String[]{"gui.no", "gui.whendistant", "gui.whenhidden"}, ai.canFireIndirect));
 		addLabel(new GuiNpcLabel(16, "ai.rangemelee", guiLeft + 150, guiTop + 115));
@@ -82,7 +85,7 @@ public class GuiNpcAI extends GuiNPCInterface2 implements ITextfieldListener, IG
 		}
         else if (ai.combatPolicy == EnumCombatPolicy.Tactical)
         {
-            addButton(new GuiNpcButton(40, guiLeft + 295, guiTop + 160, 60, 20, new String[]{"stats.normal","stats.reverse"}, npc.ai.tacticalChance > 50 ? 1:0));
+            addButton(new GuiNpcButton(40, guiLeft + 295, guiTop + 160, 60, 20, new String[]{"stats.normal","stats.reverse"}, npc.ais.tacticalChance > 50 ? 1:0));
         }
 
 		getButton(17).setEnabled(this.ai.onAttack == 0);
@@ -173,7 +176,7 @@ public class GuiNpcAI extends GuiNPCInterface2 implements ITextfieldListener, IG
 
 	@Override
 	public void save() {
-		Client.sendData(EnumPacketServer.MainmenuAISave, ai.writeToNBT(new NBTTagCompound()));
+        PacketClient.sendClient(new MainmenuAISavePacket(ai.writeToNBT(new NBTTagCompound())));
 	}
 
 	@Override
diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java
index d05e8a0a5..4a4eae046 100644
--- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java
+++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java
@@ -1,9 +1,14 @@
 package noppes.npcs.client.gui.mainmenu;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.jobs.JobGetPacket;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedGetPacket;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket;
+import kamkeel.npcs.network.packets.request.role.RoleGetPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
 import noppes.npcs.NoppesStringUtils;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.advanced.*;
 import noppes.npcs.client.gui.roles.*;
@@ -12,7 +17,7 @@ import noppes.npcs.client.gui.util.GuiNpcButton;
 import noppes.npcs.client.gui.util.IGuiData;
 import noppes.npcs.constants.EnumGuiType;
 import noppes.npcs.constants.EnumJobType;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.constants.EnumRoleType;
 import noppes.npcs.entity.EntityNPCInterface;
 
@@ -22,8 +27,9 @@ public class GuiNpcAdvanced extends GuiNPCInterface2 implements IGuiData
     public GuiNpcAdvanced(EntityNPCInterface npc)
     {
     	super(npc, 4);
-    	Client.sendData(EnumPacketServer.MainmenuAdvancedGet);
+        PacketClient.sendClient(new MainmenuAdvancedGetPacket());
     }
+
     @Override
     public void initGui(){
     	super.initGui();
@@ -55,7 +61,7 @@ public class GuiNpcAdvanced extends GuiNPCInterface2 implements IGuiData
     	GuiNpcButton button = (GuiNpcButton) guibutton;
 		if (button.id == 3) {
 			save();
-			Client.sendData(EnumPacketServer.RoleGet);
+            PacketClient.sendClient(new RoleGetPacket());
 		}
         if(button.id == 8){
 			hasChanges = true;
@@ -65,7 +71,7 @@ public class GuiNpcAdvanced extends GuiNPCInterface2 implements IGuiData
         }
         if(button.id == 4){
         	save();
-			Client.sendData(EnumPacketServer.JobGet);
+            PacketClient.sendClient(new JobGetPacket());
         }
         if(button.id == 5){
 			hasChanges = true;
@@ -152,7 +158,7 @@ public class GuiNpcAdvanced extends GuiNPCInterface2 implements IGuiData
 	@Override
 	public void save() {
 		if(hasChanges){
-			Client.sendData(EnumPacketServer.MainmenuAdvancedSave, npc.advanced.writeToNBT(new NBTTagCompound()));
+            PacketClient.sendClient(new MainmenuAdvancedSavePacket(npc.advanced.writeToNBT(new NBTTagCompound())));
 			hasChanges = false;
 		}
 	}
diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java
index 94c816936..b035b84be 100644
--- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java
+++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java
@@ -1,18 +1,22 @@
 package noppes.npcs.client.gui.mainmenu;
 
 import com.mojang.authlib.GameProfile;
-import kamkeel.addon.client.GeckoAddonClient;
+import kamkeel.npcs.addon.client.GeckoAddonClient;
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuDisplayGetPacket;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuDisplaySavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ResourceLocation;
 import noppes.npcs.DataDisplay;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.*;
 import noppes.npcs.client.gui.model.GuiCreationScreen;
 import noppes.npcs.client.gui.select.GuiTextureSelection;
 import noppes.npcs.client.gui.util.*;
 import noppes.npcs.config.ConfigMain;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.SkinOverlay;
 import noppes.npcs.entity.EntityCustomNpc;
 import noppes.npcs.entity.EntityNPCInterface;
@@ -25,7 +29,7 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene
     public GuiNpcDisplay(EntityNPCInterface npc) {
         super(npc,1);
         display = npc.display;
-        Client.sendData(EnumPacketServer.MainmenuDisplayGet);
+        PacketClient.sendClient(new MainmenuDisplayGetPacket());
     }
 
     public void initGui(){
@@ -38,6 +42,8 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene
         this.addButton(new GuiNpcButton(0, guiLeft + 253+52, y , 110, 20, new String[]{"display.show","display.hide","display.showAttacking"} ,display.showName));
 
         this.addButton(new GuiNpcButton(14, guiLeft + 259, y , 20, 20, Character.toString('\u21bb')));
+        getButton(14).setIconTexture(new ResourceLocation("customnpcs", "textures/gui/slot.png"));
+
         this.addButton(new GuiNpcButton(15, guiLeft + 259 + 22, y , 20, 20, Character.toString('\u22EE')));
 
         y+=23;
@@ -209,11 +215,11 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene
     public void save() {
         if(display.skinType == 1)
             display.loadProfile();
+
         npc.textureLocation = null;
         mc.renderGlobal.onEntityDestroy(npc);
         mc.renderGlobal.onEntityCreate(npc);
-        Client.sendData(EnumPacketServer.MainmenuDisplaySave, display.writeToNBT(new NBTTagCompound()));
-
+        PacketClient.sendClient(new MainmenuDisplaySavePacket(display.writeToNBT(new NBTTagCompound())));
     }
 
     @Override
diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java
index 192b405e3..8fc1d567c 100644
--- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java
+++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java
@@ -1,15 +1,17 @@
 package noppes.npcs.client.gui.mainmenu;
 
-import kamkeel.addon.DBCAddon;
-import kamkeel.addon.client.DBCClient;
+import kamkeel.npcs.addon.client.DBCClient;
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuStatsGetPacket;
+import kamkeel.npcs.network.packets.request.mainmenu.MainmenuStatsSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.EnumCreatureAttribute;
 import net.minecraft.nbt.NBTTagCompound;
 import noppes.npcs.DataStats;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.*;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 
 public class GuiNpcStats extends GuiNPCInterface2 implements ITextfieldListener, IGuiData{
@@ -17,7 +19,8 @@ public class GuiNpcStats extends GuiNPCInterface2 implements ITextfieldListener,
 	public GuiNpcStats(EntityNPCInterface npc) {
 		super(npc,2);
 		stats = npc.stats;
-    	Client.sendData(EnumPacketServer.MainmenuStatsGet);
+
+        PacketClient.sendClient(new MainmenuStatsGetPacket());
 	}
 
 	@Override
@@ -151,7 +154,7 @@ public class GuiNpcStats extends GuiNPCInterface2 implements ITextfieldListener,
     }
 	@Override
 	public void save() {
-		Client.sendData(EnumPacketServer.MainmenuStatsSave, stats.writeToNBT(new NBTTagCompound()));
+        PacketClient.sendClient(new MainmenuStatsSavePacket(stats.writeToNBT(new NBTTagCompound())));
 	}
 
 	@Override
diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java
index 1aec9f0b4..590b8d4ea 100644
--- a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java
+++ b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java
@@ -1,6 +1,8 @@
 package noppes.npcs.client.gui.model;
 
-import kamkeel.addon.client.GeckoAddonClient;
+import kamkeel.npcs.addon.client.GeckoAddonClient;
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.npc.ModelDataSavePacket;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
@@ -14,10 +16,10 @@ import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagByte;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.*;
 import noppes.npcs.compat.PixelmonHelper;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.*;
 
 import java.lang.reflect.Method;
@@ -380,7 +382,7 @@ public class GuiCreationScreen extends GuiModelInterface implements ICustomScrol
 
 	@Override
 	public void close(){
-		Client.sendData(EnumPacketServer.ModelDataSave, playerdata.writeToNBT());
+        PacketClient.sendClient(new ModelDataSavePacket(playerdata.writeToNBT()));
 		displayGuiScreen(parent);
 	}
 
diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java b/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java
index 3b0ff48b6..5ed455569 100644
--- a/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java
+++ b/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java
@@ -172,7 +172,7 @@ public class GuiEntitySelection extends GuiNPCInterface
 
 	@Override
 	public void save() {
-		// TODO Auto-generated method stub
+
 
 	}
 
diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiPresetSave.java b/src/main/java/noppes/npcs/client/gui/model/GuiPresetSave.java
index dc574b559..99a396853 100644
--- a/src/main/java/noppes/npcs/client/gui/model/GuiPresetSave.java
+++ b/src/main/java/noppes/npcs/client/gui/model/GuiPresetSave.java
@@ -43,7 +43,7 @@ public class GuiPresetSave extends GuiNPCInterface{
     }
 	@Override
 	public void save() {
-		// TODO Auto-generated method stub
+
 
 	}
 }
diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiPresetSelection.java b/src/main/java/noppes/npcs/client/gui/model/GuiPresetSelection.java
index e9245e0cb..f8a2e5ad4 100644
--- a/src/main/java/noppes/npcs/client/gui/model/GuiPresetSelection.java
+++ b/src/main/java/noppes/npcs/client/gui/model/GuiPresetSelection.java
@@ -155,7 +155,7 @@ public class GuiPresetSelection extends GuiNPCInterface
 
 	@Override
 	public void save() {
-		// TODO Auto-generated method stub
+
 
 	}
 
diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiAnvilRecipes.java b/src/main/java/noppes/npcs/client/gui/player/GuiAnvilRecipes.java
new file mode 100644
index 000000000..cac06388a
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/gui/player/GuiAnvilRecipes.java
@@ -0,0 +1,344 @@
+package noppes.npcs.client.gui.player;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import net.minecraft.util.StatCollector;
+import noppes.npcs.client.CustomNpcResourceListener;
+import noppes.npcs.client.gui.util.*;
+import noppes.npcs.controllers.RecipeController;
+import noppes.npcs.controllers.data.RecipeAnvil;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import noppes.npcs.util.ValueUtil;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
+
+@SideOnly(Side.CLIENT)
+public class GuiAnvilRecipes extends GuiNPCInterface {
+
+    private static final ResourceLocation SLOT_TEXTURE = new ResourceLocation("customnpcs", "textures/gui/slot.png");
+
+    private int page = 0;
+    private GuiNpcLabel lblPage;
+    private GuiNpcButton btnLeft, btnRight;
+    private List<RecipeAnvil> recipes = new ArrayList<RecipeAnvil>();
+    private String search = "";
+
+    public GuiAnvilRecipes() {
+        this.xSize = 256;
+        this.ySize = 182;
+        setBackground("recipesAnvil.png");
+        this.closeOnEsc = true;
+
+        recipes.addAll(RecipeController.Instance.anvilRecipes.values());
+    }
+
+    @Override
+    public void initGui() {
+        super.initGui();
+        guiTop += 10;
+        // Add search text field (ID 3) at top.
+        addTextField(new GuiNpcTextField(3, this, fontRendererObj, guiLeft + 2, guiTop - 25, 250, 20, search));
+
+        addLabel(new GuiNpcLabel(0, "Anvil Recipe List", guiLeft + 5, guiTop + 5));
+        addLabel(lblPage = new GuiNpcLabel(1, "", guiLeft + 5, guiTop + 168));
+
+        addButton(this.btnLeft = new GuiButtonNextPage(1, guiLeft + 150, guiTop + 164, true));
+        addButton(this.btnRight = new GuiButtonNextPage(2, guiLeft + 80, guiTop + 164, false));
+
+        updateButton();
+    }
+
+    private void updateButton() {
+        // We want 8 recipes per page.
+        int maxPages = MathHelper.ceiling_float_int(recipes.size() / 8.0F);
+        btnRight.visible = btnRight.enabled = page > 0;
+        btnLeft.visible = btnLeft.enabled = page < maxPages - 1;
+        lblPage.label = (page + 1) + "/" + maxPages;
+    }
+
+    @Override
+    public void keyTyped(char c, int i) {
+        super.keyTyped(c, i);
+        if(search.equals(getTextField(3).getText()))
+            return;
+        search = getTextField(3).getText().toLowerCase();
+        recipes = getSearchList();
+        page = 0;
+        updateButton();
+    }
+
+    private List<RecipeAnvil> getSearchList() {
+        if(search.isEmpty()) {
+            return new ArrayList<RecipeAnvil>(RecipeController.Instance.anvilRecipes.values());
+        }
+        List<RecipeAnvil> list = new ArrayList<RecipeAnvil>();
+        for(RecipeAnvil recipe : RecipeController.Instance.anvilRecipes.values()) {
+            ItemStack repairItem = recipe.itemToRepair;
+            if(repairItem == null)
+                continue;
+            if(repairItem.getDisplayName() == null)
+                continue;
+            if(repairItem.getDisplayName().trim().isEmpty())
+                continue;
+            if(repairItem.getDisplayName().toLowerCase().contains(search))
+                list.add(recipe);
+        }
+        return list;
+    }
+
+    @Override
+    protected void actionPerformed(GuiButton button) {
+        if(!button.enabled)
+            return;
+        if(button == btnRight) {
+            if(page > 0)
+                page--;
+        }
+        if(button == btnLeft) {
+            int maxPages = MathHelper.ceiling_float_int(recipes.size() / 8.0F);
+            if(page < maxPages - 1)
+                page++;
+        }
+        updateButton();
+    }
+
+    private static class ItemOverlayData {
+        public final int x, y;
+        public final ItemStack item;
+        public ItemOverlayData(int x, int y, ItemStack item) {
+            this.x = x;
+            this.y = y;
+            this.item = item;
+        }
+    }
+
+    private static class TextOverlayData {
+        public final int x, y, width, height;
+        public final List<String> textLines;
+
+        public TextOverlayData(int x, int y, int width, int height, String text) {
+            this(x, y, width, height, Arrays.asList(text));
+        }
+
+        public TextOverlayData(int x, int y, int width, int height, List<String> textLines) {
+            this.x = x;
+            this.y = y;
+            this.width = width;
+            this.height = height;
+            this.textLines = textLines;
+        }
+    }
+
+    @Override
+    public void drawScreen(int mouseX, int mouseY, float partialTicks) {
+        super.drawScreen(mouseX, mouseY, partialTicks);
+
+        // Update page label.
+        lblPage.label = (page + 1) + "/" + MathHelper.ceiling_float_int(recipes.size() / 8.0F);
+        lblPage.x = guiLeft + (xSize - Minecraft.getMinecraft().fontRenderer.getStringWidth(lblPage.label)) / 2;
+
+        int recipesPerPage = 8;
+        int startIndex = page * recipesPerPage;
+        int endIndex = Math.min(recipes.size(), startIndex + recipesPerPage);
+
+        // Base positions relative to guiLeft and guiTop.
+        int baseX = guiLeft + 4;
+        int baseY = guiTop + 28;   // first row = guiTop + 28
+        int colSpacing = 124;      // horizontal spacing between columns
+        int rowSpacing = 35;       // vertical spacing so row1 = guiTop + 28 + 35
+
+        // Create lists to collect overlay data.
+        List<ItemOverlayData> itemOverlays = new ArrayList<ItemOverlayData>();
+        List<TextOverlayData> textOverlays = new ArrayList<TextOverlayData>();
+
+        for (int i = startIndex; i < endIndex; i++) {
+            RecipeAnvil recipe = recipes.get(i);
+            if(!recipe.isValid())
+                continue;
+
+            int localIndex = i - startIndex; // 0 to 7
+            int col = localIndex / 4;         // 0 for left column, 1 for right column
+            int row = localIndex % 4;         // rows 0..3
+
+            int slotX = baseX + col * colSpacing;
+            int slotY = baseY + row * rowSpacing;
+
+            // Draw slot backgrounds for two input slots.
+            mc.renderEngine.bindTexture(SLOT_TEXTURE);
+            GL11.glColor4f(1F, 1F, 1F, 1F);
+            // Left slot (item to repair)
+            drawTexturedModalRect(slotX, slotY, 0, 0, 18, 18);
+            // Middle slot (repair material)
+            drawTexturedModalRect(slotX + 22, slotY, 0, 0, 18, 18);
+
+            // Draw the item-to-repair at 50% durability.
+            ItemStack toRepair = recipe.itemToRepair;
+            ItemStack halfItem = null;
+            if (toRepair != null) {
+                halfItem = toRepair.copy();
+                if (halfItem.isItemStackDamageable()) {
+                    int halfDamage = halfItem.getMaxDamage() / 2;
+                    halfItem.setItemDamage(halfDamage);
+                }
+                drawItem(halfItem, slotX + 1, slotY + 1, mouseX, mouseY);
+                // Instead of drawing overlay immediately, add to list.
+                if (func_146978_c((slotX+1) - guiLeft, (slotY+1) - guiTop, 16, 16, mouseX, mouseY)) {
+                    itemOverlays.add(new ItemOverlayData(slotX+1, slotY+1, halfItem));
+                }
+            }
+
+            // Draw the repair material.
+            ItemStack material = recipe.repairMaterial;
+            if (material != null) {
+                drawItem(material, slotX + 23, slotY + 1, mouseX, mouseY);
+                if (func_146978_c((slotX+23) - guiLeft, (slotY+1) - guiTop, 16, 16, mouseX, mouseY)) {
+                    itemOverlays.add(new ItemOverlayData(slotX+23, slotY+1, material));
+                }
+            }
+
+            // Draw the output item fully repaired (damage = 0).
+            int outputX = (col == 0) ? (guiLeft + 103) : (guiLeft + 229);
+            ItemStack fullOutput = null;
+            if (recipe.itemToRepair != null) {
+                fullOutput = recipe.itemToRepair.copy();
+                if (fullOutput.isItemStackDamageable()) {
+                    fullOutput.setItemDamage(0);
+                }
+                drawItem(fullOutput, outputX, slotY, mouseX, mouseY);
+                if (func_146978_c(outputX - guiLeft, slotY - guiTop, 16, 16, mouseX, mouseY)) {
+                    itemOverlays.add(new ItemOverlayData(outputX, slotY, fullOutput));
+                }
+            }
+
+            // Draw the percentage text.
+            int percentCenterX = (col == 0) ? (guiLeft + 57) : (guiLeft + 57 + colSpacing);
+            String percentText = Math.round(recipe.getRepairPercentage()) + "%";
+            int percentWidth = fontRendererObj.getStringWidth(percentText);
+            int percentTextX = percentCenterX - (percentWidth / 2);
+            int percentTextY = slotY + 4 + row;
+            fontRendererObj.drawString(percentText, percentTextX, percentTextY, CustomNpcResourceListener.DefaultTextColor);
+            // Add text overlay for percentage with the full unrounded value.
+            if (func_146978_c(percentTextX - guiLeft, percentTextY - guiTop, percentWidth, fontRendererObj.FONT_HEIGHT, mouseX, mouseY)) {
+                textOverlays.add(new TextOverlayData(percentTextX, percentTextY, percentWidth, fontRendererObj.FONT_HEIGHT, String.valueOf(recipe.getRepairPercentage())));
+            }
+
+            if(!recipe.availability.isDefault()){
+                if(!recipe.availability.isAvailable(this.player)){
+                    String helpChar = "?";
+                    float scale = 1F;  // Adjust for a very small size
+                    int questionWidth = (int)(fontRendererObj.getStringWidth(helpChar) * scale);
+                    int questionHeight = (int)(fontRendererObj.FONT_HEIGHT * scale);
+                    // Center the "?" under the percentage text.
+                    int questionX = percentCenterX - (questionWidth / 2) - 1 - row;
+                    int questionY = percentTextY + fontRendererObj.FONT_HEIGHT; // You can tweak the vertical offset if needed
+
+                    GL11.glPushMatrix();
+                    GL11.glTranslatef(questionX, questionY, 0);
+                    GL11.glScalef(scale, scale, 1.0F);
+
+                    fontRendererObj.drawString(helpChar, 0, 0, 0xbd3e35);
+                    GL11.glPopMatrix();
+
+                    if (func_146978_c(questionX - guiLeft, questionY - guiTop, questionWidth, questionHeight, mouseX, mouseY)) {
+                        List<String> availableText = recipe.availability.isAvailableText(this.player);
+                        textOverlays.add(new TextOverlayData(questionX, questionY, questionWidth, questionHeight, availableText));
+                    }
+                } else {
+                    // Draw a very small "?" under the percentage text.
+                    String helpChar = "!";
+                    float scale = 1F;  // Adjust for a very small size
+                    int questionWidth = (int)(fontRendererObj.getStringWidth(helpChar) * scale);
+                    int questionHeight = (int)(fontRendererObj.FONT_HEIGHT * scale);
+                    // Center the "?" under the percentage text.
+                    int questionX = percentCenterX - (questionWidth / 2) - 1 - row;
+                    int questionY = percentTextY + fontRendererObj.FONT_HEIGHT; // You can tweak the vertical offset if needed
+
+                    GL11.glPushMatrix();
+                    GL11.glTranslatef(questionX, questionY, 0);
+                    GL11.glScalef(scale, scale, 1.0F);
+
+                    fontRendererObj.drawString(helpChar, 0, 0, CustomNpcResourceListener.DefaultTextColor);
+                    GL11.glPopMatrix();
+
+                    // When the "!" is hovered, add its tooltip overlay.
+                    if (func_146978_c(questionX - guiLeft, questionY - guiTop, questionWidth, questionHeight, mouseX, mouseY)) {
+                        textOverlays.add(new TextOverlayData(questionX, questionY, questionWidth, questionHeight, StatCollector.translateToLocal("gui.available")));
+                    }
+                }
+            }
+
+            // Draw XP cost with scaling.
+            String xpCostStr = formatXpCost(recipe.getXpCost());
+            int digitCount = xpCostStr.length();
+            float xpScale = 1.0F - 0.1F * (digitCount - 1);
+            int rawTextWidth = fontRendererObj.getStringWidth(xpCostStr);
+            int scaledTextWidth = (int)(rawTextWidth * xpScale);
+            int xpCenterX = (col == 0) ? (guiLeft + 76) : (guiLeft + 76 + colSpacing);
+            int xpTextX = xpCenterX - (scaledTextWidth / 2) + col;
+            int xpTextY = slotY - 4 + row;
+            GL11.glPushMatrix();
+            GL11.glTranslatef(xpTextX, xpTextY, 0);
+            GL11.glScalef(xpScale, xpScale, 1.0F);
+            fontRendererObj.drawString(xpCostStr, 0, 0, 0x4ac26a);
+            GL11.glPopMatrix();
+            // Add text overlay for XP cost with the full (unformatted) number.
+            int xpBoxWidth = scaledTextWidth;
+            int xpBoxHeight = fontRendererObj.FONT_HEIGHT;
+            if (func_146978_c(xpTextX - guiLeft, xpTextY - guiTop, xpBoxWidth, xpBoxHeight, mouseX, mouseY)) {
+                textOverlays.add(new TextOverlayData(xpTextX, xpTextY, xpBoxWidth, xpBoxHeight, String.valueOf(recipe.getXpCost())));
+            }
+        }
+
+        for (ItemOverlayData iod : itemOverlays) {
+            this.renderToolTip(iod.item, mouseX, mouseY);
+        }
+
+        for (TextOverlayData tod : textOverlays) {
+            this.drawHoveringText(tod.textLines, mouseX, mouseY, this.fontRendererObj);
+        }
+    }
+    protected boolean func_146978_c(int p_146978_1_, int p_146978_2_, int p_146978_3_, int p_146978_4_, int p_146978_5_, int p_146978_6_) {
+        int k1 = this.guiLeft;
+        int l1 = this.guiTop;
+        p_146978_5_ -= k1;
+        p_146978_6_ -= l1;
+        return p_146978_5_ >= p_146978_1_ - 1 && p_146978_5_ < p_146978_1_ + p_146978_3_ + 1 && p_146978_6_ >= p_146978_2_ - 1 && p_146978_6_ < p_146978_2_ + p_146978_4_ + 1;
+    }
+
+    private String formatXpCost(int xp) {
+        if (xp < 1000) {
+            return String.valueOf(xp);
+        }
+        double xpK = xp / 1000.0;
+        if (xpK == (int)xpK) {
+            return ((int)xpK) + "K";
+        } else {
+            return String.format("%.1fK", xpK);
+        }
+    }
+
+    private void drawItem(ItemStack item, int x, int y, int mouseX, int mouseY) {
+        GL11.glPushMatrix();
+        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
+        RenderHelper.enableGUIStandardItemLighting();
+        itemRender.zLevel = 100.0F;
+        itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.renderEngine, item, x, y);
+        itemRender.renderItemOverlayIntoGUI(fontRendererObj, mc.renderEngine, item, x, y);
+        itemRender.zLevel = 0.0F;
+        RenderHelper.disableStandardItemLighting();
+        GL11.glDisable(GL12.GL_RESCALE_NORMAL);
+        GL11.glPopMatrix();
+    }
+
+    @Override
+    public void save() {}
+}
diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiBigSign.java b/src/main/java/noppes/npcs/client/gui/player/GuiBigSign.java
index 5a90a8e65..f9773d335 100644
--- a/src/main/java/noppes/npcs/client/gui/player/GuiBigSign.java
+++ b/src/main/java/noppes/npcs/client/gui/player/GuiBigSign.java
@@ -1,5 +1,7 @@
 package noppes.npcs.client.gui.player;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.player.SaveSignPacket;
 import noppes.npcs.NoppesUtilPlayer;
 import noppes.npcs.blocks.tiles.TileBigSign;
 import noppes.npcs.client.gui.SubGuiNpcTextArea;
@@ -16,6 +18,6 @@ public class GuiBigSign extends SubGuiNpcTextArea{
 	@Override
     public void close(){
 		super.close();
-		NoppesUtilPlayer.sendData(EnumPlayerPacket.SignSave, tile.xCoord, tile.yCoord, tile.zCoord, text);
+		PacketClient.sendClient(new SaveSignPacket(tile.xCoord, tile.yCoord, tile.zCoord, text));
 	}
 }
diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiBook.java b/src/main/java/noppes/npcs/client/gui/player/GuiBook.java
index 512a973c3..bc609440e 100644
--- a/src/main/java/noppes/npcs/client/gui/player/GuiBook.java
+++ b/src/main/java/noppes/npcs/client/gui/player/GuiBook.java
@@ -2,6 +2,8 @@ package noppes.npcs.client.gui.player;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.player.SaveBookPacket;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
@@ -178,7 +180,7 @@ public class GuiBook extends GuiScreen
                     this.bookObj.func_150996_a(Items.written_book);
                 }
 
-                NoppesUtilPlayer.sendData(EnumPlayerPacket.SaveBook, x, y, z, sign, bookObj.writeToNBT(new NBTTagCompound()));
+                PacketClient.sendClient(new SaveBookPacket(x, y, z, sign, bookObj.writeToNBT(new NBTTagCompound())));
 
             }
         }
diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java
index 648e9511d..43c998667 100644
--- a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java
+++ b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java
@@ -1,5 +1,8 @@
 package noppes.npcs.client.gui.player;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.player.CheckPlayerValue;
+import kamkeel.npcs.network.packets.player.DialogSelectPacket;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.gui.FontRenderer;
@@ -12,7 +15,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.IChatComponent;
 import net.minecraft.util.ResourceLocation;
 import noppes.npcs.NoppesStringUtils;
-import noppes.npcs.NoppesUtilPlayer;
 import noppes.npcs.api.handler.data.IDialogImage;
 import noppes.npcs.client.ClientProxy;
 import noppes.npcs.client.NoppesUtil;
@@ -22,7 +24,6 @@ import noppes.npcs.client.gui.util.GuiNPCInterface;
 import noppes.npcs.client.gui.util.IGuiClose;
 import noppes.npcs.config.ConfigClient;
 import noppes.npcs.constants.EnumOptionType;
-import noppes.npcs.constants.EnumPlayerPacket;
 import noppes.npcs.controllers.data.Dialog;
 import noppes.npcs.controllers.data.DialogImage;
 import noppes.npcs.controllers.data.DialogOption;
@@ -134,8 +135,8 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose
 	        float f7 = npc.rotationYawHead;
 	        float f5 = (float)(l) - i;
 	        float f6 = (float)(i1 - 50) - j;
-	        int rotation = npc.ai.orientation;
-	        npc.ai.orientation = 0;
+	        int rotation = npc.ais.orientation;
+	        npc.ais.orientation = 0;
 	        GL11.glRotatef(135F, 0.0F, 1.0F, 0.0F);
 	        RenderHelper.enableStandardItemLighting();
 	        GL11.glRotatef(-135F, 0.0F, 1.0F, 0.0F);
@@ -152,7 +153,7 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose
 	            RenderManager.instance.renderEntityWithPosYaw(npc, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F);
 	        } catch(Exception ignored){}
 
-	        npc.ai.orientation = rotation;
+	        npc.ais.orientation = rotation;
 	        npc.renderYawOffset = f2;
 	        npc.rotationYaw = f3;
 	        npc.rotationPitch = f4;
@@ -593,7 +594,7 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose
         	handleDialogSelection();
     	}
         if (closeOnEsc && (i == 1 || isInventoryKey(i))){
-        	NoppesUtilPlayer.sendData(EnumPlayerPacket.Dialog, dialog.id, -1);
+            PacketClient.sendClient(new DialogSelectPacket(dialog.id, -1));
         	closed();
             close();
         }
@@ -613,7 +614,7 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose
     		optionId = selected;
     	else if(!options.isEmpty())
     		optionId = options.get(selected);
-    	NoppesUtilPlayer.sendData(EnumPlayerPacket.Dialog, dialog.id, optionId);
+        PacketClient.sendClient(new DialogSelectPacket(dialog.id, optionId));
     	if(dialog == null || !dialog.hasOtherOptions() || options.isEmpty()){
     		closed();
     		close();
@@ -644,7 +645,7 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose
     }
     private void closed(){
     	grabMouse(false);
-    	NoppesUtilPlayer.sendData(EnumPlayerPacket.CheckQuestCompletion);
+        PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.CheckQuestCompletion));
     }
 
 	public void save() {
diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java b/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java
index f3028e3df..70e2130f9 100644
--- a/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java
+++ b/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java
@@ -1,5 +1,6 @@
 package noppes.npcs.client.gui.player;
 
+import kamkeel.npcs.network.packets.player.MailActionPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiYesNo;
 import net.minecraft.client.gui.GuiYesNoCallback;
@@ -18,16 +19,16 @@ import java.util.Comparator;
 import java.util.List;
 
 public class GuiMailbox extends GuiNPCInterface implements IGuiData, ICustomScrollListener, GuiYesNoCallback{
-    
+
     private GuiCustomScroll scroll;
     private PlayerMailData data;
     private PlayerMail selected;
-    
+
 	public GuiMailbox() {
 		super();
         xSize = 256;
         setBackground("menubg.png");
-        NoppesUtilPlayer.sendData(EnumPlayerPacket.MailGet);
+        MailActionPacket.RequestMailData();
 	}
     public void initGui()
     {
@@ -39,7 +40,7 @@ public class GuiMailbox extends GuiNPCInterface implements IGuiData, ICustomScro
         scroll.guiLeft = guiLeft + 4;
         scroll.guiTop = guiTop + 4;
         addScroll(scroll);
-        
+
         String title = StatCollector.translateToLocal("mailbox.name");
         int x = (xSize - this.fontRendererObj.getStringWidth(title)) / 2;
 
@@ -81,7 +82,7 @@ public class GuiMailbox extends GuiNPCInterface implements IGuiData, ICustomScro
     public void confirmClicked(boolean flag, int i)
     {
 		if(flag && selected != null){
-	        NoppesUtilPlayer.sendData(EnumPlayerPacket.MailDelete, selected.time, selected.sender);
+	        MailActionPacket.DeleteMail(selected.time, selected.sender);
 	        selected = null;
 		}
 		NoppesUtil.openGUI(player, this);
@@ -94,7 +95,7 @@ public class GuiMailbox extends GuiNPCInterface implements IGuiData, ICustomScro
     	if(id == 0){
     		GuiMailmanWrite.parent = this;
     		GuiMailmanWrite.mail = selected;
-    		NoppesUtilPlayer.sendData(EnumPlayerPacket.MailboxOpenMail, selected.time, selected.sender);
+    		MailActionPacket.OpenMail(selected.time, selected.sender);
     		selected = null;
     		scroll.selected = -1;
     	}
@@ -103,7 +104,7 @@ public class GuiMailbox extends GuiNPCInterface implements IGuiData, ICustomScro
             displayGuiScreen(guiyesno);
     	}
     }
-	
+
     @Override
     public void mouseClicked(int i, int j, int k)
     {
@@ -120,14 +121,14 @@ public class GuiMailbox extends GuiNPCInterface implements IGuiData, ICustomScro
     }
 	@Override
 	public void save() {
-		// TODO Auto-generated method stub
-		
+
+
 	}
 	@Override
 	public void setGuiData(NBTTagCompound compound) {
 		PlayerMailData data = new PlayerMailData();
 		data.loadNBTData(compound);
-		
+
 		List<String> list = new ArrayList<String>();
 		Collections.sort(data.playermail, new Comparator<PlayerMail>(){
 		     public int compare(PlayerMail o1, PlayerMail o2){
@@ -150,10 +151,10 @@ public class GuiMailbox extends GuiNPCInterface implements IGuiData, ICustomScro
 			GuiCustomScroll guiCustomScroll) {
 		selected = data.playermail.get(guiCustomScroll.selected);
 		initGui();
-		
+
 		if(selected != null && !selected.beenRead){
 			selected.beenRead = true;
-			NoppesUtilPlayer.sendData(EnumPlayerPacket.MailRead, selected.time, selected.sender);
+            MailActionPacket.ReadMail(selected.time, selected.sender);
 		}
 	}
 
diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java b/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java
index d17b799c9..32efa064c 100644
--- a/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java
+++ b/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java
@@ -2,6 +2,7 @@ package noppes.npcs.client.gui.player;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import kamkeel.npcs.network.packets.player.MailActionPacket;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
@@ -38,15 +39,15 @@ public class GuiMailmanWrite extends GuiContainerNPCInterface implements ITextfi
     private NBTTagList bookPages;
     private GuiButtonNextPage buttonNextPage;
     private GuiButtonNextPage buttonPreviousPage;
-    
+
     private boolean canEdit;
     private boolean canSend;
 
     /** The GuiButton to sign this book. */
-    
+
     public static GuiScreen parent;
 	public static PlayerMail mail = new PlayerMail();
-    
+
     private Minecraft mc = Minecraft.getMinecraft();
 
 	private String username = "";
@@ -105,7 +106,7 @@ public class GuiMailmanWrite extends GuiContainerNPCInterface implements ITextfi
 			addLabel(new GuiNpcLabel(0, "mailbox.sender", guiLeft + 170, guiTop + 32, 0));
 		else
 			addLabel(new GuiNpcLabel(0, "mailbox.username", guiLeft + 170, guiTop + 32, 0));
-		
+
 		if(canEdit && !canSend)
 			addTextField(new GuiNpcTextField(2, this, fontRendererObj, guiLeft + 170, guiTop + 42, 114, 20, mail.sender));
 		else if(canEdit)
@@ -124,7 +125,7 @@ public class GuiMailmanWrite extends GuiContainerNPCInterface implements ITextfi
 			addButton(new GuiNpcButton(0, this.guiLeft + 200, guiTop + 171, 60, 20, "gui.done"));
 		else if(canEdit)
 			addButton(new GuiNpcButton(0, this.guiLeft + 200, guiTop + 171, 60, 20, "mailbox.send"));
-		
+
 		if(!canEdit && !canSend)
 			addButton(new GuiNpcButton(4, this.guiLeft + 200, guiTop + 171, 60, 20, "selectWorld.deleteButton"));
 		if(!canEdit || canSend)
@@ -148,12 +149,12 @@ public class GuiMailmanWrite extends GuiContainerNPCInterface implements ITextfi
         this.buttonNextPage.setVisible(this.currPage < this.bookTotalPages - 1 || this.canEdit);
         this.buttonPreviousPage.setVisible(this.currPage > 0);
     }
-    
+
 	@Override
     public void confirmClicked(boolean flag, int i)
     {
 		if(flag){
-	        NoppesUtilPlayer.sendData(EnumPlayerPacket.MailDelete, mail.time, mail.sender);
+            MailActionPacket.DeleteMail(mail.time, mail.sender);
 	        close();
 		}
 		else
@@ -172,7 +173,7 @@ public class GuiMailmanWrite extends GuiContainerNPCInterface implements ITextfi
     		if(id == 0){
     			mail.message.setTag("pages", bookPages);
     	    	if(canSend)
-    	    		NoppesUtilPlayer.sendData(EnumPlayerPacket.MailSend, this.username, mail.writeNBT());
+                    MailActionPacket.SendMail(this.username, mail.writeNBT());
     	    	else
     	    		close();
     		}
@@ -327,7 +328,7 @@ public class GuiMailmanWrite extends GuiContainerNPCInterface implements ITextfi
         {
             s1 = this.bookPages.getStringTagAt(this.currPage);
         }
-        
+
         if(canEdit){
 	        if (mc.fontRenderer.getBidiFlag())
 	        {
@@ -349,14 +350,14 @@ public class GuiMailmanWrite extends GuiContainerNPCInterface implements ITextfi
 
         this.drawGradientRect(guiLeft + 175, guiTop + 136, guiLeft + 269, guiTop + 154, -1072689136, -804253680);
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-        
+
 
         this.mc.getTextureManager().bindTexture(bookWidgets);
         for(int i = 0; i < 4; i++)
         	this.drawTexturedModalRect(guiLeft + 175 + i * 24, guiTop + 134, 0, 22, 24, 24);
-        
+
         super.drawScreen(par1, par2, par3);
-        
+
     }
 
     public void close(){
@@ -390,6 +391,6 @@ public class GuiMailmanWrite extends GuiContainerNPCInterface implements ITextfi
 
 	@Override
 	public void save() {
-		
+
 	}
 }
diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiNPCBankChest.java b/src/main/java/noppes/npcs/client/gui/player/GuiNPCBankChest.java
index 3b86a26b9..1db1ff318 100644
--- a/src/main/java/noppes/npcs/client/gui/player/GuiNPCBankChest.java
+++ b/src/main/java/noppes/npcs/client/gui/player/GuiNPCBankChest.java
@@ -1,18 +1,17 @@
 package noppes.npcs.client.gui.player;
 
+import kamkeel.npcs.network.packets.player.BankActionPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
-import noppes.npcs.NoppesUtilPlayer;
 import noppes.npcs.NoppesUtilServer;
 import noppes.npcs.client.CustomNpcResourceListener;
 import noppes.npcs.client.gui.util.GuiContainerNPCInterface;
 import noppes.npcs.client.gui.util.GuiNpcButton;
 import noppes.npcs.client.gui.util.IGuiData;
-import noppes.npcs.constants.EnumPlayerPacket;
 import noppes.npcs.containers.ContainerNPCBankInterface;
 import noppes.npcs.entity.EntityNPCInterface;
 import org.lwjgl.opengl.GL11;
@@ -26,7 +25,7 @@ public class GuiNPCBankChest extends GuiContainerNPCInterface implements IGuiDat
     private int maxSlots = 1;
     private int unlockedSlots = 1;
     private ItemStack currency;
-    
+
     public GuiNPCBankChest(EntityNPCInterface npc,ContainerNPCBankInterface container)
     {
         super(npc,container);
@@ -35,7 +34,7 @@ public class GuiNPCBankChest extends GuiContainerNPCInterface implements IGuiDat
         allowUserInput = false; //allowUserInput
         ySize = 235;
         closeOnEsc = true;
-        
+
     }
     @Override
     public void initGui(){
@@ -70,18 +69,18 @@ public class GuiNPCBankChest extends GuiContainerNPCInterface implements IGuiDat
     	int id = guibutton.id;
     	if(id < 6){
     		close();
-    		NoppesUtilPlayer.sendData(EnumPlayerPacket.BankSlotOpen, id, container.bankid);
+            BankActionPacket.Open(container.bankid, id);
     	}
     	if(id == 8){
-    		NoppesUtilPlayer.sendData(EnumPlayerPacket.BankUnlock);
+            BankActionPacket.Unlock();
     	}
     	if(id == 9){
-    		NoppesUtilPlayer.sendData(EnumPlayerPacket.BankUpgrade);
+            BankActionPacket.Upgrade();
     	}
-    	
+
 
     }
-    
+
     @Override
     protected void drawGuiContainerBackgroundLayer(float f, int i, int j)
     {
@@ -91,8 +90,8 @@ public class GuiNPCBankChest extends GuiContainerNPCInterface implements IGuiDat
         int i1 = (height - ySize) / 2;
         drawTexturedModalRect(l, i1, 0, 0, xSize, 6);
         if(!container.isAvailable()){
-	        drawTexturedModalRect(l, i1 + 6, 0, 6, xSize, 64); 
-	        drawTexturedModalRect(l, i1 + 70, 0, 124, xSize, 222-124);    
+	        drawTexturedModalRect(l, i1 + 6, 0, 6, xSize, 64);
+	        drawTexturedModalRect(l, i1 + 70, 0, 124, xSize, 222-124);
 	        int x = guiLeft + 30;
 	        int y = guiTop + 8;
 	      	fontRendererObj.drawString(StatCollector.translateToLocal("bank.unlockCosts")+":", x , y + 4 , CustomNpcResourceListener.DefaultTextColor);
@@ -100,7 +99,7 @@ public class GuiNPCBankChest extends GuiContainerNPCInterface implements IGuiDat
         }
         else if(container.isUpgraded()){
 	        drawTexturedModalRect(l, i1 + 60, 0, 60, xSize, 162);
-	        drawTexturedModalRect(l, i1 + 6, 0, 60, xSize, 64);        	
+	        drawTexturedModalRect(l, i1 + 6, 0, 60, xSize, 64);
         }
         else if(container.canBeUpgraded()){
 	        drawTexturedModalRect(l, i1 + 6, 0, 6, xSize, 216);
@@ -136,7 +135,7 @@ public class GuiNPCBankChest extends GuiContainerNPCInterface implements IGuiDat
         {
             this.renderToolTip(item, mouseX, mouseY);
         }
-        RenderHelper.disableStandardItemLighting(); 
+        RenderHelper.disableStandardItemLighting();
         GL11.glColor4f(1, 1, 1, 1);
     }
 	@Override
diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiNpcAnvil.java b/src/main/java/noppes/npcs/client/gui/player/GuiNpcAnvil.java
new file mode 100644
index 000000000..b33075f5c
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/gui/player/GuiNpcAnvil.java
@@ -0,0 +1,81 @@
+package noppes.npcs.client.gui.player;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import noppes.npcs.client.CustomNpcResourceListener;
+import noppes.npcs.client.gui.util.GuiContainerNPCInterface;
+import noppes.npcs.client.gui.util.GuiNpcButton;
+import noppes.npcs.containers.ContainerAnvilRepair;
+import noppes.npcs.controllers.RecipeController;
+import org.lwjgl.opengl.GL11;
+
+public class GuiNpcAnvil extends GuiContainerNPCInterface {
+
+    private final ResourceLocation resource = new ResourceLocation("customnpcs", "textures/gui/anvil.png");
+    private ContainerAnvilRepair container;
+    private GuiNpcButton button;
+
+    public GuiNpcAnvil(ContainerAnvilRepair container) {
+        super(null, container);
+        this.container = container;
+        this.title = "";
+        allowUserInput = false;
+        closeOnEsc = true;
+        ySize = 180;
+    }
+
+    @Override
+    public void initGui() {
+        super.initGui();
+        addButton(button = new GuiNpcButton(0, guiLeft + 158, guiTop + 4, 12, 20, "..."));
+    }
+
+    @Override
+    public void buttonEvent(GuiButton guibutton) {
+        displayGuiScreen(new GuiAnvilRecipes());
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
+        // Enable the button if there are any anvil recipes.
+        button.enabled = RecipeController.Instance != null && !RecipeController.Instance.getAnvilList().isEmpty();
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        mc.renderEngine.bindTexture(resource);
+        int l = (width - xSize) / 2;
+        int i1 = (height - ySize) / 2;
+        drawTexturedModalRect(l, i1, 0, 0, xSize, ySize);
+        super.drawGuiContainerBackgroundLayer(partialTicks, mouseX, mouseY);
+
+        // Draw title and player's inventory label.
+        fontRendererObj.drawString(StatCollector.translateToLocal("tile.anvil.name"), guiLeft + 4, guiTop + 4, CustomNpcResourceListener.DefaultTextColor);
+        fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), guiLeft + 4, guiTop + 87, CustomNpcResourceListener.DefaultTextColor);
+
+        // Compute the repair status message based on container.repairCost and player's XP.
+        String status = "";
+        if (container.repairCost > 0) {
+            if (container.repairCost > mc.thePlayer.experienceTotal) {
+                status = "Repair cost: " + container.repairCost + " XP";
+            } else {
+                status = "Repair cost: " + container.repairCost + " XP";
+            }
+        } else {
+            // If there is a damaged item that is fully repaired.
+            if (container.anvilMatrix.getStackInRowAndColumn(0, 0) != null &&
+                container.anvilMatrix.getStackInRowAndColumn(0, 0).isItemStackDamageable() &&
+                container.anvilMatrix.getStackInRowAndColumn(0, 0).getItemDamage() <= 0) {
+                status = "Item is already fully repaired";
+            }
+        }
+        int textColor = CustomNpcResourceListener.DefaultTextColor;
+        if (container.repairCost > mc.thePlayer.experienceTotal) {
+            textColor = 0xFF0000; // red when not enough XP
+        }
+        fontRendererObj.drawString(status, guiLeft + 5, guiTop + 75, textColor);
+    }
+
+    @Override
+    public void save() {
+        // Nothing to save.
+    }
+}
diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java b/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java
index 290a02b5f..b40544fa2 100644
--- a/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java
+++ b/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java
@@ -15,7 +15,7 @@ public class GuiNpcCarpentryBench extends GuiContainerNPCInterface
 	private final ResourceLocation resource = new ResourceLocation("customnpcs","textures/gui/carpentry.png");
     private ContainerCarpentryBench container;
     private GuiNpcButton button;
-    
+
     public GuiNpcCarpentryBench(ContainerCarpentryBench container)
     {
         super(null,container);
@@ -38,7 +38,7 @@ public class GuiNpcCarpentryBench extends GuiContainerNPCInterface
     @Override
     protected void drawGuiContainerBackgroundLayer(float f, int i, int j)
     {
-    	button.enabled = RecipeController.Instance != null && !RecipeController.Instance.anvilRecipes.isEmpty();
+    	button.enabled = RecipeController.Instance != null && !RecipeController.Instance.carpentryRecipes.isEmpty();
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
         mc.renderEngine.bindTexture(resource);
         int l = (width - xSize) / 2;
diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiNpcFollower.java b/src/main/java/noppes/npcs/client/gui/player/GuiNpcFollower.java
index a51ad56d5..815ae9c9a 100644
--- a/src/main/java/noppes/npcs/client/gui/player/GuiNpcFollower.java
+++ b/src/main/java/noppes/npcs/client/gui/player/GuiNpcFollower.java
@@ -1,5 +1,8 @@
 package noppes.npcs.client.gui.player;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.player.FollowerPacket;
+import kamkeel.npcs.network.packets.player.GetNPCRole;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.item.ItemStack;
@@ -22,14 +25,14 @@ public class GuiNpcFollower extends GuiContainerNPCInterface  implements IGuiDat
 	private final ResourceLocation resource = new ResourceLocation("customnpcs","textures/gui/follower.png");
 	private EntityNPCInterface npc;
 	private RoleFollower role;
-	
+
     public GuiNpcFollower(EntityNPCInterface npc,ContainerNPCFollower container){
         super(npc, container);
         this.npc = npc;
         role = (RoleFollower) npc.roleInterface;
         closeOnEsc = true;
-        
-        NoppesUtilPlayer.sendData(EnumPlayerPacket.RoleGet);
+
+        PacketClient.sendClient(new GetNPCRole());
     }
     @Override
     public void initGui(){
@@ -44,10 +47,10 @@ public class GuiNpcFollower extends GuiContainerNPCInterface  implements IGuiDat
     	super.actionPerformed(guibutton);
     	int id = guibutton.id;
         if(id == 4){
-        	NoppesUtilPlayer.sendData(EnumPlayerPacket.FollowerState);
+            PacketClient.sendClient(new FollowerPacket(FollowerPacket.Action.State));
         }
         if(id == 5){
-        	NoppesUtilPlayer.sendData(EnumPlayerPacket.FollowerExtend);
+            PacketClient.sendClient(new FollowerPacket(FollowerPacket.Action.Extend));
         }
     }
 
@@ -58,7 +61,7 @@ public class GuiNpcFollower extends GuiContainerNPCInterface  implements IGuiDat
 	       if(role.getDaysLeft() <= 1)
 	    	   fontRendererObj.drawString(StatCollector.translateToLocal("follower.daysleft")+": " + StatCollector.translateToLocal("follower.lastday"), 62, 94, CustomNpcResourceListener.DefaultTextColor);
 	       else
-	    	   fontRendererObj.drawString(StatCollector.translateToLocal("follower.daysleft") + ": " + (role.getDaysLeft()-1), 62, 94, CustomNpcResourceListener.DefaultTextColor);   
+	    	   fontRendererObj.drawString(StatCollector.translateToLocal("follower.daysleft") + ": " + (role.getDaysLeft()-1), 62, 94, CustomNpcResourceListener.DefaultTextColor);
     	}
     }
 
@@ -78,9 +81,9 @@ public class GuiNpcFollower extends GuiContainerNPCInterface  implements IGuiDat
 	            int days = 1;
 	            if(role.rates.containsKey(id))
 	            	days = role.rates.get(id);
-	            
+
 				int yOffset = index * 20;
-				
+
 				int x = guiLeft +  68;
 				int y = guiTop + yOffset + 4;
 	            RenderHelper.enableGUIStandardItemLighting();
@@ -89,22 +92,22 @@ public class GuiNpcFollower extends GuiContainerNPCInterface  implements IGuiDat
 	            GL11.glEnable(GL11.GL_LIGHTING);
 	            itemRender.renderItemIntoGUI(fontRendererObj, mc.renderEngine, itemstack, x + 11,y);
 	            itemRender.renderItemOverlayIntoGUI(fontRendererObj, mc.renderEngine, itemstack, x+11,y);
-	            RenderHelper.disableStandardItemLighting(); 
+	            RenderHelper.disableStandardItemLighting();
 	            GL11.glDisable(32826 /*GL_RESCALE_NORMAL_EXT*/);
-	
+
 	            String daysS = days + " " + ((days == 1)?StatCollector.translateToLocal("follower.day"):StatCollector.translateToLocal("follower.days"));
 	            fontRendererObj.drawString(" = "+daysS, x + 27, y + 4, CustomNpcResourceListener.DefaultTextColor);
 		        //fontRenderer.drawString(quantity, x + 0 + (12-fontRenderer.getStringWidth(quantity))/2, y + 4, 0x404040);
-		        
+
 		        index++;
 	    	}
 		}
 		this.drawNpc(33, 131);
     }
-    
+
 	@Override
 	public void save() {
-		
+
 	}
 	@Override
 	public void setGuiData(NBTTagCompound compound) {
diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiNpcFollowerHire.java b/src/main/java/noppes/npcs/client/gui/player/GuiNpcFollowerHire.java
index 174c394bc..5dfc6008b 100644
--- a/src/main/java/noppes/npcs/client/gui/player/GuiNpcFollowerHire.java
+++ b/src/main/java/noppes/npcs/client/gui/player/GuiNpcFollowerHire.java
@@ -1,5 +1,7 @@
 package noppes.npcs.client.gui.player;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.player.FollowerPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.item.ItemStack;
@@ -41,7 +43,7 @@ public class GuiNpcFollowerHire extends GuiContainerNPCInterface
     	super.actionPerformed(guibutton);
         if(guibutton.id == 5)
         {
-        	NoppesUtilPlayer.sendData(EnumPlayerPacket.FollowerHire);
+            PacketClient.sendClient(new FollowerPacket(FollowerPacket.Action.Hire));
         	close();
         }
     }
@@ -68,10 +70,10 @@ public class GuiNpcFollowerHire extends GuiContainerNPCInterface
 			int days = 1;
 			if(role.rates.containsKey(id))
 	            days = role.rates.get(id);
-				
-			
+
+
 			int yOffset = index * 26;
-			
+
 			int x = guiLeft +  78;
 			int y = guiTop + yOffset + 10;
             GL11.glEnable(32826 /*GL_RESCALE_NORMAL_EXT*/);
@@ -79,7 +81,7 @@ public class GuiNpcFollowerHire extends GuiContainerNPCInterface
             itemRender.renderItemIntoGUI(fontRendererObj, mc.renderEngine, itemstack, x + 11,y);
 	        itemRender.renderItemOverlayIntoGUI(fontRendererObj, mc.renderEngine, itemstack, x+11,y);
 
-            RenderHelper.disableStandardItemLighting(); 
+            RenderHelper.disableStandardItemLighting();
             GL11.glDisable(32826 /*GL_RESCALE_NORMAL_EXT*/);
 
             String daysS = days + " " + ((days == 1)?StatCollector.translateToLocal("follower.day"):StatCollector.translateToLocal("follower.days"));
@@ -92,7 +94,7 @@ public class GuiNpcFollowerHire extends GuiContainerNPCInterface
 	        }
 	        index++;
     	}
-    	
+
     }
 	@Override
 	public void save() {
diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java b/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java
index 5e0c94073..1302aa678 100644
--- a/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java
+++ b/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java
@@ -9,6 +9,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import noppes.npcs.client.CustomNpcResourceListener;
 import noppes.npcs.client.gui.util.*;
 import noppes.npcs.controllers.RecipeController;
 import noppes.npcs.controllers.data.RecipeCarpentry;
@@ -16,6 +18,7 @@ import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @SideOnly(Side.CLIENT)
@@ -33,7 +36,7 @@ public class GuiRecipes extends GuiNPCInterface
         this.xSize = 256;
         setBackground("recipes.png");
         this.closeOnEsc = true;
-		recipes.addAll(RecipeController.Instance.anvilRecipes.values());
+		recipes.addAll(RecipeController.Instance.carpentryRecipes.values());
     }
     @Override
     public void initGui(){
@@ -47,7 +50,7 @@ public class GuiRecipes extends GuiNPCInterface
 
         addButton(this.left = new GuiButtonNextPage(1, guiLeft + 150, guiTop + 164, true));
         addButton(this.right = new GuiButtonNextPage(2, guiLeft + 80, guiTop + 164, false));
-        
+
         updateButton();
     }
     private void updateButton(){
@@ -67,10 +70,10 @@ public class GuiRecipes extends GuiNPCInterface
 
 	private List<IRecipe> getSearchList(){
 		if(search.isEmpty()){
-			return new ArrayList<IRecipe>(RecipeController.Instance.anvilRecipes.values());
+			return new ArrayList<IRecipe>(RecipeController.Instance.carpentryRecipes.values());
 		}
 		List<IRecipe> list = new ArrayList<IRecipe>();
-		for(IRecipe recipe : RecipeController.Instance.anvilRecipes.values()){
+		for(IRecipe recipe : RecipeController.Instance.carpentryRecipes.values()){
 			if(recipe.getRecipeOutput() == null)
 				continue;
 
@@ -96,65 +99,130 @@ public class GuiRecipes extends GuiNPCInterface
     		page++;
         updateButton();
     }
-    
+
+    private static class ItemOverlayData {
+        public final int x, y;
+        public final ItemStack item;
+        public ItemOverlayData(int x, int y, ItemStack item) {
+            this.x = x;
+            this.y = y;
+            this.item = item;
+        }
+    }
+
+    private static class TextOverlayData {
+        public final int x, y, width, height;
+        public final List<String> textLines;
+
+        public TextOverlayData(int x, int y, int width, int height, String text) {
+            this(x, y, width, height, Arrays.asList(text));
+        }
+
+        public TextOverlayData(int x, int y, int width, int height, List<String> textLines) {
+            this.x = x;
+            this.y = y;
+            this.width = width;
+            this.height = height;
+            this.textLines = textLines;
+        }
+    }
+
     @Override
     public void drawScreen(int xMouse, int yMouse, float f){
     	super.drawScreen(xMouse, yMouse, f);
     	mc.renderEngine.bindTexture(resource);
-		
+
 		label.label = page + 1 + "/" + MathHelper.ceiling_float_int(recipes.size() / 4f);
 		label.x = guiLeft + (256 - Minecraft.getMinecraft().fontRenderer.getStringWidth(label.label)) / 2;
-		for(int i = 0; i < 4; i++){
-			int index = i + page * 4;
-			if(index >= recipes.size())
-				break;
-			IRecipe irecipe = recipes.get(index);
-			if(irecipe.getRecipeOutput() == null)
-				continue;
-			int x = guiLeft + 5 + i / 2 * 126;
-			int y = guiTop + 15 + i % 2 * 76;
-			drawItem(irecipe.getRecipeOutput(), x + 98, y + 28, xMouse, yMouse);
-			if(irecipe instanceof RecipeCarpentry){
-				RecipeCarpentry recipe = (RecipeCarpentry) irecipe;
-				x += (72 - recipe.recipeWidth * 18) / 2;
-				y += (72 - recipe.recipeHeight * 18) / 2;
-				for(int j = 0; j < recipe.recipeWidth; j++){
-					for(int k = 0; k < recipe.recipeHeight; k++){
-				    	mc.renderEngine.bindTexture(resource);
-				        GL11.glColor4f(1, 1, 1, 1);
-				        drawTexturedModalRect(x + j * 18, y + k * 18, 0, 0, 18, 18);
-				        ItemStack item = recipe.getCraftingItem(j + k * recipe.recipeWidth);
-				        if(item == null)
-				        	continue;
-				        drawItem(item, x + j * 18 + 1, y + k * 18 + 1, xMouse, yMouse);
-					}
-				}
-			}
-		}
-		for(int i = 0; i < 4; i++){
-			int index = i + page * 4;
-			if(index >= recipes.size())
-				break;
-			IRecipe irecipe = recipes.get(index);
-			if(irecipe instanceof RecipeCarpentry){
-				RecipeCarpentry recipe = (RecipeCarpentry) irecipe;
-				if(recipe.getRecipeOutput() == null)
-					continue;
-				int x = guiLeft + 5 + i / 2 * 126;
-				int y = guiTop + 15 + i % 2 * 76;
-				drawOverlay(recipe.getRecipeOutput(), x + 98, y + 22, xMouse, yMouse);
-				x += (72 - recipe.recipeWidth * 18) / 2;
-				y += (72 - recipe.recipeHeight * 18) / 2;
-				for(int j = 0; j < recipe.recipeWidth; j++){
-					for(int k = 0; k < recipe.recipeHeight; k++){
-				        ItemStack item = recipe.getCraftingItem(j + k * recipe.recipeWidth);
-				        if(item == null)
-				        	continue;
-				        drawOverlay(item, x + j * 18 + 1, y + k * 18 + 1, xMouse, yMouse);
-					}
-				}
-			}
-		}
+
+        List<ItemOverlayData> itemOverlays = new ArrayList<ItemOverlayData>();
+        List<TextOverlayData> textOverlays = new ArrayList<TextOverlayData>();
+
+        // Loop through recipes.
+        for (int i = 0; i < 4; i++) {
+            int index = i + page * 4;
+            if (index >= recipes.size())
+                break;
+            IRecipe irecipe = recipes.get(index);
+            if (irecipe.getRecipeOutput() == null)
+                continue;
+            int x = guiLeft + 5 + (i / 2) * 126;
+            int y = guiTop + 15 + (i % 2) * 76;
+
+            drawItem(irecipe.getRecipeOutput(), x + 98, y + 28, xMouse, yMouse);
+            if (func_146978_c((x+98) - guiLeft, (y+28) - guiTop, 16, 16, xMouse, yMouse)) {
+                itemOverlays.add(new ItemOverlayData(x+98, y+28, irecipe.getRecipeOutput()));
+            }
+
+            if (irecipe instanceof RecipeCarpentry) {
+                RecipeCarpentry recipe = (RecipeCarpentry) irecipe;
+                if (!recipe.isGlobal && recipe.availability != null && !recipe.availability.isDefault()) {
+                    int outputX = x + 98;
+                    int outputY = y + 38;
+                    float scale = 1.0F;
+                    String iconStr;
+                    int iconColor;
+                    if (!recipe.availability.isAvailable(mc.thePlayer)) {
+                        iconStr = "?";
+                        iconColor = 0xbd3e35;
+                    } else {
+                        iconStr = "!";
+                        iconColor = CustomNpcResourceListener.DefaultTextColor;
+                    }
+                    int iconWidth = (int)(fontRendererObj.getStringWidth(iconStr) * scale);
+                    int iconHeight = (int)(fontRendererObj.FONT_HEIGHT * scale);
+                    // Center the icon below the output slot (16x16 slot).
+                    int iconX = outputX + (16 - iconWidth) / 2;
+                    int iconY = outputY + 16;
+
+                    // Render the icon.
+                    GL11.glPushMatrix();
+                    GL11.glTranslatef(iconX, iconY, 0);
+                    GL11.glScalef(scale, scale, 1.0F);
+                    fontRendererObj.drawString(iconStr, 0, 0, iconColor);
+                    GL11.glPopMatrix();
+
+                    // Instead of rendering the tooltip immediately, add it as a text overlay.
+                    if (func_146978_c(iconX - guiLeft, iconY - guiTop, iconWidth, iconHeight, xMouse, yMouse)) {
+                        List<String> tooltipLines = recipe.availability.isAvailableText(mc.thePlayer);
+                        if (tooltipLines.isEmpty()) {
+                            tooltipLines.add(StatCollector.translateToLocal("gui.available"));
+                        }
+                        textOverlays.add(new TextOverlayData(iconX, iconY, iconWidth, iconHeight, tooltipLines));
+                    }
+                }
+            }
+
+            // Draw the recipe grid (for RecipeCarpentry recipes).
+            if (irecipe instanceof RecipeCarpentry) {
+                RecipeCarpentry recipe = (RecipeCarpentry) irecipe;
+                int gridX = x + (72 - recipe.recipeWidth * 18) / 2;
+                int gridY = y + (72 - recipe.recipeHeight * 18) / 2;
+                for (int j = 0; j < recipe.recipeWidth; j++) {
+                    for (int k = 0; k < recipe.recipeHeight; k++) {
+                        mc.renderEngine.bindTexture(resource);
+                        GL11.glColor4f(1, 1, 1, 1);
+                        drawTexturedModalRect(gridX + j * 18, gridY + k * 18, 0, 0, 18, 18);
+                        ItemStack item = recipe.getCraftingItem(j + k * recipe.recipeWidth);
+                        if (item == null)
+                            continue;
+                        drawItem(item, gridX + j * 18 + 1, gridY + k * 18 + 1, xMouse, yMouse);
+                        if (func_146978_c((gridX+j*18+1)-guiLeft, (gridY+k*18+1)-guiTop, 16, 16, xMouse, yMouse)) {
+                            itemOverlays.add(new ItemOverlayData(gridX+j*18+1, gridY+k*18+1, item));
+                        }
+                    }
+                }
+            }
+        }
+
+        // Render any item tooltips.
+        for (ItemOverlayData iod : itemOverlays) {
+            this.renderToolTip(iod.item, xMouse, yMouse);
+        }
+        // Render all text overlays (each line from the availability tooltip will be on its own line).
+        for (TextOverlayData tod : textOverlays) {
+            this.drawHoveringText(tod.textLines, xMouse, yMouse, this.fontRendererObj);
+        }
     }
 
     private void drawItem(ItemStack item, int x, int y, int xMouse, int yMouse){
@@ -165,11 +233,11 @@ public class GuiRecipes extends GuiNPCInterface
         itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.renderEngine, item, x, y);
         itemRender.renderItemOverlayIntoGUI(fontRendererObj, mc.renderEngine, item, x, y);
         itemRender.zLevel = 0.0F;
-        RenderHelper.disableStandardItemLighting(); 
+        RenderHelper.disableStandardItemLighting();
         GL11.glDisable(GL12.GL_RESCALE_NORMAL);
     	GL11.glPopMatrix();
     }
-    
+
     private void drawOverlay(ItemStack item, int x, int y, int xMouse, int yMouse){
         if (this.func_146978_c(x - guiLeft, y - guiTop, 16, 16, xMouse, yMouse)){
             this.renderToolTip(item, xMouse, yMouse);
@@ -187,4 +255,4 @@ public class GuiRecipes extends GuiNPCInterface
 	@Override
 	public void save() {
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java b/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java
index cdad6e814..601f01df5 100644
--- a/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java
+++ b/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java
@@ -1,5 +1,7 @@
 package noppes.npcs.client.gui.player;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.player.TransportPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
@@ -18,9 +20,9 @@ public class GuiTransportSelection extends GuiNPCInterface implements ITopButton
     protected int xSize;
     protected int guiLeft;
     protected int guiTop;
-    
+
     private GuiCustomScroll scroll;
-    
+
 	public GuiTransportSelection(EntityNPCInterface npc) {
 		super(npc);
         xSize = 176;
@@ -43,7 +45,7 @@ public class GuiTransportSelection extends GuiNPCInterface implements ITopButton
         scroll.guiTop = guiTop + 20;
         addScroll(scroll);
     }
-    
+
     @Override
     public void drawScreen(int i, int j, float f)
     {
@@ -61,7 +63,7 @@ public class GuiTransportSelection extends GuiNPCInterface implements ITopButton
     	String sel = scroll.getSelected();
     	if(button.id == 0 && sel != null){
             close();
-        	NoppesUtilPlayer.sendData(EnumPlayerPacket.Transport,sel);
+            PacketClient.sendClient(new TransportPacket(sel));
     	}
     }
 //    @Override
@@ -82,7 +84,7 @@ public class GuiTransportSelection extends GuiNPCInterface implements ITopButton
             close();
         }
     }
-    
+
 	@Override
 	public void save() {
 	}
@@ -92,8 +94,8 @@ public class GuiTransportSelection extends GuiNPCInterface implements ITopButton
 	}
 	@Override
 	public void setSelected(String selected) {
-		// TODO Auto-generated method stub
-		
+
+
 	}
 
 }
diff --git a/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java b/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java
index b393299e2..c95927985 100644
--- a/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java
+++ b/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java
@@ -1,5 +1,8 @@
 package noppes.npcs.client.gui.player.companion;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.player.CompanionActionPacket;
+import kamkeel.npcs.network.packets.player.GetNPCRole;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.item.ItemStack;
@@ -28,7 +31,7 @@ public class GuiNpcCompanionStats extends GuiNPCInterface implements IGuiData {
 		setBackground("companion.png");
 		xSize = 171;
 		ySize = 166;
-		NoppesUtilPlayer.sendData(EnumPlayerPacket.RoleGet);
+        PacketClient.sendClient(new GetNPCRole());
 	}
 
 	@Override
@@ -41,11 +44,11 @@ public class GuiNpcCompanionStats extends GuiNPCInterface implements IGuiData {
 		addLabel(new GuiNpcLabel(3, NoppesStringUtils.translate("companion.strength", ": ", npc.stats.getAttackStrength()), guiLeft + 4, y+=12));
 		addLabel(new GuiNpcLabel(4, NoppesStringUtils.translate("companion.level", ": ", role.getTotalLevel()), guiLeft + 4, y+=12));
 		addLabel(new GuiNpcLabel(5, NoppesStringUtils.translate("job.name", ": ", "gui.none"), guiLeft + 4, y+=12));
-		
+
 		addTopMenu(role, this, 1);
-	
+
 	}
-	
+
 	public static void addTopMenu(RoleCompanion role, GuiScreen screen, int active){
 		if(screen instanceof GuiNPCInterface){
 			GuiNPCInterface gui = (GuiNPCInterface) screen;
@@ -79,7 +82,7 @@ public class GuiNpcCompanionStats extends GuiNPCInterface implements IGuiData {
 			CustomNpcs.proxy.openGui(npc, EnumGuiType.CompanionTalent);
 		}
 		if(id == 3){
-			NoppesUtilPlayer.sendData(EnumPlayerPacket.CompanionOpenInv);
+            CompanionActionPacket.OpenInventory();
 		}
 	}
 
@@ -87,14 +90,14 @@ public class GuiNpcCompanionStats extends GuiNPCInterface implements IGuiData {
 	public void drawScreen(int i, int j, float f) {
 		super.drawScreen(i, j, f);
 		if(isEating && !role.isEating()){
-			NoppesUtilPlayer.sendData(EnumPlayerPacket.RoleGet);
+            PacketClient.sendClient(new GetNPCRole());
 		}
-		
+
 		isEating = role.isEating();
 		super.drawNpc(34, 150);
 		int y = drawHealth(guiTop + 88);
 	}
-	
+
 	private int drawHealth(int y){
 		this.mc.getTextureManager().bindTexture(icons);
 
@@ -102,23 +105,23 @@ public class GuiNpcCompanionStats extends GuiNPCInterface implements IGuiData {
 		if(role.talents.containsKey(EnumCompanionTalent.ARMOR) || max > 0){
 	        for (int i = 0; i < 10; ++i){
 	            int x = guiLeft + 66 + i * 10;
-	
+
 	            if (i * 2 + 1 < max){
 	                this.drawTexturedModalRect(x, y, 34, 9, 9, 9);
 	            }
-	
+
 	            if (i * 2 + 1 == max){
 	                this.drawTexturedModalRect(x, y, 25, 9, 9, 9);
 	            }
-	
+
 	            if (i * 2 + 1 > max){
 	                this.drawTexturedModalRect(x, y, 16, 9, 9, 9);
 	            }
-	            
+
 	        }
 	        y += 10;
 		}
-		
+
 		max = MathHelper.ceiling_float_int(npc.getMaxHealth());
         int k = (int)npc.getHealth();
         float scale = 1;
@@ -134,12 +137,12 @@ public class GuiNpcCompanionStats extends GuiNPCInterface implements IGuiData {
             if(k > i)
                 this.drawTexturedModalRect(x, y + offset, 52 + i % 2 * 5, 0, i % 2 == 1?4:5, 9);
         }
-        
+
         k = role.foodstats.getFoodLevel();
         y += 10;
         if(max > 20)
             y += 10;
-        
+
         for(int i = 0; i < 20; i++){
         	int x = guiLeft + 66 + i % 20 * 5;
             this.drawTexturedModalRect(x, y, 16 + i % 2 * 5, 27, i % 2 == 1?4:5, 9);
@@ -151,7 +154,7 @@ public class GuiNpcCompanionStats extends GuiNPCInterface implements IGuiData {
 
 	@Override
 	public void save() {
-		
+
 	}
 
 	@Override
diff --git a/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionTalents.java b/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionTalents.java
index 99740d703..f9e1c8a9d 100644
--- a/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionTalents.java
+++ b/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionTalents.java
@@ -1,5 +1,6 @@
 package noppes.npcs.client.gui.player.companion;
 
+import kamkeel.npcs.network.packets.player.CompanionActionPacket;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiButton;
@@ -29,7 +30,7 @@ import java.util.Map;
 
 public class GuiNpcCompanionTalents extends GuiNPCInterface{
 	private RoleCompanion role;
-	private Map<Integer,GuiTalent> talents = new HashMap<Integer,GuiTalent>();	
+	private Map<Integer,GuiTalent> talents = new HashMap<Integer,GuiTalent>();
 	private GuiNpcButton selected;
 
 	public GuiNpcCompanionTalents(EntityNPCInterface npc) {
@@ -46,7 +47,7 @@ public class GuiNpcCompanionTalents extends GuiNPCInterface{
 		super.initGui();
     	talents.clear();
 		int y = guiTop + 12;
-		
+
 		addLabel(new GuiNpcLabel(0, NoppesStringUtils.translate("quest.exp", ": "), guiLeft + 4, guiTop + 10));
 
 		GuiNpcCompanionStats.addTopMenu(role, this, 2);
@@ -55,7 +56,7 @@ public class GuiNpcCompanionTalents extends GuiNPCInterface{
 			addTalent(i++, e);
 		}
 	}
-	
+
 	private void addTalent(int i, EnumCompanionTalent talent){
 		int y = guiTop + 28 + i/2 * 26;
 		int x = guiLeft + 4 + i % 2 * 84;
@@ -75,7 +76,7 @@ public class GuiNpcCompanionTalents extends GuiNPCInterface{
 			CustomNpcs.proxy.openGui(npc, EnumGuiType.Companion);
 		}
 		if(id == 3){
-			NoppesUtilPlayer.sendData(EnumPlayerPacket.CompanionOpenInv);
+            CompanionActionPacket.OpenInventory();
 		}
 		if(id >= 10){
 			selected = (GuiNpcButton) guibutton;
@@ -83,19 +84,19 @@ public class GuiNpcCompanionTalents extends GuiNPCInterface{
 			addExperience(1);
 		}
 	}
-	
+
 	private void addExperience(int exp){
 		EnumCompanionTalent talent = talents.get(selected.id - 10).talent;
 		if(!role.canAddExp(-exp) && role.currentExp <= 0)
 			return;
 		if(exp > role.currentExp)
 			exp = role.currentExp;
-		NoppesUtilPlayer.sendData(EnumPlayerPacket.CompanionTalentExp, talent.ordinal(), exp);
+		CompanionActionPacket.TalentExp(talent, exp);
 		role.talents.put(talent, role.talents.get(talent) + exp);
 		role.addExp(-exp);
 		getLabel(selected.id - 10).label = role.talents.get(talent) + "/" + role.getNextLevel(talent);
 	}
-	
+
 	private long lastPressedTime = 0;
 	private long startPressedTime = 0;
 	@Override
@@ -122,7 +123,7 @@ public class GuiNpcCompanionTalents extends GuiNPCInterface{
 				selected = null;
 			}
 		}
-		
+
         mc.getTextureManager().bindTexture(Gui.icons);
         this.drawTexturedModalRect(guiLeft + 4, guiTop + 20, 10, 64, 162, 5);
 
@@ -142,9 +143,9 @@ public class GuiNpcCompanionTalents extends GuiNPCInterface{
 
 	@Override
 	public void save() {
-		
+
 	}
-	
+
 	public static class GuiTalent extends GuiScreen{
 		private EnumCompanionTalent talent;
 		private int x, y;
@@ -156,12 +157,12 @@ public class GuiNpcCompanionTalents extends GuiNPCInterface{
 			this.y = y;
 			this.role = role;
 		}
-		
+
 		@Override
 		public void drawScreen(int i, int j, float f) {
 	        Minecraft mc = Minecraft.getMinecraft();
 	        mc.getTextureManager().bindTexture(resource);
-	        
+
 			ItemStack item = talent.item;
 			if(item.getItem() == null)
 				item = new ItemStack(Blocks.dirt);
@@ -177,7 +178,7 @@ public class GuiNpcCompanionTalents extends GuiNPCInterface{
 	        RenderHelper.enableGUIStandardItemLighting();
 	        itemRender.renderItemAndEffectIntoGUI(mc.fontRenderer, mc.getTextureManager(), item, x + 4, y + 4);
 	        itemRender.renderItemOverlayIntoGUI(mc.fontRenderer, mc.getTextureManager(), item, x + 4, y + 4);
-	        RenderHelper.disableStandardItemLighting(); 
+	        RenderHelper.disableStandardItemLighting();
 	        GL11.glDisable(GL11.GL_LIGHTING);
 	        GL11.glTranslatef(0, 0, 200);
             this.drawCenteredString(mc.fontRenderer, role.getTalentLevel(talent) + "", x + 20, y + 16, 0xFFFFFF);
diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiCNPCInventory.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiCNPCInventory.java
index 8dbb2345c..3ab43c14e 100644
--- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiCNPCInventory.java
+++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiCNPCInventory.java
@@ -1,13 +1,14 @@
 package noppes.npcs.client.gui.player.inventory;
 
 import cpw.mods.fml.common.Loader;
-import kamkeel.addon.client.DBCClient;
+import kamkeel.npcs.addon.client.DBCClient;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.util.ResourceLocation;
 import noppes.npcs.client.gui.util.GuiMenuSideButton;
 import noppes.npcs.client.gui.util.GuiNPCInterface;
 import noppes.npcs.config.ConfigClient;
+import noppes.npcs.config.ConfigMain;
 import tconstruct.client.tabs.InventoryTabCustomNpc;
 import tconstruct.client.tabs.TabRegistry;
 
@@ -67,6 +68,16 @@ public class GuiCNPCInventory extends GuiNPCInterface {
             addButton(dbcButton);
         }
 
+        if(ConfigMain.EnableProfiles){
+            y += 21;
+            GuiMenuSideButton profileButton = new GuiMenuSideButton(105, guiLeft + xSize + 37, this.guiTop + y, 22, 22, "");
+            profileButton.rightSided = true;
+            profileButton.active = activeTab == 5;
+            profileButton.renderIconPosX = 80;
+            profileButton.renderResource = specialIcons;
+            addButton(profileButton);
+        }
+
         y += 21;
         GuiMenuSideButton clientButton = new GuiMenuSideButton(103, guiLeft + xSize + 37, this.guiTop + y, 22, 22, "");
         clientButton.rightSided = true;
@@ -99,6 +110,10 @@ public class GuiCNPCInventory extends GuiNPCInterface {
                 activeTab = 4;
                 mc.displayGuiScreen(DBCClient.Instance.inventoryGUI());
             }
+            if (guibutton.id == 105 && activeTab != 5) {
+                activeTab = 5;
+                mc.displayGuiScreen(new GuiProfiles());
+            }
         }
     }
 
diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiFaction.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiFaction.java
index 41ff92a08..9e7b39cf6 100644
--- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiFaction.java
+++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiFaction.java
@@ -1,5 +1,7 @@
 package noppes.npcs.client.gui.player.inventory;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.player.CheckPlayerValue;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
@@ -35,7 +37,7 @@ public class GuiFaction extends GuiCNPCInventory implements IGuiData {
 		ySize = 180;
         this.drawDefaultBackground = false;
         title = "";
-        NoppesUtilPlayer.sendData(EnumPlayerPacket.FactionsGet);
+        PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.Faction));
 	}
 
 	@Override
diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java
index 0a08de502..07af473b1 100644
--- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java
+++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java
@@ -1,5 +1,9 @@
 package noppes.npcs.client.gui.player.inventory;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.data.large.PartyDataPacket;
+import kamkeel.npcs.network.packets.player.CheckPlayerValue;
+import kamkeel.npcs.network.packets.request.party.*;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiYesNo;
 import net.minecraft.client.gui.GuiYesNoCallback;
@@ -10,11 +14,11 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 import noppes.npcs.NoppesUtilPlayer;
 import noppes.npcs.QuestLogData;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.ClientCacheHandler;
 import noppes.npcs.client.CustomNpcResourceListener;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.constants.EnumPlayerPacket;
 import noppes.npcs.controllers.data.Party;
 import noppes.npcs.controllers.data.Quest;
@@ -51,8 +55,8 @@ public class GuiParty extends GuiCNPCInventory implements ITextfieldListener,ICu
         xSize = 280;
         ySize = 180;
         drawDefaultBackground = false;
-        NoppesUtilPlayer.sendData(EnumPlayerPacket.TrackedQuest);
-        Client.sendData(EnumPacketServer.GetPartyData);
+        PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.TrackedQuest));
+        PacketClient.sendClient(new PartyInfoPacket());
     }
 
     public void initGui(){
@@ -191,23 +195,23 @@ public class GuiParty extends GuiCNPCInventory implements ITextfieldListener,ICu
             switch (i) {
                 case 0:
                     // Leader New Player
-                    Client.sendData(EnumPacketServer.SetPartyLeader, this.selectedPlayer);
+                    PacketClient.sendClient(new PartySetLeaderPacket(this.selectedPlayer));
                     break;
                 case 1:
                     // Kick Other Player
-                    Client.sendData(EnumPacketServer.KickPlayer, this.selectedPlayer);
+                    PacketClient.sendClient(new PartyKickPacket(this.selectedPlayer));
                     break;
                 case 2:
                     // Disband Party
-                    Client.sendData(EnumPacketServer.DisbandParty);
+                    PacketClient.sendClient(new PartyDisbandPacket());
                     break;
                 case 3:
                     // Leave Party
-                    Client.sendData(EnumPacketServer.LeavePlayer, this.player.getCommandSenderName());
+                    PacketClient.sendClient(new PartyLeavePacket(this.player.getCommandSenderName()));
                     break;
                 case 4:
                     // Drop Party Quest
-                    Client.sendData(EnumPacketServer.SetPartyQuest, -1);
+                    PacketClient.sendClient(new PartySetQuestPacket(-1));
                     break;
             }
             receivedData = false;
@@ -229,19 +233,19 @@ public class GuiParty extends GuiCNPCInventory implements ITextfieldListener,ICu
 
         switch (guibutton.id) {
             case 200:
-                Client.sendData(EnumPacketServer.CreateParty);
+                PacketClient.sendClient(new PartyInfoPacket(true));
                 receivedData = false;
                 break;
             case 215:
                 if (this.selectedInvite != null && !this.selectedInvite.isEmpty()) {
-                    Client.sendData(EnumPacketServer.AcceptInvite, this.selectedInvite);
+                    PacketClient.sendClient(new PartyAcceptInvitePacket(this.selectedInvite));
                     receivedData = false;
                     return;
                 }
                 break;
             case 220:
                 if (this.selectedInvite != null && !this.selectedInvite.isEmpty()) {
-                    Client.sendData(EnumPacketServer.IgnoreInvite, this.selectedInvite);
+                    PacketClient.sendClient(new PartyIgnoreInvitePacket(this.selectedInvite));
                     receivedData = false;
                     return;
                 }
@@ -267,7 +271,7 @@ public class GuiParty extends GuiCNPCInventory implements ITextfieldListener,ICu
             case 330:
                 String inviteName = this.getTextField(325).getText();
                 if (!inviteName.isEmpty() && !party.getPlayerNames(true).contains(inviteName.toLowerCase())) {
-                    Client.sendData(EnumPacketServer.PartyInvite, inviteName);
+                    PacketClient.sendClient(new PartyInvitePacket(inviteName));
                     this.getTextField(325).setText("");
                 }
                 break;
@@ -455,10 +459,10 @@ public class GuiParty extends GuiCNPCInventory implements ITextfieldListener,ICu
     public void save() {
         if (this.partyChanged) {
             if(ClientCacheHandler.party != null)
-                Client.sendData(EnumPacketServer.SavePartyData, ClientCacheHandler.party.writeClientNBT());
+                PacketClient.sendClient(new PartySavePacket(ClientCacheHandler.party.writeClientNBT()));
         }
         if (!Objects.equals(this.originalTracked, data.trackedQuestKey)) {
-            Client.sendData(EnumPacketServer.PartyLogToServer, this.data.trackedQuestKey);
+            PacketClient.sendClient(new PartyLogToServerPacket(this.data.trackedQuestKey));
         }
     }
 
diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java
new file mode 100644
index 000000000..053deddac
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java
@@ -0,0 +1,199 @@
+package noppes.npcs.client.gui.player.inventory;
+
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.player.CheckPlayerValue;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import noppes.npcs.NoppesUtilPlayer;
+import noppes.npcs.client.CustomNpcResourceListener;
+import noppes.npcs.client.gui.util.GuiButtonNextPage;
+import noppes.npcs.client.gui.util.IGuiData;
+import noppes.npcs.constants.EnumPlayerPacket;
+import noppes.npcs.controllers.data.Faction;
+import noppes.npcs.controllers.data.PlayerFactionData;
+import org.lwjgl.opengl.GL11;
+import tconstruct.client.tabs.AbstractTab;
+
+import java.util.ArrayList;
+
+public class GuiProfiles extends GuiCNPCInventory implements IGuiData {
+
+	private final ResourceLocation resource = new ResourceLocation("customnpcs","textures/gui/standardbg.png");
+
+    private ArrayList<Faction> playerFactions = new ArrayList<Faction>();
+
+	private int page = 0;
+	private int pages = 1;
+
+	private GuiButtonNextPage buttonNextPage;
+	private GuiButtonNextPage buttonPreviousPage;
+
+	public GuiProfiles() {
+		super();
+		xSize = 280;
+		ySize = 180;
+        this.drawDefaultBackground = false;
+        title = "";
+        PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.Faction));
+	}
+
+	@Override
+    public void initGui()
+    {
+		super.initGui();
+
+        this.buttonList.add(buttonNextPage = new GuiButtonNextPage(1, (guiLeft + (xSize + 35) / 2) + 25, guiTop + 170, true));
+        this.buttonList.add(buttonPreviousPage = new GuiButtonNextPage(2, (guiLeft + (xSize + 35) / 2) - 40, guiTop + 170, false));
+        updateButtons();
+    }
+
+	@Override
+    public void drawScreen(int i, int j, float f)
+    {
+    	drawDefaultBackground();
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+		mc.renderEngine.bindTexture(resource);
+		drawTexturedModalRect(guiLeft, guiTop, 0, 0, 252, 195);
+		drawTexturedModalRect(guiLeft + 252, guiTop, 188, 0, 67, 195);
+
+        if(playerFactions.isEmpty()){
+        	String noFaction = StatCollector.translateToLocal("faction.nostanding");
+            fontRendererObj.drawString(noFaction,guiLeft + (xSize - fontRendererObj.getStringWidth(noFaction)) / 2,guiTop + 80, CustomNpcResourceListener.DefaultTextColor);
+        }
+        else
+        	renderScreen();
+
+        super.drawScreen(i, j, f);
+
+    }
+
+	private void renderScreen(){
+        int size = 10;
+        if(playerFactions.size() % 10 != 0 && page == pages)
+        	size = playerFactions.size() % 10;
+
+		int hLine = 5;
+		if(size < 5){
+			hLine = size;
+		}
+
+		int count = -1;
+        for(int id = 0 ; id < size; id++){
+			count++;
+
+			Faction faction = playerFactions.get((page - 1) * 10 + id);
+			String name = faction.name;
+			String points = " : " + faction.defaultPoints;
+
+			String standing = StatCollector.translateToLocal("faction.friendly");
+			int color = 0x00FF00;
+			if(faction.defaultPoints < faction.neutralPoints){
+				standing = StatCollector.translateToLocal("faction.unfriendly");
+				color = 0xFF0000;
+				points += "/" + faction.neutralPoints;
+			}
+			else if(faction.defaultPoints < faction.friendlyPoints){
+				standing = StatCollector.translateToLocal("faction.neutral");
+				color = 0xF2FF00;
+				points += "/" + faction.friendlyPoints;
+			}
+			else{
+				points += "/-";
+			}
+
+			drawVerticalLine(guiLeft + (xSize + 45) / 2, (guiTop + ySize - 15), guiTop + 13, 0xFF000000 + CustomNpcResourceListener.DefaultTextColor);
+			if(count < 5){
+				drawHorizontalLine(guiLeft + 2, guiLeft + xSize + 35, guiTop + 14 + count * 30, 0xFF000000 + CustomNpcResourceListener.DefaultTextColor);
+				fontRendererObj.drawString(name, guiLeft + (xSize + 45 - fontRendererObj.getStringWidth(name)) / 4, guiTop + 19 + count * 30, faction.color);
+
+				fontRendererObj.drawString(standing,  (guiLeft + (xSize + 45) / 4) - fontRendererObj.getStringWidth(standing), guiTop + 33 + count * 30, color);
+				fontRendererObj.drawString(points, (guiLeft + (xSize + 45) / 4), guiTop + 33 + count * 30, CustomNpcResourceListener.DefaultTextColor);
+			}
+			else {
+				fontRendererObj.drawString(name, guiLeft + 3*(xSize + 45 - fontRendererObj.getStringWidth(name)) / 4, guiTop + 19 + (count - 5) * 30, faction.color);
+
+				fontRendererObj.drawString(standing, (guiLeft + 3*(xSize + 45) / 4) - fontRendererObj.getStringWidth(standing) - 10, guiTop + 33 + (count - 5) * 30, color);
+				fontRendererObj.drawString(points, (guiLeft + 3*(xSize + 45) / 4) - 10, guiTop + 33 + (count - 5) * 30, CustomNpcResourceListener.DefaultTextColor);
+			}
+
+			drawHorizontalLine(guiLeft + 2, guiLeft + xSize + 35, guiTop + 14 + hLine * 30, 0xFF000000 + CustomNpcResourceListener.DefaultTextColor);
+		}
+
+        if(pages > 1){
+        	String s = page +"/" + pages;
+        	fontRendererObj.drawString(s, guiLeft + (xSize + 45 - fontRendererObj.getStringWidth(s)) / 2, guiTop + 175, CustomNpcResourceListener.DefaultTextColor);
+        }
+    }
+
+    @Override
+	protected void actionPerformed(GuiButton guibutton){
+        if(guibutton instanceof AbstractTab)
+            return;
+
+        if (guibutton.id >= 100 && guibutton.id <= 105) {
+            super.actionPerformed(guibutton);
+            return;
+        }
+    	if(!(guibutton instanceof GuiButtonNextPage))
+    		return;
+		int id = guibutton.id;
+		if(id == 1){
+			page++;
+		}
+		if(id == 2){
+			page--;
+		}
+		updateButtons();
+    }
+    private void updateButtons(){
+		buttonNextPage.setVisible(page < pages);
+		buttonPreviousPage.setVisible(page > 1);
+    }
+    protected void drawGuiContainerBackgroundLayer(float f, int i, int j)
+    {
+
+    }
+
+    @Override
+    public void keyTyped(char c, int i)
+    {
+        if (i == 1 || isInventoryKey(i))
+        {
+            close();
+        }
+    }
+	@Override
+	public void save() {
+	}
+	@Override
+	public void setGuiData(NBTTagCompound compound) {
+		playerFactions = new ArrayList<Faction>();
+
+		NBTTagList list = compound.getTagList("FactionList", 10);
+		for(int i = 0; i < list.tagCount(); i++){
+			Faction faction = new Faction();
+			faction.readNBT(list.getCompoundTagAt(i));
+			playerFactions.add(faction);
+		}
+		PlayerFactionData data = new PlayerFactionData();
+		data.loadNBTData(compound);
+		for(int id : data.factionData.keySet()){
+			int points = data.factionData.get(id);
+			for(Faction faction : playerFactions){
+				if(faction.id == id)
+					faction.defaultPoints = points;
+			}
+		}
+
+		pages = (playerFactions.size() - 1) / 10 ;
+		pages++;
+
+		page = 1;
+
+		updateButtons();
+	}
+
+}
diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java
index a146612db..1ab495627 100644
--- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java
+++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java
@@ -1,5 +1,10 @@
 package noppes.npcs.client.gui.player.inventory;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.player.CheckPlayerValue;
+import kamkeel.npcs.network.packets.request.party.PartyLogToServerPacket;
+import kamkeel.npcs.network.packets.request.party.PartySetQuestPacket;
+import kamkeel.npcs.network.packets.request.quest.QuestLogToServerPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiYesNo;
 import net.minecraft.client.gui.GuiYesNoCallback;
@@ -12,7 +17,7 @@ import noppes.npcs.NoppesUtilPlayer;
 import noppes.npcs.QuestLogData;
 import noppes.npcs.client.*;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.constants.EnumPlayerPacket;
 import noppes.npcs.controllers.data.Party;
 import noppes.npcs.util.ValueUtil;
@@ -47,7 +52,7 @@ public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListen
         xSize = 280;
         ySize = 180;
         drawDefaultBackground = false;
-        NoppesUtilPlayer.sendData(EnumPlayerPacket.QuestLog);
+        PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.QuestLog));
     }
     public void initGui(){
         super.initGui();
@@ -153,7 +158,7 @@ public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListen
                 String key = data.selectedCategory + ":" + data.selectedQuest;
                 if(data.partyQuests.containsKey(key)){
                     int questID = data.partyQuests.get(key);
-                    Client.sendData(EnumPacketServer.SetPartyQuest, questID);
+                    PacketClient.sendClient(new PartySetQuestPacket(questID));
                 }
             }
             initGui();
@@ -192,7 +197,7 @@ public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListen
         if (guibutton.id == 3)
         {
             if (Objects.equals(ClientCacheHandler.party.getCurrentQuestName(), data.selectedQuest)) {
-                Client.sendData(EnumPacketServer.SetPartyQuest, -1);
+                PacketClient.sendClient(new PartySetQuestPacket(-1));
             } else {
                 GuiYesNo yesnoDisband = new GuiYesNo(this, "Confirm", StatCollector.translateToLocal("party.setQuestConfirm"), 0);
                 displayGuiScreen(yesnoDisband);
@@ -405,7 +410,7 @@ public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListen
                 !Objects.equals(this.trackedQuestKeyOnOpen, data.trackedQuestKey))) {
             NBTTagCompound compound = new NBTTagCompound();
             compound.setTag("Alerts", NBTTags.nbtStringStringMap(data.questAlerts));
-            Client.sendData(EnumPacketServer.QuestLogToServer, compound, this.data.trackedQuestKey);
+            PacketClient.sendClient(new QuestLogToServerPacket(compound, this.data.trackedQuestKey));
         }
 	}
 
diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java
index ef529ed57..f85d95c00 100644
--- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java
+++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java
@@ -1,18 +1,21 @@
 package noppes.npcs.client.gui.player.inventory;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.packets.request.quest.QuestUntrackPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiYesNo;
 import net.minecraft.client.gui.GuiYesNoCallback;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.ClientCacheHandler;
 import noppes.npcs.client.gui.util.GuiNpcButton;
 import noppes.npcs.client.gui.util.GuiNpcLabel;
 import noppes.npcs.client.gui.util.GuiNpcTextField;
 import noppes.npcs.client.gui.util.ITextfieldListener;
 import noppes.npcs.config.ConfigClient;
-import noppes.npcs.constants.EnumPacketServer;
+
 import org.lwjgl.opengl.GL11;
 import tconstruct.client.tabs.AbstractTab;
 
@@ -102,7 +105,7 @@ public class GuiSettings extends GuiCNPCInventory implements ITextfieldListener,
             switch (i) {
                 case 0:
                     // Untrack Quest
-                    Client.sendData(EnumPacketServer.UntrackQuest);
+                    PacketClient.sendClient(new QuestUntrackPacket());
                     break;
                 case 1:
                     // Clear Skin Cache
diff --git a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeDialog.java b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeDialog.java
index bfdaf32fc..9458c5095 100644
--- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeDialog.java
+++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeDialog.java
@@ -1,15 +1,17 @@
 package noppes.npcs.client.gui.questtypes;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.quest.QuestDialogGetTitlePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.select.GuiDialogSelection;
 import noppes.npcs.client.gui.util.GuiNpcButton;
 import noppes.npcs.client.gui.util.GuiSelectionListener;
 import noppes.npcs.client.gui.util.IGuiData;
 import noppes.npcs.client.gui.util.SubGuiInterface;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.Quest;
 import noppes.npcs.entity.EntityNPCInterface;
 import noppes.npcs.quests.QuestDialog;
@@ -34,10 +36,12 @@ public class GuiNpcQuestTypeDialog extends SubGuiInterface implements GuiSelecti
 		xSize = 256;
 		ySize = 216;
 		closeOnEsc = true;
-		Client.sendData(EnumPacketServer.QuestDialogGetTitle,
-				quest.dialogs.containsKey(0)?quest.dialogs.get(0):-1,
-				quest.dialogs.containsKey(1)?quest.dialogs.get(1):-1,
-				quest.dialogs.containsKey(2)?quest.dialogs.get(2):-1);
+
+        PacketClient.sendClient(new QuestDialogGetTitlePacket(
+                quest.dialogs.getOrDefault(0, -1),
+                quest.dialogs.getOrDefault(1, -1),
+                quest.dialogs.getOrDefault(2, -1))
+        );
 	}
 
 	public void initGui() {
diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java
index 38f12c120..615368344 100644
--- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java
+++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java
@@ -1,13 +1,17 @@
 package noppes.npcs.client.gui.roles;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.bank.BankGetPacket;
+import kamkeel.npcs.network.packets.request.bank.BanksGetPacket;
+import kamkeel.npcs.network.packets.request.role.RoleSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.GuiCustomScroll;
 import noppes.npcs.client.gui.util.GuiNPCInterface2;
 import noppes.npcs.client.gui.util.ICustomScrollListener;
 import noppes.npcs.client.gui.util.IScrollData;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.Bank;
 import noppes.npcs.entity.EntityNPCInterface;
 import noppes.npcs.roles.RoleBank;
@@ -25,7 +29,7 @@ public class GuiNpcBankSetup extends GuiNPCInterface2 implements IScrollData,ICu
     public GuiNpcBankSetup(EntityNPCInterface npc)
     {
     	super(npc);
-    	Client.sendData(EnumPacketServer.BanksGet);
+        PacketClient.sendClient(new BanksGetPacket());
     	role = (RoleBank) npc.roleInterface;
     }
 
@@ -43,9 +47,9 @@ public class GuiNpcBankSetup extends GuiNPCInterface2 implements IScrollData,ICu
 	protected void actionPerformed(GuiButton guibutton)
     {
     }
-	
+
 	@Override
-	public void setData(Vector<String> list, HashMap<String, Integer> data) 
+	public void setData(Vector<String> list, HashMap<String, Integer> data)
 	{
 		String name = null;
 		Bank bank = role.getBank();
@@ -53,23 +57,23 @@ public class GuiNpcBankSetup extends GuiNPCInterface2 implements IScrollData,ICu
 			name = bank.name;
 		this.data = data;
 		scroll.setList(list);
-		
+
 		if(name != null)
 			setSelected(name);
 	}
-	
+
     public void mouseClicked(int i, int j, int k)
     {
     	super.mouseClicked(i, j, k);
     	if(k == 0 && scroll != null)
     		scroll.mouseClicked(i, j, k);
     }
-    
+
 	@Override
 	public void setSelected(String selected) {
 		scroll.setSelected(selected);
 	}
-	
+
 	@Override
 	public void customScrollClicked(int i, int j, int k, GuiCustomScroll guiCustomScroll) {
 		if(guiCustomScroll.id == 0)
@@ -78,8 +82,8 @@ public class GuiNpcBankSetup extends GuiNPCInterface2 implements IScrollData,ICu
 			save();
 		}
 	}
-	
+
 	public void save() {
-		Client.sendData(EnumPacketServer.RoleSave, role.writeToNBT(new NBTTagCompound()));
+        PacketClient.sendClient(new RoleSavePacket(role.writeToNBT(new NBTTagCompound())));
 	}
 }
diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java
index c56a19ca5..319d3bfcf 100644
--- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java
+++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java
@@ -1,12 +1,14 @@
 package noppes.npcs.client.gui.roles;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.jobs.JobSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.controllers.MusicController;
 import noppes.npcs.client.gui.select.GuiSoundSelection;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 import noppes.npcs.roles.JobBard;
 
@@ -90,7 +92,7 @@ public class GuiNpcBard extends GuiNPCInterface2 implements ISubGuiListener
     		job.maxRange = job.minRange;
 
         MusicController.Instance.stopAllSounds();
-		Client.sendData(EnumPacketServer.JobSave, job.writeToNBT(new NBTTagCompound()));
+        JobSavePacket.saveJob(job);
 	}
 
     @Override
diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java
index 0fdac6fd8..136dbdc77 100644
--- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java
+++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java
@@ -1,24 +1,27 @@
 package noppes.npcs.client.gui.roles;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.role.RoleCompanionUpdatePacket;
+import kamkeel.npcs.network.packets.request.role.RoleSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.player.companion.GuiNpcCompanionTalents.GuiTalent;
 import noppes.npcs.client.gui.util.*;
 import noppes.npcs.constants.EnumCompanionStage;
 import noppes.npcs.constants.EnumCompanionTalent;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 import noppes.npcs.roles.RoleCompanion;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class GuiNpcCompanion extends GuiNPCInterface2 implements ITextfieldListener, ISliderListener{	
+public class GuiNpcCompanion extends GuiNPCInterface2 implements ITextfieldListener, ISliderListener{
 	private RoleCompanion role;
 	private List<GuiTalent> talents = new ArrayList<GuiTalent>();
     public GuiNpcCompanion(EntityNPCInterface npc){
-    	super(npc);    	
+    	super(npc);
     	role = (RoleCompanion) npc.roleInterface;
     }
 
@@ -27,11 +30,11 @@ public class GuiNpcCompanion extends GuiNPCInterface2 implements ITextfieldListe
     	super.initGui();
     	talents.clear();
     	int y = guiTop + 4;
-    	
+
     	addButton(new GuiNpcButton(0, guiLeft + 70, y, 90, 20, new String[]{EnumCompanionStage.BABY.name, EnumCompanionStage.CHILD.name, EnumCompanionStage.TEEN.name, EnumCompanionStage.ADULT.name, EnumCompanionStage.FULLGROWN.name}, role.stage.ordinal()));
     	addLabel(new GuiNpcLabel(0, "companion.stage", guiLeft + 4, y + 5));
     	addButton(new GuiNpcButton(1, guiLeft + 162, y, 90, 20, "gui.update"));
-    	
+
     	addButton(new GuiNpcButton(2, guiLeft + 70, y += 22, 90, 20, new String[]{"gui.no", "gui.yes"}, role.canAge?1:0));
     	addLabel(new GuiNpcLabel(2, "companion.age", guiLeft + 4, y + 5));
     	if(role.canAge){
@@ -42,13 +45,13 @@ public class GuiNpcCompanion extends GuiNPCInterface2 implements ITextfieldListe
 
     	talents.add(new GuiTalent(role, EnumCompanionTalent.INVENTORY, guiLeft + 4, y+=26));
     	addSlider(new GuiNpcSlider(this, 10, guiLeft + 30, y + 2, 100, 20, role.getExp(EnumCompanionTalent.INVENTORY)/5000f));
-    	
+
     	talents.add(new GuiTalent(role, EnumCompanionTalent.ARMOR, guiLeft + 4, y+=26));
     	addSlider(new GuiNpcSlider(this, 11, guiLeft + 30, y + 2, 100, 20, role.getExp(EnumCompanionTalent.ARMOR)/5000f));
-    	
+
     	talents.add(new GuiTalent(role, EnumCompanionTalent.SWORD, guiLeft + 4, y+=26));
     	addSlider(new GuiNpcSlider(this, 12, guiLeft + 30, y + 2, 100, 20, role.getExp(EnumCompanionTalent.SWORD)/5000f));
-    	
+
 //    	talents.add(new GuiTalent(role, EnumCompanionTalent.RANGED, guiLeft + 4, y+=26));
 //    	addSlider(new GuiNpcSlider(this, 13, guiLeft + 30, y + 2, 100, 20, role.getExp(EnumCompanionTalent.RANGED)/5000f));
     }
@@ -63,7 +66,7 @@ public class GuiNpcCompanion extends GuiNPCInterface2 implements ITextfieldListe
     		initGui();
     	}
     	if(guibutton.id == 1){
-    		Client.sendData(EnumPacketServer.RoleCompanionUpdate, role.stage.ordinal());
+            PacketClient.sendClient(new RoleCompanionUpdatePacket(role.stage));
     	}
     	if(guibutton.id == 2){
         	GuiNpcButton button = (GuiNpcButton) guibutton;
@@ -85,16 +88,16 @@ public class GuiNpcCompanion extends GuiNPCInterface2 implements ITextfieldListe
 			talent.drawScreen(i, j, f);
 		}
 	}
-    
+
     @Override
     public void elementClicked(){
-    	
+
     }
 
 
     @Override
 	public void save() {
-		Client.sendData(EnumPacketServer.RoleSave, role.writeToNBT(new NBTTagCompound()));
+        PacketClient.sendClient(new RoleSavePacket(role.writeToNBT(new NBTTagCompound())));
 	}
 
 	@Override
@@ -111,14 +114,14 @@ public class GuiNpcCompanion extends GuiNPCInterface2 implements ITextfieldListe
 
 	@Override
 	public void mousePressed(GuiNpcSlider slider) {
-		// TODO Auto-generated method stub
-		
+
+
 	}
 
 	@Override
 	public void mouseReleased(GuiNpcSlider slider) {
-		// TODO Auto-generated method stub
-		
+
+
 	}
 
 
diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java
index 4fc3be082..1ee14f2f4 100644
--- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java
+++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java
@@ -1,12 +1,13 @@
 package noppes.npcs.client.gui.roles;
 
+import kamkeel.npcs.network.packets.request.jobs.JobSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.SubGuiNpcAvailability;
 import noppes.npcs.client.gui.select.GuiQuestSelection;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 import noppes.npcs.roles.JobConversation;
 import noppes.npcs.roles.JobConversation.ConversationLine;
@@ -109,7 +110,7 @@ public class GuiNpcConversation extends GuiNPCInterface2 implements ITextfieldLi
 
     @Override
 	public void save() {
-    	Client.sendData(EnumPacketServer.JobSave, job.writeToNBT(new NBTTagCompound()));
+        JobSavePacket.saveJob(job);
 	}
 
 	@Override
diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java
index 5b94d1189..0223de066 100644
--- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java
+++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java
@@ -1,9 +1,10 @@
 package noppes.npcs.client.gui.roles;
 
+import kamkeel.npcs.network.packets.request.jobs.JobSavePacket;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 import noppes.npcs.roles.JobFollower;
 
@@ -11,12 +12,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class GuiNpcFollowerJob extends GuiNPCInterface2 implements ICustomScrollListener
-{	
+{
 	private JobFollower job;
 	private GuiCustomScroll scroll;
     public GuiNpcFollowerJob(EntityNPCInterface npc)
     {
-    	super(npc);    	
+    	super(npc);
     	job = (JobFollower) npc.jobInterface;
     }
 
@@ -32,7 +33,7 @@ public class GuiNpcFollowerJob extends GuiNPCInterface2 implements ICustomScroll
         scroll.guiLeft = guiLeft + 268;
         scroll.guiTop = guiTop + 4;
         this.addScroll(scroll);
-        
+
         List<String> names = new ArrayList<String>();
         List<EntityNPCInterface> list = npc.worldObj.getEntitiesWithinAABB(EntityNPCInterface.class, npc.boundingBox.expand(40, 40, 40));
         for(EntityNPCInterface npc : list){
@@ -46,7 +47,7 @@ public class GuiNpcFollowerJob extends GuiNPCInterface2 implements ICustomScroll
     @Override
 	public void save() {
     	job.name = getTextField(1).getText();
-		Client.sendData(EnumPacketServer.JobSave, job.writeToNBT(new NBTTagCompound()));
+        JobSavePacket.saveJob(job);
 	}
 
 	@Override
diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java
index 1c0e2cd20..bf40f5cf4 100644
--- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java
+++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java
@@ -1,12 +1,14 @@
 package noppes.npcs.client.gui.roles;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.role.RoleSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.containers.ContainerNPCFollowerSetup;
 import noppes.npcs.entity.EntityNPCInterface;
 import noppes.npcs.roles.RoleFollower;
@@ -47,13 +49,13 @@ public class GuiNpcFollowerSetup extends GuiContainerNPCInterface2
 
         addLabel(new GuiNpcLabel(7, "follower.infiniteDays", guiLeft + 180, guiTop + 80));
         addButton(new GuiNpcButtonYesNo(7, guiLeft + 260, guiTop + 75, role.infiniteDays));
-        
+
         addLabel(new GuiNpcLabel(8, "follower.guiDisabled", guiLeft + 180, guiTop + 104));
         addButton(new GuiNpcButtonYesNo(8, guiLeft + 260, guiTop + 99, role.disableGui));
-        
+
         addLabel(new GuiNpcLabel(9, "follower.allowSoulstone", guiLeft + 180, guiTop + 128));
         addButton(new GuiNpcButtonYesNo(9, guiLeft + 260, guiTop + 123, !role.refuseSoulStone));
-        
+
 
         addButton(new GuiNpcButton(10, guiLeft + 195, guiTop + 147, 100, 20, "remote.reset"));
     }
@@ -77,7 +79,7 @@ public class GuiNpcFollowerSetup extends GuiContainerNPCInterface2
     @Override
     protected void drawGuiContainerForegroundLayer(int par1, int par2)
     {
-    	
+
     }
 	@Override
 	public void save() {
@@ -91,13 +93,13 @@ public class GuiNpcFollowerSetup extends GuiContainerNPCInterface2
     				days = getTextField(i).getInteger();
     			if(days <= 0)
     				days = 1;
-    			
+
     			map.put(i,days);
     		}
         }
     	role.rates = map;
     	role.dialogHire = getTextField(3).getText();
     	role.dialogFarewell = getTextField(4).getText();
-		Client.sendData(EnumPacketServer.RoleSave, role.writeToNBT(new NBTTagCompound()));
+        PacketClient.sendClient(new RoleSavePacket(role.writeToNBT(new NBTTagCompound())));
 	}
 }
diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcGuard.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcGuard.java
index b5365e465..bb2a2bdf9 100644
--- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcGuard.java
+++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcGuard.java
@@ -1,28 +1,29 @@
 package noppes.npcs.client.gui.roles;
 
+import kamkeel.npcs.network.packets.request.jobs.JobSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.EntityList;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.GuiCustomScroll;
 import noppes.npcs.client.gui.util.GuiNPCInterface2;
 import noppes.npcs.client.gui.util.GuiNpcButton;
 import noppes.npcs.client.gui.util.GuiNpcLabel;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 import noppes.npcs.roles.JobGuard;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class GuiNpcGuard extends GuiNPCInterface2{	
+public class GuiNpcGuard extends GuiNPCInterface2{
 	private JobGuard role;
 	private GuiCustomScroll scroll1;
 	private GuiCustomScroll scroll2;
-	
+
     public GuiNpcGuard(EntityNPCInterface npc){
-    	super(npc);    	
+    	super(npc);
     	role = (JobGuard) npc.jobInterface;
     }
 
@@ -37,10 +38,10 @@ public class GuiNpcGuard extends GuiNPCInterface2{
     	this.addLabel(new GuiNpcLabel(2, "guard.creepers", guiLeft + 275, guiTop + 9));
     	this.addButton(new GuiNpcButton(2, guiLeft + 360, guiTop + 4, 50, 20, new String[]{"gui.no", "gui.yes"},role.attackCreepers?1:0));
     	getButton(2).enabled = role.attackHostileMobs;
-    	
+
     	this.addLabel(new GuiNpcLabel(3, "guard.specifictargets", guiLeft + 10, guiTop + 31));
-    	this.addButton(new GuiNpcButton(3, guiLeft + 85, guiTop + 26, 50, 20, new String[]{"gui.no", "gui.yes"},role.specific?1:0));   
-    	
+    	this.addButton(new GuiNpcButton(3, guiLeft + 85, guiTop + 26, 50, 20, new String[]{"gui.no", "gui.yes"},role.specific?1:0));
+
     	if(role.specific){
 	        if(scroll1 == null){
 	        	scroll1 = new GuiCustomScroll(this,0);
@@ -50,7 +51,7 @@ public class GuiNpcGuard extends GuiNPCInterface2{
 	        scroll1.guiTop = guiTop + 58;
 	        this.addScroll(scroll1);
 	        addLabel(new GuiNpcLabel(11, "guard.availableTargets", guiLeft + 4, guiTop + 48));
-	        
+
 	        if(scroll2 == null){
 	        	scroll2 = new GuiCustomScroll(this,1);
 	        	scroll2.setSize(175, 154);
@@ -59,7 +60,7 @@ public class GuiNpcGuard extends GuiNPCInterface2{
 	        scroll2.guiTop = guiTop + 58;
 	        this.addScroll(scroll2);
 	        addLabel(new GuiNpcLabel(12, "guard.currentTargets", guiLeft + 235, guiTop + 48));
-	        
+
 	        List<String> all = new ArrayList<String>();
 	        for(Object entity : EntityList.stringToClassMapping.keySet()){
 	        	String name = "entity." + entity + ".name";
@@ -71,11 +72,11 @@ public class GuiNpcGuard extends GuiNPCInterface2{
 	        }
 	        scroll1.setList(all);
 	        scroll2.setList(role.targets);
-	        
-	
+
+
 	    	addButton(new GuiNpcButton(11, guiLeft + 180, guiTop + 80, 55, 20, ">"));
 	    	addButton(new GuiNpcButton(12, guiLeft + 180, guiTop + 102, 55, 20, "<"));
-	
+
 	    	addButton(new GuiNpcButton(13, guiLeft + 180, guiTop + 130, 55, 20, ">>"));
 	    	addButton(new GuiNpcButton(14, guiLeft + 180, guiTop + 152, 55, 20, "<<"));
     	}
@@ -92,11 +93,11 @@ public class GuiNpcGuard extends GuiNPCInterface2{
         }
         if(button.id == 2){
         	role.attackCreepers = button.getValue()==1;
-        }     
+        }
         if(button.id == 3){
         	role.specific = button.getValue()==1;
         	initGui();
-        }   
+        }
 
 		if(button.id == 11){
 			if(scroll1.hasSelected()){
@@ -104,14 +105,14 @@ public class GuiNpcGuard extends GuiNPCInterface2{
 				scroll1.selected = -1;
 				scroll1.selected = -1;
 				initGui();
-			}				
+			}
 		}
 		if(button.id == 12){
 			if(scroll2.hasSelected()){
 				role.targets.remove(scroll2.getSelected());
 				scroll2.selected = -1;
 				initGui();
-			}				
+			}
 		}
 		if(button.id == 13){
 			role.targets.clear();
@@ -136,7 +137,7 @@ public class GuiNpcGuard extends GuiNPCInterface2{
     }
 
 	public void save() {
-		Client.sendData(EnumPacketServer.JobSave, role.writeToNBT(new NBTTagCompound()));
+        JobSavePacket.saveJob(role);
 	}
 
 }
diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcHealer.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcHealer.java
index 615efbd12..25ac2077e 100644
--- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcHealer.java
+++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcHealer.java
@@ -1,20 +1,21 @@
 package noppes.npcs.client.gui.roles;
 
+import kamkeel.npcs.network.packets.request.jobs.JobSavePacket;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.GuiNPCInterface2;
 import noppes.npcs.client.gui.util.GuiNpcLabel;
 import noppes.npcs.client.gui.util.GuiNpcTextField;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 import noppes.npcs.roles.JobHealer;
 
 public class GuiNpcHealer extends GuiNPCInterface2
-{	
+{
 	private JobHealer job;
     public GuiNpcHealer(EntityNPCInterface npc)
     {
-    	super(npc);    	
+    	super(npc);
     	job = (JobHealer) npc.jobInterface;
     }
 
@@ -26,16 +27,16 @@ public class GuiNpcHealer extends GuiNPCInterface2
         addTextField(new GuiNpcTextField(1,this, this.fontRendererObj, guiLeft+130, guiTop + 105, 40, 20, job.speed + ""));
         getTextField(1).integersOnly = true;
         getTextField(1).setMinMaxDefault(1, Integer.MAX_VALUE, 8);
-        
+
         addLabel(new GuiNpcLabel(2,"Range:", guiLeft + 60, guiTop + 133));
         addTextField(new GuiNpcTextField(2,this, this.fontRendererObj, guiLeft+130, guiTop + 128, 40, 20, job.range + ""));
         getTextField(2).integersOnly = true;
         getTextField(2).setMinMaxDefault(2, Integer.MAX_VALUE, 5);
-        
+
     }
     @Override
     public void elementClicked(){
-    	
+
     }
 
 
@@ -44,7 +45,7 @@ public class GuiNpcHealer extends GuiNPCInterface2
     	job.speed = getTextField(1).getInteger();
     	job.range = getTextField(2).getInteger();
 
-		Client.sendData(EnumPacketServer.JobSave, job.writeToNBT(new NBTTagCompound()));
+        JobSavePacket.saveJob(job);
 	}
 
 
diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcItemGiver.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcItemGiver.java
index 4d3e7eb6a..15cf67340 100644
--- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcItemGiver.java
+++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcItemGiver.java
@@ -1,14 +1,15 @@
 package noppes.npcs.client.gui.roles;
 
+import kamkeel.npcs.network.packets.request.jobs.JobSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.SubGuiNpcAvailability;
 import noppes.npcs.client.gui.util.GuiContainerNPCInterface2;
 import noppes.npcs.client.gui.util.GuiNpcButton;
 import noppes.npcs.client.gui.util.GuiNpcLabel;
 import noppes.npcs.client.gui.util.GuiNpcTextField;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.containers.ContainerNpcItemGiver;
 import noppes.npcs.entity.EntityNPCInterface;
 import noppes.npcs.roles.JobItemGiver;
@@ -17,11 +18,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class GuiNpcItemGiver extends GuiContainerNPCInterface2
-{	
+{
 	private JobItemGiver role;
     public GuiNpcItemGiver(EntityNPCInterface npc, ContainerNpcItemGiver container)
     {
-    	super(npc,container);    	
+    	super(npc,container);
     	ySize = 200;
     	role = (JobItemGiver) npc.jobInterface;
     	setBackground("npcitemgiver.png");
@@ -37,7 +38,7 @@ public class GuiNpcItemGiver extends GuiContainerNPCInterface2
     	getTextField(0).integersOnly = true;
         addLabel(new GuiNpcLabel(0,"Cooldown:", guiLeft + 6, guiTop + 59));
         addLabel(new GuiNpcLabel(1,"Items to give", guiLeft + 46, guiTop + 79));
-        
+
         getTextField(0).integersOnly = true;
 
         int i = 0;
@@ -71,7 +72,7 @@ public class GuiNpcItemGiver extends GuiContainerNPCInterface2
         if(button.id == 4){
         	setSubGui(new SubGuiNpcAvailability(role.availability));
         }
-    	        
+
     }
 
 	public void save() {
@@ -89,7 +90,7 @@ public class GuiNpcItemGiver extends GuiContainerNPCInterface2
 
 		role.cooldown = cc;
 
-		Client.sendData(EnumPacketServer.JobSave, role.writeToNBT(new NBTTagCompound()));
+        JobSavePacket.saveJob(role);
 	}
 
 }
diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java
index 353fe4c4a..1afbedf74 100644
--- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java
+++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java
@@ -1,20 +1,24 @@
 package noppes.npcs.client.gui.roles;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.jobs.JobSavePacket;
+import kamkeel.npcs.network.packets.request.jobs.JobSpawnerAddPacket;
+import kamkeel.npcs.network.packets.request.jobs.JobSpawnerRemovePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.GuiNpcMobSpawnerSelector;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 import noppes.npcs.roles.JobSpawner;
 
 
 public class GuiNpcSpawner extends GuiNPCInterface2 implements ITextfieldListener, IGuiData
-{	
+{
 	private JobSpawner job;
-	
+
 	private int slot = -1;
 
 	public String title1 = "gui.selectnpc";
@@ -25,10 +29,10 @@ public class GuiNpcSpawner extends GuiNPCInterface2 implements ITextfieldListene
 	public String title6 = "gui.selectnpc";
 	public String title7 = "gui.selectnpc";
 	public String title8 = "gui.selectnpc";
-	
+
     public GuiNpcSpawner(EntityNPCInterface npc)
     {
-    	super(npc);    	
+    	super(npc);
     	job = (JobSpawner) npc.jobInterface;
     }
 
@@ -66,12 +70,12 @@ public class GuiNpcSpawner extends GuiNPCInterface2 implements ITextfieldListene
         addLabel(new GuiNpcLabel(3, "4:", guiLeft + 4, y + 5));
     	this.addButton(new GuiNpcButton(3, guiLeft + 45, y, 140, 20, title4));
 
-    	y += 23; 
+    	y += 23;
     	this.addButton(new GuiNpcButton(24, guiLeft + 20, y,20,20, "X"));
         addLabel(new GuiNpcLabel(4, "5:", guiLeft + 4, y + 5));
     	this.addButton(new GuiNpcButton(4, guiLeft + 45, y, 140, 20, title5));
 
-    	y += 23; 
+    	y += 23;
     	this.addButton(new GuiNpcButton(25, guiLeft + 20, y,20,20, "X"));
         addLabel(new GuiNpcLabel(5, "6:", guiLeft + 4, y + 5));
     	this.addButton(new GuiNpcButton(5, guiLeft + 45, y, 140, 20, title6));
@@ -90,9 +94,9 @@ public class GuiNpcSpawner extends GuiNPCInterface2 implements ITextfieldListene
         addLabel(new GuiNpcLabel(9,"Z:", guiLeft + 161 + 190, y + 5));
     	addTextField(new GuiNpcTextField(9,this, fontRendererObj, guiLeft + 171 + 190, y, 24, 20, job.zOffset + ""));
     	getTextField(9).integersOnly = true;
-        getTextField(9).setMinMaxDefault(-9, 9, 0);  
-        
-    	y += 23; 
+        getTextField(9).setMinMaxDefault(-9, 9, 0);
+
+    	y += 23;
         addLabel(new GuiNpcLabel(10, "spawner.type", guiLeft + 4 + 190, y + 5));
         addButton(new GuiNpcButton(10, guiLeft + 80 + 190, y, 100, 20, new String[]{"spawner.one", "spawner.all", "spawner.random", "spawner.summoner"}, job.spawnType));
 
@@ -122,15 +126,15 @@ public class GuiNpcSpawner extends GuiNPCInterface2 implements ITextfieldListene
     }
 
     protected void actionPerformed(GuiButton guibutton){
-    	GuiNpcButton button = (GuiNpcButton) guibutton;     
+    	GuiNpcButton button = (GuiNpcButton) guibutton;
     	if(button.id >= 0 && button.id < 6){
     		slot = button.id + 1;
     		setSubGui(new GuiNpcMobSpawnerSelector());
-    	}    
+    	}
     	if(button.id >= 20 && button.id < 26){
 			int removeID = button.id - 19;
 			job.setJobCompound(removeID, null);
-			Client.sendData(EnumPacketServer.JobSpawnerRemove, button.id - 19);
+            PacketClient.sendClient(new JobSpawnerRemovePacket(button.id - 19));
     	}
     	if(button.id == 26){
     		job.doesntDie = button.getValue() == 1;
@@ -182,13 +186,13 @@ public class GuiNpcSpawner extends GuiNPCInterface2 implements ITextfieldListene
 		if(selector.isServer){
 			String selected = selector.getSelected();
 			if(selected != null)
-				Client.sendData(EnumPacketServer.JobSpawnerAdd, selector.isServer, selected, selector.activeTab, slot);
+                PacketClient.sendClient(new JobSpawnerAddPacket(selector.isServer, selected, selector.activeTab, slot));
 		}
 		else{
 			NBTTagCompound compound = selector.getCompound();
 			if(compound != null){
-				job.setJobCompound(slot, compound); 
-				Client.sendData(EnumPacketServer.JobSpawnerAdd, selector.isServer, slot, compound);
+				job.setJobCompound(slot, compound);
+                PacketClient.sendClient(new JobSpawnerAddPacket(selector.isServer, slot, compound));
 			}
 		}
 		initGui();
@@ -198,7 +202,7 @@ public class GuiNpcSpawner extends GuiNPCInterface2 implements ITextfieldListene
 	public void save() {
     	NBTTagCompound compound = job.writeToNBT(new NBTTagCompound());
     	job.cleanCompound(compound);
-		Client.sendData(EnumPacketServer.JobSave, compound);
+        PacketClient.sendClient(new JobSavePacket(compound));
 	}
 
 	@Override
diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java
index 067699b70..389e52850 100644
--- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java
+++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java
@@ -1,13 +1,16 @@
 
 package noppes.npcs.client.gui.roles;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.TraderMarketSavePacket;
+import kamkeel.npcs.network.packets.request.role.RoleSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.CustomNpcResourceListener;
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.containers.ContainerNPCTraderSetup;
 import noppes.npcs.entity.EntityNPCInterface;
 import noppes.npcs.roles.RoleTrader;
@@ -85,8 +88,8 @@ public class GuiNpcTraderSetup extends GuiContainerNPCInterface2 implements ITex
 
 	@Override
 	public void save() {
-		Client.sendData(EnumPacketServer.TraderMarketSave, role.marketName, false);
-		Client.sendData(EnumPacketServer.RoleSave, role.writeToNBT(new NBTTagCompound()));
+        PacketClient.sendClient(new TraderMarketSavePacket(role.marketName, false));
+        PacketClient.sendClient(new RoleSavePacket(role.writeToNBT(new NBTTagCompound())));
 	}
 
 	@Override
@@ -94,8 +97,7 @@ public class GuiNpcTraderSetup extends GuiContainerNPCInterface2 implements ITex
 		String name = guiNpcTextField.getText();
 		if(!name.equalsIgnoreCase(role.marketName)){
 			role.marketName = name;
-			Client.sendData(EnumPacketServer.TraderMarketSave, role.marketName, true);
-		}
-
+            PacketClient.sendClient(new TraderMarketSavePacket(role.marketName, true));
+        }
 	}
 }
diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java
index c093be695..6bf2c3f62 100644
--- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java
+++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java
@@ -1,10 +1,14 @@
 package noppes.npcs.client.gui.roles;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.transport.TransportCategoriesGetPacket;
+import kamkeel.npcs.network.packets.request.transport.TransportGetLocationPacket;
+import kamkeel.npcs.network.packets.request.transport.TransportSavePacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.controllers.data.TransportLocation;
 import noppes.npcs.entity.EntityNPCInterface;
 
@@ -15,25 +19,25 @@ public class GuiNpcTransporter extends GuiNPCInterface2 implements IScrollData,
 	private GuiCustomScroll scroll;
 	public TransportLocation location = new TransportLocation();
 	private HashMap<String,Integer> data = new HashMap<String,Integer>();
-	
+
     public GuiNpcTransporter(EntityNPCInterface npc){
-    	super(npc);	
-    	Client.sendData(EnumPacketServer.TransportCategoriesGet);
-    	Client.sendData(EnumPacketServer.TransportGetLocation);
+    	super(npc);
+        PacketClient.sendClient(new TransportCategoriesGetPacket());
+        PacketClient.sendClient(new TransportGetLocationPacket());
     }
-    
+
     public void initGui(){
         super.initGui();
         Vector<String> list = new Vector<String>();
         list.addAll(data.keySet());
-        
+
         if(scroll == null){
 	        scroll = new GuiCustomScroll(this,0);
 	        scroll.setSize(143, 208);
         }
         scroll.guiLeft = guiLeft + 214;
         scroll.guiTop = guiTop + 4;
-        
+
         addScroll(scroll);
         addLabel(new GuiNpcLabel(0,"gui.name", guiLeft + 4, height + 8));
         addTextField(new GuiNpcTextField(0, this, fontRendererObj, guiLeft + 60, guiTop + 3, 140, 20, location.name));
@@ -45,7 +49,7 @@ public class GuiNpcTransporter extends GuiNPCInterface2 implements IScrollData,
     	GuiNpcButton button = (GuiNpcButton) guibutton;
     	if(button.id == 0){
     		location.type = button.getValue();
-    	}    	
+    	}
     }
 	@Override
 	public void save() {
@@ -54,14 +58,14 @@ public class GuiNpcTransporter extends GuiNPCInterface2 implements IScrollData,
 		String name = getTextField(0).getText();
 		if(!name.isEmpty())
 			location.name = name;
-		
+
 		location.posX = player.posX;
 		location.posY = player.posY;
 		location.posZ = player.posZ;
 		location.dimension = player.dimension;
-		
+
 		int cat = data.get(scroll.getSelected());
-		Client.sendData(EnumPacketServer.TransportSave,cat, location.writeNBT());
+        PacketClient.sendClient(new TransportSavePacket(cat, location.writeNBT()));
 	}
 	@Override
 	public void setData(Vector<String> list, HashMap<String, Integer> data) {
diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java b/src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java
index 47560b2fa..2a2420a83 100644
--- a/src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java
+++ b/src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java
@@ -1,9 +1,8 @@
 package noppes.npcs.client.gui.script;
 
+import kamkeel.npcs.network.packets.request.script.EventScriptPacket;
 import net.minecraft.nbt.NBTTagCompound;
 import noppes.npcs.NBTTags;
-import noppes.npcs.client.Client;
-import noppes.npcs.constants.EnumPacketServer;
 import noppes.npcs.controllers.ScriptContainer;
 import noppes.npcs.controllers.data.DataScript;
 import noppes.npcs.entity.EntityNPCInterface;
@@ -36,7 +35,7 @@ public class GuiNPCEventScripts extends GuiScriptInterface {
 
         this.script = new DataScript(npc);
         this.handler = this.script;
-        Client.sendData(EnumPacketServer.EventScriptDataGet);
+        EventScriptPacket.Get();
     }
 
     public void setGuiData(NBTTagCompound compound) {
@@ -63,12 +62,12 @@ public class GuiNPCEventScripts extends GuiScriptInterface {
         List<ScriptContainer> containers = this.script.getScripts();
         for (int i = 0; i < containers.size(); i++) {
             ScriptContainer container = containers.get(i);
-            Client.sendData(EnumPacketServer.EventScriptDataSave, i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+            EventScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
         }
         NBTTagCompound scriptData = new NBTTagCompound();
         scriptData.setString("ScriptLanguage", this.script.getLanguage());
         scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
         scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
-        Client.sendData(EnumPacketServer.EventScriptDataSave, -1, containers.size(), scriptData);
+        EventScriptPacket.Save(-1, containers.size(), scriptData);
     }
 }
diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java
index 0002bc955..908d1b75a 100644
--- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java
+++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java
@@ -1,9 +1,10 @@
 package noppes.npcs.client.gui.script;
 
+import kamkeel.npcs.network.packets.request.script.GlobalNPCScriptPacket;
 import net.minecraft.nbt.NBTTagCompound;
 import noppes.npcs.NBTTags;
-import noppes.npcs.client.Client;
-import noppes.npcs.constants.EnumPacketServer;
+
+
 import noppes.npcs.controllers.ScriptContainer;
 import noppes.npcs.controllers.data.GlobalNPCDataScript;
 
@@ -32,7 +33,7 @@ public class GuiScriptAllNPCs extends GuiScriptInterface {
         hookList.add("projectileImpact");
 
         this.handler = this.script;
-        Client.sendData(EnumPacketServer.ScriptGlobalNPCGet);
+        GlobalNPCScriptPacket.Get();
     }
 
     public void setGuiData(NBTTagCompound compound) {
@@ -59,12 +60,12 @@ public class GuiScriptAllNPCs extends GuiScriptInterface {
         List<ScriptContainer> containers = this.script.getScripts();
         for (int i = 0; i < containers.size(); i++) {
             ScriptContainer container = containers.get(i);
-            Client.sendData(EnumPacketServer.ScriptGlobalNPCSave, i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+            GlobalNPCScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
         }
         NBTTagCompound scriptData = new NBTTagCompound();
         scriptData.setString("ScriptLanguage", this.script.getLanguage());
         scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
         scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
-        Client.sendData(EnumPacketServer.ScriptGlobalNPCSave, -1, containers.size(), scriptData);
+        GlobalNPCScriptPacket.Save(-1, containers.size(), scriptData);
     }
 }
diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java
index 5a80b64af..d9cf8ff6c 100644
--- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java
+++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java
@@ -1,9 +1,10 @@
 package noppes.npcs.client.gui.script;
 
+import kamkeel.npcs.network.packets.request.script.BlockScriptPacket;
 import net.minecraft.nbt.NBTTagCompound;
 import noppes.npcs.blocks.tiles.TileScripted;
-import noppes.npcs.client.Client;
-import noppes.npcs.constants.EnumPacketServer;
+
+
 
 public class GuiScriptBlock extends GuiScriptInterface {
     private TileScripted tileScripted;
@@ -24,7 +25,7 @@ public class GuiScriptBlock extends GuiScriptInterface {
         hookList.add("timer");
 
         this.handler = this.tileScripted = (TileScripted) player.worldObj.getTileEntity(x, y, z);
-        Client.sendData(EnumPacketServer.ScriptBlockDataGet, tileScripted.xCoord, tileScripted.yCoord, tileScripted.zCoord);
+        BlockScriptPacket.Get(tileScripted.xCoord, tileScripted.yCoord, tileScripted.zCoord);
     }
 
     public void setGuiData(NBTTagCompound compound) {
@@ -34,6 +35,6 @@ public class GuiScriptBlock extends GuiScriptInterface {
 
     public void save() {
         super.save();
-        Client.sendData(EnumPacketServer.ScriptBlockDataSave, tileScripted.xCoord, tileScripted.yCoord, tileScripted.zCoord, this.tileScripted.getNBT(new NBTTagCompound()));
+        BlockScriptPacket.Save(tileScripted.xCoord, tileScripted.yCoord, tileScripted.zCoord, this.tileScripted.getNBT(new NBTTagCompound()));
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java
new file mode 100644
index 000000000..c4529bcf4
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java
@@ -0,0 +1,402 @@
+package noppes.npcs.client.gui.script;
+
+import kamkeel.npcs.network.packets.request.script.EffectScriptPacket;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiConfirmOpenLink;
+import net.minecraft.client.gui.GuiYesNo;
+import net.minecraft.client.gui.GuiYesNoCallback;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.StatCollector;
+import noppes.npcs.NBTTags;
+import noppes.npcs.NoppesStringUtils;
+import noppes.npcs.client.NoppesUtil;
+import noppes.npcs.client.gui.global.GuiNPCManageEffects;
+import noppes.npcs.client.gui.util.*;
+import noppes.npcs.controllers.ScriptContainer;
+import noppes.npcs.controllers.ScriptController;
+import noppes.npcs.controllers.data.CustomEffect;
+import noppes.npcs.controllers.data.EffectScript;
+
+import java.util.*;
+
+public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener {
+
+    private int activeTab = 0;
+    public Map<String, List<String>> languages = new HashMap();
+    private final int scriptLimit = 1;
+    public List<String> hookList = new ArrayList();
+    public String previousHookClicked = "";
+
+    public final GuiNPCManageEffects parent;
+    public final CustomEffect effect;
+    private final EffectScript scriptHandler;
+
+
+    public GuiScriptEffect(GuiNPCManageEffects parent, CustomEffect effect) {
+        this.drawDefaultBackground = true;
+        this.closeOnEsc = true;
+        this.xSize = 420;
+        this.setBackground("menubg.png");
+
+        this.parent = parent;
+        this.effect = effect;
+        this.scriptHandler = new EffectScript();
+
+        for (EffectScript.ScriptType type : EffectScript.ScriptType.values()) {
+            this.hookList.add(type.function);
+        }
+
+        EffectScriptPacket.Get(effect.id);
+    }
+
+    public void initGui() {
+        this.ySize = (int)((double)this.xSize * 0.56);
+        if ((double)this.ySize > (double)this.height * 0.95) {
+            this.ySize = (int)((double)this.height * 0.95);
+            this.xSize = (int)((double)this.ySize / 0.56);
+        }
+
+        this.bgScale = (float)this.xSize / 400.0F;
+        super.initGui();
+        this.guiTop += 10;
+        int yoffset = (int)((double)this.ySize * 0.02);
+        GuiMenuTopButton top;
+        this.addTopButton(top = new GuiMenuTopButton(0, this.guiLeft + 4, this.guiTop - 17, "gui.settings"));
+        int topXoffset = 0;
+        int topYoffset = 0;
+
+
+        if (this.scriptHandler.container != null) {
+            this.addTopButton(top = new GuiMenuTopButton(1, top.xPosition + top.width + topXoffset, top.yPosition + topYoffset, "Script"));
+
+        } else {
+            this.addTopButton(new GuiMenuTopButton(this.scriptLimit, top.xPosition + top.width, top.yPosition, "+"));
+        }
+
+        top = this.getTopButton(this.activeTab);
+        if (top == null) {
+            this.activeTab = 0;
+            top = this.getTopButton(0);
+        }
+
+        top.active = true;
+        if (this.activeTab == 1) {
+            GuiCustomScroll hooks = new GuiCustomScroll(this, 1);
+            hooks.allowUserInput = false;
+            hooks.setSize(108, 198);
+            hooks.guiLeft = this.guiLeft - 110;
+            hooks.guiTop = this.guiTop + 14;
+
+            hooks.setUnsortedList(this.hookList);
+            this.addScroll(hooks);
+            GuiNpcLabel hookLabel = new GuiNpcLabel(0, "script.hooks", hooks.guiLeft, this.guiTop + 5);
+            hookLabel.color = 11184810;
+            this.addLabel(hookLabel);
+            ScriptContainer container = this.scriptHandler.container;
+            GuiScriptTextArea ta = new GuiScriptTextArea(this, 2, this.guiLeft + 1 + yoffset, this.guiTop + yoffset, this.xSize - 108 - yoffset, (int)((double)this.ySize * 0.96) - yoffset * 2, container == null ? "" : container.script);
+            ta.enableCodeHighlighting();
+            ta.setListener(this);
+            this.addTextField(ta);
+            int left1 = this.guiLeft + this.xSize - 104;
+            this.addButton(new GuiNpcButton(102, left1, this.guiTop + yoffset, 60, 20, "gui.clear"));
+            this.addButton(new GuiNpcButton(101, left1 + 61, this.guiTop + yoffset, 60, 20, "gui.paste"));
+            this.addButton(new GuiNpcButton(100, left1, this.guiTop + 21 + yoffset, 60, 20, "gui.copy"));
+            this.addButton(new GuiNpcButton(105, left1 + 61, this.guiTop + 21 + yoffset, 60, 20, "gui.remove"));
+
+            this.addButton(new GuiNpcButton(107, left1, this.guiTop + 66 + yoffset, 80, 20, "script.loadscript"));
+            // TODO Uncomment if script lists ever get added
+            this.getButton(107).enabled = false;
+
+            GuiCustomScroll scroll = (new GuiCustomScroll(this, 0)).setUnselectable();
+            scroll.setSize(100, (int)((double)this.ySize * 0.54) - yoffset * 2);
+            scroll.guiLeft = left1;
+            scroll.guiTop = this.guiTop + 88 + yoffset;
+            if (container != null) {
+                scroll.setList(container.scripts);
+            }
+
+            this.addScroll(scroll);
+        } else {
+            GuiNpcTextArea var8 = new GuiNpcTextArea(2, this, this.guiLeft + 4 + yoffset, this.guiTop + 6 + yoffset, this.xSize - 160 - yoffset, (int)((float)this.ySize * 0.92F) - yoffset * 2, this.getConsoleText());
+            var8.enabled = false;
+            this.addTextField(var8);
+            int var9 = this.guiLeft + this.xSize - 150;
+            this.addButton(new GuiNpcButton(100, var9, this.guiTop + 125, 60, 20, "gui.copy"));
+            this.addButton(new GuiNpcButton(102, var9, this.guiTop + 146, 60, 20, "gui.clear"));
+            this.addLabel(new GuiNpcLabel(1, "script.language", var9, this.guiTop + 15));
+            this.addButton(new GuiNpcButton(103, var9 + 60, this.guiTop + 10, 80, 20, this.languages.keySet().toArray(new String[this.languages.keySet().size()]), this.getScriptIndex()));
+            this.getButton(103).enabled = !this.languages.isEmpty();
+            this.addLabel(new GuiNpcLabel(2, "gui.enabled", var9, this.guiTop + 36));
+            this.addButton(new GuiNpcButton(104, var9 + 60, this.guiTop + 31, 50, 20, new String[]{"gui.no", "gui.yes"}, this.scriptHandler.getEnabled() ? 1 : 0));
+            if (this.player.worldObj.isRemote) {
+                this.addButton(new GuiNpcButton(106, var9, this.guiTop + 55, 150, 20, "script.openfolder"));
+            }
+
+            this.addButton(new GuiNpcButton(109, var9, this.guiTop + 78, 80, 20, "gui.website"));
+            this.addButton(new GuiNpcButton(112, var9 + 81, this.guiTop + 78, 80, 20, "gui.forum"));
+            this.addButton(new GuiNpcButton(110, var9, this.guiTop + 99, 80, 20, "script.apidoc"));
+            this.addButton(new GuiNpcButton(111, var9 + 81, this.guiTop + 99, 80, 20, "script.apisrc"));
+        }
+
+        this.xSize = 420;
+        this.ySize = 256;
+    }
+
+    public void customScrollClicked(int i, int j, int k, GuiCustomScroll scroll) {
+        String hook = scroll.getSelected();
+        if (this.previousHookClicked.equals(hook)) {
+            String addString = "";
+            if (!this.getTextField(2).getText().isEmpty()) {
+                addString = addString + "\n";
+            }
+
+            addString = addString + "function " + hook + "(event) {\n    \n}\n";
+            this.getTextField(2).setText(this.getTextField(2).getText() + addString);
+            this.previousHookClicked = "";
+        } else {
+            this.previousHookClicked = hook;
+        }
+
+    }
+
+    public void unFocused(GuiNpcTextField textfield) {
+    }
+
+    private String getConsoleText() {
+        Map<Long, String> map = this.scriptHandler.getConsoleText();
+        StringBuilder builder = new StringBuilder();
+        Iterator var3 = map.entrySet().iterator();
+
+        while(var3.hasNext()) {
+            Map.Entry<Long, String> entry = (Map.Entry)var3.next();
+            builder.insert(0, new Date((Long)entry.getKey()) + (String)entry.getValue() + "\n");
+        }
+
+        return builder.toString();
+    }
+
+    private int getScriptIndex() {
+        int i = 0;
+
+        for(Iterator var2 = this.languages.keySet().iterator(); var2.hasNext(); ++i) {
+            String language = (String)var2.next();
+            if (language.equalsIgnoreCase(this.scriptHandler.getLanguage())) {
+                return i;
+            }
+        }
+
+        return 0;
+    }
+
+    public void confirmClicked(boolean flag, int i) {
+        if (flag) {
+            if (i == 0) {
+                this.openLink("https://www.curseforge.com/minecraft/mc-mods/customnpc-plus");
+            }
+
+            if (i == 1) {
+                this.openLink("https://kamkeel.github.io/CustomNPC-Plus/");
+            }
+
+            if (i == 2) {
+                this.openLink("https://kamkeel.github.io/CustomNPC-Plus/");
+            }
+
+            if (i == 3) {
+                this.openLink("http://www.minecraftforge.net/forum/index.php/board,122.0.html");
+            }
+
+            if (i == 10) {
+                this.scriptHandler.container = null;
+                this.activeTab = 0;
+            }
+
+            if (i == 101) {
+                this.getTextField(2).setText(NoppesStringUtils.getClipboardContents());
+                this.setScript();
+            }
+
+            if (i == 102) {
+                if (this.activeTab == 1) {
+                    ScriptContainer container = this.scriptHandler.container;
+                    container.script = "";
+                } else {
+                    this.scriptHandler.clearConsole();
+                }
+
+                this.initGui();
+            }
+        }
+
+        this.displayGuiScreen(this);
+    }
+
+    protected void actionPerformed(GuiButton guibutton) {
+        if (guibutton.id == 0) {
+            this.setScript();
+            this.activeTab = 0;
+            this.initGui();
+        }
+
+        if (guibutton.id == this.scriptLimit) {
+            if (scriptHandler.container == null)
+                this.scriptHandler.container = new ScriptContainer(this.scriptHandler);
+            else
+                this.setScript();
+            this.activeTab = 1;
+            this.initGui();
+        }
+
+        if (guibutton.id == 109) {
+            this.displayGuiScreen(new GuiConfirmOpenLink(this, "https://kamkeel.github.io/CustomNPC-Plus/", 0, true));
+        }
+
+        if (guibutton.id == 110) {
+            this.displayGuiScreen(new GuiConfirmOpenLink(this, "https://github.com/KAMKEEL/CustomNPC-Plus-API", 1, true));
+        }
+
+        if (guibutton.id == 111) {
+            this.displayGuiScreen(new GuiConfirmOpenLink(this, "https://github.com/Noppes/CustomNPCsAPI", 2, true));
+        }
+
+        if (guibutton.id == 112) {
+            this.displayGuiScreen(new GuiConfirmOpenLink(this, "http://www.minecraftforge.net/forum/index.php/board,122.0.html", 3, true));
+        }
+
+        if (guibutton.id == 100) {
+            NoppesStringUtils.setClipboardContents(this.getTextField(2).getText());
+        }
+
+        if (guibutton.id == 101) {
+            GuiYesNo guiyesno = new GuiYesNo(this, StatCollector.translateToLocal("gui.paste"), StatCollector.translateToLocal("gui.sure"), 101);
+            this.displayGuiScreen(guiyesno);
+        }
+
+        GuiYesNo container1;
+        if (guibutton.id == 102) {
+            container1 = new GuiYesNo(this, StatCollector.translateToLocal("gui.clear"), StatCollector.translateToLocal("gui.sure"), 102);
+            this.displayGuiScreen(container1);
+        }
+
+        if (guibutton.id == 103) {
+            this.scriptHandler.setLanguage(guibutton.displayString);
+        }
+
+        if (guibutton.id == 104) {
+            this.scriptHandler.setEnabled(((GuiNpcButton)guibutton).getValue() == 1);
+        }
+
+        if (guibutton.id == 105) {
+            container1 = new GuiYesNo(this, "", ((GuiNpcButton)guibutton).displayString, 10);
+            this.displayGuiScreen(container1);
+        }
+
+        if (guibutton.id == 106) {
+            NoppesUtil.openFolder(ScriptController.Instance.dir);
+        }
+
+        if (guibutton.id == 107) {
+            ScriptContainer container = this.scriptHandler.container;
+            if (container == null) {
+                container = new ScriptContainer(this.scriptHandler);
+                this.scriptHandler.container = container;
+            }
+
+//            this.setSubGui(new EventGuiScriptList((List)this.languages.get(this.script.getLanguage()), container));
+        }
+
+    }
+
+    private void setScript() {
+        if (this.activeTab == 1) {
+            ScriptContainer container = this.scriptHandler.container;
+            if (container == null) {
+                container = new ScriptContainer(this.scriptHandler);
+                this.scriptHandler.container = container;
+            }
+
+            String text = this.getTextField(2).getText();
+            text = text.replace("\r\n", "\n");
+            text = text.replace("\r", "\n");
+            container.script = text;
+        }
+
+    }
+
+    public void setGuiData(NBTTagCompound compound) {
+        if (!compound.hasKey("Tab")) {
+            this.scriptHandler.setLanguage(compound.getString("ScriptLanguage"));
+            this.scriptHandler.setEnabled(compound.getBoolean("ScriptEnabled"));
+            this.copiedSetGuiData(compound);
+        } else {
+            int tab = compound.getInteger("Tab");
+            ScriptContainer container = new ScriptContainer(this.scriptHandler);
+            container.readFromNBT(compound.getCompoundTag("Script"));
+            this.scriptHandler.container = container;
+            this.initGui();
+        }
+
+    }
+
+    private void copiedSetGuiData(NBTTagCompound compound) {
+        NBTTagList data = compound.getTagList("Languages", 10);
+        HashMap languages = new HashMap();
+
+        for(int i = 0; i < data.tagCount(); ++i) {
+            NBTTagCompound comp = data.getCompoundTagAt(i);
+            ArrayList scripts = new ArrayList();
+            NBTTagList list = comp.getTagList("Scripts", 8);
+
+            for(int j = 0; j < list.tagCount(); ++j) {
+                scripts.add(list.getStringTagAt(j));
+            }
+
+            languages.put(comp.getString("Language"), scripts);
+        }
+
+        this.languages = languages;
+        this.initGui();
+    }
+
+    public void save() {
+        this.setScript();
+
+        List<ScriptContainer> containers = this.scriptHandler.getScripts();
+        for (int i = 0; i < containers.size(); i++) {
+            ScriptContainer container = containers.get(i);
+            EffectScriptPacket.Save(effect.id, i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+        }
+        NBTTagCompound scriptData = new NBTTagCompound();
+        scriptData.setString("ScriptLanguage", this.scriptHandler.getLanguage());
+        scriptData.setBoolean("ScriptEnabled", this.scriptHandler.getEnabled());
+        scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.scriptHandler.getConsoleText()));
+
+        EffectScriptPacket.Save(effect.id, -1, containers.size(), scriptData);
+    }
+
+    public void textUpdate(String text) {
+        ScriptContainer container = this.scriptHandler.container;
+        if (container != null) {
+            container.script = text;
+        }
+
+    }
+
+    public void saveText(String text) {
+        ScriptContainer container = this.scriptHandler.container;
+        if (container != null) {
+            container.script = text;
+        }
+
+        this.initGui();
+    }
+
+    @Override
+    public void close() {
+        this.save();
+        parent.setWorldAndResolution(mc, width, height);
+        parent.initGui();
+        mc.currentScreen = parent;
+    }
+}
diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java
index dd84cacea..7d0ec5aee 100644
--- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java
+++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java
@@ -4,6 +4,7 @@ import com.google.common.reflect.ClassPath;
 import cpw.mods.fml.common.eventhandler.Event;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.network.FMLNetworkEvent;
+import kamkeel.npcs.network.packets.request.script.ForgeScriptPacket;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.event.entity.EntityEvent;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
@@ -12,8 +13,8 @@ import net.minecraftforge.event.world.ChunkEvent;
 import net.minecraftforge.event.world.ChunkWatchEvent;
 import net.minecraftforge.event.world.WorldEvent;
 import noppes.npcs.NBTTags;
-import noppes.npcs.client.Client;
-import noppes.npcs.constants.EnumPacketServer;
+
+
 import noppes.npcs.controllers.ScriptContainer;
 import noppes.npcs.controllers.data.ForgeDataScript;
 import org.apache.commons.lang3.StringUtils;
@@ -62,7 +63,7 @@ public class GuiScriptForge extends GuiScriptInterface {
         hookList.add("onCNPCNaturalSpawn");
 
         this.handler = this.script;
-        Client.sendData(EnumPacketServer.ScriptForgeGet);
+        ForgeScriptPacket.Get();
     }
 
     public void setGuiData(NBTTagCompound compound) {
@@ -89,12 +90,12 @@ public class GuiScriptForge extends GuiScriptInterface {
         List<ScriptContainer> containers = this.script.getScripts();
         for (int i = 0; i < containers.size(); i++) {
             ScriptContainer container = containers.get(i);
-            Client.sendData(EnumPacketServer.ScriptForgeSave, i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+            ForgeScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
         }
         NBTTagCompound scriptData = new NBTTagCompound();
         scriptData.setString("ScriptLanguage", this.script.getLanguage());
         scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
         scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
-        Client.sendData(EnumPacketServer.ScriptForgeSave, -1, containers.size(), scriptData);
+        ForgeScriptPacket.Save(-1, containers.size(), scriptData);
     }
 }
diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptGlobal.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptGlobal.java
index 210806e7a..234c9b893 100644
--- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptGlobal.java
+++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptGlobal.java
@@ -1,14 +1,15 @@
 package noppes.npcs.client.gui.script;
 
+import kamkeel.npcs.network.packets.request.script.ScriptInfoPacket;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.gui.util.GuiNPCInterface;
 import noppes.npcs.client.gui.util.GuiNpcButton;
 import noppes.npcs.client.gui.util.IGuiData;
-import noppes.npcs.constants.EnumPacketServer;
+
 import org.lwjgl.opengl.GL11;
 
 import java.util.HashMap;
@@ -35,7 +36,7 @@ public class GuiScriptGlobal extends GuiNPCInterface implements IGuiData {
         GuiNpcButton npcButton = new GuiNpcButton(2, this.guiLeft + 38, this.guiTop + 80, 100, 20, "All NPCs");
         npcButton.setEnabled(false);
         this.addButton(npcButton);
-        Client.sendData(EnumPacketServer.ScriptGlobalGuiDataGet, new Object[0]);
+        ScriptInfoPacket.Get();
     }
 
     public void setGuiData(NBTTagCompound compound) {
diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java
index 0b0475ebd..dabf86bf8 100644
--- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java
+++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener {
-    private int activeTab = 0;
+    protected int activeTab = 0;
     public IScriptHandler handler;
     public Map<String, List<String>> languages = new HashMap();
     private int scriptLimit = 1;
@@ -113,7 +113,8 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb
             this.addScroll(scroll);
         } else {
             GuiNpcTextArea var8 = new GuiNpcTextArea(2, this, this.guiLeft + 4 + yoffset, this.guiTop + 6 + yoffset, this.xSize - 160 - yoffset, (int)((float)this.ySize * 0.92F) - yoffset * 2, this.getConsoleText());
-            var8.enabled = false;
+            var8.canEdit = false;
+            var8.setFocused(true);
             this.addTextField(var8);
             int var9 = this.guiLeft + this.xSize - 150;
             this.addButton(new GuiNpcButton(100, var9, this.guiTop + 125, 60, 20, "gui.copy"));
@@ -159,7 +160,7 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb
 
     }
 
-    private String getConsoleText() {
+    protected String getConsoleText() {
         Map<Long, String> map = this.handler.getConsoleText();
         StringBuilder builder = new StringBuilder();
         Iterator var3 = map.entrySet().iterator();
diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java
index 395497a77..6f7d9e1cd 100644
--- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java
+++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java
@@ -1,14 +1,26 @@
 package noppes.npcs.client.gui.script;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.script.item.ItemScriptErrorPacket;
+import kamkeel.npcs.network.packets.request.script.item.ItemScriptPacket;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import noppes.npcs.CustomItems;
-import noppes.npcs.client.Client;
-import noppes.npcs.constants.EnumPacketServer;
+
+
+import noppes.npcs.NBTTags;
+import noppes.npcs.NoppesStringUtils;
+import noppes.npcs.controllers.ScriptContainer;
 import noppes.npcs.scripted.item.ScriptCustomItem;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
 public class GuiScriptItem extends GuiScriptInterface {
     private ScriptCustomItem item;
+    public static Map<Long, String> consoleText = new HashMap<>();
 
     public GuiScriptItem() {
         hookList.add("init");
@@ -25,17 +37,47 @@ public class GuiScriptItem extends GuiScriptInterface {
         hookList.add("finishItem");
 
         this.handler = this.item = new ScriptCustomItem(new ItemStack(CustomItems.scripted_item));
-        Client.sendData(EnumPacketServer.ScriptItemDataGet, new Object[0]);
+        ItemScriptErrorPacket.Get();
+        ItemScriptPacket.Get();
     }
 
     public void setGuiData(NBTTagCompound compound) {
-        this.item.setMCNbt(compound);
-        this.item.loadScriptData();
-        super.setGuiData(compound);
+        if(compound.hasKey("ItemScriptConsole")){
+            consoleText = NBTTags.GetLongStringMap(compound.getTagList("ItemScriptConsole", 10));
+            initGui();
+        }
+        else {
+            this.item.setMCNbt(compound);
+            this.item.loadScriptData();
+            super.setGuiData(compound);
+        }
     }
 
     public void save() {
         super.save();
-        Client.sendData(EnumPacketServer.ScriptItemDataSave, new Object[]{this.item.getMCNbt()});
+        ItemScriptPacket.Save(this.item.getMCNbt());
+    }
+
+    protected String getConsoleText() {
+        Map<Long, String> map = consoleText;
+        StringBuilder builder = new StringBuilder();
+        Iterator var3 = map.entrySet().iterator();
+
+        while(var3.hasNext()) {
+            Map.Entry<Long, String> entry = (Map.Entry)var3.next();
+            builder.insert(0, new Date((Long)entry.getKey()) + (String)entry.getValue() + "\n");
+        }
+
+        return builder.toString();
+    }
+
+    public void confirmClicked(boolean flag, int i) {
+        if(i == 102) {
+            if (activeTab <= 0){
+                consoleText = new HashMap<>();
+                ItemScriptErrorPacket.Clear();
+            }
+        }
+        super.confirmClicked(flag, i);
     }
 }
diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java
index 3ea6f6dee..22973038d 100644
--- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java
+++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java
@@ -1,10 +1,11 @@
 package noppes.npcs.client.gui.script;
 
+import kamkeel.npcs.network.packets.request.script.PlayerScriptPacket;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import noppes.npcs.NBTTags;
-import noppes.npcs.client.Client;
-import noppes.npcs.constants.EnumPacketServer;
+
+
 import noppes.npcs.controllers.ScriptContainer;
 import noppes.npcs.controllers.data.PlayerDataScript;
 
@@ -79,7 +80,7 @@ public class GuiScriptPlayers extends GuiScriptInterface {
         hookList.add("frameExit");
 
         this.handler = this.script;
-        Client.sendData(EnumPacketServer.ScriptPlayerGet);
+        PlayerScriptPacket.Get();
     }
 
     public void setGuiData(NBTTagCompound compound) {
@@ -106,12 +107,12 @@ public class GuiScriptPlayers extends GuiScriptInterface {
         List<ScriptContainer> containers = this.script.getScripts();
         for (int i = 0; i < containers.size(); i++) {
             ScriptContainer container = containers.get(i);
-            Client.sendData(EnumPacketServer.ScriptPlayerSave, i, containers.size(), container.writeToNBT(new NBTTagCompound()));
+            PlayerScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
         }
         NBTTagCompound scriptData = new NBTTagCompound();
         scriptData.setString("ScriptLanguage", this.script.getLanguage());
         scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
         scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
-        Client.sendData(EnumPacketServer.ScriptPlayerSave, -1, containers.size(), scriptData);
+        PlayerScriptPacket.Save(-1, containers.size(), scriptData);
     }
 }
diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface.java b/src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface.java
index 27b0f55e1..a8a3c7731 100644
--- a/src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface.java
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface.java
@@ -261,9 +261,9 @@ public abstract class GuiContainerNPCInterface extends GuiContainer
 		float f6 = (float) ((guiTop + y) - 50) - mouseY;
 		int orientation = 0;
 		if(npc != null){
-			if(npc.ai != null){
-				orientation = npc.ai.orientation;
-				npc.ai.orientation = 0;
+			if(npc.ais != null){
+				orientation = npc.ais.orientation;
+				npc.ais.orientation = 0;
 			}
 		}
 		GL11.glRotatef(135F, 0.0F, 1.0F, 0.0F);
@@ -282,8 +282,8 @@ public abstract class GuiContainerNPCInterface extends GuiContainer
 		npc.rotationPitch = f4;
 		npc.rotationYawHead = f7;
 		if(npc != null){
-			if(npc.ai != null){
-				npc.ai.orientation = orientation;
+			if(npc.ais != null){
+				npc.ais.orientation = orientation;
 			}
 		}
         npc.isDrawn = false;
diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java
index 7ee107877..68f5e6de7 100644
--- a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java
@@ -1,14 +1,17 @@
 package noppes.npcs.client.gui.util;
 
-import kamkeel.util.TextSplitter;
+import kamkeel.npcs.util.TextSplitter;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
+import noppes.npcs.client.gui.global.GuiNPCManageDialogs;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
 
 import java.util.*;
 
+import static noppes.npcs.client.gui.util.GuiNPCInterface.resizingActive;
+
 public class GuiCustomScroll extends GuiScreen
 {
 	public static final ResourceLocation resource = new ResourceLocation("customnpcs","textures/gui/misc.png");
@@ -127,7 +130,7 @@ public class GuiCustomScroll extends GuiScreen
         if(scrollHeight < ySize - 8){
         	i -= guiLeft;
         	j -= guiTop;
-            if(Mouse.isButtonDown(0)){
+            if(Mouse.isButtonDown(0) && !resizingActive){
                 if(i >= xSize-9 && i < xSize-4 && j >= 4 && j < ySize){
                     isScrolling = true;
                 }
@@ -263,6 +266,9 @@ public class GuiCustomScroll extends GuiScreen
 
     public void mouseClicked(int i, int j, int k)
     {
+        if(resizingActive)
+            return;
+
     	if(k != 0 || hover < 0)
     		return;
     	if(multipleSelection) {
@@ -302,7 +308,7 @@ public class GuiCustomScroll extends GuiScreen
         drawTexturedModalRect(i, k, xSize, 11, 5, 1);
     }
 	public boolean hasSelected() {
-		// TODO Auto-generated method stub
+
 		return selected >= 0;
 	}
 
diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java b/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java
new file mode 100644
index 000000000..8c8e839de
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java
@@ -0,0 +1,1294 @@
+package noppes.npcs.client.gui.util;
+
+import java.awt.Point;
+import java.util.*;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.ScaledResolution;
+import org.lwjgl.input.Mouse;
+import org.lwjgl.opengl.GL11;
+
+/**
+ * Abstract GUI class for drawing diagrams with icons (nodes) and connections (arrows).
+ *
+ * Features include:
+ * <ul>
+ *   <li>Parent reference to disable mouse interaction when a subGUI is active.</li>
+ *   <li>Caching for icons and connections (subclasses must implement createIcons() and createConnections()).</li>
+ *   <li>Support for different layout types (circular, square, tree, generated, and manual versions)
+ *       plus a CHART layout.</li>
+ *   <li>Drawing of connections as either straight or curved arrows (with hit‐detection improved for curves).</li>
+ *   <li>Chart layout: a grid with header icons and inner cells that show connection colors.
+ *       When hovering over a header or cell, only the corresponding row/column (or cell and its two icons) are highlighted
+ *       while all non‑relevant cells are dimmed. Also, cells with no connection are drawn with a darker gray.
+ *   </li>
+ *   <li>Zooming and panning controls apply to both chart and non‑chart layouts.</li>
+ *   <li>Callbacks for icon and connection interactions including click, held, release and hover events.</li>
+ * </ul>
+ */
+public abstract class GuiDiagram extends Gui {
+
+    // --- Diagram Area & Controls ---
+    protected int x, y, width, height;         // Drawing area for the diagram
+    protected float panX = 0, panY = 0;          // Panning offsets
+    protected float zoom = 1.0f;                 // Zoom factor
+    protected boolean dragging = false;          // Flag indicating active panning
+    protected int lastDragX, lastDragY;          // Last mouse positions used for panning
+
+    // --- Node (Icon) Sizing ---
+    protected int iconSize = 16;                 // Icon image size (square)
+    protected int slotPadding = 4;               // Padding around icons
+    protected int slotSize = iconSize + slotPadding; // Total size of the icon box
+
+    // --- Icon Box Appearance ---
+    protected int iconBackgroundColor = 0xFF999999; // Background color for icon boxes
+    protected int iconBorderColor = 0xFF555555;       // Border color for icon boxes
+    protected int iconBorderThickness = 1;            // Border thickness in pixels
+
+    // --- Connection Options ---
+    protected boolean showArrowHeads = true;     // Whether to draw arrow heads
+    protected boolean useColorScaling = true;    // Scale connection color based on a percentage
+
+    // --- Layout Options ---
+    public enum DiagramLayout {
+        CIRCULAR, SQUARE, TREE, GENERATED,
+        CIRCULAR_MANUAL, SQUARE_MANUAL, TREE_MANUAL,
+        CHART
+    }
+    protected DiagramLayout layout = DiagramLayout.CIRCULAR; // Default layout
+
+    /**
+     * Sets the layout type and invalidates caches.
+     */
+    public void setLayout(DiagramLayout layout) {
+        this.layout = layout;
+        invalidateCache();
+    }
+
+    // --- Arrow Drawing Options ---
+    protected boolean curvedArrows = true;   // If false, draw straight connection lines
+    protected int curveAngle = 15;             // Curvature angle in degrees
+
+    public void setCurvedArrows(boolean curved) {
+        this.curvedArrows = curved;
+    }
+    public void setCurveAngle(int angle) {
+        this.curveAngle = angle;
+    }
+
+    // --- Caching for icons and connections ---
+    protected Map<Integer, Point> cachedPositions = null;      // Cached positions for nodes (non-CHART)
+    protected List<DiagramIcon> iconsCache = null;             // Cached list of icons
+    protected List<DiagramConnection> connectionsCache = null; // Cached list of connections
+
+    /**
+     * Clears cached layout information.
+     */
+    public void invalidateCache() {
+        cachedPositions = null;
+        iconsCache = null;
+        connectionsCache = null;
+    }
+
+    // --- Parent reference ---
+    protected GuiNPCInterface parent;
+
+    // --- Constructor ---
+    public GuiDiagram(GuiNPCInterface parent, int x, int y, int width, int height) {
+        this.parent = parent;
+        this.x = x;
+        this.y = y;
+        this.width = width;
+        this.height = height;
+    }
+
+    // --- Data Providers (Subclasses must implement these) ---
+    protected abstract List<DiagramIcon> createIcons();
+    protected abstract List<DiagramConnection> createConnections();
+
+    protected final List<DiagramIcon> getIcons() {
+        if (iconsCache == null) {
+            iconsCache = createIcons();
+        }
+        return iconsCache;
+    }
+    protected final List<DiagramConnection> getConnections() {
+        if (connectionsCache == null) {
+            connectionsCache = createConnections();
+        }
+        return connectionsCache;
+    }
+
+    /**
+     * Subclasses must implement how an icon is rendered.
+     */
+    protected abstract void renderIcon(DiagramIcon icon, int posX, int posY, IconRenderState state);
+
+    /**
+     * Returns the tooltip text lines for an icon.
+     */
+    protected List<String> getIconTooltip(DiagramIcon icon) { return null; }
+
+    /**
+     * Returns the tooltip text lines for a connection.
+     */
+    protected List<String> getConnectionTooltip(DiagramConnection conn) {
+        List<String> tooltip = new ArrayList<>();
+        DiagramIcon iconFrom = getIconById(conn.idFrom);
+        DiagramIcon iconTo = getIconById(conn.idTo);
+        String nameFrom = iconFrom != null ? getIconName(iconFrom) : "Unknown";
+        String nameTo = iconTo != null ? getIconName(iconTo) : "Unknown";
+        tooltip.add(nameFrom + " > " + nameTo + ":");
+        tooltip.add(conn.hoverText);
+        DiagramConnection reverse = getConnectionByIds(conn.idTo, conn.idFrom);
+        if (reverse != null) {
+            tooltip.add(nameTo + " > " + nameFrom + ":");
+            tooltip.add(reverse.hoverText);
+        }
+        return tooltip;
+    }
+    protected String getIconName(DiagramIcon icon) { return "Icon " + icon.id; }
+
+    // --- Layout Calculation ---
+    /**
+     * For non‑CHART layouts, returns the mapping from node ID to (x,y) position.
+     * CHART layout is drawn directly.
+     */
+    protected Map<Integer, Point> calculatePositions() {
+        if (cachedPositions != null) return cachedPositions;
+        if (layout == DiagramLayout.CHART) {
+            return new HashMap<>();
+        }
+        switch (layout) {
+            case CIRCULAR:         cachedPositions = calculateCircularPositions(); break;
+            case SQUARE:           cachedPositions = calculateSquarePositions(); break;
+            case TREE:             cachedPositions = calculateTreePositions(); break;
+            case GENERATED:        cachedPositions = calculateGeneratedPositions(); break;
+            case CIRCULAR_MANUAL:  cachedPositions = calculateCircularManualPositions(); break;
+            case SQUARE_MANUAL:    cachedPositions = calculateSquareManualPositions(); break;
+            case TREE_MANUAL:      cachedPositions = calculateTreeManualPositions(); break;
+            default:               cachedPositions = calculateCircularPositions(); break;
+        }
+        return cachedPositions;
+    }
+
+    // --- Standard Layout Methods ---
+
+    protected Map<Integer, Point> calculateCircularPositions() {
+        List<DiagramIcon> icons = getIcons();
+        Map<Integer, Point> positions = new HashMap<>();
+        int count = icons.size();
+        int centerX = x + width/2, centerY = y + height/2;
+        int radius = Math.min(width, height)/2 - iconSize - 10;
+        for (int i = 0; i < count; i++) {
+            double angle = 2 * Math.PI * i / count;
+            int posX = centerX + (int)(radius * Math.cos(angle));
+            int posY = centerY + (int)(radius * Math.sin(angle));
+            positions.put(icons.get(i).id, new Point(posX, posY));
+        }
+        return positions;
+    }
+
+    protected Map<Integer, Point> calculateSquarePositions() {
+        List<DiagramIcon> icons = getIcons();
+        Map<Integer, Point> positions = new HashMap<>();
+        int count = icons.size();
+        int n = (int)Math.ceil(Math.sqrt(count));
+        int gridWidth = width - 20, gridHeight = height - 20;
+        int cellWidth = gridWidth / n, cellHeight = gridHeight / n;
+        int startX = x + (width - gridWidth)/2, startY = y + (height - gridHeight)/2;
+        for (int i = 0; i < count; i++) {
+            int row = i / n, col = i % n;
+            int posX = startX + col * cellWidth + cellWidth/2;
+            int posY = startY + row * cellHeight + cellHeight/2;
+            positions.put(icons.get(i).id, new Point(posX, posY));
+        }
+        return positions;
+    }
+
+    protected Map<Integer, Point> calculateTreePositions() {
+        List<DiagramIcon> icons = getIcons();
+        Map<Integer, Point> positions = new HashMap<>();
+        int count = icons.size();
+        int levels = (int)Math.ceil(Math.log(count + 1) / Math.log(2));
+        int levelHeight = height / (levels + 1);
+        int index = 0;
+        for (int level = 0; level < levels && index < count; level++) {
+            int nodesThisLevel = (int)Math.min(Math.pow(2, level), count - index);
+            int levelWidth = width - 20;
+            int cellWidth = levelWidth / nodesThisLevel;
+            for (int i = 0; i < nodesThisLevel && index < count; i++, index++) {
+                int posX = x + 10 + i * cellWidth + cellWidth/2;
+                int posY = y + (level + 1) * levelHeight;
+                positions.put(icons.get(index).id, new Point(posX, posY));
+            }
+        }
+        return positions;
+    }
+
+    protected Map<Integer, Point> calculateGeneratedPositions() {
+        List<DiagramIcon> icons = getIcons();
+        List<DiagramConnection> connections = getConnections();
+        Map<Integer, List<Integer>> graph = buildGraph(icons, connections);
+        List<Set<Integer>> clusters = getConnectedComponents(graph);
+        int clusterCount = clusters.size();
+        int gridCols = (int)Math.ceil(Math.sqrt(clusterCount));
+        int gridRows = (int)Math.ceil((double)clusterCount / gridCols);
+        int clusterMargin = 20;
+        int compWidth = (width - (gridCols + 1) * clusterMargin) / gridCols;
+        int compHeight = (height - (gridRows + 1) * clusterMargin) / gridRows;
+        Map<Integer, Point> globalPositions = new HashMap<>();
+        int clusterIndex = 0;
+        for (Set<Integer> cluster : clusters) {
+            int col = clusterIndex % gridCols;
+            int row = clusterIndex / gridCols;
+            int compX = x + clusterMargin + col * (compWidth + clusterMargin);
+            int compY = y + clusterMargin + row * (compHeight + clusterMargin);
+            Map<Integer, Point> compPositions;
+            if (isCycle(cluster, graph))
+                compPositions = layoutCycle(cluster, compX, compY, compWidth, compHeight);
+            else if (isTree(cluster, graph))
+                compPositions = layoutTree(cluster, compX, compY, compWidth, compHeight, graph);
+            else if (isSquare(cluster))
+                compPositions = layoutSquare(cluster, compX, compY, compWidth, compHeight);
+            else
+                compPositions = layoutForceDirected(cluster, compX, compY, compWidth, compHeight, connections);
+            globalPositions.putAll(compPositions);
+            clusterIndex++;
+        }
+        return globalPositions;
+    }
+
+    // --- Helpers for Generated Layout ---
+    private Map<Integer, List<Integer>> buildGraph(List<DiagramIcon> icons, List<DiagramConnection> connections) {
+        Map<Integer, List<Integer>> graph = new HashMap<>();
+        for (DiagramIcon icon : icons) {
+            graph.put(icon.id, new ArrayList<>());
+        }
+        for (DiagramConnection conn : connections) {
+            if (graph.containsKey(conn.idFrom) && graph.containsKey(conn.idTo)) {
+                graph.get(conn.idFrom).add(conn.idTo);
+                graph.get(conn.idTo).add(conn.idFrom);
+            }
+        }
+        return graph;
+    }
+    private List<Set<Integer>> getConnectedComponents(Map<Integer, List<Integer>> graph) {
+        Set<Integer> visited = new HashSet<>();
+        List<Set<Integer>> components = new ArrayList<>();
+        for (Integer node : graph.keySet()) {
+            if (!visited.contains(node)) {
+                Set<Integer> comp = new HashSet<>();
+                dfsComponent(node, graph, visited, comp);
+                components.add(comp);
+            }
+        }
+        return components;
+    }
+    private void dfsComponent(Integer current, Map<Integer, List<Integer>> graph, Set<Integer> visited, Set<Integer> comp) {
+        visited.add(current);
+        comp.add(current);
+        for (Integer neighbor : graph.get(current)) {
+            if (!visited.contains(neighbor))
+                dfsComponent(neighbor, graph, visited, comp);
+        }
+    }
+    private boolean isCycle(Set<Integer> cluster, Map<Integer, List<Integer>> graph) {
+        if (cluster.size() < 3) return false;
+        for (Integer node : cluster) {
+            int degree = 0;
+            for (Integer neighbor : graph.get(node)) {
+                if (cluster.contains(neighbor)) degree++;
+            }
+            if (degree != 2) return false;
+        }
+        return true;
+    }
+    private boolean isTree(Set<Integer> cluster, Map<Integer, List<Integer>> graph) {
+        int edgeCount = 0;
+        for (Integer node : cluster) {
+            for (Integer neighbor : graph.get(node)) {
+                if (cluster.contains(neighbor)) edgeCount++;
+            }
+        }
+        edgeCount /= 2;
+        return edgeCount == cluster.size() - 1;
+    }
+    private boolean isSquare(Set<Integer> cluster) {
+        int n = cluster.size();
+        int sqrt = (int)Math.round(Math.sqrt(n));
+        return sqrt * sqrt == n;
+    }
+
+    // --- Layout Algorithms for Clusters ---
+    private Map<Integer, Point> layoutCycle(Set<Integer> cluster, int compX, int compY, int compWidth, int compHeight) {
+        Map<Integer, Point> positions = new HashMap<>();
+        int centerX = compX + compWidth / 2, centerY = compY + compHeight / 2;
+        int radius = Math.min(compWidth, compHeight) / 3;
+        int i = 0;
+        for (Integer id : cluster) {
+            double angle = 2 * Math.PI * i / cluster.size();
+            int posX = centerX + (int)(radius * Math.cos(angle));
+            int posY = centerY + (int)(radius * Math.sin(angle));
+            positions.put(id, new Point(posX, posY));
+            i++;
+        }
+        return positions;
+    }
+
+    private Map<Integer, Point> layoutTree(Set<Integer> cluster, int compX, int compY, int compWidth, int compHeight,
+                                           Map<Integer, List<Integer>> fullGraph) {
+        Map<Integer, Point> positions = new HashMap<>();
+        Map<Integer, List<Integer>> subgraph = new HashMap<>();
+        for (Integer id : cluster) {
+            List<Integer> neighbors = new ArrayList<>();
+            for (Integer neighbor : fullGraph.get(id)) {
+                if (cluster.contains(neighbor))
+                    neighbors.add(neighbor);
+            }
+            subgraph.put(id, neighbors);
+        }
+        Integer root = cluster.iterator().next();
+        for (Integer id : cluster) {
+            if (id < root) root = id;
+        }
+        Map<Integer, Integer> levelMap = new HashMap<>();
+        Map<Integer, List<Integer>> levels = new HashMap<>();
+        Queue<Integer> queue = new LinkedList<>();
+        Set<Integer> visited = new HashSet<>();
+        queue.add(root);
+        visited.add(root);
+        levelMap.put(root, 0);
+        while (!queue.isEmpty()) {
+            Integer curr = queue.poll();
+            int lvl = levelMap.get(curr);
+            levels.computeIfAbsent(lvl, k -> new ArrayList<>()).add(curr);
+            for (Integer neighbor : subgraph.get(curr)) {
+                if (!visited.contains(neighbor)) {
+                    visited.add(neighbor);
+                    levelMap.put(neighbor, lvl + 1);
+                    queue.add(neighbor);
+                }
+            }
+        }
+        int maxLevel = levels.keySet().stream().max(Integer::compare).orElse(0);
+        double levelHeight = compHeight / (maxLevel + 1.0);
+        for (Map.Entry<Integer, List<Integer>> entry : levels.entrySet()) {
+            int lvl = entry.getKey();
+            List<Integer> nodesAtLevel = entry.getValue();
+            nodesAtLevel.sort(Comparator.comparingInt(a -> getIconById(a).priority));
+            double spacing = compWidth / (nodesAtLevel.size() + 1.0);
+            for (int i = 0; i < nodesAtLevel.size(); i++) {
+                int id = nodesAtLevel.get(i);
+                int posX = compX + (int)((i + 1) * spacing);
+                int posY = compY + (int)(lvl * levelHeight + levelHeight / 2);
+                positions.put(id, new Point(posX, posY));
+            }
+        }
+        return positions;
+    }
+
+    private Map<Integer, Point> layoutSquare(Set<Integer> cluster, int compX, int compY, int compWidth, int compHeight) {
+        Map<Integer, Point> positions = new HashMap<>();
+        int n = (int)Math.round(Math.sqrt(cluster.size()));
+        int gridCellWidth = compWidth / n, gridCellHeight = compHeight / n;
+        int index = 0;
+        List<Integer> nodes = new ArrayList<>(cluster);
+        nodes.sort(Comparator.comparingInt(a -> getIconById(a).priority));
+        for (int row = 0; row < n; row++) {
+            for (int col = 0; col < n; col++) {
+                if (index >= nodes.size()) break;
+                int posX = compX + col * gridCellWidth + gridCellWidth / 2;
+                int posY = compY + row * gridCellHeight + gridCellHeight / 2;
+                positions.put(nodes.get(index), new Point(posX, posY));
+                index++;
+            }
+        }
+        return positions;
+    }
+
+    private Map<Integer, Point> layoutForceDirected(Set<Integer> cluster, int compX, int compY, int compWidth, int compHeight,
+                                                    List<DiagramConnection> connections) {
+        Map<Integer, Point> positions = new HashMap<>();
+        Random rand = new Random(100);
+        for (Integer id : cluster) {
+            int posX = compX + rand.nextInt(compWidth);
+            int posY = compY + rand.nextInt(compHeight);
+            positions.put(id, new Point(posX, posY));
+        }
+        double area = compWidth * compHeight;
+        double k = Math.sqrt(area / cluster.size());
+        int iterations = 100;
+        double temperature = compWidth / 10.0;
+        double cooling = temperature / (iterations + 1);
+        double minDistance = iconSize + slotPadding;
+        List<DiagramConnection> compConnections = new ArrayList<>();
+        for (DiagramConnection conn : connections) {
+            if (cluster.contains(conn.idFrom) && cluster.contains(conn.idTo))
+                compConnections.add(conn);
+        }
+        for (int iter = 0; iter < iterations; iter++) {
+            Map<Integer, double[]> disp = new HashMap<>();
+            for (Integer id : cluster) {
+                disp.put(id, new double[]{0.0, 0.0});
+            }
+            List<Integer> nodes = new ArrayList<>(cluster);
+            for (int i = 0; i < nodes.size(); i++) {
+                Integer v = nodes.get(i);
+                Point posV = positions.get(v);
+                for (int j = i + 1; j < nodes.size(); j++) {
+                    Integer u = nodes.get(j);
+                    Point posU = positions.get(u);
+                    double dx = posV.x - posU.x, dy = posV.y - posU.y;
+                    double distance = Math.sqrt(dx * dx + dy * dy);
+                    if (distance < minDistance) distance = minDistance;
+                    double repForce = (k * k) / distance;
+                    double[] dispV = disp.get(v);
+                    double[] dispU = disp.get(u);
+                    dispV[0] += (dx / distance) * repForce;
+                    dispV[1] += (dy / distance) * repForce;
+                    dispU[0] -= (dx / distance) * repForce;
+                    dispU[1] -= (dy / distance) * repForce;
+                }
+            }
+            for (DiagramConnection conn : compConnections) {
+                Point posV = positions.get(conn.idFrom);
+                Point posU = positions.get(conn.idTo);
+                double dx = posV.x - posU.x, dy = posV.y - posU.y;
+                double distance = Math.sqrt(dx * dx + dy * dy);
+                if (distance < 0.01) distance = 0.01;
+                double attrForce = (distance * distance) / k;
+                double[] dispV = disp.get(conn.idFrom);
+                double[] dispU = disp.get(conn.idTo);
+                dispV[0] -= (dx / distance) * attrForce;
+                dispV[1] -= (dy / distance) * attrForce;
+                dispU[0] += (dx / distance) * attrForce;
+                dispU[1] += (dy / distance) * attrForce;
+            }
+            for (Integer id : cluster) {
+                double[] d = disp.get(id);
+                double dispLength = Math.sqrt(d[0] * d[0] + d[1] * d[1]);
+                if (dispLength < 0.01) dispLength = 0.01;
+                int newX = positions.get(id).x + (int)((d[0] / dispLength) * Math.min(dispLength, temperature));
+                int newY = positions.get(id).y + (int)((d[1] / dispLength) * Math.min(dispLength, temperature));
+                newX = Math.max(compX, Math.min(compX + compWidth, newX));
+                newY = Math.max(compY, Math.min(compY + compHeight, newY));
+                positions.get(id).x = newX;
+                positions.get(id).y = newY;
+            }
+            temperature -= cooling;
+        }
+        return positions;
+    }
+
+    // --- Manual Layouts ---
+    // Manual layouts use the icon index (e.g. ring number, row, level) and the priority for ordering.
+    private Map<Integer, Point> calculateCircularManualPositions() {
+        List<DiagramIcon> icons = getIcons();
+        Map<Integer, List<DiagramIcon>> groups = new TreeMap<>();
+        for (DiagramIcon icon : icons) {
+            groups.computeIfAbsent(icon.index, k -> new ArrayList<>()).add(icon);
+        }
+        Map<Integer, Point> positions = new HashMap<>();
+        int centerX = x + width/2, centerY = y + height/2;
+        int maxRing = groups.isEmpty() ? 0 : Collections.max(groups.keySet());
+        int maxRadius = Math.min(width, height)/2 - iconSize - 10;
+        double ringSpacing = (maxRing + 1) > 0 ? (double)maxRadius/(maxRing + 1) : 0;
+        for (Map.Entry<Integer, List<DiagramIcon>> entry : groups.entrySet()) {
+            int ring = entry.getKey();
+            List<DiagramIcon> groupIcons = entry.getValue();
+            groupIcons.sort(Comparator.comparingInt(icon -> icon.priority));
+            double radius = ringSpacing * (ring + 1);
+            int count = groupIcons.size();
+            double startAngle = (ring == 0) ? -Math.PI/2 : -3 * Math.PI/4;
+            for (int i = 0; i < count; i++) {
+                double angle = startAngle + 2 * Math.PI * i / count;
+                int posX = centerX + (int)(radius * Math.cos(angle));
+                int posY = centerY + (int)(radius * Math.sin(angle));
+                positions.put(groupIcons.get(i).id, new Point(posX, posY));
+            }
+        }
+        return positions;
+    }
+
+    private Map<Integer, Point> calculateSquareManualPositions() {
+        List<DiagramIcon> icons = getIcons();
+        Map<Integer, List<DiagramIcon>> groups = new TreeMap<>();
+        for (DiagramIcon icon : icons) {
+            groups.computeIfAbsent(icon.index, k -> new ArrayList<>()).add(icon);
+        }
+        Map<Integer, Point> positions = new HashMap<>();
+        int centerX = x + width/2, centerY = y + height/2;
+        int maxRing = groups.isEmpty() ? 0 : Collections.max(groups.keySet());
+        int halfSide = Math.min(width, height)/2 - iconSize - 10;
+        double ringSpacing = (maxRing + 1) > 0 ? (double)halfSide/(maxRing + 1) : 0;
+        for (Map.Entry<Integer, List<DiagramIcon>> entry : groups.entrySet()) {
+            int ring = entry.getKey();
+            List<DiagramIcon> groupIcons = entry.getValue();
+            groupIcons.sort(Comparator.comparingInt(icon -> icon.priority));
+            double offset = ringSpacing * (ring + 1);
+            int count = groupIcons.size();
+            double perimeter = 8 * offset;
+            for (int i = 0; i < count; i++) {
+                double posAlong = (perimeter * i) / count;
+                int posX, posY;
+                if (posAlong < 2 * offset) {
+                    posX = centerX - (int)offset + (int)posAlong;
+                    posY = centerY - (int)offset;
+                } else if (posAlong < 4 * offset) {
+                    posX = centerX + (int)offset;
+                    posY = centerY - (int)offset + (int)(posAlong - 2 * offset);
+                } else if (posAlong < 6 * offset) {
+                    posX = centerX + (int)offset - (int)(posAlong - 4 * offset);
+                    posY = centerY + (int)offset;
+                } else {
+                    posX = centerX - (int)offset;
+                    posY = centerY + (int)offset - (int)(posAlong - 6 * offset);
+                }
+                positions.put(groupIcons.get(i).id, new Point(posX, posY));
+            }
+        }
+        return positions;
+    }
+
+    private Map<Integer, Point> calculateTreeManualPositions() {
+        List<DiagramIcon> icons = getIcons();
+        Map<Integer, List<DiagramIcon>> levels = new TreeMap<>();
+        for (DiagramIcon icon : icons) {
+            levels.computeIfAbsent(icon.index, k -> new ArrayList<>()).add(icon);
+        }
+        Map<Integer, Point> positions = new HashMap<>();
+        int maxLevel = levels.isEmpty() ? 0 : Collections.max(levels.keySet());
+        int levelHeight = height / (maxLevel + 2);
+        for (Map.Entry<Integer, List<DiagramIcon>> entry : levels.entrySet()) {
+            int level = entry.getKey();
+            List<DiagramIcon> levelIcons = entry.getValue();
+            levelIcons.sort(Comparator.comparingInt(icon -> icon.priority));
+            int count = levelIcons.size();
+            int horizontalSpacing = (width - 40) / (count + 1);
+            for (int i = 0; i < count; i++) {
+                int posX = x + 20 + (i + 1) * horizontalSpacing;
+                int posY = y + levelHeight * (level + 1);
+                positions.put(levelIcons.get(i).id, new Point(posX, posY));
+            }
+        }
+        return positions;
+    }
+
+    // --- Arrow Drawing Methods ---
+    /**
+     * Draws a connection line between two points.
+     * If curvedArrows is enabled, draws a quadratic Bezier curve.
+     */
+    protected void drawConnectionLine(int x1, int y1, int x2, int y2, DiagramConnection conn, boolean dim) {
+        int color = getConnectionColor(conn);
+        if (!useColorScaling) color = 0xFFFFFFFF;
+        if (!curvedArrows) {
+            GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
+            GL11.glDisable(GL11.GL_TEXTURE_2D);
+            GL11.glLineWidth(2.0F);
+            float r = ((color >> 16) & 0xFF) / 255f;
+            float g = ((color >> 8) & 0xFF) / 255f;
+            float b = (color & 0xFF) / 255f;
+            if (dim) { r *= 0.4f; g *= 0.4f; b *= 0.4f; }
+            GL11.glColor4f(r, g, b, 1f);
+            GL11.glBegin(GL11.GL_LINES);
+            GL11.glVertex2i(x1, y1);
+            GL11.glVertex2i(x2, y2);
+            GL11.glEnd();
+            GL11.glEnable(GL11.GL_TEXTURE_2D);
+            GL11.glPopAttrib();
+        } else {
+            Point start = new Point(x1, y1);
+            Point end = new Point(x2, y2);
+            double dx = x2 - x1, dy = y2 - y1;
+            double len = Math.sqrt(dx * dx + dy * dy);
+            if (len == 0) len = 1;
+            double angleRad = Math.toRadians(curveAngle);
+            double offset = len * Math.tan(angleRad) / 2;
+            double perpX = -dy / len, perpY = dx / len;
+            Point control = new Point((x1 + x2) / 2 + (int)(perpX * offset),
+                (y1 + y2) / 2 + (int)(perpY * offset));
+            int segments = 100;
+            GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
+            GL11.glDisable(GL11.GL_TEXTURE_2D);
+            GL11.glLineWidth(2.0F);
+            float rr = ((color >> 16) & 0xFF) / 255f;
+            float gg = ((color >> 8) & 0xFF) / 255f;
+            float bb = (color & 0xFF) / 255f;
+            if (dim) { rr *= 0.4f; gg *= 0.4f; bb *= 0.4f; }
+            GL11.glColor4f(rr, gg, bb, 1f);
+            GL11.glBegin(GL11.GL_LINE_STRIP);
+            for (int i = 0; i <= segments; i++) {
+                double t = (double)i / segments;
+                int bx = (int)((1 - t) * (1 - t) * start.x + 2 * (1 - t) * t * control.x + t * t * end.x);
+                int by = (int)((1 - t) * (1 - t) * start.y + 2 * (1 - t) * t * control.y + t * t * end.y);
+                GL11.glVertex2i(bx, by);
+            }
+            GL11.glEnd();
+            GL11.glEnable(GL11.GL_TEXTURE_2D);
+            GL11.glPopAttrib();
+        }
+    }
+
+    /**
+     * Draws the arrow head at the end of a connection.
+     */
+    protected void drawArrowHead(int x1, int y1, int x2, int y2, DiagramConnection conn, boolean dim) {
+        int color = getConnectionColor(conn);
+        if (!useColorScaling) color = 0xFFFFFFFF;
+        double angle;
+        if (!curvedArrows) {
+            angle = Math.atan2(y2 - y1, x2 - x1);
+        } else {
+            double dx = x2 - x1, dy = y2 - y1;
+            double len = Math.sqrt(dx * dx + dy * dy);
+            if (len == 0) len = 1;
+            double offset = len * Math.tan(Math.toRadians(curveAngle)) / 2;
+            double perpX = -dy / len, perpY = dx / len;
+            int cx = (x1 + x2) / 2 + (int)(perpX * offset);
+            int cy = (y1 + y2) / 2 + (int)(perpY * offset);
+            double t = 0.95;
+            double bx = (1 - t) * (1 - t) * x1 + 2 * (1 - t) * t * cx + t * t * x2;
+            double by = (1 - t) * (1 - t) * y1 + 2 * (1 - t) * t * cy + t * t * y2;
+            double dBx = 2 * (1 - t) * (cx - x1) + 2 * t * (x2 - cx);
+            double dBy = 2 * (1 - t) * (cy - y1) + 2 * t * (y2 - cy);
+            angle = Math.atan2(dBy, dBx);
+        }
+        float defenderEdgeX = x2 - (slotSize / 2f) * (float)Math.cos(angle);
+        float defenderEdgeY = y2 - (slotSize / 2f) * (float)Math.sin(angle);
+        int arrowSize = 6;
+        float leftX = defenderEdgeX - arrowSize * (float)Math.cos(angle - Math.PI / 6);
+        float leftY = defenderEdgeY - arrowSize * (float)Math.sin(angle - Math.PI / 6);
+        float rightX = defenderEdgeX - arrowSize * (float)Math.cos(angle + Math.PI / 6);
+        float rightY = defenderEdgeY - arrowSize * (float)Math.sin(angle + Math.PI / 6);
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
+        GL11.glDisable(GL11.GL_TEXTURE_2D);
+        float rr = ((color >> 16) & 0xFF) / 255f;
+        float gg = ((color >> 8) & 0xFF) / 255f;
+        float bb = (color & 0xFF) / 255f;
+        if(dim){ rr *= 0.4f; gg *= 0.4f; bb *= 0.4f; }
+        GL11.glColor4f(rr, gg, bb, 1f);
+        GL11.glDisable(GL11.GL_CULL_FACE);
+        GL11.glBegin(GL11.GL_TRIANGLES);
+        GL11.glVertex2f(defenderEdgeX, defenderEdgeY);
+        GL11.glVertex2f(leftX, leftY);
+        GL11.glVertex2f(rightX, rightY);
+        GL11.glEnd();
+        GL11.glEnable(GL11.GL_CULL_FACE);
+        GL11.glEnable(GL11.GL_TEXTURE_2D);
+        GL11.glPopAttrib();
+    }
+
+    // --- Standard Icon Box Drawing ---
+    protected void drawIconBox(int slotX, int slotY, int slotSize, boolean highlighted) {
+        int bg = highlighted ? mixColors(iconBackgroundColor, 0xFFFFFFFF, 0.2f) : iconBackgroundColor;
+        drawRect(slotX, slotY, slotX + slotSize, slotY + slotSize, bg);
+        for (int i = 0; i < iconBorderThickness; i++) {
+            drawHorizontalLine(slotX + i, slotX + slotSize - i, slotY + i, iconBorderColor);
+            drawHorizontalLine(slotX + i, slotX + slotSize - i, slotY + slotSize - 1 - i, iconBorderColor);
+            drawVerticalLine(slotX + i, slotY + i, slotY + slotSize - i, iconBorderColor);
+            drawVerticalLine(slotX + slotSize - 1 - i, slotY + i, slotY + slotSize - i, iconBorderColor);
+        }
+    }
+    protected int mixColors(int color1, int color2, float ratio) {
+        int a1 = (color1 >> 24) & 0xFF, r1 = (color1 >> 16) & 0xFF, g1 = (color1 >> 8) & 0xFF, b1 = color1 & 0xFF;
+        int a2 = (color2 >> 24) & 0xFF, r2 = (color2 >> 16) & 0xFF, g2 = (color2 >> 8) & 0xFF, b2 = color2 & 0xFF;
+        int a = (int)(a1 + (a2 - a1) * ratio);
+        int r = (int)(r1 + (r2 - r1) * ratio);
+        int g = (int)(g1 + (g2 - g1) * ratio);
+        int b = (int)(b1 + (b2 - b1) * ratio);
+        return (a << 24) | (r << 16) | (g << 8) | b;
+    }
+
+    // --- Hit-detection helpers ---
+    private double distanceToBezier(Point start, Point control, Point end, int segments, int px, int py) {
+        double minDist = Double.MAX_VALUE;
+        Point prev = null;
+        for (int i = 0; i <= segments; i++) {
+            double t = (double)i / segments;
+            int x = (int)((1 - t) * (1 - t) * start.x + 2 * (1 - t) * t * control.x + t * t * end.x);
+            int y = (int)((1 - t) * (1 - t) * start.y + 2 * (1 - t) * t * control.y + t * t * end.y);
+            Point curr = new Point(x, y);
+            if (prev != null) {
+                double d = distancePointToSegment(px, py, prev, curr);
+                if(d < minDist) minDist = d;
+            }
+            prev = curr;
+        }
+        return minDist;
+    }
+    private double distancePointToSegment(int px, int py, Point a, Point b) {
+        double A = px - a.x, B = py - a.y;
+        double C = b.x - a.x, D = b.y - a.y;
+        double dot = A * C + B * D;
+        double lenSq = C * C + D * D;
+        double param = (lenSq != 0) ? (dot / lenSq) : -1;
+        double xx, yy;
+        if(param < 0){ xx = a.x; yy = a.y; }
+        else if(param > 1){ xx = b.x; yy = b.y; }
+        else { xx = a.x + param * C; yy = a.y + param * D; }
+        double dx = px - xx, dy = py - yy;
+        return Math.sqrt(dx * dx + dy * dy);
+    }
+
+    // --- CHART Layout Drawing ---
+    /**
+     * Draws the CHART layout.
+     * <ul>
+     *   <li>The grid has (n+1) columns and rows, where n is the number of icons.</li>
+     *   <li>The top row and left column show header icons.</li>
+     *   <li>Each inner cell is filled with the connection color (if one exists) or a darker gray otherwise.</li>
+     *   <li>Hovering over a header or inner cell highlights the corresponding column/row or cell (and its two header icons),
+     *       while dimming non-relevant cells.</li>
+     *   <li>Zoom and pan are applied to the entire chart.</li>
+     * </ul>
+     */
+    private void drawChartDiagram(int mouseX, int mouseY, boolean subGui) {
+        Minecraft mc = Minecraft.getMinecraft();
+        ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
+        int factor = sr.getScaleFactor();
+
+        // 1. Draw the static background for the entire diagram.
+        drawRect(x, y, x + width, y + height, 0xFF333333);
+
+        // 2. Setup scissor to clip drawing to the diagram area.
+        GL11.glEnable(GL11.GL_SCISSOR_TEST);
+        GL11.glScissor(x * factor, (sr.getScaledHeight() - (y + height)) * factor, width * factor, height * factor);
+
+        // 3. Push a matrix and apply pan/zoom for grid, icons, and overlays.
+        GL11.glPushMatrix();
+        int centerX = x + width / 2;
+        int centerY = y + height / 2;
+        GL11.glTranslatef(centerX + panX, centerY + panY, 0);
+        GL11.glScalef(zoom, zoom, 1.0f);
+        GL11.glTranslatef(-centerX, -centerY, 0);
+
+        // 4. Compute grid parameters.
+        List<DiagramIcon> icons = getIcons();
+        int n = icons.size();
+        int cols = n + 1, rows = n + 1;
+        int cellSize = Math.min(width / cols, height / rows);
+        int gridWidth = cellSize * cols;
+        int gridHeight = cellSize * rows;
+        int startX = x + (width - gridWidth) / 2;
+        int startY = y + (height - gridHeight) / 2;
+
+        // 5. Draw grid cells.
+        for (int row = 0; row < rows; row++) {
+            for (int col = 0; col < cols; col++) {
+                int cellX = startX + col * cellSize;
+                int cellY = startY + row * cellSize;
+                int fillColor = 0xFFCCCCCC; // Default for header cells.
+                if (row > 0 && col > 0) { // inner cell: use connection color (or darker gray)
+                    DiagramIcon leftIcon = icons.get(row - 1);
+                    DiagramIcon topIcon = icons.get(col - 1);
+                    DiagramConnection conn = getConnectionByIds(leftIcon.id, topIcon.id);
+                    fillColor = (conn != null) ? getConnectionColor(conn) : 0xFF777777;
+                }
+                drawRect(cellX, cellY, cellX + cellSize, cellY + cellSize, fillColor);
+            }
+        }
+
+        // 6. Draw grid lines.
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
+        GL11.glDisable(GL11.GL_TEXTURE_2D);
+        GL11.glColor4f(0, 0, 0, 1);
+        GL11.glLineWidth(1.0f);
+        GL11.glBegin(GL11.GL_LINES);
+        for (int col = 0; col <= cols; col++) {
+            int xLine = startX + col * cellSize;
+            GL11.glVertex2i(xLine, startY);
+            GL11.glVertex2i(xLine, startY + gridHeight);
+        }
+        for (int row = 0; row <= rows; row++) {
+            int yLine = startY + row * cellSize;
+            GL11.glVertex2i(startX, yLine);
+            GL11.glVertex2i(startX + gridWidth, yLine);
+        }
+        GL11.glEnd();
+        GL11.glEnable(GL11.GL_TEXTURE_2D);
+        GL11.glPopAttrib();
+
+        // 7. Draw header icons (top and left) scaled to fit within each cell.
+        float iconMargin = 1f;  // margin in pixels inside the cell.
+        float iconScale = (cellSize - iconMargin) / (float)iconSize;
+        for (int i = 0; i < n; i++) {
+            // Top header icon:
+            int topHeaderCenterX = startX + (i + 1) * cellSize + cellSize / 2;
+            int topHeaderCenterY = startY + cellSize / 2;
+            GL11.glPushMatrix();
+            GL11.glTranslatef(topHeaderCenterX, topHeaderCenterY, 0);
+            GL11.glScalef(iconScale, iconScale, 1);
+            // renderIcon should draw centered at (0,0)
+            renderIcon(icons.get(i), 0, 0, IconRenderState.DEFAULT);
+            GL11.glPopMatrix();
+
+            // Left header icon:
+            int leftHeaderCenterX = startX + cellSize / 2;
+            int leftHeaderCenterY = startY + (i + 1) * cellSize + cellSize / 2;
+            GL11.glPushMatrix();
+            GL11.glTranslatef(leftHeaderCenterX, leftHeaderCenterY, 0);
+            GL11.glScalef(iconScale, iconScale, 1);
+            renderIcon(icons.get(i), 0, 0, IconRenderState.DEFAULT);
+            GL11.glPopMatrix();
+        }
+
+        // 8. Compute effective mouse coordinates (reverse pan/zoom).
+        int effectiveMouseX = (int)(((float)mouseX - (centerX + panX)) / zoom + centerX);
+        int effectiveMouseY = (int)(((float)mouseY - (centerY + panY)) / zoom + centerY);
+
+        // 9. Determine hover state on the grid.
+        boolean hoverInGrid = (effectiveMouseX >= startX && effectiveMouseX < startX + gridWidth &&
+            effectiveMouseY >= startY && effectiveMouseY < startY + gridHeight);
+        int hoveredRow = -1, hoveredCol = -1;
+        Set<Integer> highlightTop = new HashSet<>();
+        Set<Integer> highlightLeft = new HashSet<>();
+        List<String> tooltipToShow = null;
+        if (hoverInGrid) {
+            int colIndex = (effectiveMouseX - startX) / cellSize;
+            int rowIndex = (effectiveMouseY - startY) / cellSize;
+            // If hovering over a top header cell.
+            if (rowIndex == 0 && colIndex >= 1) {
+                highlightTop.add(colIndex - 1);
+                tooltipToShow = getIconTooltip(icons.get(colIndex - 1));
+                onIconHover(icons.get(colIndex - 1));
+            }
+            // If hovering over a left header cell.
+            else if (colIndex == 0 && rowIndex >= 1) {
+                highlightLeft.add(rowIndex - 1);
+                tooltipToShow = getIconTooltip(icons.get(rowIndex - 1));
+                onIconHover(icons.get(rowIndex - 1));
+            }
+            // Else, hovering over an inner cell.
+            else if (rowIndex >= 1 && colIndex >= 1) {
+                hoveredRow = rowIndex - 1;
+                hoveredCol = colIndex - 1;
+                highlightTop.add(hoveredCol);
+                highlightLeft.add(hoveredRow);
+                DiagramIcon leftIcon = icons.get(hoveredRow);
+                DiagramIcon topIcon = icons.get(hoveredCol);
+                DiagramConnection conn = getConnectionByIds(leftIcon.id, topIcon.id);
+                if (conn != null) {
+                    tooltipToShow = getConnectionTooltip(conn);
+                    onConnectionHover(conn);
+                }
+            }
+        }
+
+        // 10. Draw hover overlay:
+        // Dim all inner cells (row>=1 & col>=1) not in highlighted row/column.
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
+        GL11.glDisable(GL11.GL_TEXTURE_2D);
+        GL11.glColor4f(0, 0, 0, 0.5f);
+        GL11.glBegin(GL11.GL_QUADS);
+        for (int r = 1; r < rows; r++) {
+            for (int c = 1; c < cols; c++) {
+                boolean keepBright = false;
+                if (!highlightTop.isEmpty() && highlightTop.contains(c - 1))
+                    keepBright = true;
+                if (!highlightLeft.isEmpty() && highlightLeft.contains(r - 1))
+                    keepBright = true;
+                // Also, if a specific cell is hovered, its entire row/column is bright.
+                if (hoveredRow != -1 && hoveredCol != -1) {
+                    if (r - 1 == hoveredRow || c - 1 == hoveredCol)
+                        keepBright = true;
+                }
+                if (!keepBright) {
+                    int cellX = startX + c * cellSize;
+                    int cellY = startY + r * cellSize;
+                    GL11.glVertex2i(cellX, cellY);
+                    GL11.glVertex2i(cellX + cellSize, cellY);
+                    GL11.glVertex2i(cellX + cellSize, cellY + cellSize);
+                    GL11.glVertex2i(cellX, cellY + cellSize);
+                }
+            }
+        }
+        GL11.glEnd();
+        // Then draw a white overlay on the highlighted headers/inner cell.
+        GL11.glColor4f(1, 1, 1, 0.3f);
+        GL11.glBegin(GL11.GL_QUADS);
+        for (int i = 0; i < n; i++) {
+            if (highlightTop.contains(i)) {
+                int hx = startX + (i + 1) * cellSize;
+                int hy = startY;
+                GL11.glVertex2i(hx, hy);
+                GL11.glVertex2i(hx + cellSize, hy);
+                GL11.glVertex2i(hx + cellSize, hy + cellSize);
+                GL11.glVertex2i(hx, hy + cellSize);
+            }
+            if (highlightLeft.contains(i)) {
+                int hx = startX;
+                int hy = startY + (i + 1) * cellSize;
+                GL11.glVertex2i(hx, hy);
+                GL11.glVertex2i(hx + cellSize, hy);
+                GL11.glVertex2i(hx + cellSize, hy + cellSize);
+                GL11.glVertex2i(hx, hy + cellSize);
+            }
+        }
+        if (hoveredRow != -1 && hoveredCol != -1) {
+            int cellX = startX + (hoveredCol + 1) * cellSize;
+            int cellY = startY + (hoveredRow + 1) * cellSize;
+            GL11.glVertex2i(cellX, cellY);
+            GL11.glVertex2i(cellX + cellSize, cellY);
+            GL11.glVertex2i(cellX + cellSize, cellY + cellSize);
+            GL11.glVertex2i(cellX, cellY + cellSize);
+        }
+        GL11.glEnd();
+        GL11.glEnable(GL11.GL_TEXTURE_2D);
+        GL11.glPopAttrib();
+
+        // End pan/zoom block.
+        GL11.glPopMatrix();
+        GL11.glDisable(GL11.GL_SCISSOR_TEST);
+
+        // 11. Draw tooltip (using raw screen coordinates).
+        if (tooltipToShow != null && !tooltipToShow.isEmpty()) {
+            drawHoveringText(tooltipToShow, mouseX, mouseY, mc.fontRenderer);
+        }
+    }
+
+
+
+    /**
+     * Main method for drawing the diagram.
+     * If layout == CHART, delegates to drawChartDiagram().
+     * Otherwise, applies pan/zoom, draws connections (with hit-detection fixed for curves)
+     * and icons, and shows tooltips and hover events.
+     */
+    public void drawDiagram(int mouseX, int mouseY, boolean subGui) {
+        boolean allowInput = (parent == null || !parent.hasSubGui());
+        if (allowInput && isWithin(mouseX, mouseY) && !subGui)
+            handleMouseScroll(Mouse.getDWheel());
+        if (layout == DiagramLayout.CHART) {
+            drawChartDiagram(mouseX, mouseY, subGui);
+            return;
+        }
+        Minecraft mc = Minecraft.getMinecraft();
+        ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
+        int factor = sr.getScaleFactor();
+        Map<Integer, Point> positions = calculatePositions();
+        int centerX = x + width / 2, centerY = y + height / 2;
+        int effectiveMouseX = (int)(((float)mouseX - (centerX + panX)) / zoom + centerX);
+        int effectiveMouseY = (int)(((float)mouseY - (centerY + panY)) / zoom + centerY);
+        Integer hoveredIconId = null;
+        int hoveredConnFrom = -1, hoveredConnTo = -1;
+        Set<Integer> selectedIconIds = new HashSet<>();
+        // Check if mouse is over an icon.
+        for (DiagramIcon icon : getIcons()) {
+            if (!icon.enabled) continue;
+            Point pos = positions.get(icon.id);
+            if (pos == null) continue;
+            int slotX = pos.x - slotSize / 2, slotY = pos.y - slotSize / 2;
+            if (effectiveMouseX >= slotX && effectiveMouseX < slotX + slotSize &&
+                effectiveMouseY >= slotY && effectiveMouseY < slotY + slotSize) {
+                hoveredIconId = icon.id;
+                selectedIconIds.add(icon.id);
+                onIconHover(icon);
+                break;
+            }
+        }
+        // If no icon was hovered, check connections.
+        if (hoveredIconId == null) {
+            final double threshold = 5.0;
+            outer:
+            for (DiagramConnection conn : getConnections()) {
+                DiagramIcon iconFrom = getIconById(conn.idFrom);
+                DiagramIcon iconTo = getIconById(conn.idTo);
+                if (iconFrom == null || iconTo == null || !iconFrom.enabled || !iconTo.enabled)
+                    continue;
+                Point pFrom = positions.get(conn.idFrom);
+                Point pTo = positions.get(conn.idTo);
+                if (pFrom == null || pTo == null) continue;
+                double dist;
+                if (curvedArrows) {
+                    double dx = pTo.x - pFrom.x, dy = pTo.y - pFrom.y;
+                    double len = Math.sqrt(dx * dx + dy * dy);
+                    if (len == 0) len = 1;
+                    double offset = len * Math.tan(Math.toRadians(curveAngle)) / 2;
+                    double perpX = -dy / len, perpY = dx / len;
+                    Point control = new Point((pFrom.x + pTo.x) / 2 + (int)(perpX * offset),
+                        (pFrom.y + pTo.y) / 2 + (int)(perpY * offset));
+                    dist = distanceToBezier(pFrom, control, pTo, 200, effectiveMouseX, effectiveMouseY);
+                } else {
+                    dist = pointLineDistance(effectiveMouseX, effectiveMouseY, pFrom.x, pFrom.y, pTo.x, pTo.y);
+                }
+                if (dist < threshold) {
+                    hoveredConnFrom = conn.idFrom;
+                    hoveredConnTo = conn.idTo;
+                    selectedIconIds.add(conn.idFrom);
+                    selectedIconIds.add(conn.idTo);
+                    onConnectionHover(conn);
+                    break outer;
+                }
+            }
+        }
+        // Setup scissor.
+        GL11.glEnable(GL11.GL_SCISSOR_TEST);
+        GL11.glScissor(x * factor, (sr.getScaledHeight() - (y + height)) * factor, width * factor, height * factor);
+        drawRect(x, y, x + width, y + height, 0xFF333333);
+        GL11.glPushMatrix();
+        GL11.glTranslatef(centerX + panX, centerY + panY, 0);
+        GL11.glScalef(zoom, zoom, 1.0f);
+        GL11.glTranslatef(-centerX, -centerY, 0);
+        // Draw connections.
+        for (DiagramConnection conn : getConnections()) {
+            DiagramIcon iconFrom = getIconById(conn.idFrom);
+            DiagramIcon iconTo = getIconById(conn.idTo);
+            if (iconFrom == null || iconTo == null || !iconFrom.enabled || !iconTo.enabled)
+                continue;
+            Point pFrom = positions.get(conn.idFrom);
+            Point pTo = positions.get(conn.idTo);
+            if (pFrom == null || pTo == null) continue;
+            int ax = pFrom.x, ay = pFrom.y, bx = pTo.x, by = pTo.y;
+            boolean dim = !selectedIconIds.isEmpty() &&
+                !(selectedIconIds.contains(conn.idFrom) && selectedIconIds.contains(conn.idTo));
+            drawConnectionLine(ax, ay, bx, by, conn, dim);
+        }
+        // Draw icons.
+        for (DiagramIcon icon : getIcons()) {
+            if (!icon.enabled) continue;
+            Point pos = positions.get(icon.id);
+            if (pos == null) continue;
+            int slotX = pos.x - slotSize / 2, slotY = pos.y - slotSize / 2;
+            boolean highlighted = selectedIconIds.isEmpty() || selectedIconIds.contains(icon.id);
+            drawIconBox(slotX, slotY, slotSize, highlighted);
+            IconRenderState state = highlighted ? IconRenderState.HIGHLIGHTED : IconRenderState.NOT_HIGHLIGHTED;
+            renderIcon(icon, pos.x, pos.y, state);
+        }
+        GL11.glPopMatrix();
+        // Draw arrow heads.
+        if (showArrowHeads) {
+            GL11.glPushMatrix();
+            GL11.glTranslatef(centerX + panX, centerY + panY, 0);
+            GL11.glScalef(zoom, zoom, 1.0f);
+            GL11.glTranslatef(-centerX, -centerY, 0);
+            for (DiagramConnection conn : getConnections()) {
+                DiagramIcon iconFrom = getIconById(conn.idFrom);
+                DiagramIcon iconTo = getIconById(conn.idTo);
+                if (iconFrom == null || iconTo == null || !iconFrom.enabled || !iconTo.enabled)
+                    continue;
+                Point pFrom = positions.get(conn.idFrom);
+                Point pTo = positions.get(conn.idTo);
+                if (pFrom == null || pTo == null) continue;
+                int ax = pFrom.x, ay = pFrom.y, bx = pTo.x, by = pTo.y;
+                boolean dim = !selectedIconIds.isEmpty() &&
+                    !(selectedIconIds.contains(conn.idFrom) && selectedIconIds.contains(conn.idTo));
+                drawArrowHead(ax, ay, bx, by, conn, dim);
+            }
+            GL11.glPopMatrix();
+        }
+        GL11.glDisable(GL11.GL_SCISSOR_TEST);
+        // Show tooltips if an icon or connection was hovered.
+        if (hoveredIconId != null) {
+            DiagramIcon icon = getIconById(hoveredIconId);
+            List<String> tooltip = getIconTooltip(icon);
+            if (tooltip != null && !tooltip.isEmpty())
+                drawHoveringText(tooltip, mouseX, mouseY, mc.fontRenderer);
+        } else if (hoveredConnFrom != -1 && hoveredConnTo != -1) {
+            DiagramConnection conn = getConnectionByIds(hoveredConnFrom, hoveredConnTo);
+            List<String> tooltip = getConnectionTooltip(conn);
+            if (tooltip != null && !tooltip.isEmpty())
+                drawHoveringText(tooltip, mouseX, mouseY, mc.fontRenderer);
+        }
+    }
+
+    // --- Utility Methods ---
+    protected DiagramIcon getIconById(int id) {
+        for (DiagramIcon icon : getIcons()) {
+            if (icon.id == id) return icon;
+        }
+        return null;
+    }
+    protected DiagramConnection getConnectionByIds(int idFrom, int idTo) {
+        for (DiagramConnection conn : getConnections()) {
+            if (conn.idFrom == idFrom && conn.idTo == idTo) return conn;
+        }
+        return null;
+    }
+    protected int getConnectionColor(DiagramConnection conn) {
+        float percent = conn.percent;
+        if (percent <= 0.10f) return 0xFF80FF80;
+        else if (percent <= 0.40f) return 0xFFCCFF66;
+        else if (percent <= 0.50f) return 0xFFFFA500;
+        else {
+            float ratio = (percent - 0.50f) / 0.50f;
+            ratio = Math.min(1f, Math.max(0f, ratio));
+            int r1 = 0xFF, g1 = 0xA5, b1 = 0x00;
+            int r2 = 0xFF, g2 = 0x00, b2 = 0x00;
+            int r = r1 + (int)((r2 - r1) * ratio);
+            int g = g1 + (int)((g2 - g1) * ratio);
+            int b = b1 + (int)((b2 - b1) * ratio);
+            return (0xFF << 24) | (r << 16) | (g << 8) | b;
+        }
+    }
+    private double pointLineDistance(int px, int py, int x1, int y1, int x2, int y2) {
+        double A = px - x1, B = py - y1, C = x2 - x1, D = y2 - y1;
+        double dot = A * C + B * D;
+        double lenSq = C * C + D * D;
+        double param = (lenSq != 0) ? (dot / lenSq) : -1;
+        double xx, yy;
+        if (param < 0) { xx = x1; yy = y1; }
+        else if (param > 1) { xx = x2; yy = y2; }
+        else { xx = x1 + param * C; yy = y1 + param * D; }
+        double dx = px - xx, dy = py - yy;
+        return Math.sqrt(dx * dx + dy * dy);
+    }
+
+    // --- Inner Helper Classes ---
+    public static class DiagramIcon {
+        public int id;
+        public boolean enabled = true;
+        public boolean pressable = false;
+        public int index = 0;      // For row, ring, or level.
+        public int priority = 0;   // For ordering.
+        public DiagramIcon(int id) { this.id = id; }
+        public DiagramIcon(int id, int index, int priority) {
+            this.id = id;
+            this.index = index;
+            this.priority = priority;
+        }
+    }
+    public static class DiagramConnection {
+        public int idFrom, idTo;
+        public float percent;
+        public String hoverText;
+        public DiagramConnection(int idFrom, int idTo, float percent, String hoverText) {
+            this.idFrom = idFrom;
+            this.idTo = idTo;
+            this.percent = percent;
+            this.hoverText = hoverText;
+        }
+    }
+    // Used by the CHART layout to represent an inner cell.
+    private static class ConnectionCell {
+        int x, y, size;
+        DiagramConnection conn;
+        ConnectionCell(int x, int y, int size, DiagramConnection conn) {
+            this.x = x; this.y = y; this.size = size; this.conn = conn;
+        }
+    }
+    // Simple helper class for rectangles.
+    private static class Rectangle {
+        int x, y, width, height;
+        Rectangle(int x, int y, int width, int height) {
+            this.x = x; this.y = y; this.width = width; this.height = height;
+        }
+        int centerX() { return x + width / 2; }
+        int centerY() { return y + height / 2; }
+    }
+
+    public enum IconRenderState {
+        DEFAULT,
+        HIGHLIGHTED,
+        NOT_HIGHLIGHTED;
+    }
+
+    // --- Mouse Handling ---
+    public boolean mouseClicked(int mouseX, int mouseY, int mouseButton) {
+        if (parent != null && parent.hasSubGui()) return false;
+        if (mouseButton == 0) {
+            for (DiagramIcon icon : getIcons()) {
+                if (!icon.enabled || !icon.pressable) continue;
+                Point pos = calculatePositions().get(icon.id);
+                if (pos == null) continue;
+                int centerX = x + width / 2, centerY = y + height / 2;
+                int effectiveX = (int)(((float)mouseX - (centerX + panX)) / zoom + centerX);
+                int effectiveY = (int)(((float)mouseY - (centerY + panY)) / zoom + centerY);
+                int slotX = pos.x - slotSize / 2, slotY = pos.y - slotSize / 2;
+                if (effectiveX >= slotX && effectiveX < slotX + slotSize &&
+                    effectiveY >= slotY && effectiveY < slotY + slotSize) {
+                    onIconClick(icon);
+                    currentlyPressedIcon = icon;
+                    return true;
+                }
+            }
+            if (isWithin(mouseX, mouseY)) {
+                dragging = true;
+                lastDragX = mouseX;
+                lastDragY = mouseY;
+                return true;
+            }
+        }
+        return false;
+    }
+    protected DiagramIcon currentlyPressedIcon = null;
+    public void mouseClickMove(int mouseX, int mouseY, int mouseButton, long timeSinceLastClick) {
+        if (parent != null && parent.hasSubGui()) return;
+        if (dragging) {
+            int dx = mouseX - lastDragX, dy = mouseY - lastDragY;
+            panX += dx / zoom * 0.7f;
+            panY += dy / zoom * 0.7f;
+            lastDragX = mouseX;
+            lastDragY = mouseY;
+        }
+        if (currentlyPressedIcon != null) onIconHeld(currentlyPressedIcon);
+    }
+    public void mouseReleased(int mouseX, int mouseY, int state) {
+        if (parent != null && parent.hasSubGui()) return;
+        if (currentlyPressedIcon != null) {
+            onIconRelease(currentlyPressedIcon);
+            currentlyPressedIcon = null;
+        }
+        dragging = false;
+    }
+    public boolean isWithin(int mouseX, int mouseY) {
+        if (parent.hasSubGui())
+            return false;
+        return mouseX >= x && mouseX <= x + width && mouseY >= y && mouseY <= y + height;
+    }
+    /**
+     * Handles zooming based on mouse wheel scrolling.
+     */
+    public void handleMouseScroll(int scrollDelta) {
+        zoom += scrollDelta * 0.0009f;
+        if (zoom < 0.5f) zoom = 0.5f;
+        if (zoom > 2.0f) zoom = 2.0f;
+    }
+    /**
+     * Override to render tooltips.
+     */
+    protected void drawHoveringText(List<String> text, int mouseX, int mouseY, FontRenderer fontRenderer) {}
+
+    // --- Flag Setters ---
+    public void setShowArrowHeads(boolean showArrowHeads) {
+        this.showArrowHeads = showArrowHeads;
+    }
+    public void setUseColorScaling(boolean useColorScaling) {
+        this.useColorScaling = useColorScaling;
+    }
+
+    // --- Icon and Connection Event Callbacks ---
+    /**
+     * Called when an icon is clicked.
+     */
+    protected void onIconClick(DiagramIcon icon) {
+        System.out.println("Icon " + icon.id + " clicked.");
+    }
+    /**
+     * Called when an icon is held.
+     */
+    protected void onIconHeld(DiagramIcon icon) {
+        System.out.println("Icon " + icon.id + " held.");
+    }
+    /**
+     * Called when an icon is released.
+     */
+    protected void onIconRelease(DiagramIcon icon) {
+        System.out.println("Icon " + icon.id + " released.");
+    }
+    /**
+     * Called when an icon is hovered over.
+     */
+    protected void onIconHover(DiagramIcon icon) {
+        // Override to handle icon hovering events.
+    }
+    /**
+     * Called when a connection is hovered over.
+     */
+    protected void onConnectionHover(DiagramConnection conn) {
+        // Override to handle connection hovering events.
+    }
+}
diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiModelInterface.java b/src/main/java/noppes/npcs/client/gui/util/GuiModelInterface.java
index a3163a45c..f419f3b24 100644
--- a/src/main/java/noppes/npcs/client/gui/util/GuiModelInterface.java
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiModelInterface.java
@@ -196,7 +196,7 @@ public class GuiModelInterface extends GuiNPCInterface {
 
     @Override
     public void save() {
-        // TODO Auto-generated method stub
+
 
     }
 }
diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiModelInterface2.java b/src/main/java/noppes/npcs/client/gui/util/GuiModelInterface2.java
index 31f3fa130..ae1578679 100644
--- a/src/main/java/noppes/npcs/client/gui/util/GuiModelInterface2.java
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiModelInterface2.java
@@ -155,8 +155,8 @@ public class GuiModelInterface2 extends GuiNPCInterface2{
 
 	@Override
 	public void save() {
-		// TODO Auto-generated method stub
-		
+
+
 	}
 
     public void setSave(boolean saveNPC){
diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java
index 04cceb311..65835fa6b 100644
--- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java
@@ -22,6 +22,7 @@ import org.lwjgl.opengl.GL12;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 public abstract class GuiNPCInterface extends GuiScreen {
     public EntityClientPlayerMP player;
@@ -36,6 +37,9 @@ public abstract class GuiNPCInterface extends GuiScreen {
     protected HashMap<Integer, GuiNpcSlider> sliders = new HashMap<Integer, GuiNpcSlider>();
     protected HashMap<Integer, GuiScreen> extra = new HashMap<Integer, GuiScreen>();
     protected HashMap<Integer, GuiScrollWindow> scrollWindows = new HashMap<>();
+    protected HashMap<Integer, GuiDiagram> diagrams = new HashMap<>();
+
+    public static boolean resizingActive = false;
 
     public String title;
     private ResourceLocation background = null;
@@ -88,6 +92,7 @@ public abstract class GuiNPCInterface extends GuiScreen {
         scrolls.clear();
         sliders.clear();
         scrollWindows.clear();
+        diagrams.clear();
         Keyboard.enableRepeatEvents(true);
     }
 
@@ -104,7 +109,6 @@ public abstract class GuiNPCInterface extends GuiScreen {
         }
     }
 
-
     public void addExtra(GuiHoverText gui) {
         gui.setWorldAndResolution(mc, 350, 250);
         extra.put(gui.id, gui);
@@ -116,6 +120,19 @@ public abstract class GuiNPCInterface extends GuiScreen {
         scrollWindows.put(id, gui);
     }
 
+    /**
+     * Adds a GuiDiagram to the interface.
+     * The diagram is initialized with the current resolution and cached.
+     */
+    public void addDiagram(int id, GuiDiagram diagram) {
+        diagram.invalidateCache();
+        diagrams.put(id, diagram);
+    }
+
+    public GuiDiagram getDiagram(int id) {
+        return diagrams.get(id);
+    }
+
     public void mouseClicked(int i, int j, int k) {
         if (subgui != null)
             subgui.mouseClicked(i, j, k);
@@ -134,6 +151,13 @@ public abstract class GuiNPCInterface extends GuiScreen {
                     scroll.mouseClicked(i, j, k);
                 }
             }
+            // Process diagram mouse clicks
+            for (GuiDiagram diagram : diagrams.values()) {
+                if (diagram.isWithin(i, j)) {
+                    if (diagram.mouseClicked(i, j, k))
+                        return;
+                }
+            }
             mouseEvent(i, j, k);
             super.mouseClicked(i, j, k);
         }
@@ -163,7 +187,7 @@ public abstract class GuiNPCInterface extends GuiScreen {
             guiScrollableComponent.keyTyped(c, i);
         }
 
-        //Fixes closing sub with escape closes all of it's parents
+        // Fixes closing sub with escape closes all of its parents
         boolean enoughTimeSinceSubClosed = Minecraft.getSystemTime() - timeClosedSubGui > 50;
 
         if (closeOnEsc && enoughTimeSinceSubClosed && (i == 1 || !GuiNpcTextField.isFieldActive() && isInventoryKey(i))) {
@@ -273,6 +297,13 @@ public abstract class GuiNPCInterface extends GuiScreen {
         }
         for (GuiScreen gui : extra.values())
             gui.drawScreen(i, j, f);
+        // Draw scrollable windows.
+        for (GuiScrollWindow guiScrollableComponent : scrollWindows.values()) {
+            guiScrollableComponent.drawScreen(i, j, f, !subGui && guiScrollableComponent.isMouseOver(i, j) ? Mouse.getDWheel() : 0);
+        }
+        for (GuiDiagram diagram : diagrams.values()) {
+            diagram.drawDiagram(i, j, subGui);
+        }
         super.drawScreen(i, j, f);
         for (GuiCustomScroll scroll : scrolls.values())
             if (scroll.hoverableText) {
@@ -284,9 +315,6 @@ public abstract class GuiNPCInterface extends GuiScreen {
                 button.drawHover(i, j, subGui);
             }
         }
-        for (GuiScrollWindow guiScrollableComponent : scrollWindows.values()) {
-            guiScrollableComponent.drawScreen(i, j, f, !subGui && guiScrollableComponent.isMouseOver(i, j) ? Mouse.getDWheel() : 0);
-        }
 
         if (subgui != null) {
             subgui.drawScreen(i, j, f);
@@ -333,7 +361,7 @@ public abstract class GuiNPCInterface extends GuiScreen {
     }
 
     public boolean isInventoryKey(int i) {
-        return i == mc.gameSettings.keyBindInventory.getKeyCode(); //inventory key
+        return i == mc.gameSettings.keyBindInventory.getKeyCode(); // inventory key
     }
 
     @Override
@@ -398,8 +426,8 @@ public abstract class GuiNPCInterface extends GuiScreen {
         float f6 = (float) ((guiTop + y) - 50 * scale * zoomed) - mouseY;
         int orientation = 0;
         if (npc != null) {
-            orientation = npc.ai.orientation;
-            npc.ai.orientation = rotation;
+            orientation = npc.ais.orientation;
+            npc.ais.orientation = rotation;
         }
 
         GL11.glRotatef(135F, 0.0F, 1.0F, 0.0F);
@@ -418,7 +446,7 @@ public abstract class GuiNPCInterface extends GuiScreen {
         entity.prevRotationPitch = entity.rotationPitch = f4;
         entity.prevRotationYawHead = entity.rotationYawHead = f7;
         if (npc != null) {
-            npc.ai.orientation = orientation;
+            npc.ais.orientation = orientation;
         }
         GL11.glPopMatrix();
         RenderHelper.disableStandardItemLighting();
@@ -430,6 +458,10 @@ public abstract class GuiNPCInterface extends GuiScreen {
         OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
     }
 
+    public void renderHoveringText(List textLines, int x, int y, FontRenderer font) {
+        this.drawHoveringText(textLines, x, y, font);
+    }
+
     public void openLink(String link) {
         try {
             Class oclass = Class.forName("java.awt.Desktop");
diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java
index da766c681..a987fe826 100644
--- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java
@@ -1,9 +1,12 @@
 package noppes.npcs.client.gui.util;
 
+import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.util.ResourceLocation;
 import noppes.npcs.entity.EntityNPCInterface;
 import org.lwjgl.opengl.GL11;
 
+import java.util.List;
+
 public abstract class GuiNPCInterface2 extends GuiNPCInterface
 {
 	private ResourceLocation background = new ResourceLocation("customnpcs:textures/gui/menubg.png");
diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNpcButton.java b/src/main/java/noppes/npcs/client/gui/util/GuiNpcButton.java
index 836c25ab1..820ad12ca 100644
--- a/src/main/java/noppes/npcs/client/gui/util/GuiNpcButton.java
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiNpcButton.java
@@ -1,9 +1,10 @@
 package noppes.npcs.client.gui.util;
 
-import kamkeel.util.TextSplitter;
+import kamkeel.npcs.util.TextSplitter;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
@@ -12,97 +13,145 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-public class GuiNpcButton extends GuiButton{
+public class GuiNpcButton extends GuiButton {
 
-	protected String[] display;
-	private int displayValue = 0;
-	public int id;
+    protected String[] display;
+    private int displayValue = 0;
+    public int id;
     public String hoverableText = "";
     public int oldHover;
     public int hoverCount = 0;
     boolean hasSubGUI = false;
 
-	public GuiNpcButton(int i, int j, int k,  String s) {
-		super(i, j, k,  StatCollector.translateToLocal(s));
-		id = i;
-	}
-	public GuiNpcButton(int i, int j, int k,  String[] display, int val) {
-		this(i, j, k, display[val]);
-		this.display = display;
-		this.displayValue = val;
-	}
-	public GuiNpcButton(int i, int j, int k, int l, int m, String string) {
-		super(i, j, k, l, m, StatCollector.translateToLocal(string));
-		id = i;
-	}
-	public GuiNpcButton(int i, int j, int k, int l, int m, String[] display,
-			int val) {
-		this(i, j, k, l, m, display.length == 0?"":display[val % display.length]);
-		this.display = display;
-		this.displayValue = display.length == 0?0:val % display.length;
-	}
+    // Fields for icon texture and its dimensions.
+    protected ResourceLocation iconTexture = null;
+    protected int iconWidth = 16;
+    protected int iconHeight = 16;
 
-    public GuiNpcButton(int i, int j, int k, int l, int m, Enum<?>[] displayEnums,
-                        int val) {
+    protected int iconPosX = 0;
+    protected int iconPosY = 0;
+
+    public GuiNpcButton(int i, int j, int k, String s) {
+        super(i, j, k, StatCollector.translateToLocal(s));
+        id = i;
+    }
+
+    public GuiNpcButton(int i, int j, int k, String[] display, int val) {
+        this(i, j, k, display[val]);
+        this.display = display;
+        this.displayValue = val;
+    }
+
+    public GuiNpcButton(int i, int j, int k, int l, int m, String string) {
+        super(i, j, k, l, m, StatCollector.translateToLocal(string));
+        id = i;
+    }
+
+    public GuiNpcButton(int i, int j, int k, int l, int m, String[] display, int val) {
+        this(i, j, k, l, m, display.length == 0 ? "" : display[val % display.length]);
+        this.display = display;
+        this.displayValue = display.length == 0 ? 0 : val % display.length;
+    }
+
+    public GuiNpcButton(int i, int j, int k, int l, int m, Enum<?>[] displayEnums, int val) {
         this(i, j, k, l, m, displayEnums.length == 0 ? "" : displayEnums[val % displayEnums.length].toString());
-
         ArrayList<String> strings = new ArrayList<>();
         for (Enum<?> e : displayEnums) {
             strings.add(e.toString());
         }
-
         this.display = strings.toArray(new String[0]);
-        this.displayValue = display.length == 0?0:val % display.length;
+        this.displayValue = display.length == 0 ? 0 : val % display.length;
     }
 
-	public void setDisplayText(String text){
-		this.displayString = StatCollector.translateToLocal(text);
-	}
-    public void setHoverText(String text){
+    public void setDisplayText(String text) {
+        this.displayString = StatCollector.translateToLocal(text);
+    }
+
+    public void setHoverText(String text) {
         this.hoverableText = StatCollector.translateToLocal(text);
     }
-	public int getValue(){
-		return displayValue;
-	}
 
-	public void setEnabled(boolean bo){
-		this.enabled = bo;
-	}
-	public void setVisible(boolean b) {
-		this.visible = b;
-	}
-    public boolean getVisible() {
-		return visible;
-	}
-
-    public void setDisplay(int value){
-    	this.displayValue = value;
-    	this.setDisplayText(display[value]);
+    public int getValue() {
+        return displayValue;
     }
 
-    public void setTextColor(int color){
-    	this.packedFGColour = color;
+    public void setEnabled(boolean bo) {
+        this.enabled = bo;
+    }
+
+    public void setVisible(boolean b) {
+        this.visible = b;
+    }
+
+    public boolean getVisible() {
+        return visible;
+    }
+
+    public void setDisplay(int value) {
+        this.displayValue = value;
+        this.setDisplayText(display[value]);
+    }
+
+    public void setTextColor(int color) {
+        this.packedFGColour = color;
+    }
+
+    /**
+     * Sets the icon texture for this button.
+     * The texture should be 16x16 by default, unless you adjust the icon dimensions.
+     */
+    public GuiNpcButton setIconTexture(ResourceLocation texture) {
+        this.iconTexture = texture;
+        return this;
+    }
+
+    public GuiNpcButton setIconPos(int width, int height, int x, int y) {
+        this.iconWidth = width;
+        this.iconHeight = height;
+        this.iconPosX = x;
+        this.iconPosY = y;
+        return this;
     }
 
     @Override
-    public boolean mousePressed(Minecraft minecraft, int i, int j)
-    {
-    	boolean bo = super.mousePressed(minecraft, i, j);
-    	if(bo && display != null && display.length != 0){
-    		displayValue = (displayValue+1) % display.length;
-    		this.setDisplayText(display[displayValue]);
-    	}
-    	return bo;
+    public boolean mousePressed(Minecraft minecraft, int i, int j) {
+        boolean bo = super.mousePressed(minecraft, i, j);
+        if (bo && display != null && display.length != 0) {
+            displayValue = (displayValue + 1) % display.length;
+            this.setDisplayText(display[displayValue]);
+        }
+        return bo;
     }
 
-	public int getWidth() {
-		return width;
-	}
+    public int getWidth() {
+        return width;
+    }
+
+    @Override
+    public void drawButton(Minecraft mc, int mouseX, int mouseY) {
+        if (!this.visible)
+            return;
+        // First, draw the button normally using the superclass method.
+        super.drawButton(mc, mouseX, mouseY);
+        // Then, if an icon texture is set, draw it.
+        if (iconTexture != null) {
+            mc.getTextureManager().bindTexture(iconTexture);
+            GL11.glPushMatrix();
+            RenderHelper.enableGUIStandardItemLighting();
+            // Calculate the icon position so that it's centered in the button.
+            // (Assumes the button's (xPosition,yPosition) is its top left.)
+            int iconX = this.xPosition + (this.width - iconWidth) / 2;
+            int iconY = this.yPosition + (this.height - iconHeight) / 2;
+            // Draw the texture; we assume texture coordinates start at (0,0) with the desired size.
+            this.drawTexturedModalRect(iconX, iconY, iconPosX, iconPosY, iconWidth, iconHeight);
+            RenderHelper.disableStandardItemLighting();
+            GL11.glPopMatrix();
+        }
+    }
 
     public void drawHover(int i, int j, boolean hasSubGui) {
         if (hasSubGui || !visible || hoverableText.isEmpty())
             return;
-
         int hoverState = this.getHoverState(this.field_146123_n);
         if (oldHover != hoverState) {
             oldHover = hoverState;
@@ -111,7 +160,6 @@ public class GuiNpcButton extends GuiButton{
             if (hoverCount < 110)
                 hoverCount++;
         }
-
         if (hoverState == 2 && hoverCount > 100) {
             GL11.glPushMatrix();
             Minecraft mc = Minecraft.getMinecraft();
@@ -127,7 +175,6 @@ public class GuiNpcButton extends GuiButton{
     protected void drawHoveringText(List textLines, int x, int y, Minecraft mc) {
         if (mc.fontRenderer == null || textLines.isEmpty())
             return;
-
         GL11.glDisable(GL12.GL_RESCALE_NORMAL);
         RenderHelper.disableStandardItemLighting();
         GL11.glDisable(GL11.GL_LIGHTING);
@@ -151,26 +198,21 @@ public class GuiNpcButton extends GuiButton{
             maxHeight += 2 + (textLines.size() - 1) * 10;
         }
 
-        // Calculate the maximum x-coordinate to ensure the tooltip stays within the game window
         int gameWidth = mc.displayWidth;
-        int maxTooltipX = gameWidth - maxWidth - 4; // Subtract the tooltip width
+        int maxTooltipX = gameWidth - maxWidth - 4;
 
-        // Adjust tooltip position if it goes off the screen to the right
         if (j2 > maxTooltipX) {
             int diff = j2 - maxTooltipX;
-            j2 -= diff; // Shift tooltip to the left
-            GL11.glTranslatef(-300, 0, 0); // Apply translation
+            j2 -= diff;
+            GL11.glTranslatef(-300, 0, 0);
         }
 
         if (k2 + maxHeight + 6 > mc.displayHeight) {
             k2 = mc.displayHeight - maxHeight - 6;
         }
 
-        // Draw the tooltip
         this.zLevel = 300.0F;
         int j1 = -267386864;
-        // Draw the gradient background
-        // (Ensure to adjust the coordinates according to the translation)
         this.drawGradientRect(j2 - 3, k2 - 4, j2 + maxWidth + 3, k2 - 3, j1, j1);
         this.drawGradientRect(j2 - 3, k2 + maxHeight + 3, j2 + maxWidth + 3, k2 + maxHeight + 4, j1, j1);
         this.drawGradientRect(j2 - 3, k2 - 3, j2 + maxWidth + 3, k2 + maxHeight + 3, j1, j1);
@@ -183,7 +225,6 @@ public class GuiNpcButton extends GuiButton{
         this.drawGradientRect(j2 - 3, k2 - 3, j2 + maxWidth + 3, k2 - 3 + 1, k1, k1);
         this.drawGradientRect(j2 - 3, k2 + maxHeight + 2, j2 + maxWidth + 3, k2 + maxHeight + 3, l1, l1);
 
-        // Draw the text lines
         for (int i2 = 0; i2 < textLines.size(); ++i2) {
             String s1 = (String) textLines.get(i2);
             mc.fontRenderer.drawStringWithShadow(s1, j2, k2, -1);
@@ -201,28 +242,21 @@ public class GuiNpcButton extends GuiButton{
     }
 
     @Override
-    public int getHoverState(boolean mouseOver)
-    {
+    public int getHoverState(boolean mouseOver) {
         byte b0 = 1;
-        if (!this.enabled)
-        {
+        if (!this.enabled) {
             b0 = 0;
-        }
-        else if (mouseOver && !this.hasSubGUI)
-        {
+        } else if (mouseOver && !this.hasSubGUI) {
             b0 = 2;
         }
-
         return b0;
     }
 
-    public void updateSubGUI(boolean hasSubGUI)
-    {
+    public void updateSubGUI(boolean hasSubGUI) {
         this.hasSubGUI = hasSubGUI;
     }
 
-    public boolean getHasSubGUI()
-    {
+    public boolean getHasSubGUI() {
         return this.hasSubGUI;
     }
 }
diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNpcMenu.java b/src/main/java/noppes/npcs/client/gui/util/GuiNpcMenu.java
index 01bbb8d20..70492f9cb 100644
--- a/src/main/java/noppes/npcs/client/gui/util/GuiNpcMenu.java
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiNpcMenu.java
@@ -1,5 +1,8 @@
 package noppes.npcs.client.gui.util;
 
+import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.request.npc.NpcClosePacket;
+import kamkeel.npcs.network.packets.request.npc.NpcDeletePacket;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiScreen;
@@ -7,10 +10,10 @@ import net.minecraft.client.gui.GuiYesNo;
 import net.minecraft.client.gui.GuiYesNoCallback;
 import net.minecraft.util.StatCollector;
 import noppes.npcs.CustomNpcs;
-import noppes.npcs.client.Client;
+
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.constants.EnumGuiType;
-import noppes.npcs.constants.EnumPacketServer;
+
 import noppes.npcs.entity.EntityNPCInterface;
 import org.lwjgl.input.Keyboard;
 
@@ -104,7 +107,7 @@ public class GuiNpcMenu implements GuiYesNoCallback {
         if (npc != null) {
             npc.reset();
             if (saveNPC)
-                Client.sendData(EnumPacketServer.NpcMenuClose);
+                PacketClient.sendClient(new NpcClosePacket());
         }
     }
 
@@ -132,7 +135,7 @@ public class GuiNpcMenu implements GuiYesNoCallback {
     public void confirmClicked(boolean flag, int i) {
         Minecraft mc = Minecraft.getMinecraft();
         if (flag) {
-            Client.sendData(EnumPacketServer.Delete);
+            PacketClient.sendClient(new NpcDeletePacket());
             mc.displayGuiScreen(null);
             mc.setIngameFocus();
         } else {
diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNpcSquareButton.java b/src/main/java/noppes/npcs/client/gui/util/GuiNpcSquareButton.java
new file mode 100644
index 000000000..8132e2eaa
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiNpcSquareButton.java
@@ -0,0 +1,117 @@
+package noppes.npcs.client.gui.util;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.renderer.RenderHelper;
+import org.lwjgl.opengl.GL11;
+
+import static noppes.npcs.client.gui.player.inventory.GuiCNPCInventory.specialIcons;
+
+public class GuiNpcSquareButton extends GuiNpcButton {
+
+    // Fixed height for the text button portion.
+    public static final int TEXT_BUTTON_HEIGHT = 20;
+    // Overall square side length (set via layout).
+    public int size;
+    // The icon area height is the overall size minus TEXT_BUTTON_HEIGHT.
+    public int iconAreaHeight;
+    // Background color (ARGB) for the icon area.
+    protected int backgroundColor;
+    // The child text button.
+    public GuiNpcButton textButton;
+
+    /**
+     * Constructor.
+     *
+     * @param id              Button id.
+     * @param x               Initial x (placeholder; layout will override).
+     * @param y               Initial y (placeholder; layout will override).
+     * @param size            Overall square side (placeholder; layout will override).
+     * @param label           Button text.
+     * @param backgroundColor ARGB color for the icon area.
+     */
+    public GuiNpcSquareButton(int id, int x, int y, int size, String label, int backgroundColor) {
+        // The composite button’s width and height are both "size".
+        super(id, x, y, size, size, label);
+        this.size = size;
+        this.iconAreaHeight = size - TEXT_BUTTON_HEIGHT;
+        this.backgroundColor = backgroundColor;
+        // Create the child text button.
+        this.textButton = new GuiNpcButton(id, x, y + iconAreaHeight, size, TEXT_BUTTON_HEIGHT, label);
+    }
+
+    /**
+     * Update the composite button’s position and overall size.
+     */
+    public void updatePositionAndSize(int x, int y, int newSize) {
+        this.xPosition = x;
+        this.yPosition = y;
+        this.size = newSize - 1;
+        this.width = newSize;
+        this.height = newSize;
+        this.iconAreaHeight = newSize - TEXT_BUTTON_HEIGHT;
+        this.textButton.xPosition = x;
+        this.textButton.yPosition = y + this.iconAreaHeight;
+        this.textButton.width = newSize;
+        this.textButton.height = TEXT_BUTTON_HEIGHT;
+    }
+
+    @Override
+    public void drawButton(Minecraft mc, int mouseX, int mouseY) {
+        if (!this.visible)
+            return;
+
+        // --- Draw the icon area background ---
+        Gui.drawRect(xPosition, yPosition, xPosition + size, yPosition + iconAreaHeight, backgroundColor);
+
+        // --- Draw the icon ---
+        if (iconTexture != null) {
+            mc.getTextureManager().bindTexture(iconTexture);
+            GL11.glPushMatrix();
+            // Disable lighting so the icon is drawn at full brightness.
+            RenderHelper.disableStandardItemLighting();
+            // Reset color to white.
+            GL11.glColor4f(1F, 1F, 1F, 1F);
+            // Compute center of icon area.
+            float centerX = xPosition + size / 2.0F;
+            float centerY = yPosition + iconAreaHeight / 2.0F;
+            GL11.glTranslatef(centerX, centerY, 0F);
+            // Use an internal padding so the icon doesn't touch the borders.
+            int iconPadding = 2;  // adjust as needed
+            // Compute scale: available space is (iconAreaHeight - 2 * iconPadding)
+            float scale = (float) (iconAreaHeight - 2 * iconPadding) / (float) iconHeight;
+            GL11.glScalef(scale, scale, 1F);
+            // Center the icon (assuming iconWidth and iconHeight are the texture's dimensions)
+            GL11.glTranslatef(-iconWidth / 2.0F, -iconHeight / 2.0F, 0F);
+            this.drawTexturedModalRect(0, 0, iconPosX, iconPosY, iconWidth, iconHeight);
+            GL11.glPopMatrix();
+        }
+
+        // --- Draw the child text button ---
+        textButton.drawButton(mc, mouseX, mouseY);
+    }
+
+
+    @Override
+    public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) {
+        if (!this.visible)
+            return false;
+
+        // If click is in the text button area:
+        if (mouseX >= xPosition && mouseX < xPosition + size &&
+            mouseY >= yPosition + iconAreaHeight && mouseY < yPosition + size) {
+            return textButton.mousePressed(mc, mouseX, mouseY);
+        }
+        // Or if click is in the icon area, we also treat it as a click.
+        if (mouseX >= xPosition && mouseX < xPosition + size &&
+            mouseY >= yPosition && mouseY < yPosition + iconAreaHeight) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void mouseReleased(int mouseX, int mouseY) {
+        textButton.mouseReleased(mouseX, mouseY);
+    }
+}
diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNpcTextArea.java b/src/main/java/noppes/npcs/client/gui/util/GuiNpcTextArea.java
index d2be0c1bb..076306b86 100644
--- a/src/main/java/noppes/npcs/client/gui/util/GuiNpcTextArea.java
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiNpcTextArea.java
@@ -90,20 +90,18 @@ public class GuiNpcTextArea extends GuiNpcTextField {
 		}
 		return false;
 	}
-	
+
 	@Override
     public void mouseClicked(int i, int j, int k){
     	boolean wasFocused = isFocused();
         super.mouseClicked(i, j, k);
-        
+
         if(hoverVerticalScrollBar(i, j)){
         	clickVerticalBar = true;
         	startClick = -1;
         	return;
         }
-        if(k != 0 || !canEdit)
-        	return;
-        
+
     	int x = i - posX;
     	int y = (j - posY - 4) / font.height() + getStartLineY();
     	cursorPosition = 0;
@@ -126,22 +124,22 @@ public class GuiNpcTextArea extends GuiNpcTextField {
             		return;
         		charCount++;
         		line += c;
-        		
+
     		}
     		cursorPosition = charCount;
 
-            	
+
 
     		lineCount++;
 			charCount++;
             if(y < lineCount){
             	break;
             }
-		}        
+		}
         if(y >= lineCount)
         	cursorPosition = getText().length();
     }
-	
+
 	private List<String> getLines(){
 		List<String> list = new ArrayList<String>();
 		String line = "";
@@ -156,7 +154,7 @@ public class GuiNpcTextArea extends GuiNpcTextField {
     	list.add(line);
 		return list;
 	}
-	
+
 	private int getStartLineY(){
 		if(!isScrolling())
 			scrolledY = 0;
@@ -171,9 +169,9 @@ public class GuiNpcTextArea extends GuiNpcTextField {
         //int color = isEnabled?0xe0e0e0:0x707070;
         int color = 0xe0e0e0;
         boolean flag = isFocused() && (cursorCounter / 6) % 2 == 0;
-        
+
         int startLine = getStartLineY();
-        
+
         int maxLine = height / font.height() + startLine;
 
         int charCount = 0;
@@ -193,7 +191,7 @@ public class GuiNpcTextArea extends GuiNpcTextField {
         			int xx = posX + font.width(line) + 4;
         			int yy = posY + ((lineCount - startLine) * font.height()) + 4;
             		if(getText().length() == cursorPosition){
-            			font.drawString("_", xx, yy, color);  
+            			font.drawString("_", xx, yy, color);
             		}
             		else{
             			drawCursorVertical(xx, yy, xx + 1, yy + font.height());
@@ -208,7 +206,7 @@ public class GuiNpcTextArea extends GuiNpcTextField {
 	    			int xx = posX + font.width(line) + 4;
 	    			int yy = posY + ((lineCount - startLine) * font.height()) + 4;
 	        		if(getText().length() == cursorPosition){
-	        			font.drawString("_", xx, yy, color);  
+	        			font.drawString("_", xx, yy, color);
 	        		}
 	        		else{
 	        			drawCursorVertical(xx, yy, xx + 1, yy + font.height());
@@ -218,8 +216,8 @@ public class GuiNpcTextArea extends GuiNpcTextField {
     		lineCount++;
         	charCount++;
         }
-        
-        
+
+
         int k2 = Mouse.getDWheel();
         if(k2 != 0 && isFocused()){
         	addScrollY(k2 < 0?-10:10);
@@ -229,10 +227,10 @@ public class GuiNpcTextArea extends GuiNpcTextField {
         	if(clickVerticalBar){
 	        	if(startClick >= 0)
 	        		addScrollY(startClick - (mouseY - posY));
-	        	
+
 	        	if(hoverVerticalScrollBar(mouseX, mouseY))
 	        		startClick = mouseY - posY;
-	
+
 	    		startClick = mouseY - posY;
         	}
         }
@@ -242,20 +240,20 @@ public class GuiNpcTextArea extends GuiNpcTextField {
         listHeight = lineCount * font.height();
         drawVerticalScrollBar();
     }
-	
+
     public void drawString(FontRenderer fontRendererIn, String text, int x, int y, int color){
     	GL11.glColor4f(1, 1, 1, 1);
     	font.drawString(text, x, y, color);
     	//super.drawString(fontRendererIn, text, x, y, color);
     }
-	
+
 	private boolean isScrolling() {
     	return listHeight > height - 4;
 	}
 
 	private void addScrollY(int scrolled){
 		scrolledY -= 1f * scrolled / height;
-		
+
     	if(scrolledY < 0)
     		scrolledY = 0;
 
@@ -263,17 +261,17 @@ public class GuiNpcTextArea extends GuiNpcTextField {
     	if(scrolledY > max )
     		scrolledY = max;
 	}
-	
+
 	private boolean hoverVerticalScrollBar(int x, int y){
     	if(listHeight <= height - 4)
     		return false;
-    	
+
     	if(posY < y && posY + height > y && x < posX + width && x > posX + (width - 8))
     		return true;
-    	
+
 		return false;
 	}
-	
+
     private void drawCursorVertical(int p_146188_1_, int p_146188_2_, int p_146188_3_, int p_146188_4_){
         int i1;
 
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelStool.java b/src/main/java/noppes/npcs/client/model/blocks/ModelStool.java
index 1da08f6e6..429e5ea96 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelStool.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/ModelStool.java
@@ -1,83 +1,37 @@
 package noppes.npcs.client.model.blocks;
 
 import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
 public class ModelStool extends ModelBase {
-	ModelRenderer Base;
-	ModelRenderer Leg1;
-	ModelRenderer Leg2;
-	ModelRenderer Leg3;
-	ModelRenderer Leg4;
-	ModelRenderer Shape1;
-	ModelRenderer Shape2;
-	ModelRenderer Shape3;
-	ModelRenderer Shape4;
+	private final ModelRenderer stool;
 
 	public ModelStool() {
-		Base = new ModelRenderer(this, 9, 3);
-		Base.addBox(-5F, 0F, -5F, 10, 1, 10);
-		Base.setRotationPoint(0F, 16F, 0F);
-		
-		Leg1 = new ModelRenderer(this, 0, 12);
-		Leg1.addBox(-1F, 0F, 0F, 2, 8, 1);
-		Leg1.setRotationPoint(2F, 17F, 2F);
-		setRotation(Leg1, 0.3316126F, 0.7853982F, 0F);
-		
-		Leg2 = new ModelRenderer(this, 0, 12);
-		Leg2.addBox(-1F, 0F, 0F, 2, 8, 1);
-		Leg2.setRotationPoint(2F, 17F, -2F);
-		setRotation(Leg2, 0.3316126F, 2.356194F, -0.0081449F);
-		
-		Leg3 = new ModelRenderer(this, 0, 12);
-		Leg3.addBox(-1F, 0F, 0F, 2, 8, 1);
-		Leg3.setRotationPoint(-2F, 17F, 2F);
-		setRotation(Leg3, 0.3316126F, -0.7853982F, 0F);
-		
-		Leg4 = new ModelRenderer(this, 0, 12);
-		Leg4.addBox(-1F, 0F, 0F, 2, 8, 1);
-		Leg4.setRotationPoint(-2F, 17F, -2F);
-		setRotation(Leg4, 0.3316126F, -2.356194F, 0F);
-		
-		Shape1 = new ModelRenderer(this, 0, 11);
-		Shape1.addBox(-3F, 0F, 0F, 6, 1, 1);
-		Shape1.setRotationPoint(2.4F, 19F, 0F);
-		setRotation(Shape1, 0F, 1.570796F, 0F);
-		
-		Shape2 = new ModelRenderer(this, 0, 11);
-		Shape2.addBox(-3F, 0F, 0F, 6, 1, 1);
-		Shape2.setRotationPoint(0F, 19F, 2.4F);
-		
-		Shape3 = new ModelRenderer(this, 0, 11);
-		Shape3.addBox(-3F, 0F, 0F, 6, 1, 1);
-		Shape3.setRotationPoint(0F, 19F, -3.4F);
-		
-		Shape4 = new ModelRenderer(this, 0, 11);
-		Shape4.addBox(-3F, 0F, 0F, 6, 1, 1);
-		Shape4.setRotationPoint(-3.4F, 19F, 0F);
-		setRotation(Shape4, 0F, 1.570796F, 0F);
+        textureWidth = 64;
+        textureHeight = 32;
+
+        stool = new ModelRenderer(this);
+        stool.setRotationPoint(0.0F, 24.0F, 0.0F);
+        stool.cubeList.add(new ModelBox(stool, 0, 0, -5.0F, -9.0F, -5.0F, 10, 2, 10, 0.0F));
+        stool.cubeList.add(new ModelBox(stool, 0, 12, 2.0F, -7.0F, -4.0F, 2, 7, 2, 0.0F));
+        stool.cubeList.add(new ModelBox(stool, 8, 8, 3.0F, -5.0F, -2.0F, 0, 2, 4, 0.0F));
+        stool.cubeList.add(new ModelBox(stool, 8, 12, -2.0F, -5.0F, -3.0F, 4, 2, 0, 0.0F));
+        stool.cubeList.add(new ModelBox(stool, 0, 12, -4.0F, -7.0F, -4.0F, 2, 7, 2, 0.0F));
+        stool.cubeList.add(new ModelBox(stool, 0, 12, -4.0F, -7.0F, 2.0F, 2, 7, 2, 0.0F));
+        stool.cubeList.add(new ModelBox(stool, 8, 8, -3.0F, -5.0F, -2.0F, 0, 2, 4, 0.0F));
+        stool.cubeList.add(new ModelBox(stool, 0, 12, 2.0F, -7.0F, 2.0F, 2, 7, 2, 0.0F));
+        stool.cubeList.add(new ModelBox(stool, 8, 12, -2.0F, -5.0F, 3.0F, 4, 2, 0, 0.0F));	}
+
+	@Override
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+		stool.render(f5);
 	}
 
-	public void render(Entity entity, float f, float f1, float f2, float f3,
-			float f4, float f5) {
-		super.render(entity, f, f1, f2, f3, f4, f5);
-		Base.render(f5);
-		Leg1.render(f5);
-		Leg2.render(f5);
-		Leg3.render(f5);
-		Leg4.render(f5);
-		Shape1.render(f5);
-		Shape2.render(f5);
-		Shape3.render(f5);
-		Shape4.render(f5);
+	public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+		modelRenderer.rotateAngleX = x;
+		modelRenderer.rotateAngleY = y;
+		modelRenderer.rotateAngleZ = z;
 	}
-
-	private void setRotation(ModelRenderer model, float x, float y, float z) {
-		model.rotateAngleX = x;
-		model.rotateAngleY = y;
-		model.rotateAngleZ = z;
-	}
-
-
 }
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelTable.java b/src/main/java/noppes/npcs/client/model/blocks/ModelTable.java
index df4b79fef..e44916856 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelTable.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/ModelTable.java
@@ -1,53 +1,86 @@
 package noppes.npcs.client.model.blocks;
 
 import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
 public class ModelTable extends ModelBase {
-	public ModelRenderer Shape1;
-	public ModelRenderer Table;
-	public ModelRenderer Shape3;
-	public ModelRenderer Shape4;
-	public ModelRenderer Shape5;
+	public final ModelRenderer Shape1;
+	private final ModelRenderer cube_r1;
+	private final ModelRenderer cube_r2;
+    public final ModelRenderer Shape3;
+    public final ModelRenderer Shape4;
+	private final ModelRenderer cube_r3;
+    public final ModelRenderer Shape2;
+	private final ModelRenderer cube_r4;
+    public final ModelRenderer Table;
 
 	public ModelTable() {
-		Shape1 = new ModelRenderer(this, 0, 0);
-		Shape1.mirror = true;
-		Shape1.addBox(-1F, 0F, -1F, 2, 14, 2);
-		Shape1.setRotationPoint(-6F, 10F, 6F);
-		
-		Table = new ModelRenderer(this, 0, 0);
-		Table.addBox(0F, -2F, 0F, 16, 2, 16);
-		Table.setRotationPoint(-8F, 10F, -8F);
-		
-		Shape3 = new ModelRenderer(this, 0, 0);
-		Shape3.addBox(-1F, 0F, -1F, 2, 14, 2);
-		Shape3.setRotationPoint(6F, 10F, -6F);
-		
-		Shape4 = new ModelRenderer(this, 0, 0);
-		Shape4.addBox(-1F, 0F, -1F, 2, 14, 2);
-		Shape4.setRotationPoint(6F, 10F, 6F);
-		
-		Shape5 = new ModelRenderer(this, 0, 0);
-		Shape5.mirror = true;
-		Shape5.addBox(-1F, 0F, -1F, 2, 14, 2);
-		Shape5.setRotationPoint(-6F, 10F, -6F);
+		textureWidth = 64;
+		textureHeight = 64;
+
+		Shape1 = new ModelRenderer(this);
+		Shape1.setRotationPoint(-4.8333F, 14.8333F, 4.8333F);
+		Shape1.cubeList.add(new ModelBox(Shape1, 0, 19, -2.1667F, -3.8333F, 0.1667F, 2, 13, 2, 0.0F));
+
+		cube_r1 = new ModelRenderer(this);
+		cube_r1.setRotationPoint(-1.1667F, -1.3333F, -2.3333F);
+		Shape1.addChild(cube_r1);
+		setRotationAngle(cube_r1, 0.0F, 3.1416F, 0.0F);
+		cube_r1.cubeList.add(new ModelBox(cube_r1, 8, 14, 0.0F, -2.5F, -2.5F, 0, 5, 5, 0.0F));
+
+		cube_r2 = new ModelRenderer(this);
+		cube_r2.setRotationPoint(2.3333F, -1.3333F, 1.1667F);
+		Shape1.addChild(cube_r2);
+		setRotationAngle(cube_r2, 0.0F, 3.1416F, 0.0F);
+		cube_r2.cubeList.add(new ModelBox(cube_r2, 8, 19, -2.5F, -2.5F, 0.0F, 5, 5, 0, 0.0F));
+
+		Shape3 = new ModelRenderer(this);
+		Shape3.setRotationPoint(-6.0F, 24.0F, 6.0F);
+		Shape3.cubeList.add(new ModelBox(Shape3, 8, 19, 6.0F, -13.0F, -12.0F, 5, 5, 0, 0.0F));
+		Shape3.cubeList.add(new ModelBox(Shape3, 0, 19, 11.0F, -13.0F, -13.0F, 2, 13, 2, 0.0F));
+		Shape3.cubeList.add(new ModelBox(Shape3, 8, 14, 12.0F, -13.0F, -11.0F, 0, 5, 5, 0.0F));
+
+		Shape4 = new ModelRenderer(this);
+		Shape4.setRotationPoint(-6.0F, 24.0F, 6.0F);
+		Shape4.cubeList.add(new ModelBox(Shape4, 8, 19, 6.0F, -13.0F, 0.0F, 5, 5, 0, 0.0F));
+		Shape4.cubeList.add(new ModelBox(Shape4, 0, 19, 11.0F, -13.0F, -1.0F, 2, 13, 2, 0.0F));
+
+		cube_r3 = new ModelRenderer(this);
+		cube_r3.setRotationPoint(12.0F, -10.5F, -3.5F);
+		Shape4.addChild(cube_r3);
+		setRotationAngle(cube_r3, 0.0F, 3.1416F, 0.0F);
+		cube_r3.cubeList.add(new ModelBox(cube_r3, 8, 14, 0.0F, -2.5F, -2.5F, 0, 5, 5, 0.0F));
+
+		Shape2 = new ModelRenderer(this);
+		Shape2.setRotationPoint(0.0F, 24.0F, 6.0F);
+		Shape2.cubeList.add(new ModelBox(Shape2, 0, 19, -7.0F, -13.0F, -13.0F, 2, 13, 2, 0.0F));
+		Shape2.cubeList.add(new ModelBox(Shape2, 8, 14, -6.0F, -13.0F, -11.0F, 0, 5, 5, 0.0F));
+
+		cube_r4 = new ModelRenderer(this);
+		cube_r4.setRotationPoint(-2.5F, -10.5F, -12.0F);
+		Shape2.addChild(cube_r4);
+		setRotationAngle(cube_r4, 0.0F, 3.1416F, 0.0F);
+		cube_r4.cubeList.add(new ModelBox(cube_r4, 8, 19, -2.5F, -2.5F, 0.0F, 5, 5, 0, 0.0F));
+
+		Table = new ModelRenderer(this);
+		Table.setRotationPoint(0.0F, 24.0F, 6.0F);
+		Table.cubeList.add(new ModelBox(Table, 0, 0, -8.0F, -16.0F, -14.0F, 16, 3, 16, 0.0F));
 	}
 
-	public void render(Entity entity, float f, float f1, float f2, float f3,
-			float f4, float f5) {
-		super.render(entity, f, f1, f2, f3, f4, f5);
-		Shape1.render(f5);
+	@Override
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+        super.render(entity, f, f1, f2, f3, f4, f5);
+        Shape1.render(f5);
 		Shape3.render(f5);
 		Shape4.render(f5);
-		Shape5.render(f5);
+		Shape2.render(f5);
 	}
 
-	private void setRotation(ModelRenderer model, float x, float y, float z) {
-		model.rotateAngleX = x;
-		model.rotateAngleY = y;
-		model.rotateAngleZ = z;
+	public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+		modelRenderer.rotateAngleX = x;
+		modelRenderer.rotateAngleY = y;
+		modelRenderer.rotateAngleZ = z;
 	}
-
 }
diff --git a/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloor.java b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloor.java
new file mode 100644
index 000000000..b58c134a1
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloor.java
@@ -0,0 +1,69 @@
+package noppes.npcs.client.model.blocks.banner;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelBannerFloor extends ModelBase {
+	private final ModelRenderer FloorBanner;
+	private final ModelRenderer Leg4_r1;
+	private final ModelRenderer Leg3_r1;
+	private final ModelRenderer Leg2_r1;
+	private final ModelRenderer Leg1_r1;
+	private final ModelRenderer Point1_r1;
+
+	public ModelBannerFloor() {
+		textureWidth = 64;
+		textureHeight = 64;
+
+		FloorBanner = new ModelRenderer(this);
+		FloorBanner.setRotationPoint(0.0F, 24.0F, 0.0F);
+		FloorBanner.cubeList.add(new ModelBox(FloorBanner, 0, 0, -8.0F, -32.0F, -1.0F, 16, 3, 3, 0.0F));
+		FloorBanner.cubeList.add(new ModelBox(FloorBanner, 0, 8, -6.0F, -36.0F, 0.5F, 4, 4, 0, 0.0F));
+		FloorBanner.cubeList.add(new ModelBox(FloorBanner, 0, 13, -1.0F, -29.0F, -0.5F, 2, 26, 2, 0.0F));
+		FloorBanner.cubeList.add(new ModelBox(FloorBanner, 18, 28, -6.0F, -2.0F, -5.0F, 12, 2, 11, 0.0F));
+		FloorBanner.cubeList.add(new ModelBox(FloorBanner, 26, 19, -4.0F, -4.0F, -3.0F, 8, 2, 7, 0.0F));
+
+		Leg4_r1 = new ModelRenderer(this);
+		Leg4_r1.setRotationPoint(-3.5F, -2.1F, 0.5F);
+		FloorBanner.addChild(Leg4_r1);
+		setRotationAngle(Leg4_r1, 0.0F, 0.0F, 1.1781F);
+		Leg4_r1.cubeList.add(new ModelBox(Leg4_r1, 10, 29, -1.0F, -3.0F, -1.0F, 2, 6, 2, 0.0F));
+
+		Leg3_r1 = new ModelRenderer(this);
+		Leg3_r1.setRotationPoint(0.0F, -2.1F, 4.0F);
+		FloorBanner.addChild(Leg3_r1);
+		setRotationAngle(Leg3_r1, 1.1781F, 0.0F, 0.0F);
+		Leg3_r1.cubeList.add(new ModelBox(Leg3_r1, 10, 29, -1.0F, -3.0F, -1.0F, 2, 6, 2, 0.0F));
+
+		Leg2_r1 = new ModelRenderer(this);
+		Leg2_r1.setRotationPoint(0.0F, -2.1F, -3.0F);
+		FloorBanner.addChild(Leg2_r1);
+		setRotationAngle(Leg2_r1, -1.1781F, 0.0F, 0.0F);
+		Leg2_r1.cubeList.add(new ModelBox(Leg2_r1, 10, 29, -1.0F, -3.0F, -1.0F, 2, 6, 2, 0.0F));
+
+		Leg1_r1 = new ModelRenderer(this);
+		Leg1_r1.setRotationPoint(3.5F, -2.1F, 0.5F);
+		FloorBanner.addChild(Leg1_r1);
+		setRotationAngle(Leg1_r1, 0.0F, 0.0F, -1.1781F);
+		Leg1_r1.cubeList.add(new ModelBox(Leg1_r1, 10, 29, -1.0F, -3.0F, -1.0F, 2, 6, 2, 0.0F));
+
+		Point1_r1 = new ModelRenderer(this);
+		Point1_r1.setRotationPoint(4.0F, -34.0F, 0.5F);
+		FloorBanner.addChild(Point1_r1);
+		setRotationAngle(Point1_r1, 0.0F, 3.1416F, 0.0F);
+		Point1_r1.cubeList.add(new ModelBox(Point1_r1, 0, 8, -2.0F, -2.0F, 0.0F, 4, 4, 0, 0.0F));
+	}
+
+	@Override
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+		FloorBanner.render(f5);
+	}
+
+	public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+		modelRenderer.rotateAngleX = x;
+		modelRenderer.rotateAngleY = y;
+		modelRenderer.rotateAngleZ = z;
+	}
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloorFlag.java b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloorFlag.java
new file mode 100644
index 000000000..030145314
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloorFlag.java
@@ -0,0 +1,31 @@
+package noppes.npcs.client.model.blocks.banner;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelBannerFloorFlag extends ModelBase {
+    public final ModelRenderer BannerFlag;
+
+    public ModelBannerFloorFlag() {
+        textureWidth = 32;
+        textureHeight = 32;
+
+        BannerFlag = new ModelRenderer(this);
+        BannerFlag.setRotationPoint(0.0F, -8.0F, 5.0F);
+        BannerFlag.cubeList.add(new ModelBox(BannerFlag, 2, 0, -7.0F, 0.4F, -6.05F, 14, 29, 0, 0.0F));
+    }
+
+    @Override
+    public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+        // Render the flag
+        BannerFlag.render(f5);
+    }
+
+    public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+        modelRenderer.rotateAngleX = x;
+        modelRenderer.rotateAngleY = y;
+        modelRenderer.rotateAngleZ = z;
+    }
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerWall.java b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerWall.java
new file mode 100644
index 000000000..e3756d963
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerWall.java
@@ -0,0 +1,37 @@
+package noppes.npcs.client.model.blocks.banner;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelBannerWall extends ModelBase {
+    private final ModelRenderer bb_main;
+    private final ModelRenderer cube_r1;
+
+	public ModelBannerWall() {
+        textureWidth = 64;
+        textureHeight = 64;
+
+        bb_main = new ModelRenderer(this);
+        bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
+        bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -8.0F, -32.0F, 5.0F, 16, 3, 3, 0.0F));
+        bb_main.cubeList.add(new ModelBox(bb_main, 0, 8, -6.0F, -36.0F, 6.5F, 4, 4, 0, 0.0F));
+
+        cube_r1 = new ModelRenderer(this);
+        cube_r1.setRotationPoint(4.0F, -34.0F, 6.5F);
+        bb_main.addChild(cube_r1);
+        setRotationAngle(cube_r1, 0.0F, 3.1416F, 0.0F);
+        cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 8, -2.0F, -2.0F, 0.0F, 4, 4, 0, 0.0F));}
+
+	@Override
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+        bb_main.render(f5);
+	}
+
+	public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+		modelRenderer.rotateAngleX = x;
+		modelRenderer.rotateAngleY = y;
+		modelRenderer.rotateAngleZ = z;
+	}
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerWallFlag.java b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerWallFlag.java
new file mode 100644
index 000000000..486db9504
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerWallFlag.java
@@ -0,0 +1,31 @@
+package noppes.npcs.client.model.blocks.banner;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelBannerWallFlag extends ModelBase {
+    public final ModelRenderer BannerFlag;
+
+    public ModelBannerWallFlag() {
+        textureWidth = 32;
+        textureHeight = 32;
+
+        BannerFlag = new ModelRenderer(this);
+        BannerFlag.setRotationPoint(0.0F, -8.0F, 5.0F);
+        BannerFlag.cubeList.add(new ModelBox(BannerFlag, 2, 0, -7.0F, 0.4F, -0.05F, 14, 29, 0, 0.0F));
+    }
+
+    @Override
+    public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+        // Render the flag
+        BannerFlag.render(f5);
+    }
+
+    public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+        modelRenderer.rotateAngleX = x;
+        modelRenderer.rotateAngleY = y;
+        modelRenderer.rotateAngleZ = z;
+    }
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/barrel/BarrelCore.java b/src/main/java/noppes/npcs/client/model/blocks/barrel/BarrelCore.java
deleted file mode 100644
index fb3aa099a..000000000
--- a/src/main/java/noppes/npcs/client/model/blocks/barrel/BarrelCore.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package noppes.npcs.client.model.blocks.barrel;
-
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelBox;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.entity.Entity;
-
-public class BarrelCore extends ModelBase {
-	private final ModelRenderer bb_main;
-	private final ModelRenderer cube_r1;
-	private final ModelRenderer cube_r2;
-	private final ModelRenderer cube_r3;
-	private final ModelRenderer cube_r4;
-	private final ModelRenderer cube_r5;
-
-	public BarrelCore() {
-        textureWidth = 64;
-        textureHeight = 32;
-
-        bb_main = new ModelRenderer(this);
-        bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
-
-        cube_r1 = new ModelRenderer(this);
-        cube_r1.setRotationPoint(0.0F, 0.0F, 0.0F);
-        bb_main.addChild(cube_r1);
-        setRotationAngle(cube_r1, 1.5708F, 0.0F, -1.5708F);
-        cube_r1.cubeList.add(new ModelBox(cube_r1, 6, -6, 0.0F, -5.0F, -5.0F, 0, 10, 10, 0.0F));
-
-        cube_r2 = new ModelRenderer(this);
-        cube_r2.setRotationPoint(0.0F, -14.5F, 0.0F);
-        bb_main.addChild(cube_r2);
-        setRotationAngle(cube_r2, 0.0F, 0.0F, 1.5708F);
-        cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 2, 2.5F, -5.5F, 5.5F, 8, 11, 0, 0.0F));
-        cube_r2.cubeList.add(new ModelBox(cube_r2, 8, 2, 2.5F, -5.5F, -5.5F, 8, 11, 0, 0.0F));
-        cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 3, -1.5F, -5.0F, -5.0F, 16, 10, 0, 0.0F));
-
-        cube_r3 = new ModelRenderer(this);
-        cube_r3.setRotationPoint(0.0F, -14.5F, 0.0F);
-        bb_main.addChild(cube_r3);
-        setRotationAngle(cube_r3, 1.5708F, 0.0F, 1.5708F);
-        cube_r3.cubeList.add(new ModelBox(cube_r3, 8, 2, 2.5F, -5.5F, -5.5F, 8, 11, 0, 0.0F));
-        cube_r3.cubeList.add(new ModelBox(cube_r3, 0, 2, 2.5F, -5.5F, 5.5F, 8, 11, 0, 0.0F));
-        cube_r3.cubeList.add(new ModelBox(cube_r3, 6, -5, -1.5F, -5.0F, -5.0F, 0, 10, 10, 0.0F));
-        cube_r3.cubeList.add(new ModelBox(cube_r3, 0, 5, -1.5F, -5.0F, -5.0F, 16, 10, 0, 0.0F));
-
-        cube_r4 = new ModelRenderer(this);
-        cube_r4.setRotationPoint(0.0F, -14.5F, 0.0F);
-        bb_main.addChild(cube_r4);
-        setRotationAngle(cube_r4, -1.5708F, 0.0F, 1.5708F);
-        cube_r4.cubeList.add(new ModelBox(cube_r4, 0, 4, -1.5F, -5.0F, -5.0F, 16, 10, 0, 0.0F));
-
-        cube_r5 = new ModelRenderer(this);
-        cube_r5.setRotationPoint(0.0F, -8.0F, 5.0F);
-        bb_main.addChild(cube_r5);
-        setRotationAngle(cube_r5, 3.1416F, 0.0F, 1.5708F);
-        cube_r5.cubeList.add(new ModelBox(cube_r5, 0, 3, -8.0F, -5.0F, 0.0F, 16, 10, 0, 0.0F));
-	}
-
-	@Override
-	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
-		bb_main.render(f5);
-	}
-
-	public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
-		modelRenderer.rotateAngleX = x;
-		modelRenderer.rotateAngleY = y;
-		modelRenderer.rotateAngleZ = z;
-	}
-}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/barrel/BarrelTrim.java b/src/main/java/noppes/npcs/client/model/blocks/barrel/BarrelTrim.java
deleted file mode 100644
index b5404428e..000000000
--- a/src/main/java/noppes/npcs/client/model/blocks/barrel/BarrelTrim.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package noppes.npcs.client.model.blocks.barrel;// Made with Blockbench 4.9.4
-// Exported for Minecraft version 1.7 - 1.12
-// Paste this class into your mod and generate all required imports
-
-
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelBox;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.entity.Entity;
-
-public class BarrelTrim extends ModelBase {
-	private final ModelRenderer bb_main;
-	private final ModelRenderer cube_r1;
-	private final ModelRenderer cube_r2;
-
-	public BarrelTrim() {
-		textureWidth = 32;
-		textureHeight = 32;
-
-		bb_main = new ModelRenderer(this);
-		bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
-		bb_main.cubeList.add(new ModelBox(bb_main, 0, 7, 0.0F, -16.5F, -4.0F, 2, 1, 2, 0.0F));
-
-		cube_r1 = new ModelRenderer(this);
-		cube_r1.setRotationPoint(0.0F, -8.0F, 0.0F);
-		bb_main.addChild(cube_r1);
-		setRotationAngle(cube_r1, -1.5708F, 0.0F, 1.5708F);
-		cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 0, -6.0F, -6.0F, -6.0F, 2, 12, 12, 0.0F));
-
-		cube_r2 = new ModelRenderer(this);
-		cube_r2.setRotationPoint(0.0F, -3.0F, 0.0F);
-		bb_main.addChild(cube_r2);
-		setRotationAngle(cube_r2, 1.5708F, 0.0F, 1.5708F);
-		cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 0, -1.0F, -6.0F, -6.0F, 2, 12, 12, 0.0F));
-	}
-
-	@Override
-	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
-		bb_main.render(f5);
-	}
-
-	public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
-		modelRenderer.rotateAngleX = x;
-		modelRenderer.rotateAngleY = y;
-		modelRenderer.rotateAngleZ = z;
-	}
-}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/barrel/ModelBarrel.java b/src/main/java/noppes/npcs/client/model/blocks/barrel/ModelBarrel.java
new file mode 100644
index 000000000..6c1a2692f
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/barrel/ModelBarrel.java
@@ -0,0 +1,80 @@
+package noppes.npcs.client.model.blocks.barrel;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelBarrel extends ModelBase {
+	private final ModelRenderer Wall;
+	private final ModelRenderer cube_r1;
+	private final ModelRenderer cube_r2;
+	private final ModelRenderer cube_r3;
+	private final ModelRenderer Trim;
+	private final ModelRenderer Base;
+
+	public ModelBarrel() {
+		textureWidth = 64;
+		textureHeight = 32;
+
+		Wall = new ModelRenderer(this);
+		Wall.setRotationPoint(0.0F, 24.0F, 0.0F);
+		Wall.cubeList.add(new ModelBox(Wall, 0, 0, 5.0F, -16.0F, 5.0F, 1, 16, 1, 0.0F));
+		Wall.cubeList.add(new ModelBox(Wall, 0, 0, 5.0F, -16.0F, -6.0F, 1, 16, 1, 0.0F));
+		Wall.cubeList.add(new ModelBox(Wall, 0, 0, -6.0F, -16.0F, -6.0F, 1, 16, 1, 0.0F));
+		Wall.cubeList.add(new ModelBox(Wall, 0, 0, -6.0F, -16.0F, 5.0F, 1, 16, 1, 0.0F));
+
+		cube_r1 = new ModelRenderer(this);
+		cube_r1.setRotationPoint(-6.5F, -8.0F, 0.0F);
+		Wall.addChild(cube_r1);
+		setRotationAngle(cube_r1, 1.5708F, 0.0F, 0.0F);
+		cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 0, -0.5F, -6.0F, -8.0F, 1, 12, 16, 0.0F));
+
+		cube_r2 = new ModelRenderer(this);
+		cube_r2.setRotationPoint(0.0F, -8.0F, 6.5F);
+		Wall.addChild(cube_r2);
+		setRotationAngle(cube_r2, 0.0F, 0.0F, 1.5708F);
+		cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 14, -8.0F, -6.0F, -0.5F, 16, 12, 1, 0.0F));
+		cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 14, -8.0F, -6.0F, -13.5F, 16, 12, 1, 0.0F));
+
+		cube_r3 = new ModelRenderer(this);
+		cube_r3.setRotationPoint(6.5F, -8.0F, 0.0F);
+		Wall.addChild(cube_r3);
+		setRotationAngle(cube_r3, -1.5708F, 0.0F, 0.0F);
+		cube_r3.cubeList.add(new ModelBox(cube_r3, 0, 0, -0.5F, -6.0F, -8.0F, 1, 12, 16, 0.0F));
+
+		Trim = new ModelRenderer(this);
+		Trim.setRotationPoint(0.0F, 24.0F, 0.0F);
+		Trim.cubeList.add(new ModelBox(Trim, 4, 28, -6.5F, -5.0F, 5.5F, 13, 2, 2, 0.0F));
+		Trim.cubeList.add(new ModelBox(Trim, 34, 17, 5.5F, -5.0F, -6.5F, 2, 2, 13, 0.0F));
+		Trim.cubeList.add(new ModelBox(Trim, 4, 28, -6.5F, -5.0F, -7.5F, 13, 2, 2, 0.0F));
+		Trim.cubeList.add(new ModelBox(Trim, 34, 17, -7.5F, -5.0F, -6.5F, 2, 2, 13, 0.0F));
+		Trim.cubeList.add(new ModelBox(Trim, 4, 28, -6.5F, -13.0F, -7.5F, 13, 2, 2, 0.0F));
+		Trim.cubeList.add(new ModelBox(Trim, 4, 28, -6.5F, -13.0F, 5.5F, 13, 2, 2, 0.0F));
+		Trim.cubeList.add(new ModelBox(Trim, 34, 17, -7.5F, -13.0F, -6.5F, 2, 2, 13, 0.0F));
+		Trim.cubeList.add(new ModelBox(Trim, 34, 17, 5.5F, -13.0F, -6.5F, 2, 2, 13, 0.0F));
+
+		Base = new ModelRenderer(this);
+		Base.setRotationPoint(0.0F, 24.0F, 0.0F);
+		Base.cubeList.add(new ModelBox(Base, 16, 2, -6.0F, -15.0F, -6.0F, 12, 1, 12, 0.0F));
+		Base.cubeList.add(new ModelBox(Base, 16, 2, -6.0F, -2.0F, -6.0F, 12, 1, 12, 0.0F));
+	}
+
+    public void renderBase(float f5){
+        Base.render(f5);
+    }
+
+    public void renderTrim(float f5){
+        Trim.render(f5);
+    }
+
+    public void renderWall(float f5){
+        Wall.render(f5);
+    }
+
+	public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+		modelRenderer.rotateAngleX = x;
+		modelRenderer.rotateAngleY = y;
+		modelRenderer.rotateAngleZ = z;
+	}
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireCoals.java b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireCoals.java
new file mode 100644
index 000000000..9f10ef8c9
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireCoals.java
@@ -0,0 +1,30 @@
+package noppes.npcs.client.model.blocks.campfire;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelCampfireCoals extends ModelBase {
+	private final ModelRenderer bb_main;
+
+	public ModelCampfireCoals() {
+		textureWidth = 64;
+		textureHeight = 64;
+
+		bb_main = new ModelRenderer(this);
+		bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
+		bb_main.cubeList.add(new ModelBox(bb_main, -10, 0, -5.0F, -0.02F, -5.0F, 10, 0, 10, 0.0F));
+	}
+
+	@Override
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+		bb_main.render(f5);
+	}
+
+	public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+		modelRenderer.rotateAngleX = x;
+		modelRenderer.rotateAngleY = y;
+		modelRenderer.rotateAngleZ = z;
+	}
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireFlame.java b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireFlame.java
new file mode 100644
index 000000000..23b20b30a
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireFlame.java
@@ -0,0 +1,57 @@
+package noppes.npcs.client.model.blocks.campfire;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelCampfireFlame extends ModelBase {
+    private final ModelRenderer[] frames;
+    private static int frameDuration = 2;
+
+    public ModelCampfireFlame() {
+        textureWidth = 16;
+        textureHeight = 144;
+
+        frames = new ModelRenderer[9];
+
+        // Create frames and add them to the array
+        frames[0] = new ModelRenderer(this);
+        frames[0].setRotationPoint(0.0F, 16.5F, 0.0F);
+        frames[0].cubeList.add(new ModelBox(frames[0], 0, 0, -8.0F, -8.5F, 0.0F, 16, 16, 0, 0.0F));
+
+        ModelRenderer cube_r1 = new ModelRenderer(this);
+        cube_r1.setRotationPoint(0.0F, 0.0F, 0.0F);
+        frames[0].addChild(cube_r1);
+        setRotationAngle(cube_r1, 0.0F, -1.5708F, 0.0F);
+        cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 0, -8.0F, -8.5F, 0.0F, 16, 16, 0, 0.0F));
+
+        // Repeat the above for all frames, incrementing texture offsets for each frame
+        for (int i = 1; i < 9; i++) {
+            frames[i] = new ModelRenderer(this);
+            frames[i].setRotationPoint(0.0F, 16.5F, 0.0F);
+            frames[i].cubeList.add(new ModelBox(frames[i], 0, i * 16 + 1, -8.0F, -8.5F, 0.0F, 16, 16, 0, 0.0F));
+
+            ModelRenderer cube_r = new ModelRenderer(this);
+            cube_r.setRotationPoint(0.0F, 0.0F, 0.0F);
+            frames[i].addChild(cube_r);
+            setRotationAngle(cube_r, 0.0F, -1.5708F, 0.0F);
+            cube_r.cubeList.add(new ModelBox(cube_r, 0, i * 16 + 1, -8.0F, -8.5F, 0.0F, 16, 16, 0, 0.0F));
+        }
+    }
+
+    @Override
+    public void render(Entity entity, float world_time, float f1, float f2, float f3, float f4, float f5) {
+        // Calculate the current frame directly using modulo arithmetic
+        int frameIndex = ((int) world_time / frameDuration) % frames.length;
+
+        // Render only the current frame
+        frames[frameIndex].render(f5);
+    }
+
+    public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+        modelRenderer.rotateAngleX = x;
+        modelRenderer.rotateAngleY = y;
+        modelRenderer.rotateAngleZ = z;
+    }
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireLog.java b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireLog.java
new file mode 100644
index 000000000..414fff49b
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireLog.java
@@ -0,0 +1,51 @@
+package noppes.npcs.client.model.blocks.campfire;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelCampfireLog extends ModelBase {
+    private final ModelRenderer bb_main;
+    private final ModelRenderer cube_r1;
+    private final ModelRenderer cube_r2;
+    private final ModelRenderer cube_r3;
+
+    public ModelCampfireLog() {
+        textureWidth = 16;
+        textureHeight = 16;
+
+        bb_main = new ModelRenderer(this);
+        bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
+
+
+        cube_r1 = new ModelRenderer(this);
+        cube_r1.setRotationPoint(1.25F, -6.3F, 1.25F);
+        bb_main.addChild(cube_r1);
+        setRotationAngle(cube_r1, 0.5449F, -1.0854F, -0.744F);
+        cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 0, -1.0F, -2.0F, -1.0F, 3, 8, 3, 0.0F));
+
+        cube_r2 = new ModelRenderer(this);
+        cube_r2.setRotationPoint(-1.5F, -6.0F, -0.25F);
+        bb_main.addChild(cube_r2);
+        setRotationAngle(cube_r2, 0.0F, 0.0F, 0.3927F);
+        cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 0, -2.0F, -2.0F, -1.0F, 3, 8, 3, 0.0F));
+
+        cube_r3 = new ModelRenderer(this);
+        cube_r3.setRotationPoint(1.5F, -6.0F, -2.25F);
+        bb_main.addChild(cube_r3);
+        setRotationAngle(cube_r3, -0.3295F, 0.7268F, -0.4754F);
+        cube_r3.cubeList.add(new ModelBox(cube_r3, 0, 0, -2.0F, -2.5F, -1.0F, 3, 8, 3, 0.0F));
+    }
+
+    @Override
+    public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+        bb_main.render(f5);
+    }
+
+    public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+        modelRenderer.rotateAngleX = x;
+        modelRenderer.rotateAngleY = y;
+        modelRenderer.rotateAngleZ = z;
+    }
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireStone.java b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireStone.java
new file mode 100644
index 000000000..feded698a
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireStone.java
@@ -0,0 +1,57 @@
+package noppes.npcs.client.model.blocks.campfire;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelCampfireStone extends ModelBase {
+	private final ModelRenderer bb_main;
+	private final ModelRenderer cube_r1;
+	private final ModelRenderer cube_r2;
+	private final ModelRenderer cube_r3;
+
+	public ModelCampfireStone() {
+		textureWidth = 16;
+		textureHeight = 16;
+
+		bb_main = new ModelRenderer(this);
+		bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
+		bb_main.cubeList.add(new ModelBox(bb_main, 18, 5, 4.0F, -2.0F, 1.0F, 3, 2, 4, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 18, 2, -4.0F, -3.0F, -7.0F, 4, 3, 3, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 17, 0, -3.0F, -3.0F, 5.0F, 4, 3, 3, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 18, 2, -8.0F, -3.0F, -1.0F, 3, 3, 4, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 18, 11, -6.0F, -2.0F, 3.0F, 3, 2, 3, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 16, 0, -7.0F, -2.0F, -5.0F, 3, 2, 4, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 18, 11, 4.0F, -2.0F, -6.0F, 3, 2, 3, 0.0F));
+
+		cube_r1 = new ModelRenderer(this);
+		cube_r1.setRotationPoint(6.5F, -1.5F, -1.0F);
+		bb_main.addChild(cube_r1);
+		setRotationAngle(cube_r1, 0.0F, -1.5708F, 0.0F);
+		cube_r1.cubeList.add(new ModelBox(cube_r1, 18, 2, -2.0F, -1.5F, -1.5F, 4, 3, 3, 0.0F));
+
+		cube_r2 = new ModelRenderer(this);
+		cube_r2.setRotationPoint(2.5F, -1.5F, -6.0F);
+		bb_main.addChild(cube_r2);
+		setRotationAngle(cube_r2, 0.0F, 1.5708F, 0.0F);
+		cube_r2.cubeList.add(new ModelBox(cube_r2, 18, 5, -1.0F, -0.5F, -2.5F, 3, 2, 4, 0.0F));
+
+		cube_r3 = new ModelRenderer(this);
+		cube_r3.setRotationPoint(3.5F, -1.5F, 5.5F);
+		bb_main.addChild(cube_r3);
+		setRotationAngle(cube_r3, 0.0F, -1.5708F, 0.0F);
+		cube_r3.cubeList.add(new ModelBox(cube_r3, 20, 1, -0.5F, -0.5F, -1.5F, 2, 2, 4, 0.0F));
+	}
+
+	@Override
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+		bb_main.render(f5);
+	}
+
+	public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+		modelRenderer.rotateAngleX = x;
+		modelRenderer.rotateAngleY = y;
+		modelRenderer.rotateAngleZ = z;
+	}
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/chair/ModelChair.java b/src/main/java/noppes/npcs/client/model/blocks/chair/ModelChair.java
new file mode 100644
index 000000000..84bff4eac
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/chair/ModelChair.java
@@ -0,0 +1,41 @@
+package noppes.npcs.client.model.blocks.chair;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelChair extends ModelBase {
+	private final ModelRenderer bb_main;
+
+	public ModelChair(){
+		textureWidth = 64;
+		textureHeight = 32;
+
+		bb_main = new ModelRenderer(this);
+		bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
+		bb_main.cubeList.add(new ModelBox(bb_main, 0, 17, 4.0F, -6.0F, 4.0F, 2, 6, 2, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 0, 17, -6.0F, -6.0F, 4.0F, 2, 6, 2, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 0, 17, -6.0F, -6.0F, -6.0F, 2, 6, 2, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 0, 17, 4.0F, -6.0F, -6.0F, 2, 6, 2, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -6.0F, -8.0F, -6.0F, 12, 2, 12, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 8, 17, 4.0F, -20.0F, 4.0F, 2, 12, 2, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 8, 17, -6.0F, -20.0F, 4.0F, 2, 12, 2, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 16, 18, -4.0F, -19.0F, 5.0F, 8, 11, 0, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 16, 8, 5.0F, -4.0F, -4.0F, 0, 2, 8, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 16, 16, -4.0F, -4.0F, -5.0F, 8, 2, 0, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 16, 8, -5.0F, -4.0F, -4.0F, 0, 2, 8, 0.0F));
+		bb_main.cubeList.add(new ModelBox(bb_main, 16, 16, -4.0F, -4.0F, 5.0F, 8, 2, 0, 0.0F));
+	}
+
+	@Override
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+		bb_main.render(f5);
+	}
+
+	public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+		modelRenderer.rotateAngleX = x;
+		modelRenderer.rotateAngleY = y;
+		modelRenderer.rotateAngleZ = z;
+	}
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelChair.java b/src/main/java/noppes/npcs/client/model/blocks/chair/ModelChairSpoof.java
similarity index 93%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelChair.java
rename to src/main/java/noppes/npcs/client/model/blocks/chair/ModelChairSpoof.java
index 6f7f94e46..eccad5767 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelChair.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/chair/ModelChairSpoof.java
@@ -1,4 +1,4 @@
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.chair;
 
 
 import net.minecraft.client.model.ModelBase;
@@ -6,11 +6,11 @@ import net.minecraft.client.model.ModelBox;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
-public class ModelChair extends ModelBase {
+public class ModelChairSpoof extends ModelBase {
 
     private final ModelRenderer chairBase;
 
-	public ModelChair() {
+	public ModelChairSpoof() {
 		textureWidth = 64;
 		textureHeight = 32;
 
diff --git a/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouch.java b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouch.java
new file mode 100644
index 000000000..a6988ab05
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouch.java
@@ -0,0 +1,43 @@
+package noppes.npcs.client.model.blocks.couch;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelCouch extends ModelBase {
+	public final ModelRenderer CouchBack;
+    public final ModelRenderer Cussion;
+
+	public ModelCouch() {
+		textureWidth = 64;
+		textureHeight = 64;
+
+		CouchBack = new ModelRenderer(this);
+		CouchBack.setRotationPoint(0.0F, 24.0F, 0.0F);
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 18, -8.0F, -2.0F, -8.0F, 16, 1, 15, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 46, -8.0F, -10.0F, 7.0F, 16, 9, 1, 0.0F));
+
+		Cussion = new ModelRenderer(this);
+		Cussion.setRotationPoint(0.0F, 24.0F, 0.0F);
+		Cussion.cubeList.add(new ModelBox(Cussion, 0, 0, -8.0F, -5.0F, -8.0F, 16, 3, 15, 0.0F));
+		Cussion.cubeList.add(new ModelBox(Cussion, 0, 34, -8.0F, -14.0F, 4.0F, 16, 9, 3, 0.0F));
+		Cussion.cubeList.add(new ModelBox(Cussion, 0, 56, -8.0F, -14.0F, 7.0F, 16, 4, 1, 0.0F));
+	}
+
+	@Override
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+		CouchBack.render(f5);
+		Cussion.render(f5);
+	}
+
+	public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+		modelRenderer.rotateAngleX = x;
+		modelRenderer.rotateAngleY = y;
+		modelRenderer.rotateAngleZ = z;
+	}
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchCorner.java b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchCorner.java
new file mode 100644
index 000000000..cd38b2005
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchCorner.java
@@ -0,0 +1,64 @@
+package noppes.npcs.client.model.blocks.couch;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelCouchCorner extends ModelBase {
+	private final ModelRenderer CouchBack;
+	private final ModelRenderer cube_r1;
+	private final ModelRenderer Cussion;
+	private final ModelRenderer cube_r2;
+	private final ModelRenderer cube_r3;
+
+	public ModelCouchCorner() {
+		textureWidth = 16;
+		textureHeight = 16;
+
+		CouchBack = new ModelRenderer(this);
+		CouchBack.setRotationPoint(0.0F, 24.0F, 0.0F);
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, -20, -13, -8.0F, -2.0F, -8.0F, 16, 1, 15, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, -6, 1, -8.0F, -10.0F, 7.0F, 16, 9, 1, 0.0F));
+
+		cube_r1 = new ModelRenderer(this);
+		cube_r1.setRotationPoint(-7.5F, -6.5F, -1.0F);
+		CouchBack.addChild(cube_r1);
+		setRotationAngle(cube_r1, 0.0F, -1.5708F, 0.0F);
+		cube_r1.cubeList.add(new ModelBox(cube_r1, -6, 1, -7.0F, -3.5F, -0.5F, 15, 8, 1, 0.0F));
+
+		Cussion = new ModelRenderer(this);
+		Cussion.setRotationPoint(0.0F, 24.0F, 0.0F);
+		Cussion.cubeList.add(new ModelBox(Cussion, -20, -13, -7.0F, -5.0F, -8.0F, 15, 3, 15, 0.0F));
+		Cussion.cubeList.add(new ModelBox(Cussion, -8, -1, -7.0F, -14.0F, 4.0F, 15, 9, 3, 0.0F));
+		Cussion.cubeList.add(new ModelBox(Cussion, -6, 1, -8.0F, -14.0F, 7.0F, 16, 4, 1, 0.0F));
+
+		cube_r2 = new ModelRenderer(this);
+		cube_r2.setRotationPoint(-7.5F, -12.0F, -1.0F);
+		Cussion.addChild(cube_r2);
+		setRotationAngle(cube_r2, 0.0F, -1.5708F, 0.0F);
+		cube_r2.cubeList.add(new ModelBox(cube_r2, -6, 1, -7.0F, -2.0F, -0.5F, 15, 4, 1, 0.0F));
+
+		cube_r3 = new ModelRenderer(this);
+		cube_r3.setRotationPoint(-5.5F, -9.5F, -3.5F);
+		Cussion.addChild(cube_r3);
+		setRotationAngle(cube_r3, 0.0F, -1.5708F, 0.0F);
+		cube_r3.cubeList.add(new ModelBox(cube_r3, -8, -1, -4.5F, -4.5F, -1.5F, 12, 9, 3, 0.0F));
+	}
+
+	@Override
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+		CouchBack.render(f5);
+		Cussion.render(f5);
+	}
+
+	public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+		modelRenderer.rotateAngleX = x;
+		modelRenderer.rotateAngleY = y;
+		modelRenderer.rotateAngleZ = z;
+	}
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchLeft.java b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchLeft.java
new file mode 100644
index 000000000..b20289eee
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchLeft.java
@@ -0,0 +1,48 @@
+package noppes.npcs.client.model.blocks.couch;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelCouchLeft extends ModelBase {
+	private final ModelRenderer CouchBack;
+	private final ModelRenderer Cussion;
+
+	public ModelCouchLeft() {
+		textureWidth = 64;
+		textureHeight = 64;
+
+		CouchBack = new ModelRenderer(this);
+		CouchBack.setRotationPoint(0.0F, 24.0F, 0.0F);
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 18, -6.0F, -2.0F, -8.0F, 14, 1, 15, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 4, 46, -6.0F, -10.0F, 7.0F, 14, 9, 1, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 13, 14, -8.0F, -5.0F, -8.0F, 2, 4, 16, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 1, 47, -8.0F, -10.0F, 4.0F, 2, 5, 4, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 15, 19, -8.0F, -10.0F, -8.0F, 2, 2, 12, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 44, 51, -7.0F, -8.0F, -6.0F, 0, 3, 10, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 15, 18, -8.0F, -8.0F, -8.0F, 2, 3, 2, 0.0F));
+
+		Cussion = new ModelRenderer(this);
+		Cussion.setRotationPoint(0.0F, 24.0F, 0.0F);
+		Cussion.cubeList.add(new ModelBox(Cussion, 1, 0, -6.0F, -5.0F, -8.0F, 14, 3, 15, 0.0F));
+		Cussion.cubeList.add(new ModelBox(Cussion, 1, 34, -6.0F, -14.0F, 4.0F, 14, 9, 3, 0.0F));
+		Cussion.cubeList.add(new ModelBox(Cussion, 3, 56, -6.0F, -14.0F, 7.0F, 14, 4, 1, 0.0F));
+	}
+
+	@Override
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+		CouchBack.render(f5);
+		Cussion.render(f5);
+	}
+
+	public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+		modelRenderer.rotateAngleX = x;
+		modelRenderer.rotateAngleY = y;
+		modelRenderer.rotateAngleZ = z;
+	}
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchRight.java b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchRight.java
new file mode 100644
index 000000000..d9f6423a5
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchRight.java
@@ -0,0 +1,48 @@
+package noppes.npcs.client.model.blocks.couch;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelCouchRight extends ModelBase {
+	private final ModelRenderer CouchBack;
+	private final ModelRenderer Cussion;
+
+	public ModelCouchRight() {
+		textureWidth = 64;
+		textureHeight = 64;
+
+		CouchBack = new ModelRenderer(this);
+		CouchBack.setRotationPoint(0.0F, 24.0F, 0.0F);
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 35, -8.0F, -2.0F, -8.0F, 14, 1, 15, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 51, -8.0F, -10.0F, 7.0F, 14, 9, 1, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 36, 50, 6.0F, -5.0F, -6.0F, 2, 4, 10, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 52, 35, 6.0F, -10.0F, 4.0F, 2, 9, 4, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 36, 50, 6.0F, -10.0F, -8.0F, 2, 2, 12, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 44, 51, 7.0F, -8.0F, -6.0F, 0, 3, 10, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 15, 18, 6.0F, -8.0F, -8.0F, 2, 7, 2, 0.0F));
+
+		Cussion = new ModelRenderer(this);
+		Cussion.setRotationPoint(0.0F, 24.0F, 0.0F);
+		Cussion.cubeList.add(new ModelBox(Cussion, 1, 0, -8.0F, -5.0F, -8.0F, 14, 3, 15, 0.0F));
+		Cussion.cubeList.add(new ModelBox(Cussion, 1, 18, -8.0F, -14.0F, 4.0F, 14, 9, 3, 0.0F));
+		Cussion.cubeList.add(new ModelBox(Cussion, 4, 30, -8.0F, -14.0F, 7.0F, 14, 4, 1, 0.0F));
+	}
+
+	@Override
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+		CouchBack.render(f5);
+		Cussion.render(f5);
+	}
+
+	public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+		modelRenderer.rotateAngleX = x;
+		modelRenderer.rotateAngleY = y;
+		modelRenderer.rotateAngleZ = z;
+	}
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchSingle.java b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchSingle.java
new file mode 100644
index 000000000..0a78455a7
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchSingle.java
@@ -0,0 +1,45 @@
+package noppes.npcs.client.model.blocks.couch;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBox;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelCouchSingle extends ModelBase {
+	private final ModelRenderer CouchBack;
+	private final ModelRenderer Cussion;
+
+	public ModelCouchSingle() {
+		textureWidth = 16;
+		textureHeight = 16;
+
+		CouchBack = new ModelRenderer(this);
+		CouchBack.setRotationPoint(0.0F, 24.0F, 0.0F);
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, -18, -13, -6.0F, -2.0F, -8.0F, 12, 1, 15, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, -4, 1, -6.0F, -10.0F, 7.0F, 12, 9, 1, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, -14, -14, 6.0F, -10.0F, -8.0F, 2, 9, 16, 0.0F));
+		CouchBack.cubeList.add(new ModelBox(CouchBack, -14, -14, -8.0F, -10.0F, -8.0F, 2, 9, 16, 0.0F));
+
+		Cussion = new ModelRenderer(this);
+		Cussion.setRotationPoint(0.0F, 24.0F, 0.0F);
+		Cussion.cubeList.add(new ModelBox(Cussion, -18, -13, -6.0F, -5.0F, -8.0F, 12, 3, 15, 0.0F));
+		Cussion.cubeList.add(new ModelBox(Cussion, -6, -1, -6.0F, -14.0F, 4.0F, 12, 9, 3, 0.0F));
+		Cussion.cubeList.add(new ModelBox(Cussion, -4, 1, -6.0F, -14.0F, 7.0F, 12, 4, 1, 0.0F));
+	}
+
+	@Override
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+		CouchBack.render(f5);
+		Cussion.render(f5);
+	}
+
+	public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
+		modelRenderer.rotateAngleX = x;
+		modelRenderer.rotateAngleY = y;
+		modelRenderer.rotateAngleZ = z;
+	}
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelBanner.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBanner.java
similarity index 93%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelBanner.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBanner.java
index 4f9bde1f8..086e27b65 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelBanner.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBanner.java
@@ -1,11 +1,11 @@
 
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
-public class ModelBanner extends ModelBase
+public class ModelLegacyBanner extends ModelBase
 {
   //fields
     ModelRenderer Base;
@@ -18,50 +18,50 @@ public class ModelBanner extends ModelBase
     ModelRenderer BaseDeco2;
     ModelRenderer BaseDeco3;
     ModelRenderer BaseDeco4;
-  
-  public ModelBanner()
+
+  public ModelLegacyBanner()
   {
       Base = new ModelRenderer(this, 3, 1);
       Base.addBox(-7F, 0F, -7F, 14, 1, 14);
       Base.setRotationPoint(0F, 23F, 0F);
-      
+
       MiddleStick = new ModelRenderer(this, 12, 2);
       MiddleStick.addBox(-1F, 0F, -1F, 2, 32, 2);
       MiddleStick.setRotationPoint(0F, -9F, 0F);
-      
+
       StickDecoration = new ModelRenderer(this, 11, 12);
       StickDecoration.addBox(0F, 0F, 0F, 16, 3, 3);
       StickDecoration.setRotationPoint(-8F, -7.5F, -1.5F);
-      
+
       TopDecoration = new ModelRenderer(this, 45, 19);
       TopDecoration.addBox(0F, 0F, 0F, 1, 1, 1);
       TopDecoration.setRotationPoint(-0.5F, -10F, -0.5F);
-      
+
       FlagPole1 = new ModelRenderer(this, 45, 19);
       FlagPole1.addBox(0F, 0F, 0F, 1, 1, 1);
       FlagPole1.setRotationPoint(-7F, -6.5F, -2.5F);
-      
+
       FlagPole2 = new ModelRenderer(this, 45, 19);
       FlagPole2.addBox(0F, 0F, 0F, 1, 1, 1);
       FlagPole2.setRotationPoint(6F, -6.5F, -2.5F);
-      
+
       BaseDeco1 = new ModelRenderer(this, 1, 14);
       BaseDeco1.addBox(0F, 0F, 0F, 12, 1, 1);
       BaseDeco1.setRotationPoint(-6F, 23F, -8F);
-      
+
       BaseDeco2 = new ModelRenderer(this, 1, 14);
       BaseDeco2.addBox(0F, 0F, 0F, 12, 1, 1);
       BaseDeco2.setRotationPoint(-6F, 23F, 7F);
-      
+
       BaseDeco3 = new ModelRenderer(this, 2, 2);
       BaseDeco3.addBox(0F, 0F, 0F, 1, 1, 12);
       BaseDeco3.setRotationPoint(-8F, 23F, -6F);
-      
+
       BaseDeco4 = new ModelRenderer(this, 2, 2);
       BaseDeco4.addBox(0F, 0F, 0F, 1, 1, 12);
       BaseDeco4.setRotationPoint(7F, 23F, -6F);
   }
-  
+
   public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
   {
     super.render(entity, f, f1, f2, f3, f4, f5);
@@ -76,7 +76,7 @@ public class ModelBanner extends ModelBase
     BaseDeco3.render(f5);
     BaseDeco4.render(f5);
   }
-  
+
   private void setRotation(ModelRenderer model, float x, float y, float z)
   {
     model.rotateAngleX = x;
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelBannerFlag.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBannerFlag.java
similarity index 83%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelBannerFlag.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBannerFlag.java
index bc3ea2656..b6830ad7a 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelBannerFlag.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBannerFlag.java
@@ -1,31 +1,31 @@
 
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
-public class ModelBannerFlag extends ModelBase
+public class ModelLegacyBannerFlag extends ModelBase
 {
     ModelRenderer Flag;
-  
-  public ModelBannerFlag()
+
+  public ModelLegacyBannerFlag()
   {
     textureWidth = 32;
     textureHeight = 32;
-    
+
       Flag = new ModelRenderer(this, 0, 0);
       Flag.addBox(0F, 0F, 0F, 15, 27, 0);
       Flag.setRotationPoint(-7.5F, -7F, -2F);
       Flag.setTextureSize(32, 32);
   }
-  
+
   public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
   {
     super.render(entity, f, f1, f2, f3, f4, f5);
     Flag.render(f5);
   }
-  
+
   private void setRotation(ModelRenderer model, float x, float y, float z)
   {
     model.rotateAngleX = x;
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelBarrel.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBarrel.java
similarity index 94%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelBarrel.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBarrel.java
index acf209070..19ca1d92c 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelBarrel.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBarrel.java
@@ -1,10 +1,10 @@
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
-public class ModelBarrel extends ModelBase
+public class ModelLegacyBarrel extends ModelBase
 {
     ModelRenderer Plank1;
     ModelRenderer Plank2;
@@ -18,70 +18,70 @@ public class ModelBarrel extends ModelBase
     ModelRenderer Plank10;
     ModelRenderer Plank11;
     ModelRenderer Plank12;
-  
-  public ModelBarrel()
-  {      
+
+  public ModelLegacyBarrel()
+  {
       Plank1 = new ModelRenderer(this, 10, 0);
       Plank1.addBox(0F, 6.5F, -2F, 17, 1, 4);
       Plank1.setRotationPoint(0F, 7.01F, 0F);
       setRotation(Plank1, 0F, 0F, 1.570796F);
-      
+
       Plank2 = new ModelRenderer(this, 10, 8);
       Plank2.addBox(0F, 6.5F, -2F, 17, 1, 4);
       Plank2.setRotationPoint(0F, 7F, 0F);
       setRotation(Plank2, 0F, 0.5235988F, 1.570796F);
-      
+
       Plank3 = new ModelRenderer(this, 10, 0);
       Plank3.addBox(0F, 6.5F, -2F, 17, 1, 4);
       Plank3.setRotationPoint(0F, 7.01F, 0F);
       setRotation(Plank3, 0F, 1.047198F, 1.570796F);
-      
+
       Plank4 = new ModelRenderer(this, 10, 8);
       Plank4.addBox(0F, 6.5F, -2F, 17, 1, 4);
       Plank4.setRotationPoint(0F, 7F, 0F);
       setRotation(Plank4, 0F, 1.570796F, 1.570796F);
-      
+
       Plank5 = new ModelRenderer(this, 10, 0);
       Plank5.addBox(0F, 6.5F, -2F, 17, 1, 4);
       Plank5.setRotationPoint(0F, 7.01F, 0F);
       setRotation(Plank5, 0F, 2.094395F, 1.570796F);
-      
+
       Plank6 = new ModelRenderer(this, 10, 8);
       Plank6.addBox(0F, 6.5F, -2F, 17, 1, 4);
       Plank6.setRotationPoint(0F, 7F, 0F);
       setRotation(Plank6, 0F, 2.617994F, 1.570796F);
-      
+
       Plank7 = new ModelRenderer(this, 10, 0);
       Plank7.addBox(0F, 6.5F, -2F, 17, 1, 4);
       Plank7.setRotationPoint(0F, 7.01F, 0F);
       setRotation(Plank7, 0F, 3.150901F, 1.570796F);
-      
+
       Plank8 = new ModelRenderer(this, 10, 8);
       Plank8.addBox(0F, 6.5F, -2F, 17, 1, 4);
       Plank8.setRotationPoint(0F, 7F, 0F);
       setRotation(Plank8, 0F, -2.617994F, 1.570796F);
-      
+
       Plank9 = new ModelRenderer(this, 10, 0);
       Plank9.addBox(0F, 6.5F, -2F, 17, 1, 4);
       Plank9.setRotationPoint(0F, 7.01F, 0F);
       setRotation(Plank9, 0F, -2.094395F, 1.570796F);
-      
+
       Plank10 = new ModelRenderer(this, 10, 8);
       Plank10.addBox(0F, 6.5F, -2F, 17, 1, 4);
       Plank10.setRotationPoint(0F, 7F, 0F);
       setRotation(Plank10, 0F, -1.570796F, 1.570796F);
-      
+
       Plank11 = new ModelRenderer(this, 10, 0);
       Plank11.addBox(0F, 6.5F, -2F, 17, 1, 4);
       Plank11.setRotationPoint(0F, 7.01F, 0F);
       setRotation(Plank11, 0F, -1.047198F, 1.570796F);
-      
+
       Plank12 = new ModelRenderer(this, 10, 0);
       Plank12.addBox(0F, 6.5F, -2F, 17, 1, 4);
       Plank12.setRotationPoint(0F, 7F, 0F);
       setRotation(Plank12, 0F, -0.5235988F, 1.570796F);
   }
-  
+
   public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
   {
     super.render(entity, f, f1, f2, f3, f4, f5);
@@ -98,13 +98,13 @@ public class ModelBarrel extends ModelBase
     Plank11.render(f5);
     Plank12.render(f5);
   }
-  
+
   private void setRotation(ModelRenderer model, float x, float y, float z)
   {
     model.rotateAngleX = y;
     model.rotateAngleY = x;
     model.rotateAngleZ = z;
   }
-  
+
 
 }
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelBarrelLit.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBarrelLid.java
similarity index 85%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelBarrelLit.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBarrelLid.java
index 00db785bc..b8efe0a8f 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelBarrelLit.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBarrelLid.java
@@ -1,38 +1,38 @@
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
-public class ModelBarrelLit extends ModelBase
+public class ModelLegacyBarrelLid extends ModelBase
 {
 	ModelRenderer Top;
     ModelRenderer Bottom;
-  
-  public ModelBarrelLit()
+
+  public ModelLegacyBarrelLid()
   {
       Top = new ModelRenderer(this, 0, 0);
       Top.addBox(0F, 0F, 0F, 16, 0, 16);
       Top.setRotationPoint(-8F, 9F, -8F);
-      
+
       Bottom = new ModelRenderer(this, 0, 0);
       Bottom.addBox(0F, 0F, 0F, 16, 0, 16);
       Bottom.setRotationPoint(-8F, 23F, -8F);
   }
-  
+
   public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
   {
     super.render(entity, f, f1, f2, f3, f4, f5);
     Bottom.render(f5);
     Top.render(f5);
   }
-  
+
   private void setRotation(ModelRenderer model, float x, float y, float z)
   {
     model.rotateAngleX = y;
     model.rotateAngleY = x;
     model.rotateAngleZ = z;
   }
-  
+
 
 }
diff --git a/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyCarpentryBench.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyCarpentryBench.java
new file mode 100644
index 000000000..9ccbd93e2
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyCarpentryBench.java
@@ -0,0 +1,113 @@
+package noppes.npcs.client.model.blocks.legacy;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelLegacyCarpentryBench extends ModelBase {
+	// fields
+	ModelRenderer Leg1;
+	ModelRenderer Leg2;
+	ModelRenderer Leg3;
+	ModelRenderer Leg4;
+	ModelRenderer Bottom_plate;
+	ModelRenderer Desktop;
+	ModelRenderer Backboard;
+	ModelRenderer Vice_Jaw1;
+	ModelRenderer Vice_Jaw2;
+	ModelRenderer Vice_Base1;
+	ModelRenderer Vice_Base2;
+	ModelRenderer Vice_Crank;
+	ModelRenderer Vice_Screw;
+	ModelRenderer Blueprint;
+
+	public ModelLegacyCarpentryBench() {
+		this.textureWidth = 128;
+		this.textureHeight = 64;
+
+		Leg1 = new ModelRenderer(this, 0, 0);
+		Leg1.addBox(0F, 0F, 0F, 2, 14, 2);
+		Leg1.setRotationPoint(6F, 10F, 5F);
+
+		Leg2 = new ModelRenderer(this, 0, 0);
+		Leg2.addBox(0F, 0F, 0F, 2, 14, 2);
+		Leg2.setRotationPoint(6F, 10F, -5F);
+
+		Leg3 = new ModelRenderer(this, 0, 0);
+		Leg3.addBox(0F, 0F, 0F, 2, 14, 2);
+		Leg3.setRotationPoint(-8F, 10F, 5F);
+
+		Leg4 = new ModelRenderer(this, 0, 0);
+		Leg4.addBox(0F, 0F, 0F, 2, 14, 2);
+		Leg4.setRotationPoint(-8F, 10F, -5F);
+
+		Bottom_plate = new ModelRenderer(this, 0, 24);
+		Bottom_plate.addBox(0F, 0F, 0F, 14, 1, 10);
+		Bottom_plate.setRotationPoint(-7F, 21F, -4F);
+		Bottom_plate.setTextureSize(130, 64);
+
+		Desktop = new ModelRenderer(this, 0, 3);
+		Desktop.addBox(0F, 0F, 0F, 18, 2, 13);
+		Desktop.setRotationPoint(-9F, 9F, -6F);
+
+		Backboard = new ModelRenderer(this, 0, 18);
+		Backboard.addBox(-1F, 0F, 0F, 18, 5, 1);
+		Backboard.setRotationPoint(-8F, 7F, 7F);
+
+		Vice_Jaw1 = new ModelRenderer(this, 54, 18);
+		Vice_Jaw1.addBox(0F, 0F, 0F, 3, 2, 1);
+		Vice_Jaw1.setRotationPoint(3F, 6F, -8F);
+
+		Vice_Jaw2 = new ModelRenderer(this, 54, 21);
+		Vice_Jaw2.addBox(0F, 0F, 0F, 3, 2, 1);
+		Vice_Jaw2.setRotationPoint(3F, 6F, -6F);
+
+		Vice_Base1 = new ModelRenderer(this, 38, 30);
+		Vice_Base1.addBox(0F, 0F, 0F, 3, 1, 3);
+		Vice_Base1.setRotationPoint(3F, 8F, -5F);
+
+		Vice_Base2 = new ModelRenderer(this, 38, 25);
+		Vice_Base2.addBox(0F, 0F, 0F, 1, 2, 2);
+		Vice_Base2.setRotationPoint(4F, 7F, -5F);
+
+		Vice_Crank = new ModelRenderer(this, 54, 24);
+		Vice_Crank.addBox(0F, 0F, 0F, 1, 5, 1);
+		Vice_Crank.setRotationPoint(6F, 6F, -9F);
+
+		Vice_Screw = new ModelRenderer(this, 44, 25);
+		Vice_Screw.addBox(0F, 0F, 0F, 1, 1, 4);
+		Vice_Screw.setRotationPoint(4F, 8F, -8F);
+
+		Blueprint = new ModelRenderer(this, 31, 18);
+		Blueprint.addBox(0F, 0F, 0F, 8, 0, 7);
+		Blueprint.setRotationPoint(0F, 9F, 1F);
+	    setRotation(Blueprint, 0.3271718F, 0.1487144F, 0F);
+	}
+
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+		super.render(entity, f, f1, f2, f3, f4, f5);
+		setRotationAngles(f, f1, f2, f3, f4, f5,entity);
+		Leg1.render(f5);
+		Leg2.render(f5);
+		Leg3.render(f5);
+		Leg4.render(f5);
+		Bottom_plate.render(f5);
+		Desktop.render(f5);
+		Backboard.render(f5);
+		Vice_Jaw1.render(f5);
+		Vice_Jaw2.render(f5);
+		Vice_Base1.render(f5);
+		Vice_Base2.render(f5);
+		Vice_Crank.render(f5);
+		Vice_Screw.render(f5);
+		Blueprint.render(f5);
+	}
+
+	private void setRotation(ModelRenderer model, float x, float y, float z) {
+		model.rotateAngleX = x;
+		model.rotateAngleY = y;
+		model.rotateAngleZ = z;
+	}
+
+
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyChair.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyChair.java
new file mode 100644
index 000000000..4b6cfcfe4
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyChair.java
@@ -0,0 +1,126 @@
+package noppes.npcs.client.model.blocks.legacy;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelLegacyChair extends ModelBase
+{
+  //fields
+    ModelRenderer Leg1;
+    ModelRenderer Leg2;
+    ModelRenderer Leg3;
+    ModelRenderer Leg4;
+    ModelRenderer Shape1;
+    ModelRenderer Shape2;
+    ModelRenderer Shape3;
+    ModelRenderer Shape4;
+    ModelRenderer Shape5;
+    ModelRenderer Shape6;
+    ModelRenderer Shape7;
+    ModelRenderer Shape8;
+    ModelRenderer Shape9;
+    ModelRenderer Shape10;
+    ModelRenderer Shape11;
+
+  public ModelLegacyChair()
+  {
+      Leg1 = new ModelRenderer(this, 0, 0);
+      Leg1.mirror = true;
+      Leg1.addBox(0F, 0F, 0F, 1, 18, 1);
+      Leg1.setRotationPoint(4.01F, 6F, 5.01F);
+
+      Leg2 = new ModelRenderer(this, 0, 0);
+      Leg2.mirror = true;
+      Leg2.addBox(0F, 0F, 0F, 1, 9, 1);
+      Leg2.setRotationPoint(4.01F, 15.5F, -5.01F);
+
+      Leg3 = new ModelRenderer(this, 0, 0);
+      Leg3.addBox(0F, 0F, 0F, 1, 18, 1);
+      Leg3.setRotationPoint(-5.01F, 6F, 5.01F);
+
+      Leg4 = new ModelRenderer(this, 0, 0);
+      Leg4.addBox(0F, 0F, 0F, 1, 9, 1);
+      Leg4.setRotationPoint(-5.01F, 15.5F, -5.01F);
+
+      Shape1 = new ModelRenderer(this, 8, 2);
+      Shape1.addBox(0F, 0F, 0F, 10, 1, 11);
+      Shape1.setRotationPoint(-5F, 16F, -5F);
+
+      Shape2 = new ModelRenderer(this, 4, 4);
+      Shape2.addBox(0F, 0F, 0F, 3, 2, 1);
+      Shape2.setRotationPoint(-1.5F, 6.51F, 5.5F);
+
+      Shape3 = new ModelRenderer(this, 4, 4);
+      Shape3.mirror = true;
+      Shape3.addBox(-3F, 0F, 0F, 3, 2, 1);
+      Shape3.setRotationPoint(4F, 6.5F, 5F);
+      setRotation(Shape3, 0F, 0.2094395F, 0F);
+
+      Shape4 = new ModelRenderer(this, 4, 4);
+      Shape4.addBox(0F, 0F, 0F, 3, 2, 1);
+      Shape4.setRotationPoint(-4F, 6.5F, 5F);
+      setRotation(Shape4, 0F, -0.2094395F, 0F);
+
+      Shape5 = new ModelRenderer(this, 46, 0);
+      Shape5.addBox(0F, 0F, 0F, 9, 1, 1);
+      Shape5.setRotationPoint(-4F, 19F, 5F);
+
+      Shape6 = new ModelRenderer(this, 46, 0);
+      Shape6.addBox(0F, 0F, 0F, 8, 1, 1);
+      Shape6.setRotationPoint(-4F, 19F, -5F);
+
+      Shape7 = new ModelRenderer(this, 11, 13);
+      Shape7.addBox(0F, 0F, 0F, 1, 1, 9);
+      Shape7.setRotationPoint(-5F, 20F, -4F);
+
+      Shape8 = new ModelRenderer(this, 11, 13);
+      Shape8.mirror = true;
+      Shape8.addBox(0F, 0F, 0F, 1, 1, 9);
+      Shape8.setRotationPoint(4F, 20F, -4F);
+
+      Shape9 = new ModelRenderer(this, 0, 0);
+      Shape9.mirror = true;
+      Shape9.addBox(0F, 0F, 0F, 1, 8, 1);
+      Shape9.setRotationPoint(2F, 8F, 5.5F);
+      setRotation(Shape9, -0.0523599F, 0F, 0F);
+
+      Shape10 = new ModelRenderer(this, 0, 0);
+      Shape10.addBox(0F, 0F, 0F, 1, 8, 1);
+      Shape10.setRotationPoint(-3F, 8F, 5.5F);
+      setRotation(Shape10, -0.0523599F, 0F, 0F);
+
+      Shape11 = new ModelRenderer(this, 0, 0);
+      Shape11.addBox(0F, 0F, 0F, 1, 8, 1);
+      Shape11.setRotationPoint(-0.5F, 8F, 5.6F);
+      setRotation(Shape11, -0.0698132F, 0F, 0F);
+  }
+
+  public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
+  {
+    super.render(entity, f, f1, f2, f3, f4, f5);
+    Leg1.render(f5);
+    Leg2.render(f5);
+    Leg3.render(f5);
+    Leg4.render(f5);
+    Shape1.render(f5);
+    Shape2.render(f5);
+    Shape3.render(f5);
+    Shape4.render(f5);
+    Shape5.render(f5);
+    Shape6.render(f5);
+    Shape7.render(f5);
+    Shape8.render(f5);
+    Shape9.render(f5);
+    Shape10.render(f5);
+    Shape11.render(f5);
+  }
+
+  private void setRotation(ModelRenderer model, float x, float y, float z)
+  {
+    model.rotateAngleX = x;
+    model.rotateAngleY = y;
+    model.rotateAngleZ = z;
+  }
+
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyStool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyStool.java
new file mode 100644
index 000000000..0c964f5ec
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyStool.java
@@ -0,0 +1,83 @@
+package noppes.npcs.client.model.blocks.legacy;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelLegacyStool extends ModelBase {
+	ModelRenderer Base;
+	ModelRenderer Leg1;
+	ModelRenderer Leg2;
+	ModelRenderer Leg3;
+	ModelRenderer Leg4;
+	ModelRenderer Shape1;
+	ModelRenderer Shape2;
+	ModelRenderer Shape3;
+	ModelRenderer Shape4;
+
+	public ModelLegacyStool() {
+		Base = new ModelRenderer(this, 9, 3);
+		Base.addBox(-5F, 0F, -5F, 10, 1, 10);
+		Base.setRotationPoint(0F, 16F, 0F);
+
+		Leg1 = new ModelRenderer(this, 0, 12);
+		Leg1.addBox(-1F, 0F, 0F, 2, 8, 1);
+		Leg1.setRotationPoint(2F, 17F, 2F);
+		setRotation(Leg1, 0.3316126F, 0.7853982F, 0F);
+
+		Leg2 = new ModelRenderer(this, 0, 12);
+		Leg2.addBox(-1F, 0F, 0F, 2, 8, 1);
+		Leg2.setRotationPoint(2F, 17F, -2F);
+		setRotation(Leg2, 0.3316126F, 2.356194F, -0.0081449F);
+
+		Leg3 = new ModelRenderer(this, 0, 12);
+		Leg3.addBox(-1F, 0F, 0F, 2, 8, 1);
+		Leg3.setRotationPoint(-2F, 17F, 2F);
+		setRotation(Leg3, 0.3316126F, -0.7853982F, 0F);
+
+		Leg4 = new ModelRenderer(this, 0, 12);
+		Leg4.addBox(-1F, 0F, 0F, 2, 8, 1);
+		Leg4.setRotationPoint(-2F, 17F, -2F);
+		setRotation(Leg4, 0.3316126F, -2.356194F, 0F);
+
+		Shape1 = new ModelRenderer(this, 0, 11);
+		Shape1.addBox(-3F, 0F, 0F, 6, 1, 1);
+		Shape1.setRotationPoint(2.4F, 19F, 0F);
+		setRotation(Shape1, 0F, 1.570796F, 0F);
+
+		Shape2 = new ModelRenderer(this, 0, 11);
+		Shape2.addBox(-3F, 0F, 0F, 6, 1, 1);
+		Shape2.setRotationPoint(0F, 19F, 2.4F);
+
+		Shape3 = new ModelRenderer(this, 0, 11);
+		Shape3.addBox(-3F, 0F, 0F, 6, 1, 1);
+		Shape3.setRotationPoint(0F, 19F, -3.4F);
+
+		Shape4 = new ModelRenderer(this, 0, 11);
+		Shape4.addBox(-3F, 0F, 0F, 6, 1, 1);
+		Shape4.setRotationPoint(-3.4F, 19F, 0F);
+		setRotation(Shape4, 0F, 1.570796F, 0F);
+	}
+
+	public void render(Entity entity, float f, float f1, float f2, float f3,
+			float f4, float f5) {
+		super.render(entity, f, f1, f2, f3, f4, f5);
+		Base.render(f5);
+		Leg1.render(f5);
+		Leg2.render(f5);
+		Leg3.render(f5);
+		Leg4.render(f5);
+		Shape1.render(f5);
+		Shape2.render(f5);
+		Shape3.render(f5);
+		Shape4.render(f5);
+	}
+
+	private void setRotation(ModelRenderer model, float x, float y, float z) {
+		model.rotateAngleX = x;
+		model.rotateAngleY = y;
+		model.rotateAngleZ = z;
+	}
+
+
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyTable.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyTable.java
new file mode 100644
index 000000000..2bd7aa165
--- /dev/null
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyTable.java
@@ -0,0 +1,53 @@
+package noppes.npcs.client.model.blocks.legacy;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelLegacyTable extends ModelBase {
+	public ModelRenderer Shape1;
+	public ModelRenderer Table;
+	public ModelRenderer Shape3;
+	public ModelRenderer Shape4;
+	public ModelRenderer Shape5;
+
+	public ModelLegacyTable() {
+		Shape1 = new ModelRenderer(this, 0, 0);
+		Shape1.mirror = true;
+		Shape1.addBox(-1F, 0F, -1F, 2, 14, 2);
+		Shape1.setRotationPoint(-6F, 10F, 6F);
+
+		Table = new ModelRenderer(this, 0, 0);
+		Table.addBox(0F, -2F, 0F, 16, 2, 16);
+		Table.setRotationPoint(-8F, 10F, -8F);
+
+		Shape3 = new ModelRenderer(this, 0, 0);
+		Shape3.addBox(-1F, 0F, -1F, 2, 14, 2);
+		Shape3.setRotationPoint(6F, 10F, -6F);
+
+		Shape4 = new ModelRenderer(this, 0, 0);
+		Shape4.addBox(-1F, 0F, -1F, 2, 14, 2);
+		Shape4.setRotationPoint(6F, 10F, 6F);
+
+		Shape5 = new ModelRenderer(this, 0, 0);
+		Shape5.mirror = true;
+		Shape5.addBox(-1F, 0F, -1F, 2, 14, 2);
+		Shape5.setRotationPoint(-6F, 10F, -6F);
+	}
+
+	public void render(Entity entity, float f, float f1, float f2, float f3,
+			float f4, float f5) {
+		super.render(entity, f, f1, f2, f3, f4, f5);
+		Shape1.render(f5);
+		Shape3.render(f5);
+		Shape4.render(f5);
+		Shape5.render(f5);
+	}
+
+	private void setRotation(ModelRenderer model, float x, float y, float z) {
+		model.rotateAngleX = x;
+		model.rotateAngleY = y;
+		model.rotateAngleZ = z;
+	}
+
+}
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelWallBanner.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyWallBanner.java
similarity index 83%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelWallBanner.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyWallBanner.java
index a4f9610a5..8c3a6dd8a 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelWallBanner.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyWallBanner.java
@@ -1,16 +1,10 @@
-// Date: 21-2-2014 11:50:33
-// Template version 1.1
-// Java generated by Techne
-// Keep in mind that you still need to fill in some blanks
-// - ZeuX
-
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
-public class ModelWallBanner extends ModelBase {
+public class ModelLegacyWallBanner extends ModelBase {
 	// fields
 	ModelRenderer MiddleStick;
 	ModelRenderer StickDecoration;
@@ -18,24 +12,24 @@ public class ModelWallBanner extends ModelBase {
 	ModelRenderer FlagPole1;
 	ModelRenderer FlagPole2;
 
-	public ModelWallBanner() {
+	public ModelLegacyWallBanner() {
 
 		MiddleStick = new ModelRenderer(this, 56, 0);
 		MiddleStick.addBox(-1F, 0F, -1F, 2, 3, 2);
 		MiddleStick.setRotationPoint(0F, -9F, 6.5F);
-		
+
 		StickDecoration = new ModelRenderer(this, 11, 12);
 		StickDecoration.addBox(0F, 0F, 0F, 16, 3, 3);
 		StickDecoration.setRotationPoint(-8F, -7.5F, 5F);
-		
+
 		TopDecoration = new ModelRenderer(this, 45, 19);
 		TopDecoration.addBox(0F, 0F, 0F, 1, 1, 1);
 		TopDecoration.setRotationPoint(-0.5F, -10F, 6F);
-		
+
 		FlagPole1 = new ModelRenderer(this, 45, 19);
 		FlagPole1.addBox(0F, 0F, 0F, 1, 1, 1);
 		FlagPole1.setRotationPoint(-7F, -6.5F, 4F);
-		
+
 		FlagPole2 = new ModelRenderer(this, 45, 19);
 		FlagPole2.addBox(0F, 0F, 0F, 1, 1, 1);
 		FlagPole2.setRotationPoint(6F, -6.5F, 4F);
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelWallBannerFlag.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyWallBannerFlag.java
similarity index 78%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelWallBannerFlag.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyWallBannerFlag.java
index a32a5fed6..17e152f3a 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelWallBannerFlag.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyWallBannerFlag.java
@@ -1,13 +1,13 @@
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
-public class ModelWallBannerFlag extends ModelBase {
+public class ModelLegacyWallBannerFlag extends ModelBase {
 	ModelRenderer Flag;
 
-	public ModelWallBannerFlag() {
+	public ModelLegacyWallBannerFlag() {
 		textureWidth = 32;
 		textureHeight = 32;
 		Flag = new ModelRenderer(this, 0, 0);
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodLeft.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodLeft.java
similarity index 97%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodLeft.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodLeft.java
index 227e40c22..5d889b3b3 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodLeft.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodLeft.java
@@ -1,4 +1,4 @@
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy.couch;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
@@ -29,77 +29,77 @@ public class ModelCouchWoodLeft extends ModelBase {
 		Shape1.mirror = true;
 		Shape1.addBox(0F, 0F, 0F, 2, 3, 10);
 		Shape1.setRotationPoint(-8F, 18F, -4F);
-		
+
 		Shape2 = new ModelRenderer(this, 0, 0);
 		Shape2.addBox(0F, 0F, 0F, 1, 3, 2);
 		Shape2.setRotationPoint(7F, 21F, -6F);
-		
+
 		Shape3 = new ModelRenderer(this, 0, 0);
 		Shape3.mirror = true;
 		Shape3.addBox(0F, 0F, 0F, 2, 4, 1);
 		Shape3.setRotationPoint(-8F, 14F, 0.5F);
-		
+
 		Shape4 = new ModelRenderer(this, 0, 0);
 		Shape4.mirror = true;
 		Shape4.addBox(0F, 0F, 0F, 14, 2, 1);
 		Shape4.setRotationPoint(-6F, 7F, 7F);
-		
+
 		Shape5 = new ModelRenderer(this, 0, 0);
 		Shape5.mirror = true;
 		Shape5.addBox(0F, 0F, 0F, 14, 2, 2);
 		Shape5.setRotationPoint(-6F, 19F, 6F);
-		
+
 		Shape6 = new ModelRenderer(this, 0, 0);
 		Shape6.mirror = true;
 		Shape6.addBox(0F, 0F, 0F, 2, 1, 13);
 		Shape6.setRotationPoint(-8F, 13F, -7F);
-		
+
 		Shape7 = new ModelRenderer(this, 0, 0);
 		Shape7.addBox(0F, 0F, 0F, 1, 1, 10);
 		Shape7.setRotationPoint(-6F, 19F, -4F);
-		
+
 		Shape8 = new ModelRenderer(this, 0, 0);
 		Shape8.addBox(0F, 0F, 0F, 1, 3, 2);
 		Shape8.setRotationPoint(7F, 21F, 6F);
-		
+
 		Shape9 = new ModelRenderer(this, 0, 0);
 		Shape9.addBox(0F, 0F, 0F, 2, 1, 10);
 		Shape9.setRotationPoint(5F, 19F, -4F);
-		
+
 		Shape10 = new ModelRenderer(this, 0, 0);
 		Shape10.addBox(0F, 0F, 0F, 1, 10, 1);
 		Shape10.setRotationPoint(-6F, 9F, 7F);
-		
+
 		Shape11 = new ModelRenderer(this, 0, 0);
 		Shape11.mirror = true;
 		Shape11.addBox(0F, 0F, 0F, 14, 2, 2);
 		Shape11.setRotationPoint(-6F, 19F, -6F);
-		
+
 		Shape12 = new ModelRenderer(this, 0, 0);
 		Shape12.addBox(0F, 0F, 0F, 2, 1, 10);
 		Shape12.setRotationPoint(-3F, 19F, -4F);
-		
+
 		Shape13 = new ModelRenderer(this, 0, 0);
 		Shape13.addBox(0F, 0F, 0F, 2, 1, 10);
 		Shape13.setRotationPoint(1F, 19F, -4F);
-		
+
 		Shape14 = new ModelRenderer(this, 0, 0);
 		Shape14.addBox(0F, 0F, 0F, 2, 10, 1);
 		Shape14.setRotationPoint(-3F, 9F, 7F);
-		
+
 		Shape15 = new ModelRenderer(this, 0, 0);
 		Shape15.addBox(0F, 0F, 0F, 2, 10, 1);
 		Shape15.setRotationPoint(1F, 9F, 7F);
-		
+
 		Shape16 = new ModelRenderer(this, 0, 0);
 		Shape16.addBox(0F, 0F, 0F, 2, 10, 1);
 		Shape16.setRotationPoint(5F, 9F, 7F);
-		
+
 		Shape17 = new ModelRenderer(this, 0, 0);
 		Shape17.mirror = true;
 		Shape17.addBox(0F, 0F, 0F, 2, 10, 2);
 		Shape17.setRotationPoint(-8F, 14F, -6F);
-		
+
 		Shape18 = new ModelRenderer(this, 0, 0);
 		Shape18.mirror = true;
 		Shape18.addBox(0F, 0F, 0F, 2, 18, 2);
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodMiddle.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodMiddle.java
similarity index 98%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodMiddle.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodMiddle.java
index 5248f938a..f59932b83 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodMiddle.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodMiddle.java
@@ -1,4 +1,4 @@
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy.couch;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
@@ -26,7 +26,7 @@ public class ModelCouchWoodMiddle extends ModelBase {
 		Shape2 = new ModelRenderer(this, 0, 0);
 		Shape2.addBox(0F, 0F, 0F, 1, 3, 2);
 		Shape2.setRotationPoint(-8F, 21F, -6F);
-		
+
 		Shape4 = new ModelRenderer(this, 0, 0);
 		Shape4.addBox(0F, 0F, 0F, 16, 2, 1);
 		Shape4.setRotationPoint(-8F, 7F, 7F);
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodRight.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodRight.java
similarity index 98%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodRight.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodRight.java
index 5819b2ada..951af09c2 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodRight.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodRight.java
@@ -1,4 +1,4 @@
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy.couch;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodSingle.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodSingle.java
similarity index 98%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodSingle.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodSingle.java
index 7023ba6b1..f43549102 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodSingle.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodSingle.java
@@ -1,4 +1,4 @@
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy.couch;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
@@ -33,30 +33,30 @@ public class ModelCouchWoodSingle extends ModelBase {
 		Shape1.mirror = true;
 		Shape1.addBox(0F, 0F, 0F, 2, 3, 10);
 		Shape1.setRotationPoint(-8F, 18F, -4F);
-		
+
 		Shape2 = new ModelRenderer(this, 0, 0);
 		Shape2.mirror = true;
 		Shape2.addBox(0F, 0F, 0F, 2, 10, 2);
 		Shape2.setRotationPoint(-8F, 14F, -6F);
-		
+
 		Shape3 = new ModelRenderer(this, 0, 0);
 		Shape3.mirror = true;
 		Shape3.addBox(0F, 0F, 0F, 2, 4, 1);
 		Shape3.setRotationPoint(-8F, 14F, 0.5F);
-		
+
 		Shape4 = new ModelRenderer(this, 0, 0);
 		Shape4.addBox(0F, 0F, 0F, 12, 2, 1);
 		Shape4.setRotationPoint(-6F, 7F, 7F);
-		
+
 		Shape5 = new ModelRenderer(this, 0, 0);
 		Shape5.addBox(0F, 0F, 0F, 12, 2, 2);
 		Shape5.setRotationPoint(-6F, 19F, 6F);
-		
+
 		Shape6 = new ModelRenderer(this, 0, 0);
 		Shape6.mirror = true;
 		Shape6.addBox(0F, 0F, 0F, 2, 1, 13);
 		Shape6.setRotationPoint(-8F, 13F, -7F);
-		
+
 		Shape7 = new ModelRenderer(this, 0, 0);
 		Shape7.addBox(0F, 0F, 0F, 1, 1, 10);
 		Shape7.setRotationPoint(-6F, 19F, -4F);
@@ -109,11 +109,11 @@ public class ModelCouchWoodSingle extends ModelBase {
 		Shape19 = new ModelRenderer(this, 0, 0);
 		Shape19.addBox(0F, 0F, 0F, 2, 10, 2);
 		Shape19.setRotationPoint(6F, 14F, -6F);
-		
+
 		Shape20 = new ModelRenderer(this, 0, 0);
 		Shape20.addBox(0F, 0F, 0F, 2, 3, 10);
 		Shape20.setRotationPoint(6F, 18F, -4F);
-		
+
 		Shape21 = new ModelRenderer(this, 0, 0);
 		Shape21.addBox(0F, 0F, 0F, 2, 4, 1);
 		Shape21.setRotationPoint(6F, 14F, 0.5F);
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchCorner.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchCorner.java
similarity index 92%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchCorner.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchCorner.java
index 36f02c5a5..990c7c56c 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchCorner.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchCorner.java
@@ -1,10 +1,10 @@
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy.couch;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
-public class ModelCouchCorner extends ModelBase {
+public class ModelLegacyCouchCorner extends ModelBase {
 	ModelRenderer Leg1;
 	ModelRenderer Leg2;
 	ModelRenderer Leg3;
@@ -15,39 +15,39 @@ public class ModelCouchCorner extends ModelBase {
 	ModelRenderer Bottom;
 	ModelRenderer Bottom2;
 
-	public ModelCouchCorner() {
+	public ModelLegacyCouchCorner() {
 		Leg1 = new ModelRenderer(this, 0, 0);
 		Leg1.addBox(0F, 0F, 0F, 1, 1, 2);
 		Leg1.setRotationPoint(7F, 23F, 6F);
-		
+
 		Leg2 = new ModelRenderer(this, 0, 0);
 		Leg2.addBox(0F, 0F, 0F, 2, 1, 1);
 		Leg2.setRotationPoint(4F, 23F, -8F);
-		
+
 		Leg3 = new ModelRenderer(this, 0, 0);
 		Leg3.addBox(0F, 0F, 0F, 2, 1, 1);
 		Leg3.setRotationPoint(-8F, 23F, -8F);
-		
+
 		Leg4 = new ModelRenderer(this, 0, 0);
 		Leg4.addBox(0F, 0F, 0F, 2, 1, 2);
 		Leg4.setRotationPoint(-8F, 23F, 6F);
-		
+
 		Leg5 = new ModelRenderer(this, 0, 0);
 		Leg5.addBox(0F, 0F, 0F, 1, 1, 2);
 		Leg5.setRotationPoint(7F, 23F, -6F);
-		
+
 		Back = new ModelRenderer(this, 1, 1);
 		Back.addBox(0F, 0F, 0F, 1, 15, 15);
 		Back.setRotationPoint(-8F, 6F, -8F);
-		
+
 		Back2 = new ModelRenderer(this, 14, 15);
 		Back2.addBox(0F, 0F, 0F, 16, 15, 1);
 		Back2.setRotationPoint(-8F, 6F, 7F);
-		
+
 		Bottom = new ModelRenderer(this, 4, 0);
 		Bottom.addBox(0F, 0F, 0F, 16, 2, 14);
 		Bottom.setRotationPoint(-8F, 21F, -6F);
-		
+
 		Bottom2 = new ModelRenderer(this, 0, 0);
 		Bottom2.addBox(0F, 0F, 0F, 14, 2, 2);
 		Bottom2.setRotationPoint(-8F, 21F, -8F);
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchCornerWool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchCornerWool.java
similarity index 87%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchCornerWool.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchCornerWool.java
index 69bfaa4d6..ec6f9e12d 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchCornerWool.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchCornerWool.java
@@ -1,28 +1,28 @@
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy.couch;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
-public class ModelCouchCornerWool extends ModelBase {
+public class ModelLegacyCouchCornerWool extends ModelBase {
 	ModelRenderer Wool1;
 	ModelRenderer Wool2;
 	ModelRenderer Wool3;
 	ModelRenderer Wool4;
 
-	public ModelCouchCornerWool() {		
+	public ModelLegacyCouchCornerWool() {
 		Wool1 = new ModelRenderer(this, 11, 3);
 		Wool1.addBox(0F, 0F, 0F, 13, 5, 2);
 		Wool1.setRotationPoint(-7F, 16F, -8F);
-		
+
 		Wool2 = new ModelRenderer(this, 2, 4);
 		Wool2.addBox(0F, 0F, 0F, 2, 10, 13);
 		Wool2.setRotationPoint(-7F, 6F, -8F);
-		
+
 		Wool3 = new ModelRenderer(this, 14, 15);
 		Wool3.addBox(0F, 0F, 0F, 15, 10, 2);
 		Wool3.setRotationPoint(-7F, 6F, 5F);
-		
+
 		Wool4 = new ModelRenderer(this, 0, 45);
 		Wool4.addBox(0F, 0F, 0F, 15, 5, 13);
 		Wool4.setRotationPoint(-7F, 16F, -6F);
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeft.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchLeft.java
similarity index 91%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeft.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchLeft.java
index c07f32051..b51488dd8 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeft.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchLeft.java
@@ -1,10 +1,10 @@
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy.couch;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
-public class ModelCouchLeft extends ModelBase {
+public class ModelLegacyCouchLeft extends ModelBase {
 	ModelRenderer Leg1;
 	ModelRenderer Leg2;
 	ModelRenderer Leg3;
@@ -13,31 +13,31 @@ public class ModelCouchLeft extends ModelBase {
 	ModelRenderer Side;
 	ModelRenderer Bottom;
 
-	public ModelCouchLeft() {
+	public ModelLegacyCouchLeft() {
 		Leg1 = new ModelRenderer(this, 0, 0);
 		Leg1.addBox(0F, 0F, 0F, 2, 1, 2);
 		Leg1.setRotationPoint(-8F, 23F, 6F);
-		
+
 		Leg2 = new ModelRenderer(this, 0, 0);
 		Leg2.addBox(0F, 0F, 0F, 1, 1, 2);
 		Leg2.setRotationPoint(7F, 23F, -6F);
-		
+
 		Leg3 = new ModelRenderer(this, 0, 0);
 		Leg3.addBox(0F, 0F, 0F, 2, 1, 2);
 		Leg3.setRotationPoint(-8F, 23F, -6F);
-		
+
 		Leg4 = new ModelRenderer(this, 0, 0);
 		Leg4.addBox(0F, 0F, 0F, 1, 1, 2);
 		Leg4.setRotationPoint(7F, 23F, 6F);
-		
+
 		Back = new ModelRenderer(this, 1, 15);
 		Back.addBox(0F, 0F, 0F, 14, 15, 1);
 		Back.setRotationPoint(-6F, 6F, 7F);
-		
+
 		Side = new ModelRenderer(this, 1, 28);
 		Side.addBox(0F, 0F, 0F, 2, 11, 14);
 		Side.setRotationPoint(-8F, 12F, -6F);
-		
+
 		Bottom = new ModelRenderer(this, 3, 1);
 		Bottom.addBox(0F, 0F, 0F, 14, 2, 14);
 		Bottom.setRotationPoint(-6F, 21F, -6F);
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeftWool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchLeftWool.java
similarity index 83%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeftWool.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchLeftWool.java
index 039d843ba..3e3ab99bf 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeftWool.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchLeftWool.java
@@ -1,18 +1,18 @@
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy.couch;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
-public class ModelCouchLeftWool extends ModelBase {
+public class ModelLegacyCouchLeftWool extends ModelBase {
 	ModelRenderer Wool1;
 	ModelRenderer Wool2;
 
-	public ModelCouchLeftWool() {
+	public ModelLegacyCouchLeftWool() {
 		Wool1 = new ModelRenderer(this, 3, 0);
 		Wool1.addBox(0F, 0F, 0F, 14, 5, 13);
 		Wool1.setRotationPoint(-6F, 16F, -6F);
-		
+
 		Wool2 = new ModelRenderer(this, 14, 0);
 		Wool2.addBox(0F, 0F, 0F, 14, 10, 2);
 		Wool2.setRotationPoint(-6F, 6F, 5F);
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddle.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchMiddle.java
similarity index 90%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddle.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchMiddle.java
index 563b9ff20..61d9554e8 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddle.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchMiddle.java
@@ -1,10 +1,10 @@
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy.couch;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
-public class ModelCouchMiddle extends ModelBase
+public class ModelLegacyCouchMiddle extends ModelBase
 {
   //fields
     ModelRenderer Leg1;
@@ -13,33 +13,33 @@ public class ModelCouchMiddle extends ModelBase
     ModelRenderer Leg4;
     ModelRenderer Bottom;
     ModelRenderer Back;
-  
-  public ModelCouchMiddle(){
+
+  public ModelLegacyCouchMiddle(){
       Leg1 = new ModelRenderer(this, 0, 0);
       Leg1.addBox(0F, 0F, 0F, 1, 1, 2);
       Leg1.setRotationPoint(7F, 23F, 6F);
-      
+
       Leg2 = new ModelRenderer(this, 0, 0);
       Leg2.addBox(0F, 0F, 0F, 1, 1, 2);
       Leg2.setRotationPoint(7F, 23F, -6F);
-      
+
       Leg3 = new ModelRenderer(this, 0, 0);
       Leg3.addBox(0F, 0F, 0F, 1, 1, 2);
       Leg3.setRotationPoint(-8F, 23F, -6F);
-      
+
       Leg4 = new ModelRenderer(this, 0, 0);
       Leg4.addBox(0F, 0F, 0F, 1, 1, 2);
       Leg4.setRotationPoint(-8F, 23F, 6F);
-      
+
       Bottom = new ModelRenderer(this, 2, 0);
       Bottom.addBox(0F, 0F, 0F, 16, 2, 14);
       Bottom.setRotationPoint(-8F, 21F, -6F);
-      
+
       Back = new ModelRenderer(this, 14, 15);
       Back.addBox(0F, 0F, 0F, 16, 15, 1);
       Back.setRotationPoint(-8F, 6F, 7F);
   }
-  
+
   public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
   {
     super.render(entity, f, f1, f2, f3, f4, f5);
@@ -50,7 +50,7 @@ public class ModelCouchMiddle extends ModelBase
     Bottom.render(f5);
     Back.render(f5);
   }
-  
+
   private void setRotation(ModelRenderer model, float x, float y, float z)
   {
     model.rotateAngleX = x;
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddleWool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchMiddleWool.java
similarity index 84%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddleWool.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchMiddleWool.java
index 8746975b6..654298906 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddleWool.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchMiddleWool.java
@@ -1,31 +1,31 @@
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy.couch;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
-public class ModelCouchMiddleWool extends ModelBase
+public class ModelLegacyCouchMiddleWool extends ModelBase
 {
     ModelRenderer Wool1;
     ModelRenderer Wool2;
-  
-  public ModelCouchMiddleWool(){      
+
+  public ModelLegacyCouchMiddleWool(){
       Wool1 = new ModelRenderer(this, 3, 0);
       Wool1.addBox(0F, 0F, 0F, 16, 5, 13);
       Wool1.setRotationPoint(-8F, 16F, -6F);
-      
+
       Wool2 = new ModelRenderer(this, 14, 0);
       Wool2.addBox(0F, 0F, 0F, 16, 10, 2);
       Wool2.setRotationPoint(-8F, 6F, 5F);
   }
-  
+
   public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
   {
     super.render(entity, f, f1, f2, f3, f4, f5);
     Wool1.render(f5);
     Wool2.render(f5);
   }
-  
+
   private void setRotation(ModelRenderer model, float x, float y, float z)
   {
     model.rotateAngleX = x;
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchRight.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchRight.java
similarity index 91%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchRight.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchRight.java
index 33f96e40c..e3867a270 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchRight.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchRight.java
@@ -1,10 +1,10 @@
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy.couch;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
-public class ModelCouchRight extends ModelBase {
+public class ModelLegacyCouchRight extends ModelBase {
 	// fields
 	ModelRenderer Leg1;
 	ModelRenderer Leg2;
@@ -14,33 +14,33 @@ public class ModelCouchRight extends ModelBase {
 	ModelRenderer Bottom;
 	ModelRenderer Side;
 
-	public ModelCouchRight() {
+	public ModelLegacyCouchRight() {
 		Leg1 = new ModelRenderer(this, 0, 0);
 		Leg1.addBox(0F, 0F, 0F, 2, 1, 2);
 		Leg1.setRotationPoint(6F, 23F, 6F);
-		
+
 		Leg2 = new ModelRenderer(this, 0, 0);
 		Leg2.addBox(0F, 0F, 0F, 1, 1, 2);
 		Leg2.setRotationPoint(-8F, 23F, -6F);
-		
+
 		Leg3 = new ModelRenderer(this, 0, 0);
 		Leg3.addBox(0F, 0F, 0F, 2, 1, 2);
 		Leg3.setRotationPoint(6F, 23F, -6F);
-		
+
 		Leg4 = new ModelRenderer(this, 0, 0);
 		Leg4.addBox(0F, 0F, 0F, 1, 1, 2);
 		Leg4.setRotationPoint(-8F, 23F, 6F);
-		
+
 		Back = new ModelRenderer(this, 1, 15);
 		Back.mirror = true;
 		Back.addBox(0F, 0F, 0F, 14, 15, 1);
 		Back.setRotationPoint(-8F, 6F, 7F);
-		
+
 		Bottom = new ModelRenderer(this, 3, 1);
 		Bottom.mirror = true;
 		Bottom.addBox(0F, 0F, 0F, 14, 2, 14);
 		Bottom.setRotationPoint(-8F, 21F, -6F);
-		
+
 		Side = new ModelRenderer(this, 1, 28);
 		Side.mirror = true;
 		Side.addBox(0F, 0F, 0F, 2, 11, 14);
diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchRightWool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchRightWool.java
similarity index 84%
rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchRightWool.java
rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchRightWool.java
index ae9617417..6a92b3855 100644
--- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchRightWool.java
+++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchRightWool.java
@@ -1,19 +1,19 @@
-package noppes.npcs.client.model.blocks;
+package noppes.npcs.client.model.blocks.legacy.couch;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
-public class ModelCouchRightWool extends ModelBase {
+public class ModelLegacyCouchRightWool extends ModelBase {
 	ModelRenderer Wool1;
 	ModelRenderer Wool2;
 
-	public ModelCouchRightWool() {
+	public ModelLegacyCouchRightWool() {
 		Wool1 = new ModelRenderer(this, 3, 0);
 		Wool1.mirror = true;
 		Wool1.addBox(0F, 0F, 0F, 14, 5, 13);
 		Wool1.setRotationPoint(-8F, 16F, -6F);
-		
+
 		Wool2 = new ModelRenderer(this, 14, 0);
 		Wool2.mirror = true;
 		Wool2.addBox(0F, 0F, 0F, 14, 10, 2);
diff --git a/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java b/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java
index a33105e2d..82da923bb 100644
--- a/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java
+++ b/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java
@@ -26,6 +26,8 @@ import org.lwjgl.util.glu.Project;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.UUID;
 
 public class RenderCNPCPlayer extends RenderPlayer {
     public static boolean hasMPM = false;
@@ -286,36 +288,56 @@ public class RenderCNPCPlayer extends RenderPlayer {
         }
     }
 
-    public void renderFirstPersonArmOverlay(EntityPlayer player)
-    {
-        float gender = -1;
+    public void renderFirstPersonArmOverlay(EntityPlayer player) {
+        // Check if player or model is null
+        if (player == null || this.modelBipedMain == null) {
+            return;
+        }
+
+        float gender = -1F;
         try {
             Class<?> RenderPlayerJBRA = Class.forName("JinRyuu.JBRA.RenderPlayerJBRA");
             gender = (float) RenderPlayerJBRA.getMethod("genGet").invoke(null);
         } catch (Exception ignored) {}
 
-        if (ClientCacheHandler.skinOverlays.containsKey(player.getUniqueID())) {
-            for (SkinOverlay overlayData : ClientCacheHandler.skinOverlays.get(player.getUniqueID()).values()) {
-                if (((SkinOverlay)overlayData).texture.isEmpty())
-                    continue;
+        // Check if the skinOverlays map exists for this player's UUID
+        UUID uuid = player.getUniqueID();
+        if (uuid == null || !ClientCacheHandler.skinOverlays.containsKey(uuid)) {
+            return;
+        }
 
-                ImageData imageData = ClientCacheHandler.getImageData(((SkinOverlay)overlayData).texture);
-                if (!imageData.imageLoaded())
-                    continue;
-
-                if (!this.preRenderOverlay(overlayData, player))
-                    continue;
-
-                if (gender >= 2.0F) {
-                    GL11.glRotatef(7F, 0, 0, 1);
-                    GL11.glTranslatef(0.015F, 0.0375F, -0.0025F);
-                }
-                this.modelBipedMain.onGround = 0.0F;
-                this.modelBipedMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, player);
-                this.modelBipedMain.bipedRightArm.render(0.0625F);
-
-                postRenderOverlay();
+        Map<Integer, SkinOverlay> overlayMap = ClientCacheHandler.skinOverlays.get(uuid);
+        if (overlayMap == null || overlayMap.isEmpty()) {
+            return;
+        }
+        // Iterate through each SkinOverlay safely
+        for (SkinOverlay overlayData : overlayMap.values()) {
+            if (overlayData == null || overlayData.texture == null || overlayData.texture.isEmpty()) {
+                continue;
             }
+
+            ImageData imageData = ClientCacheHandler.getImageData(overlayData.texture);
+            if (imageData == null || !imageData.imageLoaded()) {
+                continue;
+            }
+
+            // Check your preRenderOverlay return
+            if (!this.preRenderOverlay(overlayData, player)) {
+                continue;
+            }
+
+            // Adjust arm rendering for gender if needed
+            if (gender >= 2.0F) {
+                GL11.glRotatef(7F, 0, 0, 1);
+                GL11.glTranslatef(0.015F, 0.0375F, -0.0025F);
+            }
+
+            // Render the arm
+            this.modelBipedMain.onGround = 0.0F;
+            this.modelBipedMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, player);
+            this.modelBipedMain.bipedRightArm.render(0.0625F);
+
+            postRenderOverlay();
         }
     }
 
diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java
index 1fb76656e..19e9ce232 100644
--- a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java
+++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java
@@ -2,7 +2,7 @@ package noppes.npcs.client.renderer;
 
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
-import kamkeel.addon.client.GeckoAddonClient;
+import kamkeel.npcs.addon.client.GeckoAddonClient;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.gui.FontRenderer;
@@ -153,13 +153,13 @@ public class RenderNPCInterface extends RenderLiving{
 		shadowSize = npc.display.modelSize / 10f;
 
 		float xOffset = 0;
-		float yOffset = npc.currentAnimation == EnumAnimation.NONE?npc.ai.bodyOffsetY / 10 - 0.5f:0;
+		float yOffset = npc.currentAnimation == EnumAnimation.NONE?npc.ais.bodyOffsetY / 10 - 0.5f:0;
 		float zOffset = 0;
 
 		if(npc.isEntityAlive()){
 			if(npc.isPlayerSleeping()){
-				xOffset = (float) -Math.cos(Math.toRadians(180 - npc.ai.orientation));
-				zOffset = (float) -Math.sin(Math.toRadians(npc.ai.orientation));
+				xOffset = (float) -Math.cos(Math.toRadians(180 - npc.ais.orientation));
+				zOffset = (float) -Math.sin(Math.toRadians(npc.ais.orientation));
 				yOffset += 0.14f;
 			}
 			else if(npc.isRiding()){
@@ -180,7 +180,7 @@ public class RenderNPCInterface extends RenderLiving{
 		EntityNPCInterface npc = (EntityNPCInterface) entity;
 		if(npc.isEntityAlive() && npc.isPlayerSleeping())
 		{
-			GL11.glRotatef(npc.ai.orientation, 0.0F, 1.0F, 0.0F);
+			GL11.glRotatef(npc.ais.orientation, 0.0F, 1.0F, 0.0F);
 			GL11.glRotatef(getDeathMaxRotation(npc), 0.0F, 0.0F, 1.0F);
 			GL11.glRotatef(270F, 0.0F, 1.0F, 0.0F);
 		}
@@ -216,8 +216,8 @@ public class RenderNPCInterface extends RenderLiving{
 		if((npc.display.showBossBar == 1 || npc.display.showBossBar == 2 && npc.isAttacking()) && !npc.isKilled() && npc.deathTime <= 20 && npc.canSee(Minecraft.getMinecraft().thePlayer))
 			BossStatus.setBossStatus(npc, true);
 
-		if(npc.ai.standingType == EnumStandingType.HeadRotation && !npc.isWalking() && !npc.isInteracting()){
-			npc.prevRenderYawOffset = npc.renderYawOffset = npc.ai.orientation;
+		if(npc.ais.standingType == EnumStandingType.HeadRotation && !npc.isWalking() && !npc.isInteracting()){
+			npc.prevRenderYawOffset = npc.renderYawOffset = npc.ais.orientation;
 		}
 
 		staticRenderManager = this.renderManager;
diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java
index 163428087..d7e19393e 100644
--- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java
+++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java
@@ -10,23 +10,41 @@ import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
 import noppes.npcs.CustomItems;
 import noppes.npcs.blocks.BlockBanner;
 import noppes.npcs.blocks.tiles.TileBanner;
-import noppes.npcs.client.model.blocks.ModelBanner;
-import noppes.npcs.client.model.blocks.ModelBannerFlag;
+import noppes.npcs.client.model.blocks.banner.ModelBannerFloor;
+import noppes.npcs.client.model.blocks.banner.ModelBannerFloorFlag;
+import noppes.npcs.client.model.blocks.legacy.ModelLegacyBanner;
+import noppes.npcs.client.model.blocks.legacy.ModelLegacyBannerFlag;
+import noppes.npcs.config.ConfigClient;
+import noppes.npcs.constants.EnumBannerVariant;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
 public class BlockBannerRenderer extends BlockRendererInterface{
 
-	private final ModelBanner model = new ModelBanner();
-	private final ModelBannerFlag flag = new ModelBannerFlag();
+	private final ModelLegacyBanner legacyBanner = new ModelLegacyBanner();
+	private final ModelLegacyBannerFlag legacyFlag = new ModelLegacyBannerFlag();
 
-    public static final ResourceLocation resourceFlag = new ResourceLocation("customnpcs","textures/models/BannerFlag.png");
+    private final ModelBannerFloor banner = new ModelBannerFloor();
+    private final ModelBannerFloorFlag flag = new ModelBannerFloorFlag();
 
+    public static final ResourceLocation legacyFlagResource = new ResourceLocation("customnpcs","textures/models/legacy/banner.png");
 
+    public static final ResourceLocation normalFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/normal.png");
+    public static final ResourceLocation pointyFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/pointy.png");
+    public static final ResourceLocation triangleFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/triangle.png");
+    public static final ResourceLocation tornFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/torn.png");
+    public static final ResourceLocation curvedFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/curved.png");
+
+    protected static final ResourceLocation BannerWood = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorWood.png");
+    protected static final ResourceLocation BannerStone = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorStone.png");
+    protected static final ResourceLocation BannerIron = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorIron.png");
+    protected static final ResourceLocation BannerGold = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorGold.png");
+    protected static final ResourceLocation BannerDiamond = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorDiamond.png");
 
     public BlockBannerRenderer(){
 		((BlockBanner)CustomItems.banner).renderId = RenderingRegistry.getNextAvailableRenderId();
@@ -46,28 +64,64 @@ public class BlockBannerRenderer extends BlockRendererInterface{
         GL11.glRotatef(90 * tile.rotation, 0, 1, 0);
         GL11.glColor3f(1, 1, 1);
 
-        setMaterialTexture(var1.getBlockMetadata());
-        model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        if(ConfigClient.LegacyBanner){
+            setMaterialTexture(var1.getBlockMetadata());
+            legacyBanner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
 
-        this.bindTexture(resourceFlag);
-        float[] color = colorTable[tile.color];
-        GL11.glColor3f(color[0], color[1], color[2]);
-        flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            this.bindTexture(legacyFlagResource);
+            float[] color = colorTable[tile.color];
+            GL11.glColor3f(color[0], color[1], color[2]);
+            legacyFlag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
 
-		GL11.glPopMatrix();
-        GL11.glColor3f(1, 1, 1);
-        if(tile.icon != null && !this.playerTooFar(tile)){
-        	doRender(var2, var4, var6, tile.rotation, tile.icon);
+            GL11.glPopMatrix();
+            GL11.glColor3f(1, 1, 1);
+            if(tile.icon != null && !this.playerTooFar(tile)){
+                doRender(var2, var4, var6, tile.rotation, tile.icon, 0);
+            }
+        }
+        else {
+            long worldTime = tile.getWorldObj() != null ? tile.getWorldObj().getTotalWorldTime() : 0;
+            // 100 is one full revolution, so we can just mod by 100 without affecting the result
+            int animationProgress100 = (((tile.xCoord % 100) * 7 + (tile.yCoord % 100) * 9 + (tile.zCoord % 100) * 13) + (int) (worldTime % 100)) % 100;
+            float f3 = (float) animationProgress100 + var8;
+            float angle_x = (-0.0125F + 0.01F * MathHelper.cos(f3 * 0.01F * 2F * (float) Math.PI)) * (float) Math.PI;
+            flag.BannerFlag.rotateAngleX = angle_x;
+
+            setBannerMaterial(var1.getBlockMetadata());
+            banner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+
+            setFlagType(tile.variant);
+            float[] color = colorTable[tile.color];
+            GL11.glPushMatrix();
+            GL11.glColor3f(color[0], color[1], color[2]);
+            flag.render(null, 0, 0, 0, f3, 0.0F, 0.0625F);
+            GL11.glPopMatrix();
+
+            GL11.glPopMatrix();
+            GL11.glColor3f(1, 1, 1);
+            if(tile.icon != null && !this.playerTooFar(tile)){
+                doRender(var2, var4, var6, tile.rotation, tile.icon, angle_x);
+            }
         }
 	}
-    public void doRender(double par2, double par4, double par6, int meta, ItemStack iicon)
+    public void doRender(double par2, double par4, double par6, int meta, ItemStack iicon, float rotate)
     {
         GL11.glPushMatrix();
         bindTexture(TextureMap.locationItemsTexture);
         GL11.glTranslatef((float)par2 + 0.5f, (float)par4 +1.3f, (float)par6 + 0.5f);
         GL11.glRotatef(180, 0, 0, 1);
     	GL11.glRotatef(90 * meta, 0, 1, 0);
-        GL11.glTranslatef(0, 0, -0.14f);
+        if(ConfigClient.LegacyBanner){
+            GL11.glTranslatef(0, 0, -0.14f);
+        }
+        else {
+            GL11.glTranslatef(0, 0, -0.075f);
+
+            GL11.glTranslatef(0, -0.6f, 0); // Translate to pivot point
+            GL11.glRotatef((float) Math.toDegrees(rotate), 1, 0, 0); // Apply sway rotation
+            GL11.glTranslatef(0, 0.6f, 0); // Translate back after rotation
+        }
+
         GL11.glDepthMask(false);
         float f2 = 0.05f;
         Minecraft mc = Minecraft.getMinecraft();
@@ -133,14 +187,26 @@ public class BlockBannerRenderer extends BlockRendererInterface{
         GL11.glRotatef(180, 0, 0, 1);
         GL11.glRotatef(180, 0, 1, 0);
 
-        setMaterialTexture(metadata);
-        GL11.glColor3f(1, 1, 1);
-        model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        if(ConfigClient.LegacyBanner){
+            setMaterialTexture(metadata);
+            GL11.glColor3f(1, 1, 1);
+            legacyBanner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+
+            this.bindTexture(legacyFlagResource);
+            float[] color = colorTable[15 - metadata];
+            GL11.glColor3f(color[0], color[1], color[2]);
+            legacyFlag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        }
+        else {
+            setBannerMaterial(metadata);
+            banner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+
+            this.bindTexture(normalFlag);
+            float[] color = colorTable[15 - metadata];
+            GL11.glColor3f(color[0], color[1], color[2]);
+            flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        }
 
-        this.bindTexture(resourceFlag);
-        float[] color = colorTable[15 - metadata];
-        GL11.glColor3f(color[0], color[1], color[2]);
-        flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
 		GL11.glPopMatrix();
 	}
 
@@ -152,4 +218,39 @@ public class BlockBannerRenderer extends BlockRendererInterface{
 	public int specialRenderDistance(){
 		return 26;
 	}
+
+    public static void setBannerMaterial(int meta){
+        TextureManager manager = Minecraft.getMinecraft().getTextureManager();
+        if(meta == 1)
+            manager.bindTexture(BannerStone);
+        else if(meta == 2)
+            manager.bindTexture(BannerIron);
+        else if(meta == 3)
+            manager.bindTexture(BannerGold);
+        else if(meta == 4)
+            manager.bindTexture(BannerDiamond);
+        else
+            manager.bindTexture(BannerWood);
+    }
+
+    public static void setFlagType(EnumBannerVariant variant){
+        TextureManager manager = Minecraft.getMinecraft().getTextureManager();
+        switch (variant){
+            case Pointy:
+                manager.bindTexture(pointyFlag);
+                break;
+            case Triangle:
+                manager.bindTexture(triangleFlag);
+                break;
+            case Torn:
+                manager.bindTexture(tornFlag);
+                break;
+            case Curved:
+                manager.bindTexture(curvedFlag);
+                break;
+            default:
+                manager.bindTexture(normalFlag);
+                break;
+        }
+    }
 }
diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBarrelRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBarrelRenderer.java
index e90dd504f..71c66c9c8 100644
--- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBarrelRenderer.java
+++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBarrelRenderer.java
@@ -4,28 +4,37 @@ import cpw.mods.fml.client.registry.RenderingRegistry;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import noppes.npcs.CustomItems;
 import noppes.npcs.blocks.BlockBarrel;
 import noppes.npcs.blocks.tiles.TileColorable;
-import noppes.npcs.client.model.blocks.ModelBarrel;
-import noppes.npcs.client.model.blocks.ModelBarrelLit;
-import noppes.npcs.client.model.blocks.barrel.BarrelCore;
-import noppes.npcs.client.model.blocks.barrel.BarrelTrim;
+import noppes.npcs.client.model.blocks.barrel.ModelBarrel;
+import noppes.npcs.client.model.blocks.legacy.ModelLegacyBarrel;
+import noppes.npcs.client.model.blocks.legacy.ModelLegacyBarrelLid;
+import noppes.npcs.config.ConfigClient;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
 public class BlockBarrelRenderer extends BlockRendererInterface{
 
-	private final ModelBarrel model = new ModelBarrel();
-	private final ModelBarrelLit modelLit = new ModelBarrelLit();
-	private static final ResourceLocation resource1 = new ResourceLocation("customnpcs","textures/models/Barrel.png");
+    // Legacy
+	private final ModelLegacyBarrel legacyModel = new ModelLegacyBarrel();
+	private final ModelLegacyBarrelLid legacyLid = new ModelLegacyBarrelLid();
+	private static final ResourceLocation legacy_texture = new ResourceLocation("customnpcs","textures/models/Barrel.png");
 
 
-    private final BarrelCore core = new BarrelCore();
-    private final BarrelTrim trim = new BarrelTrim();
-    private static final ResourceLocation trimTexture = new ResourceLocation("customnpcs","textures/models/BarrelTrim.png");
+    // Modern
+    private final ModelBarrel barrel = new ModelBarrel();
+    private static final ResourceLocation trimTexture = new ResourceLocation("customnpcs","textures/models/barrel/trim.png");
+
+    private static final ResourceLocation oak_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png");
+    private static final ResourceLocation spruce_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png");
+    private static final ResourceLocation birch_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png");
+    private static final ResourceLocation jungle_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png");
+    private static final ResourceLocation acacia_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png");
+    private static final ResourceLocation dark_oak_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png");
 
 	public BlockBarrelRenderer(){
 		((BlockBarrel)CustomItems.barrel).renderId = RenderingRegistry.getNextAvailableRenderId();
@@ -39,17 +48,38 @@ public class BlockBarrelRenderer extends BlockRendererInterface{
         GL11.glDisable(GL12.GL_RESCALE_NORMAL);
         GL11.glEnable(GL11.GL_ALPHA_TEST);
         GL11.glPushMatrix();
-        GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.42f, (float)var6 + 0.5f);
-        GL11.glScalef(1.2f, 0.94f,1.2f);
-        GL11.glRotatef(180, 0, 0, 1);
-        GL11.glRotatef(45 * tile.rotation, 0, 1, 0);
-        GL11.glColor3f(1, 1, 1);
 
-        GL11.glEnable(GL11.GL_CULL_FACE);
-        setWoodTexture(var1.getBlockMetadata());
-        core.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
-        Minecraft.getMinecraft().getTextureManager().bindTexture(trimTexture);
-        trim.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+
+        if(ConfigClient.LegacyBarrel){
+            GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.42f, (float)var6 + 0.5f);
+            GL11.glScalef(1.2f, 0.94f,1.2f);
+            GL11.glRotatef(180, 0, 0, 1);
+            GL11.glRotatef(45 * tile.rotation, 0, 1, 0);
+            GL11.glColor3f(1, 1, 1);
+
+            GL11.glEnable(GL11.GL_CULL_FACE);
+
+            setWoodTexture(var1.getBlockMetadata());
+            legacyModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            Minecraft.getMinecraft().getTextureManager().bindTexture(legacy_texture);
+            legacyLid.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        }
+        else {
+            GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.5f, (float)var6 + 0.5f);
+            GL11.glScalef(1.0f, 1.0f,1.0f);
+            GL11.glRotatef(180, 0, 0, 1);
+            GL11.glRotatef(45 * tile.rotation, 0, 1, 0);
+            GL11.glColor3f(1, 1, 1);
+
+            GL11.glEnable(GL11.GL_CULL_FACE);
+
+            setWoodTexture(var1.getBlockMetadata());
+            barrel.renderWall(0.0625F);
+            Minecraft.getMinecraft().getTextureManager().bindTexture(trimTexture);
+            barrel.renderTrim(0.0625F);
+            setLidTexture(var1.getBlockMetadata());
+            barrel.renderBase(0.0625F);
+        }
 
 		GL11.glPopMatrix();
 	}
@@ -58,20 +88,55 @@ public class BlockBarrelRenderer extends BlockRendererInterface{
 	public void renderInventoryBlock(Block block, int metadata, int modelId,
 			RenderBlocks renderer) {
         GL11.glPushMatrix();
-        GL11.glTranslatef(0, 1.05f, 0);
-        GL11.glScalef(1f, 1f, 1f);
-        GL11.glRotatef(180, 0, 0, 1);
-        GL11.glRotatef(180, 0, 1, 0);
+        if(ConfigClient.LegacyBarrel){
+            GL11.glTranslatef(0, 0.75f, 0);
+            GL11.glScalef(0.7f, 0.7f, 0.7f);
+            GL11.glRotatef(180, 0, 0, 1);
+            GL11.glRotatef(180, 0, 1, 0);
+
+            setWoodTexture(metadata);
+            GL11.glColor3f(1, 1, 1);
+            legacyModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+
+            Minecraft.getMinecraft().getTextureManager().bindTexture(legacy_texture);
+            legacyLid.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        }
+        else {
+            GL11.glTranslatef(0, 0.9f, 0);
+            GL11.glScalef(0.9f, 0.9f, 0.9f);
+            GL11.glRotatef(180, 0, 0, 1);
+            GL11.glRotatef(180, 0, 1, 0);
+
+            setWoodTexture(metadata);
+            GL11.glColor3f(1, 1, 1);
+            barrel.renderWall(0.0625F);
+            Minecraft.getMinecraft().getTextureManager().bindTexture(trimTexture);
+            barrel.renderTrim(0.0625F);
+            setLidTexture(metadata);
+            barrel.renderBase(0.0625F);
+        }
 
-        setWoodTexture(metadata);
-        GL11.glColor3f(1, 1, 1);
-        core.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
-        Minecraft.getMinecraft().getTextureManager().bindTexture(trimTexture);
-        trim.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
 		GL11.glPopMatrix();
 	}
 
-	@Override
+    public void setLidTexture(int meta){
+        TextureManager manager = Minecraft.getMinecraft().getTextureManager();
+        if(meta == 1)
+            manager.bindTexture(oak_lid);
+        else if(meta == 2)
+            manager.bindTexture(oak_lid);
+        else if(meta == 3)
+            manager.bindTexture(oak_lid);
+        else if(meta == 4)
+            manager.bindTexture(oak_lid);
+        else if(meta == 5)
+            manager.bindTexture(oak_lid);
+        else
+            manager.bindTexture(oak_lid);
+    }
+
+
+    @Override
 	public int getRenderId() {
 		return CustomItems.barrel.getRenderType();
 	}
diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java
index 9c451f0ca..a1b2328fd 100644
--- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java
+++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java
@@ -5,17 +5,33 @@ import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.IBlockAccess;
 import noppes.npcs.CustomItems;
 import noppes.npcs.blocks.BlockRotated;
 import noppes.npcs.blocks.tiles.TileColorable;
 import noppes.npcs.client.model.blocks.ModelCampfire;
+import noppes.npcs.client.model.blocks.campfire.ModelCampfireCoals;
+import noppes.npcs.client.model.blocks.campfire.ModelCampfireFlame;
+import noppes.npcs.client.model.blocks.campfire.ModelCampfireLog;
+import noppes.npcs.client.model.blocks.campfire.ModelCampfireStone;
+import noppes.npcs.config.ConfigClient;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-public class BlockCampfireRenderer extends BlockRendererInterface{
+public class BlockCampfireRenderer extends BlockRendererInterface {
+
+    // Legacy
+	private final ModelCampfire legacy_model = new ModelCampfire();
+
+    // Modern
+    private final ModelCampfireFlame flameModel = new ModelCampfireFlame();
+    private final ModelCampfireLog logsModel = new ModelCampfireLog();
+    private final ModelCampfireStone stonesModel = new ModelCampfireStone();
+    private final ModelCampfireCoals coalsModel = new ModelCampfireCoals();
+
+    protected static final ResourceLocation coalsTexture = new ResourceLocation("customnpcs","textures/models/CampfireCoals.png");
 
-	private final ModelCampfire model = new ModelCampfire();
-   
     public BlockCampfireRenderer(){
 		((BlockRotated)CustomItems.campfire).renderId = RenderingRegistry.getNextAvailableRenderId();
 		((BlockRotated)CustomItems.campfire_unlit).renderId = ((BlockRotated)CustomItems.campfire).renderId;
@@ -29,15 +45,35 @@ public class BlockCampfireRenderer extends BlockRendererInterface{
         GL11.glDisable(GL12.GL_RESCALE_NORMAL);
         GL11.glPushMatrix();
         GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.5f, (float)var6 + 0.5f);
-        //GL11.glScalef(0.95f, 0.95f, 0.95f);
+
         GL11.glRotatef(180, 0, 0, 1);
         GL11.glRotatef(45 * tile.rotation, 0, 1, 0);
         GL11.glColor3f(1, 1, 1);
-        
-        Minecraft.getMinecraft().getTextureManager().bindTexture(PlanksOak);
-    	model.renderLog(0.0625F);
-        Minecraft.getMinecraft().getTextureManager().bindTexture(Stone);
-    	model.renderRock(0.0625F);
+
+        if(ConfigClient.LegacyCampfire){
+            Minecraft.getMinecraft().getTextureManager().bindTexture(PlanksOak);
+            legacy_model.renderLog(0.0625F);
+            Minecraft.getMinecraft().getTextureManager().bindTexture(Stone);
+            legacy_model.renderRock(0.0625F);
+        }
+        else {
+            Block block = tile.getBlockType();
+
+            Minecraft.getMinecraft().getTextureManager().bindTexture(Logs);
+            logsModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            Minecraft.getMinecraft().getTextureManager().bindTexture(Cobble);
+            stonesModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            if(block == CustomItems.campfire){
+                GL11.glDisable(GL11.GL_LIGHTING);
+                GL11.glEnable(GL11.GL_ALPHA_TEST);
+                Minecraft.getMinecraft().getTextureManager().bindTexture(Flame);
+                flameModel.render(null, tile.getWorldObj().getWorldTime(), 0, 0, 0, 0.0F, 0.0625F);
+                GL11.glDisable(GL11.GL_ALPHA_TEST);
+                GL11.glEnable(GL11.GL_LIGHTING);
+            }
+            Minecraft.getMinecraft().getTextureManager().bindTexture(coalsTexture);
+            coalsModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        }
 
 		GL11.glPopMatrix();
 	}
@@ -51,10 +87,19 @@ public class BlockCampfireRenderer extends BlockRendererInterface{
         GL11.glRotatef(180, 0, 0, 1);
         GL11.glRotatef(180, 0, 1, 0);
         GL11.glColor3f(1, 1, 1);
-        Minecraft.getMinecraft().getTextureManager().bindTexture(PlanksOak);
-    	model.renderLog(0.0625F);
-        Minecraft.getMinecraft().getTextureManager().bindTexture(Stone);
-    	model.renderRock(0.0625F);
+
+        if(ConfigClient.LegacyCampfire){
+            Minecraft.getMinecraft().getTextureManager().bindTexture(PlanksOak);
+            legacy_model.renderLog(0.0625F);
+            Minecraft.getMinecraft().getTextureManager().bindTexture(Stone);
+            legacy_model.renderRock(0.0625F);
+        }
+        else {
+            Minecraft.getMinecraft().getTextureManager().bindTexture(Logs);
+            logsModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            Minecraft.getMinecraft().getTextureManager().bindTexture(Cobble);
+            stonesModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        }
 
 		GL11.glPopMatrix();
 	}
diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java
index 57c8c5f43..9ee1bf066 100644
--- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java
+++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java
@@ -12,15 +12,21 @@ import noppes.npcs.CustomItems;
 import noppes.npcs.blocks.BlockCarpentryBench;
 import noppes.npcs.client.model.blocks.ModelAnvil;
 import noppes.npcs.client.model.blocks.ModelCarpentryBench;
+import noppes.npcs.client.model.blocks.legacy.ModelLegacyCarpentryBench;
+import noppes.npcs.config.ConfigClient;
 import org.lwjgl.opengl.GL11;
 
 public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler{
 
-	private final ModelCarpentryBench model = new ModelCarpentryBench();
-	private final ModelAnvil anvil = new ModelAnvil();
-	private static final ResourceLocation anvilTexture = new ResourceLocation("customnpcs","textures/models/Steel.png");
-    private static final ResourceLocation carpentryBench = new ResourceLocation("customnpcs","textures/models/CarpentryBench.png");
+	private final ModelCarpentryBench modelCarpentryBench = new ModelCarpentryBench();
+    private static final ResourceLocation carpentryBenchTexture = new ResourceLocation("customnpcs","textures/models/CarpentryBench.png");
 
+	private final ModelAnvil anvil = new ModelAnvil();
+
+    private static final ResourceLocation anvilTexture = new ResourceLocation("customnpcs","textures/models/Steel.png");
+
+    private final ModelLegacyCarpentryBench legacyBench = new ModelLegacyCarpentryBench();
+    private static final ResourceLocation legacyCarpentryBench = new ResourceLocation("customnpcs","textures/models/legacy/bench.png");
 
     public BlockCarpentryBenchRenderer(){
 		((BlockCarpentryBench)CustomItems.carpentyBench).renderId = RenderingRegistry.getNextAvailableRenderId();
@@ -40,9 +46,17 @@ public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer imple
             this.bindTexture(anvilTexture);
         	anvil.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
         }
-        else{
-            this.bindTexture(carpentryBench);
-        	model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        else {
+
+            GL11.glEnable(GL11.GL_ALPHA_TEST);
+            if(ConfigClient.LegacyCarpentryBench){
+                this.bindTexture(legacyCarpentryBench);
+                legacyBench.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            } else {
+                this.bindTexture(carpentryBenchTexture);
+                modelCarpentryBench.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            }
+            GL11.glDisable(GL11.GL_ALPHA_TEST);
         }
 		GL11.glPopMatrix();
 	}
@@ -58,8 +72,13 @@ public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer imple
 
         GL11.glColor3f(1, 1, 1);
         if(metadata == 0){
-            this.bindTexture(carpentryBench);
-        	model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            if(ConfigClient.LegacyCarpentryBench){
+                this.bindTexture(legacyCarpentryBench);
+                legacyBench.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            } else {
+                this.bindTexture(carpentryBenchTexture);
+                modelCarpentryBench.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            }
         }
         else{
             this.bindTexture(anvilTexture);
@@ -73,7 +92,7 @@ public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer imple
 	@Override
 	public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z,
 			Block block, int modelId, RenderBlocks renderer) {
-		// TODO Auto-generated method stub
+
 		return false;
 	}
 
diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java
index 9557d2229..b394ba01b 100644
--- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java
+++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java
@@ -2,18 +2,34 @@ package noppes.npcs.client.renderer.blocks;
 
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 import noppes.npcs.CustomItems;
 import noppes.npcs.blocks.BlockChair;
 import noppes.npcs.blocks.tiles.TileColorable;
-import noppes.npcs.client.model.blocks.ModelChair;
+import noppes.npcs.client.model.blocks.chair.ModelChair;
+import noppes.npcs.client.model.blocks.chair.ModelChairSpoof;
+import noppes.npcs.client.model.blocks.legacy.ModelLegacyChair;
+import noppes.npcs.config.ConfigClient;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
 public class BlockChairRenderer extends BlockRendererInterface{
 
-	private final ModelChair model = new ModelChair();
+    private final ModelLegacyChair legacyModel = new ModelLegacyChair();
+
+    private final ModelChairSpoof chairSpoof = new ModelChairSpoof();
+    private final ModelChair chair = new ModelChair();
+
+    private static final ResourceLocation oak = new ResourceLocation("customnpcs","textures/models/chair/oak.png");
+    private static final ResourceLocation spruce = new ResourceLocation("customnpcs","textures/models/chair/spruce.png");
+    private static final ResourceLocation birch = new ResourceLocation("customnpcs","textures/models/chair/birch.png");
+    private static final ResourceLocation jungle = new ResourceLocation("customnpcs","textures/models/chair/jungle.png");
+    private static final ResourceLocation dark_oak = new ResourceLocation("customnpcs","textures/models/chair/dark_oak.png");
+    private static final ResourceLocation acacia = new ResourceLocation("customnpcs","textures/models/chair/acacia.png");
 
 	public BlockChairRenderer(){
 		((BlockChair)CustomItems.chair).renderId = RenderingRegistry.getNextAvailableRenderId();
@@ -25,14 +41,25 @@ public class BlockChairRenderer extends BlockRendererInterface{
 		TileColorable tile = (TileColorable) var1;
         GL11.glDisable(GL12.GL_RESCALE_NORMAL);
         GL11.glPushMatrix();
-        GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.68f, (float)var6 + 0.5f);
+        GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.65f, (float)var6 + 0.5f);
         GL11.glScalef(1.2f, 1.1f, 1.2f);
         GL11.glRotatef(180, 0, 0, 1);
         GL11.glRotatef(90 * tile.rotation, 0, 1, 0);
         GL11.glColor3f(1, 1, 1);
 
+        GL11.glEnable(GL11.GL_ALPHA_TEST);
         setWoodTexture(var1.getBlockMetadata());
-        model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        if(ConfigClient.LegacyChair)
+            legacyModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        else {
+            if(ConfigClient.WoodTextures)
+                chairSpoof.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            else {
+                setChairTexture(var1.getBlockMetadata());
+                chair.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            }
+        }
+        GL11.glDisable(GL11.GL_ALPHA_TEST);
 
 		GL11.glPopMatrix();
 	}
@@ -48,11 +75,34 @@ public class BlockChairRenderer extends BlockRendererInterface{
 
         setWoodTexture(metadata);
         GL11.glColor3f(1, 1, 1);
-        model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
-
+        if(ConfigClient.LegacyChair)
+            legacyModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        else {
+            if(ConfigClient.WoodTextures)
+                chairSpoof.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            else {
+                setChairTexture(metadata);
+                chair.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            }
+        }
 		GL11.glPopMatrix();
 	}
 
+    public void setChairTexture(int meta){
+        TextureManager manager = Minecraft.getMinecraft().getTextureManager();
+        if(meta == 1)
+            manager.bindTexture(spruce);
+        else if(meta == 2)
+            manager.bindTexture(birch);
+        else if(meta == 3)
+            manager.bindTexture(jungle);
+        else if(meta == 4)
+            manager.bindTexture(acacia);
+        else if(meta == 5)
+            manager.bindTexture(dark_oak);
+        else
+            manager.bindTexture(oak);
+    }
 
 
 	@Override
diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java
index f2cd94a0c..15974b322 100644
--- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java
+++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java
@@ -8,23 +8,20 @@ import net.minecraft.tileentity.TileEntity;
 import noppes.npcs.CustomItems;
 import noppes.npcs.blocks.BlockCouchWood;
 import noppes.npcs.blocks.tiles.TileCouchWood;
-import noppes.npcs.client.model.blocks.ModelCouchWoodLeft;
-import noppes.npcs.client.model.blocks.ModelCouchWoodMiddle;
-import noppes.npcs.client.model.blocks.ModelCouchWoodRight;
-import noppes.npcs.client.model.blocks.ModelCouchWoodSingle;
+import noppes.npcs.client.model.blocks.legacy.couch.ModelCouchWoodLeft;
+import noppes.npcs.client.model.blocks.legacy.couch.ModelCouchWoodMiddle;
+import noppes.npcs.client.model.blocks.legacy.couch.ModelCouchWoodRight;
+import noppes.npcs.client.model.blocks.legacy.couch.ModelCouchWoodSingle;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
 public class BlockCouchWoodRenderer extends BlockRendererInterface{
 
 	private final ModelBase model = new ModelCouchWoodMiddle();
-
 	private final ModelBase modelLeft = new ModelCouchWoodLeft();
-
 	private final ModelBase modelRight = new ModelCouchWoodRight();
-
 	private final ModelBase modelCorner = new ModelCouchWoodSingle();
-	
+
     public BlockCouchWoodRenderer(){
 		((BlockCouchWood)CustomItems.couchWood).renderId = RenderingRegistry.getNextAvailableRenderId();
 		RenderingRegistry.registerBlockHandler(this);
@@ -40,7 +37,7 @@ public class BlockCouchWoodRenderer extends BlockRendererInterface{
         GL11.glRotatef(180, 0, 0, 1);
         GL11.glRotatef(90 * tile.rotation, 0, 1, 0);
         GL11.glColor3f(1, 1, 1);
-        
+
         setWoodTexture(var1.getBlockMetadata());
         if(tile.hasLeft && tile.hasRight)
         	model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
@@ -66,7 +63,7 @@ public class BlockCouchWoodRenderer extends BlockRendererInterface{
         setWoodTexture(metadata);
         GL11.glColor3f(1, 1, 1);
         modelCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
-        
+
 		GL11.glPopMatrix();
 	}
 
diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java
index 6c75e9d38..bfe226f7d 100644
--- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java
+++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java
@@ -8,24 +8,32 @@ import net.minecraft.tileentity.TileEntity;
 import noppes.npcs.CustomItems;
 import noppes.npcs.blocks.BlockCouchWool;
 import noppes.npcs.blocks.tiles.TileCouchWool;
-import noppes.npcs.client.model.blocks.*;
+import noppes.npcs.client.model.blocks.couch.*;
+import noppes.npcs.client.model.blocks.legacy.couch.*;
+import noppes.npcs.config.ConfigClient;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
 public class BlockCouchWoolRenderer extends BlockRendererInterface{
 
-	private final ModelBase model = new ModelCouchMiddle();
-	private final ModelBase model2 = new ModelCouchMiddleWool();
+    private final ModelBase modelCouchLeft = new ModelCouchLeft();
+    private final ModelBase modelCouchRight = new ModelCouchRight();
+    private final ModelBase modelCouchCorner = new ModelCouchCorner();
+    private final ModelBase modelCouch = new ModelCouch();
+    private final ModelBase modelCouchSingle = new ModelCouchSingle();
 
-	private final ModelBase modelLeft = new ModelCouchLeft();
-	private final ModelBase modelLeft2 = new ModelCouchLeftWool();
+	private final ModelBase modelLegacyCouchMiddle = new ModelLegacyCouchMiddle();
+	private final ModelBase modelLegacyCouchMiddleWool = new ModelLegacyCouchMiddleWool();
 
-	private final ModelBase modelRight = new ModelCouchRight();
-	private final ModelBase modelRight2 = new ModelCouchRightWool();
+	private final ModelBase modelLegacyCouchLeft = new ModelLegacyCouchLeft();
+	private final ModelBase modelLegacyCouchLeftWool = new ModelLegacyCouchLeftWool();
+
+	private final ModelBase modelLegacyCouchRight = new ModelLegacyCouchRight();
+	private final ModelBase modelLegacyCouchRightWool = new ModelLegacyCouchRightWool();
+
+	private final ModelBase modelLegacyCouchCorner = new ModelLegacyCouchCorner();
+	private final ModelBase modelLegacyCouchCornerWool = new ModelLegacyCouchCornerWool();
 
-	private final ModelBase modelCorner = new ModelCouchCorner();
-	private final ModelBase modelCorner2 = new ModelCouchCornerWool();
-	
     public BlockCouchWoolRenderer(){
 		((BlockCouchWool)CustomItems.couchWool).renderId = RenderingRegistry.getNextAvailableRenderId();
 		RenderingRegistry.registerBlockHandler(this);
@@ -37,41 +45,59 @@ public class BlockCouchWoolRenderer extends BlockRendererInterface{
         GL11.glDisable(GL12.GL_RESCALE_NORMAL);
         GL11.glPushMatrix();
         GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.5f, (float)var6 + 0.5f);
-        //GL11.glScalef(0.95f, 0.95f, 0.95f);
+        //GL11.glS calef(0.95f, 0.95f, 0.95f);
         GL11.glRotatef(180, 0, 0, 1);
         GL11.glRotatef(90 * tile.rotation, 0, 1, 0);
         GL11.glColor3f(1, 1, 1);
-        
-        setWoodTexture(var1.getBlockMetadata());
-        if(tile.hasCornerLeft)
-        	modelCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
-        else if(tile.hasCornerRight){
-            GL11.glRotatef(90, 0, 1, 0);
-        	modelCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+
+        if(false){
+            setWoodTexture(var1.getBlockMetadata());
+            if(tile.hasCornerLeft)
+                modelLegacyCouchCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            else if(tile.hasCornerRight){
+                GL11.glRotatef(90, 0, 1, 0);
+                modelLegacyCouchCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            }
+            else if(tile.hasLeft && tile.hasRight)
+                modelLegacyCouchMiddle.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            else if(tile.hasLeft)
+                modelLegacyCouchLeft.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            else if(tile.hasRight)
+                modelLegacyCouchRight.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            else
+                modelLegacyCouchMiddle.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+
+            this.bindTexture(BlockTallLampRenderer.resourceTop);
+            float[] color = BlockBannerRenderer.colorTable[tile.color];
+            GL11.glColor3f(color[0], color[1], color[2]);
+
+            if(tile.hasCornerLeft || tile.hasCornerRight)
+                modelLegacyCouchCornerWool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            else if(tile.hasLeft && tile.hasRight)
+                modelLegacyCouchMiddleWool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            else if(tile.hasLeft)
+                modelLegacyCouchLeftWool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            else if(tile.hasRight)
+                modelLegacyCouchRightWool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            else
+                modelLegacyCouchMiddleWool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        } else {
+            setWoodTexture(var1.getBlockMetadata());
+            if(tile.hasCornerLeft)
+                modelCouchCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            else if(tile.hasCornerRight){
+                GL11.glRotatef(90, 0, 1, 0);
+                modelCouchCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            }
+            else if(tile.hasLeft && tile.hasRight)
+                modelCouch.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            else if(tile.hasLeft)
+                modelCouchLeft.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            else if(tile.hasRight)
+                modelCouchRight.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            else
+                modelCouchSingle.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
         }
-        else if(tile.hasLeft && tile.hasRight)
-        	model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
-        else if(tile.hasLeft)
-        	modelLeft.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
-        else if(tile.hasRight)
-        	modelRight.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
-        else
-        	model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
-
-        this.bindTexture(BlockTallLampRenderer.resourceTop);
-        float[] color = BlockBannerRenderer.colorTable[tile.color];
-        GL11.glColor3f(color[0], color[1], color[2]);
-
-        if(tile.hasCornerLeft || tile.hasCornerRight)
-        	modelCorner2.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
-        else if(tile.hasLeft && tile.hasRight)
-        	model2.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
-        else if(tile.hasLeft)
-        	modelLeft2.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
-        else if(tile.hasRight)
-        	modelRight2.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
-        else
-        	model2.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
 
 		GL11.glPopMatrix();
 	}
@@ -87,12 +113,12 @@ public class BlockCouchWoolRenderer extends BlockRendererInterface{
 
         setWoodTexture(metadata);
         GL11.glColor3f(1, 1, 1);
-        model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        modelLegacyCouchMiddle.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
 
         this.bindTexture(BlockTallLampRenderer.resourceTop);
         float[] color = BlockBannerRenderer.colorTable[15 - metadata];
         GL11.glColor3f(color[0], color[1], color[2]);
-        model2.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        modelLegacyCouchMiddleWool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
 		GL11.glPopMatrix();
 	}
 
diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java
index 9327b4627..97cc97b64 100644
--- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java
+++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java
@@ -24,16 +24,13 @@ public abstract class BlockRendererInterface extends TileEntitySpecialRenderer i
 	protected static final ResourceLocation PlanksAcacia = new ResourceLocation("customnpcs","textures/cache/planks_acacia.png");
 	protected static final ResourceLocation PlanksJungle = new ResourceLocation("customnpcs","textures/cache/planks_jungle.png");
 
-
-    protected static final ResourceLocation MCPlanksOak = new ResourceLocation("customnpcs","textures/cache/planks_oak.png");
-    protected static final ResourceLocation MCPlanksBigOak = new ResourceLocation("customnpcs","textures/cache/planks_big_oak.png");
-    protected static final ResourceLocation MCPlanksSpruce = new ResourceLocation("customnpcs","textures/cache/planks_spruce.png");
-    protected static final ResourceLocation MCPlanksBirch = new ResourceLocation("customnpcs","textures/cache/planks_birch.png");
-    protected static final ResourceLocation MCPlanksAcacia = new ResourceLocation("customnpcs","textures/cache/planks_acacia.png");
-    protected static final ResourceLocation MCPlanksJungle = new ResourceLocation("customnpcs","textures/cache/planks_jungle.png");
-
 	protected static final ResourceLocation Steel = new ResourceLocation("customnpcs","textures/models/Steel.png");
-	protected static final RenderItem renderer = new RenderItem();
+
+    protected static final ResourceLocation Logs = new ResourceLocation("textures/blocks/log_oak.png");
+    protected static final ResourceLocation Cobble = new ResourceLocation("textures/blocks/cobblestone.png");
+    protected static final ResourceLocation Flame = new ResourceLocation("customnpcs","textures/models/flame.png");
+
+    protected static final RenderItem renderer = new RenderItem();
 
     public static float colorTable[][] = {
         {
@@ -111,22 +108,6 @@ public abstract class BlockRendererInterface extends TileEntitySpecialRenderer i
         	manager.bindTexture(PlanksOak);
     }
 
-    public void setDefaultWoodTexture(int meta){
-        TextureManager manager = Minecraft.getMinecraft().getTextureManager();
-        if(meta == 1)
-            manager.bindTexture(PlanksSpruce);
-        else if(meta == 2)
-            manager.bindTexture(PlanksBirch);
-        else if(meta == 3)
-            manager.bindTexture(PlanksJungle);
-        else if(meta == 4)
-            manager.bindTexture(PlanksAcacia);
-        else if(meta == 5)
-            manager.bindTexture(PlanksBigOak);
-        else
-            manager.bindTexture(PlanksOak);
-    }
-
     public static void setMaterialTexture(int meta){
     	TextureManager manager = Minecraft.getMinecraft().getTextureManager();
         if(meta == 1)
diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java
index 42f72ad0a..3775a35d3 100644
--- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java
+++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java
@@ -2,19 +2,32 @@ package noppes.npcs.client.renderer.blocks;
 
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 import noppes.npcs.CustomItems;
 import noppes.npcs.blocks.BlockStool;
 import noppes.npcs.blocks.tiles.TileColorable;
 import noppes.npcs.client.model.blocks.ModelStool;
+import noppes.npcs.client.model.blocks.legacy.ModelLegacyStool;
+import noppes.npcs.config.ConfigClient;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
 public class BlockStoolRenderer extends BlockRendererInterface{
 
-	private final ModelStool model = new ModelStool();
-    
+	private final ModelLegacyStool legacyStool = new ModelLegacyStool();
+    private final ModelStool stool = new ModelStool();
+
+    private static final ResourceLocation oak = new ResourceLocation("customnpcs","textures/models/stool/oak.png");
+    private static final ResourceLocation spruce = new ResourceLocation("customnpcs","textures/models/stool/spruce.png");
+    private static final ResourceLocation birch = new ResourceLocation("customnpcs","textures/models/stool/birch.png");
+    private static final ResourceLocation jungle = new ResourceLocation("customnpcs","textures/models/stool/jungle.png");
+    private static final ResourceLocation dark_oak = new ResourceLocation("customnpcs","textures/models/stool/dark_oak.png");
+    private static final ResourceLocation acacia = new ResourceLocation("customnpcs","textures/models/stool/acacia.png");
+
 	public BlockStoolRenderer(){
 		((BlockStool)CustomItems.stool).renderId = RenderingRegistry.getNextAvailableRenderId();
 		RenderingRegistry.registerBlockHandler(this);
@@ -25,13 +38,27 @@ public class BlockStoolRenderer extends BlockRendererInterface{
 		TileColorable tile = (TileColorable) var1;
         GL11.glDisable(GL12.GL_RESCALE_NORMAL);
         GL11.glPushMatrix();
-        GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.68f, (float)var6 + 0.5f);
+        GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.65f, (float)var6 + 0.5f);
         GL11.glScalef(1.2f, 1.1f, 1.2f);
         GL11.glRotatef(180, 0, 0, 1);
         GL11.glColor3f(1, 1, 1);
-        setWoodTexture(var1.getBlockMetadata());
-        model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
 
+
+        GL11.glEnable(GL11.GL_ALPHA_TEST);
+        if(ConfigClient.LegacyStool){
+            setWoodTexture(var1.getBlockMetadata());
+            legacyStool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        }
+        else {
+            if(ConfigClient.WoodTextures) {
+                setWoodTexture(var1.getBlockMetadata());
+            }
+            else {
+                setStoolTexture(var1.getBlockMetadata());
+            }
+            stool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        }
+        GL11.glDisable(GL11.GL_ALPHA_TEST);
 		GL11.glPopMatrix();
 	}
 
@@ -44,13 +71,36 @@ public class BlockStoolRenderer extends BlockRendererInterface{
         GL11.glRotatef(180, 0, 0, 1);
         GL11.glRotatef(180, 0, 1, 0);
 
-        setWoodTexture(metadata);
-        GL11.glColor3f(1, 1, 1);
-        model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
-        
+        if(ConfigClient.LegacyStool){
+            setWoodTexture(metadata);
+            GL11.glColor3f(1, 1, 1);
+            legacyStool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        }
+        else {
+            setStoolTexture(metadata);
+            GL11.glColor3f(1, 1, 1);
+            stool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        }
+
 		GL11.glPopMatrix();
 	}
 
+    public void setStoolTexture(int meta){
+        TextureManager manager = Minecraft.getMinecraft().getTextureManager();
+        if(meta == 1)
+            manager.bindTexture(spruce);
+        else if(meta == 2)
+            manager.bindTexture(birch);
+        else if(meta == 3)
+            manager.bindTexture(jungle);
+        else if(meta == 4)
+            manager.bindTexture(acacia);
+        else if(meta == 5)
+            manager.bindTexture(dark_oak);
+        else
+            manager.bindTexture(oak);
+    }
+
 	@Override
 	public int getRenderId() {
 		return CustomItems.stool.getRenderType();
diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockTableRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockTableRenderer.java
index 9a492bf4c..9cc53b0da 100644
--- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockTableRenderer.java
+++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockTableRenderer.java
@@ -2,25 +2,31 @@ package noppes.npcs.client.renderer.blocks;
 
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import noppes.npcs.CustomItems;
 import noppes.npcs.blocks.BlockTable;
 import noppes.npcs.blocks.tiles.TileColorable;
 import noppes.npcs.client.model.blocks.ModelTable;
+import noppes.npcs.client.model.blocks.legacy.ModelLegacyTable;
+import noppes.npcs.config.ConfigClient;
 import org.lwjgl.opengl.GL11;
 
 public class BlockTableRenderer extends BlockRendererInterface{
 
-	private final ModelTable model = new ModelTable();
-	private static final ResourceLocation resource1 = new ResourceLocation("customnpcs","textures/cache/planks_oak.png");
-	private static final ResourceLocation resource2 = new ResourceLocation("customnpcs","textures/cache/planks_big_oak.png");
-	private static final ResourceLocation resource3 = new ResourceLocation("customnpcs","textures/cache/planks_spruce.png");
-	private static final ResourceLocation resource4 = new ResourceLocation("customnpcs","textures/cache/planks_birch.png");
-	private static final ResourceLocation resource5 = new ResourceLocation("customnpcs","textures/cache/planks_acacia.png");
-	private static final ResourceLocation resource6 = new ResourceLocation("customnpcs","textures/cache/planks_jungle.png");
-    
+	private final ModelLegacyTable legacyTable = new ModelLegacyTable();
+    private final ModelTable table = new ModelTable();
+
+    private static final ResourceLocation oak = new ResourceLocation("customnpcs","textures/models/table/oak.png");
+	private static final ResourceLocation spruce = new ResourceLocation("customnpcs","textures/models/table/spruce.png");
+	private static final ResourceLocation birch = new ResourceLocation("customnpcs","textures/models/table/birch.png");
+	private static final ResourceLocation jungle = new ResourceLocation("customnpcs","textures/models/table/jungle.png");
+	private static final ResourceLocation acacia = new ResourceLocation("customnpcs","textures/models/table/acacia.png");
+	private static final ResourceLocation dark_oak = new ResourceLocation("customnpcs","textures/models/table/dark_oak.png");
+
 	public BlockTableRenderer(){
 		((BlockTable)CustomItems.table).renderId = RenderingRegistry.getNextAvailableRenderId();
 		RenderingRegistry.registerBlockHandler(this);
@@ -39,15 +45,29 @@ public class BlockTableRenderer extends BlockRendererInterface{
         boolean east = var1.getWorldObj().getBlock(var1.xCoord, var1.yCoord, var1.zCoord + 1) == CustomItems.table;
         boolean west = var1.getWorldObj().getBlock(var1.xCoord, var1.yCoord, var1.zCoord - 1) == CustomItems.table;
 
-        model.Shape1.showModel = !south && !east;
-        model.Shape3.showModel = !north && !west;
-        model.Shape4.showModel = !north && !east;
-        model.Shape5.showModel = !south && !west;
-        
-        setWoodTexture(var1.getBlockMetadata());
-        model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
-        GL11.glRotatef(90 * tile.rotation, 0, 1, 0);
-        model.Table.render(0.0625f);
+        legacyTable.Shape1.showModel = !south && !east;
+        legacyTable.Shape3.showModel = !north && !west;
+        legacyTable.Shape4.showModel = !north && !east;
+        legacyTable.Shape5.showModel = !south && !west;
+
+        table.Shape1.showModel = !south && !east;
+        table.Shape2.showModel = !south && !west;
+        table.Shape3.showModel = !north && !west;
+        table.Shape4.showModel = !north && !east;
+
+        if(ConfigClient.LegacyTable){
+            setWoodTexture(var1.getBlockMetadata());
+            legacyTable.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            GL11.glRotatef(90 * tile.rotation, 0, 1, 0);
+            legacyTable.Table.render(0.0625f);
+        } else {
+            GL11.glEnable(GL11.GL_ALPHA_TEST);
+            setTableTexture(var1.getBlockMetadata());
+            table.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            GL11.glRotatef(90 * tile.rotation, 0, 1, 0);
+            table.Table.render(0.0625f);
+            GL11.glDisable(GL11.GL_ALPHA_TEST);
+        }
 
 		GL11.glPopMatrix();
 	}
@@ -60,18 +80,45 @@ public class BlockTableRenderer extends BlockRendererInterface{
         GL11.glRotatef(180, 0, 0, 1);
         GL11.glRotatef(180, 0, 1, 0);
 
-        setWoodTexture(metadata);
-        GL11.glColor3f(1, 1, 1);
-        model.Table.render(0.0625f);
-        model.Shape1.showModel = true;
-        model.Shape3.showModel = true;
-        model.Shape4.showModel = true;
-        model.Shape5.showModel = true;
-        model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
-        
+        if(ConfigClient.LegacyTable){
+            setWoodTexture(metadata);
+            GL11.glColor3f(1, 1, 1);
+            legacyTable.Table.render(0.0625f);
+            legacyTable.Shape1.showModel = true;
+            legacyTable.Shape3.showModel = true;
+            legacyTable.Shape4.showModel = true;
+            legacyTable.Shape5.showModel = true;
+            legacyTable.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        } else {
+            setTableTexture(metadata);
+            GL11.glColor3f(1, 1, 1);
+            table.Table.render(0.0625f);
+            table.Shape1.showModel = true;
+            table.Shape2.showModel = true;
+            table.Shape3.showModel = true;
+            table.Shape4.showModel = true;
+            table.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        }
+
 		GL11.glPopMatrix();
 	}
 
+    public void setTableTexture(int meta){
+        TextureManager manager = Minecraft.getMinecraft().getTextureManager();
+        if(meta == 1)
+            manager.bindTexture(spruce);
+        else if(meta == 2)
+            manager.bindTexture(birch);
+        else if(meta == 3)
+            manager.bindTexture(jungle);
+        else if(meta == 4)
+            manager.bindTexture(acacia);
+        else if(meta == 5)
+            manager.bindTexture(dark_oak);
+        else
+            manager.bindTexture(oak);
+    }
+
 	@Override
 	public int getRenderId() {
 		return CustomItems.table.getRenderType();
diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java
index d76e72669..8ccbe2f75 100644
--- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java
+++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java
@@ -2,8 +2,6 @@ package noppes.npcs.client.renderer.blocks;
 
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockColored;
-import net.minecraft.block.material.MapColor;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.RenderBlocks;
@@ -13,19 +11,26 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.*;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
 import noppes.npcs.CustomItems;
 import noppes.npcs.blocks.BlockWallBanner;
 import noppes.npcs.blocks.tiles.TileWallBanner;
-import noppes.npcs.client.model.blocks.ModelWallBanner;
-import noppes.npcs.client.model.blocks.ModelWallBannerFlag;
+import noppes.npcs.client.model.blocks.banner.ModelBannerWall;
+import noppes.npcs.client.model.blocks.banner.ModelBannerWallFlag;
+import noppes.npcs.client.model.blocks.legacy.ModelLegacyWallBanner;
+import noppes.npcs.client.model.blocks.legacy.ModelLegacyWallBannerFlag;
+import noppes.npcs.config.ConfigClient;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
 public class BlockWallBannerRenderer extends BlockRendererInterface{
 
-	private final ModelWallBanner model = new ModelWallBanner();
-	private final ModelWallBannerFlag flag = new ModelWallBannerFlag();
+	private final ModelLegacyWallBanner modelLegacyWallBanner = new ModelLegacyWallBanner();
+	private final ModelLegacyWallBannerFlag modelLegacyWallBannerFlag = new ModelLegacyWallBannerFlag();
+
+    private final ModelBannerWall model = new ModelBannerWall();
+    private final ModelBannerWallFlag flag = new ModelBannerWallFlag();
 
     public BlockWallBannerRenderer(){
 		((BlockWallBanner)CustomItems.wallBanner).renderId = RenderingRegistry.getNextAvailableRenderId();
@@ -44,29 +49,66 @@ public class BlockWallBannerRenderer extends BlockRendererInterface{
         GL11.glRotatef(180, 0, 0, 1);
         GL11.glRotatef(90 * tile.rotation, 0, 1, 0);
 
-        setMaterialTexture(var1.getBlockMetadata());
-        GL11.glColor3f(1, 1, 1);
-        model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        if(ConfigClient.LegacyBanner){
+            setMaterialTexture(var1.getBlockMetadata());
+            GL11.glColor3f(1, 1, 1);
+            modelLegacyWallBanner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
 
-        this.bindTexture(BlockBannerRenderer.resourceFlag);
-        float[] color = BlockBannerRenderer.colorTable[tile.color];
-        GL11.glColor3f(color[0], color[1], color[2]);
-        flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            this.bindTexture(BlockBannerRenderer.legacyFlagResource);
+            float[] color = BlockBannerRenderer.colorTable[tile.color];
+            GL11.glColor3f(color[0], color[1], color[2]);
+            modelLegacyWallBannerFlag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
 
-		GL11.glPopMatrix();
-        GL11.glColor3f(1, 1, 1);
-        if(tile.icon != null && !this.playerTooFar(tile)){
-        	doRender(var2, var4, var6, tile.rotation, tile.icon);
+            GL11.glPopMatrix();
+            GL11.glColor3f(1, 1, 1);
+            if(tile.icon != null && !this.playerTooFar(tile)){
+                doRender(var2, var4, var6, tile.rotation, tile.icon, 0);
+            }
+        }
+        else {
+            long worldTime = tile.getWorldObj() != null ? tile.getWorldObj().getTotalWorldTime() : 0;
+            // 100 is one full revolution, so we can just mod by 100 without affecting the result
+            int animationProgress100 = (((tile.xCoord % 100) * 7 + (tile.yCoord % 100) * 9 + (tile.zCoord % 100) * 13) + (int) (worldTime % 100)) % 100;
+            float f3 = (float) animationProgress100 + var8;
+            float angle_x = (-0.0125F + 0.01F * MathHelper.cos(f3 * 0.01F * 2F * (float) Math.PI)) * (float) Math.PI;
+            flag.BannerFlag.rotateAngleX = angle_x;
+
+            BlockBannerRenderer.setBannerMaterial(var1.getBlockMetadata());
+            model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+
+            BlockBannerRenderer.setFlagType(tile.variant);
+            float[] color = colorTable[tile.color];
+            GL11.glPushMatrix();
+            GL11.glColor3f(color[0], color[1], color[2]);
+            flag.render(null, 0, 0, 0, f3, 0.0F, 0.0625F);
+            GL11.glPopMatrix();
+
+            GL11.glPopMatrix();
+            GL11.glColor3f(1, 1, 1);
+            if(tile.icon != null && !this.playerTooFar(tile)){
+                doRender(var2, var4, var6, tile.rotation, tile.icon, angle_x);
+            }
         }
 	}
-    public void doRender(double par2, double par4, double par6, int meta, ItemStack iicon)
+    public void doRender(double par2, double par4, double par6, int meta, ItemStack iicon, float rotate)
     {
         GL11.glPushMatrix();
         bindTexture(TextureMap.locationItemsTexture);
-        GL11.glTranslatef((float)par2 + 0.5f, (float)par4 +0.2f, (float)par6 + 0.5f);
+        GL11.glTranslatef((float)par2 + 0.5f, (float)par4 + 0.2f, (float)par6 + 0.5f);
         GL11.glRotatef(180, 0, 0, 1);
         GL11.glRotatef(90 * meta, 0, 1, 0);
-        GL11.glTranslatef(0, 0, 0.26f);
+
+        if(ConfigClient.LegacyBanner){
+            GL11.glTranslatef(0, 0, 0.26f);
+        }
+        else {
+            GL11.glTranslatef(0, 0, 0.3f);
+
+            GL11.glTranslatef(0, -0.6f, 0); // Translate to pivot point
+            GL11.glRotatef((float) Math.toDegrees(rotate), 1, 0, 0); // Apply sway rotation
+            GL11.glTranslatef(0, 0.6f, 0); // Translate to pivot point
+        }
+
         GL11.glDepthMask(false);
         float f2 = 0.05f;
         Minecraft mc = Minecraft.getMinecraft();
@@ -150,14 +192,25 @@ public class BlockWallBannerRenderer extends BlockRendererInterface{
         GL11.glRotatef(180, 0, 0, 1);
         GL11.glRotatef(180, 0, 1, 0);
 
-        setMaterialTexture(metadata);
-        GL11.glColor3f(1, 1, 1);
-        model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        if(ConfigClient.LegacyBanner){
+            setMaterialTexture(metadata);
+            GL11.glColor3f(1, 1, 1);
+            modelLegacyWallBanner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
 
-        this.bindTexture(BlockBannerRenderer.resourceFlag);
-        float[] color = BlockBannerRenderer.colorTable[15 - metadata];
-        GL11.glColor3f(color[0], color[1], color[2]);
-        flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+            this.bindTexture(BlockBannerRenderer.legacyFlagResource);
+            float[] color = BlockBannerRenderer.colorTable[15 - metadata];
+            GL11.glColor3f(color[0], color[1], color[2]);
+            modelLegacyWallBannerFlag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        }
+        else {
+            BlockBannerRenderer.setBannerMaterial(metadata);
+            model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+
+            this.bindTexture(BlockBannerRenderer.normalFlag);
+            float[] color = colorTable[15 - metadata];
+            GL11.glColor3f(color[0], color[1], color[2]);
+            flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
+        }
 		GL11.glPopMatrix();
 	}
 
diff --git a/src/main/java/noppes/npcs/client/renderer/items/CustomItemRenderer.java b/src/main/java/noppes/npcs/client/renderer/items/CustomItemRenderer.java
index e672281f0..7b871267a 100644
--- a/src/main/java/noppes/npcs/client/renderer/items/CustomItemRenderer.java
+++ b/src/main/java/noppes/npcs/client/renderer/items/CustomItemRenderer.java
@@ -46,7 +46,7 @@ public class CustomItemRenderer implements IItemRenderer {
     public void renderItem(ItemRenderType type, ItemStack itemStack, Object... data) {
         ScriptCustomItem scriptCustomItem = ItemScripted.GetWrapper(itemStack);
 
-        ImageData imageData = ClientCacheHandler.getImageData(scriptCustomItem.texture);
+        ImageData imageData = ClientCacheHandler.getImageData(scriptCustomItem.itemDisplay.texture);
         if (!imageData.imageLoaded()) {
             return;
         }
@@ -64,34 +64,34 @@ public class CustomItemRenderer implements IItemRenderer {
             if (!entityItem.ignoreFrustumCheck) {
                 entityItem.ignoreFrustumCheck = true;
 
-                float entityXZSize = (float) Math.sqrt(Math.pow(scriptCustomItem.scaleX,2) + Math.pow(scriptCustomItem.scaleZ,2));
-                this.setEntitySize(entityItem, entityXZSize * 0.25F, scriptCustomItem.scaleY * 0.25F);
+                float entityXZSize = (float) Math.sqrt(Math.pow(scriptCustomItem.itemDisplay.scaleX,2) + Math.pow(scriptCustomItem.itemDisplay.scaleZ,2));
+                this.setEntitySize(entityItem, entityXZSize * 0.25F, scriptCustomItem.itemDisplay.scaleY * 0.25F);
 
                 double XSize = entityItem.boundingBox.maxX - entityItem.boundingBox.minX;
                 double YSize = entityItem.boundingBox.maxY - entityItem.boundingBox.minY;
                 double ZSize = entityItem.boundingBox.maxZ - entityItem.boundingBox.minZ;
-                entityItem.boundingBox.maxX = entityItem.boundingBox.minX + XSize * scriptCustomItem.scaleX;
-                entityItem.boundingBox.maxY = entityItem.boundingBox.minY + YSize * scriptCustomItem.scaleY;
-                entityItem.boundingBox.maxZ = entityItem.boundingBox.minZ + ZSize * scriptCustomItem.scaleZ;
+                entityItem.boundingBox.maxX = entityItem.boundingBox.minX + XSize * scriptCustomItem.itemDisplay.scaleX;
+                entityItem.boundingBox.maxY = entityItem.boundingBox.minY + YSize * scriptCustomItem.itemDisplay.scaleY;
+                entityItem.boundingBox.maxZ = entityItem.boundingBox.minZ + ZSize * scriptCustomItem.itemDisplay.scaleZ;
             }
 
             float entityRenderTicks = Minecraft.getMinecraft().timer.renderPartialTicks;
             float bobbing = MathHelper.sin(((float)entityItem.age + entityRenderTicks) / 10.0F + entityItem.hoverStart) * 0.1F + 0.1F;
 
             if(!scriptCustomItem.isNormalItem){
-                GL11.glRotatef(scriptCustomItem.rotationX, 1, 0, 0);
-                GL11.glRotatef(scriptCustomItem.rotationY, 0, 1, 0);
-                GL11.glRotatef(scriptCustomItem.rotationZ, 0, 0, 1);
+                GL11.glRotatef(scriptCustomItem.itemDisplay.rotationX, 1, 0, 0);
+                GL11.glRotatef(scriptCustomItem.itemDisplay.rotationY, 0, 1, 0);
+                GL11.glRotatef(scriptCustomItem.itemDisplay.rotationZ, 0, 0, 1);
             }
 
-            GL11.glRotatef(scriptCustomItem.rotationXRate * entityRenderTicks %360, 1, 0, 0);
-            GL11.glRotatef(scriptCustomItem.rotationYRate * entityRenderTicks %360, 0, 1, 0);
-            GL11.glRotatef(scriptCustomItem.rotationZRate * entityRenderTicks %360, 0, 0, 1);
+            GL11.glRotatef(scriptCustomItem.itemDisplay.rotationXRate * entityRenderTicks %360, 1, 0, 0);
+            GL11.glRotatef(scriptCustomItem.itemDisplay.rotationYRate * entityRenderTicks %360, 0, 1, 0);
+            GL11.glRotatef(scriptCustomItem.itemDisplay.rotationZRate * entityRenderTicks %360, 0, 0, 1);
 
             if (!renderInFrame) {
                 if(!scriptCustomItem.isNormalItem){
-                    GL11.glScalef(scriptCustomItem.scaleX, scriptCustomItem.scaleY, scriptCustomItem.scaleZ);
-                    GL11.glTranslatef(0.0F, (Math.max(scriptCustomItem.scaleY, 1) - 1) * (1.0F / 4), 0.0F);
+                    GL11.glScalef(scriptCustomItem.itemDisplay.scaleX, scriptCustomItem.itemDisplay.scaleY, scriptCustomItem.itemDisplay.scaleZ);
+                    GL11.glTranslatef(0.0F, (Math.max(scriptCustomItem.itemDisplay.scaleY, 1) - 1) * (1.0F / 4), 0.0F);
                 }
                 GL11.glTranslatef(0.0F, -bobbing, 0.0F);
             }
@@ -144,23 +144,23 @@ public class CustomItemRenderer implements IItemRenderer {
             GL11.glRotatef(-80, 0, 1, 0);
             GL11.glRotatef(80, 0, 0, 1);
 
-            GL11.glRotatef(scriptCustomItem.rotationXRate * item3dRenderTicks %360, 1, 0, 0);
-            GL11.glRotatef(scriptCustomItem.rotationYRate * item3dRenderTicks %360, 0, 1, 0);
-            GL11.glRotatef(scriptCustomItem.rotationZRate * item3dRenderTicks %360, 0, 0, 1);
+            GL11.glRotatef(scriptCustomItem.itemDisplay.rotationXRate * item3dRenderTicks %360, 1, 0, 0);
+            GL11.glRotatef(scriptCustomItem.itemDisplay.rotationYRate * item3dRenderTicks %360, 0, 1, 0);
+            GL11.glRotatef(scriptCustomItem.itemDisplay.rotationZRate * item3dRenderTicks %360, 0, 0, 1);
 
             GL11.glScalef(0.6F, 0.6F,0.6F);
         }
         else {
-            GL11.glTranslatef(scriptCustomItem.translateX, scriptCustomItem.translateY, scriptCustomItem.translateZ);
-            GL11.glRotatef(scriptCustomItem.rotationX, 1, 0, 0);
-            GL11.glRotatef(scriptCustomItem.rotationY, 0, 1, 0);
-            GL11.glRotatef(scriptCustomItem.rotationZ, 0, 0, 1);
+            GL11.glTranslatef(scriptCustomItem.itemDisplay.translateX, scriptCustomItem.itemDisplay.translateY, scriptCustomItem.itemDisplay.translateZ);
+            GL11.glRotatef(scriptCustomItem.itemDisplay.rotationX, 1, 0, 0);
+            GL11.glRotatef(scriptCustomItem.itemDisplay.rotationY, 0, 1, 0);
+            GL11.glRotatef(scriptCustomItem.itemDisplay.rotationZ, 0, 0, 1);
 
-            GL11.glRotatef(scriptCustomItem.rotationXRate * item3dRenderTicks %360, 1, 0, 0);
-            GL11.glRotatef(scriptCustomItem.rotationYRate * item3dRenderTicks %360, 0, 1, 0);
-            GL11.glRotatef(scriptCustomItem.rotationZRate * item3dRenderTicks %360, 0, 0, 1);
+            GL11.glRotatef(scriptCustomItem.itemDisplay.rotationXRate * item3dRenderTicks %360, 1, 0, 0);
+            GL11.glRotatef(scriptCustomItem.itemDisplay.rotationYRate * item3dRenderTicks %360, 0, 1, 0);
+            GL11.glRotatef(scriptCustomItem.itemDisplay.rotationZRate * item3dRenderTicks %360, 0, 0, 1);
 
-            GL11.glScalef(scriptCustomItem.scaleX, scriptCustomItem.scaleY, scriptCustomItem.scaleZ);
+            GL11.glScalef(scriptCustomItem.itemDisplay.scaleX, scriptCustomItem.itemDisplay.scaleY, scriptCustomItem.itemDisplay.scaleZ);
         }
 
         int color = scriptCustomItem.getColor();
@@ -230,7 +230,7 @@ public class CustomItemRenderer implements IItemRenderer {
         int pass = 0;
 
         GL11.glPushMatrix();
-            ClientCacheHandler.getImageData(scriptCustomItem.texture).bindTexture();
+            ClientCacheHandler.getImageData(scriptCustomItem.itemDisplay.texture).bindTexture();
 
             if (renderInFrame)
             {
@@ -277,7 +277,7 @@ public class CustomItemRenderer implements IItemRenderer {
                 }
 
                 if(!scriptCustomItem.isNormalItem)
-                    GL11.glScalef(scriptCustomItem.scaleX, scriptCustomItem.scaleY, scriptCustomItem.scaleZ);
+                    GL11.glScalef(scriptCustomItem.itemDisplay.scaleX, scriptCustomItem.itemDisplay.scaleY, scriptCustomItem.itemDisplay.scaleZ);
                 GL11.glTranslatef(-f7, -f8, -((f9 + f10) * (float)b0 / 2.0F));
 
                 for (int k = 0; k < b0; ++k)
@@ -289,7 +289,7 @@ public class CustomItemRenderer implements IItemRenderer {
                         GL11.glRotatef(-90.0F, 0.0F, 0.0F, 1.0F);
                     }*/
 
-                    ImageData imageData = ClientCacheHandler.getImageData(scriptCustomItem.texture);
+                    ImageData imageData = ClientCacheHandler.getImageData(scriptCustomItem.itemDisplay.texture);
                     ItemRenderer.renderItemIn2D(tessellator, f15, f4, f14, f5, imageData.getTotalWidth(), imageData.getTotalHeight(), f9);
 
                     if (itemStack.hasEffect(pass))
@@ -389,7 +389,7 @@ public class CustomItemRenderer implements IItemRenderer {
             GL11.glDisable(GL11.GL_LIGHTING); //Forge: Make sure that render states are reset, a renderEffect can derp them up.
             GL11.glEnable(GL11.GL_ALPHA_TEST);
 
-            ClientCacheHandler.getImageData(scriptCustomItem.texture).bindTexture();
+            ClientCacheHandler.getImageData(scriptCustomItem.itemDisplay.texture).bindTexture();
             renderCustomItemSlot(0,0,16,16, itemRed, itemGreen, itemBlue);
 
             GL11.glEnable(GL11.GL_LIGHTING);
@@ -464,7 +464,7 @@ public class CustomItemRenderer implements IItemRenderer {
         TextureManager texturemanager = mc.getTextureManager();
         int par3 = 0;
 
-        ClientCacheHandler.getImageData(scriptCustomItem.texture).bindTexture();
+        ClientCacheHandler.getImageData(scriptCustomItem.itemDisplay.texture).bindTexture();
 
         Tessellator tessellator = Tessellator.instance;
         IIcon icon = entityLivingBase.getItemIcon(itemStack, par3);
@@ -519,7 +519,7 @@ public class CustomItemRenderer implements IItemRenderer {
 
     public static void renderCustomItemIn2D(ItemStack itemStack, Tessellator p_78439_0_, float p_78439_1_, float p_78439_2_, float p_78439_3_, float p_78439_4_, float p_78439_7_)
     {
-        ImageData imageData = ClientCacheHandler.getImageData(ItemScripted.GetWrapper(itemStack).texture);
+        ImageData imageData = ClientCacheHandler.getImageData(ItemScripted.GetWrapper(itemStack).itemDisplay.texture);
         int width = imageData.getTotalWidth();
         int height = imageData.getTotalHeight();
 
diff --git a/src/main/java/noppes/npcs/config/ConfigClient.java b/src/main/java/noppes/npcs/config/ConfigClient.java
index 3b4b7d1b2..3916c0d19 100644
--- a/src/main/java/noppes/npcs/config/ConfigClient.java
+++ b/src/main/java/noppes/npcs/config/ConfigClient.java
@@ -16,6 +16,8 @@ public class ConfigClient
     public final static String GENERAL = "General";
     public final static String VISUAL = "Visual";
     public final static String QUESTING = "Questing";
+    public final static String MODEL = "Model";
+    public final static String TEXTURE = "Texture";
 
 
     /**
@@ -72,6 +74,23 @@ public class ConfigClient
     public static Property BannerAlertsProperty;
     public static boolean BannerAlerts = true;
 
+    /**
+     *  Texture Properties
+     **/
+    public static boolean WoodTextures = false;
+
+    /**
+     *  Model Properties
+     **/
+    public static boolean LegacyCampfire = false;
+    public static boolean LegacyBanner = false;
+    public static boolean LegacyChair = false;
+    public static boolean LegacyStool = false;
+    public static boolean LegacyCouch = false;
+    public static boolean LegacyTable = false;
+    public static boolean LegacyBarrel = false;
+    public static boolean LegacyCarpentryBench = false;
+
     public static void init(File configFile)
     {
         config = new Configuration(configFile);
@@ -128,6 +147,17 @@ public class ConfigClient
             BannerAlertsProperty = config.get(VISUAL, "All Banner Alerts", true, "Universal enable/disable for Banner Alerts");
             BannerAlerts = BannerAlertsProperty.getBoolean(true);
 
+            WoodTextures = config.get(TEXTURE, "Wood Textures", false, "Models like Chairs and Stools will use default MC Wood Textures").getBoolean(false);
+
+            LegacyCampfire = config.get(MODEL, "Legacy Campfire Model", false).getBoolean(false);
+            LegacyBanner = config.get(MODEL, "Legacy Banner Model", false).getBoolean(false);
+            LegacyBarrel = config.get(MODEL, "Legacy Barrel Model", false).getBoolean(false);
+            LegacyChair = config.get(MODEL, "Legacy Chair Model", false).getBoolean(false);
+            LegacyStool = config.get(MODEL, "Legacy Stool Model", false).getBoolean(false);
+            LegacyCouch = config.get(MODEL, "Legacy Couch Model", false).getBoolean(false);
+            LegacyTable = config.get(MODEL, "Legacy Table Model", false).getBoolean(false);
+            LegacyCarpentryBench = config.get(MODEL, "Legacy Carpentry Bench Model", false).getBoolean(false);
+
             // Convert to Legacy
             if(CustomNpcs.legacyExist){
                 EnableChatBubbles = LegacyConfig.EnableChatBubbles;
diff --git a/src/main/java/noppes/npcs/config/ConfigMain.java b/src/main/java/noppes/npcs/config/ConfigMain.java
index 046b77da0..e3437c610 100644
--- a/src/main/java/noppes/npcs/config/ConfigMain.java
+++ b/src/main/java/noppes/npcs/config/ConfigMain.java
@@ -17,6 +17,7 @@ public class ConfigMain
     public final static String NPC = "NPC";
     public final static String UPDATE = "Update";
     public final static String PARTY = "PARTY";
+    public final static String PROFILES = "Profile";
 
     /**
      *  General Main Properties
@@ -79,6 +80,8 @@ public class ConfigMain
     public static Property DefaultMaxPartySizeProperty;
     public static int DefaultMaxPartySize = 4;
 
+    public static boolean EnableProfiles = true;
+
     /**
      *  General NPC Properties
      **/
@@ -216,6 +219,9 @@ public class ConfigMain
             TrackedQuestUpdateFrequencyProperty = config.get(UPDATE, "Tracked Quest Update Frequency", 5, "How often in seconds to update a players tracked quest. [Only applies to Item Quest currently]");
             TrackedQuestUpdateFrequency = TrackedQuestUpdateFrequencyProperty.getInt(5);
 
+            // PROFILES
+            EnableProfiles = config.get(PROFILES, "Enable Profiles", true, "Allow the use of character Profiles").getBoolean(true);
+
             // Convert to Legacy
             if(CustomNpcs.legacyExist){
                 EnableUpdateChecker = LegacyConfig.EnableUpdateChecker;
diff --git a/src/main/java/noppes/npcs/config/ConfigScript.java b/src/main/java/noppes/npcs/config/ConfigScript.java
index 6e4c3dd72..57c6d434c 100644
--- a/src/main/java/noppes/npcs/config/ConfigScript.java
+++ b/src/main/java/noppes/npcs/config/ConfigScript.java
@@ -1,7 +1,7 @@
 package noppes.npcs.config;
 
 import cpw.mods.fml.common.FMLLog;
-import kamkeel.developer.Developer;
+import kamkeel.npcs.developer.Developer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.common.config.Configuration;
@@ -178,7 +178,7 @@ public class ConfigScript
         if(ScriptOpsOnly){
             return isOp || scriptDev;
         }
-        
+
         return scriptDev || CustomNpcsPermissions.hasPermission(player, perm);
     }
 }
diff --git a/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java b/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java
index 17e0e8c13..87469c391 100644
--- a/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java
+++ b/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java
@@ -13,7 +13,7 @@ public class LegacyLoader {
 	private String fileName;
 	private Class<?> configClass;
 	private LinkedList<Field> configFields;
-	
+
 	public LegacyLoader(Class<?> clss, File dir, String fileName){
 		if(!dir.exists())
 			dir.mkdir();
@@ -131,16 +131,16 @@ public class LegacyLoader {
 					out.write(name + "=" + field.get(null).toString() + System.getProperty( "line.separator" ));
 					out.write(System.getProperty( "line.separator" ));
 				} catch (IllegalArgumentException e) {
-					// TODO Auto-generated catch block
+
 					e.printStackTrace();
 				} catch (IllegalAccessException e) {
-					// TODO Auto-generated catch block
+
 					e.printStackTrace();
 				}
 			}
 			out.close();
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
+
 			e.printStackTrace();
 		}
 	}
diff --git a/src/main/java/noppes/npcs/constants/EnumBannerVariant.java b/src/main/java/noppes/npcs/constants/EnumBannerVariant.java
new file mode 100644
index 000000000..343d14c3f
--- /dev/null
+++ b/src/main/java/noppes/npcs/constants/EnumBannerVariant.java
@@ -0,0 +1,5 @@
+package noppes.npcs.constants;
+
+public enum EnumBannerVariant {
+	Normal, Curved, Pointy, Triangle, Torn
+}
diff --git a/src/main/java/noppes/npcs/constants/EnumGuiType.java b/src/main/java/noppes/npcs/constants/EnumGuiType.java
index 7d356220e..a55db8ac7 100644
--- a/src/main/java/noppes/npcs/constants/EnumGuiType.java
+++ b/src/main/java/noppes/npcs/constants/EnumGuiType.java
@@ -1,5 +1,11 @@
 package noppes.npcs.constants;
 
+import noppes.npcs.quests.QuestItem;
+import noppes.npcs.roles.companion.CompanionTrader;
+import noppes.npcs.scripted.ScriptBlock;
+
+import javax.swing.border.Border;
+
 public enum EnumGuiType {
 	MainMenuDisplay,
 	MainMenuInv,
@@ -23,13 +29,15 @@ public enum EnumGuiType {
 	SetupTransporter,
 	ManageTransport,
 	ManageBanks,
-	MobSpawner,
+    Cloner,
 	SetupBank,
 	ManageDialogs,
 	ManageQuests,
-	PlayerAnvil,
+    PlayerCarpentryBench,
+    PlayerAnvil,
 	QuestReward,
 	ManageRecipes,
+    ManageEffects,
 	QuestItem,
 	NpcRemote,
     GlobalRemote,
diff --git a/src/main/java/noppes/npcs/constants/EnumPacketClient.java b/src/main/java/noppes/npcs/constants/EnumPacketClient.java
deleted file mode 100644
index 85705569e..000000000
--- a/src/main/java/noppes/npcs/constants/EnumPacketClient.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package
-noppes.npcs.constants;
-
-public enum EnumPacketClient {
-	CHAT,
-	MESSAGE,
-	PARTY_MESSAGE,
-	SYNCRECIPES_ADD,
-	SYNCRECIPES_WORKBENCH,
-	DIALOG,
-	QUEST_COMPLETION,
-	EDIT_NPC,
-	PLAY_SOUND,
-	PLAY_MUSIC,
-	UPDATE_NPC,
-	ROLE,
-	GUI,
-	SCRIPTED_PARTICLE,
-	PARTICLE,
-	DELETE_NPC,
-	SCROLL_LIST,
-	SCROLL_DATA,
-	SCROLL_DATA_PART,
-	SCROLL_GROUP,
-	SCROLL_GROUP_PART,
-	SCROLL_SELECTED,
-	GUI_REDSTONE,
-	GUI_WAYPOINT,
-	GUI_DATA,
-	GUI_ERROR,
-	GUI_CLOSE,
-	VILLAGER_LIST,
-	CHATBUBBLE,
-	SYNCRECIPES_CARPENTRYBENCH,
-	CLONE,
-    CLONER,
-    TELEPORTER,
-	OPEN_BOOK,
-	DIALOG_DUMMY,
-	CONFIG,
-	ISGUIOPEN,
-    SCRIPT_OVERLAY_DATA,
-	SCRIPT_OVERLAY_CLOSE,
-	SWING_PLAYER_ARM,
-	UPDATE_ITEM,
-	PLAYER_UPDATE_SKIN_OVERLAYS,
-	UPDATE_ANIMATIONS,
-	OVERLAY_QUEST_TRACKING,
-	DISABLE_MOUSE_INPUT,
-	PLAY_SOUND_TO,
-	PLAY_SOUND_TO_NO_ID,
-	STOP_SOUND_FOR,
-	PAUSE_SOUNDS,
-	CONTINUE_SOUNDS,
-	STOP_SOUNDS,
-	SYNC_WEAPON,
-    MARK_DATA,
-    SYNC_ADD, SYNC_END, SYNC_UPDATE, SYNC_REMOVE, SYNC_PLAYER,
-    DBC_FORM,
-    LARGE_NBT_PART, LARGE_NBT_END,
-    PARTY_DATA
-}
diff --git a/src/main/java/noppes/npcs/constants/EnumPacketServer.java b/src/main/java/noppes/npcs/constants/EnumPacketServer.java
deleted file mode 100644
index 1b9136686..000000000
--- a/src/main/java/noppes/npcs/constants/EnumPacketServer.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package noppes.npcs.constants;
-
-import noppes.npcs.CustomNpcsPermissions;
-
-public enum EnumPacketServer {
-	Delete(CustomNpcsPermissions.NPC_DELETE, true),
-	RemoteMainMenu(CustomNpcsPermissions.NPC_GUI),
-    RemoteGlobalMenu(CustomNpcsPermissions.GLOBAL_REMOTE),
-	NpcMenuClose(CustomNpcsPermissions.NPC_GUI, true),
-	RemoteDelete(CustomNpcsPermissions.NPC_DELETE, true),
-	RemoteFreeze(CustomNpcsPermissions.NPC_FREEZE), RemoteFreezeGet,
-	RemoteReset(CustomNpcsPermissions.NPC_RESET),
-	SpawnMob(CustomNpcsPermissions.SPAWNER_MOB),
-	MobSpawner(CustomNpcsPermissions.SPAWNER_CREATE),
-
-    MainmenuAISave(CustomNpcsPermissions.NPC_AI,true), MainmenuAIGet(true),
-	MainmenuInvSave(CustomNpcsPermissions.NPC_INVENTORY, true), MainmenuInvGet(true),
-	MainmenuStatsSave(CustomNpcsPermissions.NPC_STATS, true), MainmenuStatsGet(true),
-
-	MainmenuDisplaySave(CustomNpcsPermissions.NPC_DISPLAY, true), MainmenuDisplayGet(true),
-	ModelDataSave(CustomNpcsPermissions.NPC_DISPLAY, true),
-
-	MainmenuAdvancedSave(CustomNpcsPermissions.NPC_ADVANCED,true), MainmenuAdvancedGet(true), MainmenuAdvancedMarkData(CustomNpcsPermissions.NPC_ADVANCED,true),
-	DialogNpcSet(CustomNpcsPermissions.NPC_ADVANCED),
-	DialogNpcRemove(CustomNpcsPermissions.NPC_ADVANCED, true),
-	FactionSet(CustomNpcsPermissions.NPC_ADVANCED, true),
-	TagSet(CustomNpcsPermissions.NPC_ADVANCED, true),
-	TransportSave(CustomNpcsPermissions.NPC_ADVANCED, true),
-	TransformSave(CustomNpcsPermissions.NPC_ADVANCED, true), TransformGet(true),
-	TransformLoad(CustomNpcsPermissions.NPC_ADVANCED, true),
-	TraderMarketSave(CustomNpcsPermissions.NPC_ADVANCED, true),
-	JobSave(CustomNpcsPermissions.NPC_ADVANCED, true), JobGet(true),
-	RoleSave(CustomNpcsPermissions.NPC_ADVANCED, true), RoleGet(true),
-	JobSpawnerAdd(CustomNpcsPermissions.NPC_ADVANCED, true), JobSpawnerRemove(CustomNpcsPermissions.NPC_ADVANCED, true),
-	RoleCompanionUpdate(CustomNpcsPermissions.NPC_ADVANCED, true),
-	LinkedSet(CustomNpcsPermissions.NPC_ADVANCED, true),
-
-	ClonePreSave(CustomNpcsPermissions.NPC_CLONE), CloneSave(CustomNpcsPermissions.NPC_CLONE), CloneRemove(CustomNpcsPermissions.NPC_CLONE), CloneList, CloneTagList, CloneAllTags, CloneAllTagsShort,
-
-	ScriptGlobalGuiDataSave(CustomNpcsPermissions.SCRIPT_GLOBAL, false),
-	ScriptGlobalGuiDataGet(false),
-
-	ScriptPlayerSave(CustomNpcsPermissions.SCRIPT_PLAYER, false),
-	ScriptPlayerGet(false),
-
-	ScriptForgeSave(CustomNpcsPermissions.SCRIPT_FORGE, false),
-	ScriptForgeGet(false),
-
-	ScriptGlobalNPCSave(CustomNpcsPermissions.SCRIPT_GLOBAL, false),
-	ScriptGlobalNPCGet(false),
-
-	ScriptItemDataSave(CustomNpcsPermissions.SCRIPT_ITEM, false),
-	ScriptItemDataGet(false),
-
-    ScriptBlockDataSave(CustomNpcsPermissions.SCRIPT_BLOCK, false),
-	ScriptBlockDataGet(false),
-
-	LinkedGetAll,
-    LinkedRemove(CustomNpcsPermissions.GLOBAL_LINKED), LinkedAdd(CustomNpcsPermissions.GLOBAL_LINKED),
-
-    ScriptDataSave(CustomNpcsPermissions.SCRIPT_NPC, true), ScriptDataGet(true),
-	EventScriptDataSave(CustomNpcsPermissions.SCRIPT_NPC, true), EventScriptDataGet(true),
-
-    PlayerDataRemove(CustomNpcsPermissions.GLOBAL_PLAYERDATA),
-    PlayerDataMapRegen(CustomNpcsPermissions.GLOBAL_PLAYERDATA),
-
-    BankSave(CustomNpcsPermissions.GLOBAL_BANK), BanksGet, BankGet,
-    BankRemove(CustomNpcsPermissions.GLOBAL_BANK),
-
-    DialogCategorySave(CustomNpcsPermissions.GLOBAL_DIALOG), DialogCategoriesGet, DialogsGetFromDialog,
-	DialogCategoryRemove(CustomNpcsPermissions.GLOBAL_DIALOG),  DialogCategoryGet,
-	DialogSave(CustomNpcsPermissions.GLOBAL_DIALOG),  DialogsGet, DialogGet,
-	DialogRemove(CustomNpcsPermissions.GLOBAL_DIALOG),
-
-    TransportCategoryRemove(CustomNpcsPermissions.GLOBAL_TRANSPORT), TransportGetLocation(true),
-	TransportRemove(CustomNpcsPermissions.GLOBAL_TRANSPORT), TransportsGet,
-	TransportCategorySave(CustomNpcsPermissions.GLOBAL_TRANSPORT), TransportCategoriesGet,
-	FactionRemove(CustomNpcsPermissions.GLOBAL_FACTION),
-	FactionSave(CustomNpcsPermissions.GLOBAL_FACTION), FactionsGet, FactionGet,
-	TagRemove(CustomNpcsPermissions.GLOBAL_TAG),
-	TagSave(CustomNpcsPermissions.GLOBAL_TAG), TagsGet, TagGet, NpcTagsGet,
-	QuestCategorySave(CustomNpcsPermissions.GLOBAL_QUEST), QuestCategoriesGet,
-	QuestRemove(CustomNpcsPermissions.GLOBAL_QUEST),
-	QuestCategoryRemove(CustomNpcsPermissions.GLOBAL_QUEST),
-	QuestRewardSave(CustomNpcsPermissions.GLOBAL_QUEST),
-	QuestSave(CustomNpcsPermissions.GLOBAL_QUEST), QuestsGetFromQuest, QuestsGet,
-	QuestDialogGetTitle(CustomNpcsPermissions.GLOBAL_QUEST),
-	RecipeSave(CustomNpcsPermissions.GLOBAL_RECIPE),
-	RecipeRemove(CustomNpcsPermissions.GLOBAL_RECIPE),
-	NaturalSpawnSave(CustomNpcsPermissions.GLOBAL_NATURALSPAWN), NaturalSpawnGet,
-	NaturalSpawnRemove(CustomNpcsPermissions.GLOBAL_NATURALSPAWN),
-	MerchantUpdate(CustomNpcsPermissions.EDIT_VILLAGER),
-	PlayerRider(CustomNpcsPermissions.TOOL_MOUNTER),
-	SpawnRider(CustomNpcsPermissions.TOOL_MOUNTER),
-	MovingPathSave(CustomNpcsPermissions.TOOL_PATHER,true), MovingPathGet(true),
-	DialogNpcGet,
-
-	AnimationsGet, AnimationGet,
-    AnimationRemove(CustomNpcsPermissions.GLOBAL_ANIMATION), AnimationSave(CustomNpcsPermissions.GLOBAL_ANIMATION),
-
-    RecipesGet, RecipeGet, QuestOpenGui, PlayerDataGet, QuestLogToServer, PartyLogToServer, UntrackQuest,
-
-	RemoteNpcsGet(CustomNpcsPermissions.NPC_GUI),
-	RemoteTpToNpc(CustomNpcsPermissions.NPC_TELEPORT),
-    QuestGet, QuestCategoryGet,
-	SaveTileEntity,
-	NaturalSpawnGetAll, MailOpenSetup,
-	DimensionsGet, DimensionTeleport, GetTileEntity, Gui, IsGuiOpen, CacheAnimation,
-
-	CustomGuiButton,CustomGuiScrollClick,CustomGuiClose,CustomGuiUnfocused,
-
-	SavePartyData, CreateParty, GetPartyData, DisbandParty, KickPlayer, LeavePlayer, PartyInvite, GetPartyInviteList, AcceptInvite,
-	IgnoreInvite, SetPartyLeader, SetPartyQuest,
-
-    ServerUpdateSkinOverlays;
-
-	public CustomNpcsPermissions.Permission permission = null;
-	public boolean needsNpc = false;
-
-	EnumPacketServer() {}
-
-	EnumPacketServer(CustomNpcsPermissions.Permission permission, boolean npc) {
-		this(permission);
-	}
-	EnumPacketServer(boolean npc) {
-		needsNpc = npc;
-	}
-	EnumPacketServer(CustomNpcsPermissions.Permission permission) {
-		this.permission = permission;
-	}
-	public boolean hasPermission() {
-		return permission != null;
-	}
-}
diff --git a/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java b/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java
index 4834c9d25..aeaab47a0 100644
--- a/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java
+++ b/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java
@@ -1,9 +1,29 @@
 package noppes.npcs.constants;
 
 public enum EnumPlayerPacket {
-	FollowerHire,FollowerExtend,Trader, FollowerState, Transport, BankUnlock, BankUpgrade,
-    Dialog, QuestLog, TrackedQuest, CheckQuestCompletion, BankSlotOpen, FactionsGet,
-    MailGet, MailDelete, MailSend, MailRead, MailboxOpenMail,
-    SignSave, SaveBook, CompanionOpenInv, RoleGet, KeyPressed,
-    MouseClicked, CompanionTalentExp, ScreenSize, MarkData
+//	FollowerHire, // Finished
+//    FollowerExtend,
+//    FollowerState,
+//    Transport,
+//    BankUnlock,
+//    BankUpgrade,
+//    Dialog,
+//    QuestLog,
+//    TrackedQuest,
+//    CheckQuestCompletion,
+//    BankSlotOpen,
+//    FactionsGet,
+//    MailGet,
+//    MailDelete,
+//    MailSend,
+//    MailRead,
+//    MailboxOpenMail,
+//    SignSave,
+//    SaveBook,
+//    CompanionOpenInv,
+//    RoleGet,
+//    KeyPressed,
+//    MouseClicked,
+//    CompanionTalentExp,
+//    ScreenSize
 }
diff --git a/src/main/java/noppes/npcs/constants/SyncType.java b/src/main/java/noppes/npcs/constants/SyncType.java
deleted file mode 100644
index d3e76ae93..000000000
--- a/src/main/java/noppes/npcs/constants/SyncType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package noppes.npcs.constants;
-
-public class SyncType {
-	public static final int FACTION = 1;
-	public static final int QUEST = 2;
-	public static final int QUEST_CATEGORY = 3;
-	public static final int DIALOG = 4;
-	public static final int DIALOG_CATEGORY = 5;
-	public static final int PLAYER_DATA = 6;
-    public static final int MAGIC = 7;
-}
diff --git a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java
new file mode 100644
index 000000000..9230ed884
--- /dev/null
+++ b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java
@@ -0,0 +1,312 @@
+package noppes.npcs.containers;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.inventory.InventoryCraftResult;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import noppes.npcs.api.handler.data.IAnvilRecipe;
+import noppes.npcs.controllers.RecipeController;
+import noppes.npcs.controllers.data.RecipeAnvil;
+
+public class ContainerAnvilRepair extends Container {
+    // A 2-slot crafting matrix: slot 0 = damaged item, slot 1 = repair material.
+    public InventoryCrafting anvilMatrix = new InventoryCrafting(this, 2, 1);
+    // Single-slot output inventory.
+    public InventoryCraftResult anvilResult = new InventoryCraftResult();
+
+    private EntityPlayer player;
+    private World worldObj;
+    private int posX, posY, posZ;
+
+    public int repairCost = 0;
+    public int repairMaterialConsumed = 0;
+
+    public ContainerAnvilRepair(InventoryPlayer playerInv, World world, int x, int y, int z) {
+        this.worldObj = world;
+        this.posX = x;
+        this.posY = y;
+        this.posZ = z;
+        this.player = playerInv.player;
+
+        // Output slot (index 0) using our custom SlotAnvilOutput.
+        this.addSlotToContainer(new SlotAnvilOutput(this, anvilResult, 0, 133, 47));
+
+        // Input slot 0: damaged item. We restrict its stack size to 1.
+        this.addSlotToContainer(new Slot(anvilMatrix, 0, 26, 47) {
+            @Override
+            public int getSlotStackLimit() {
+                return 1;
+            }
+        });
+        // Input slot 1: repair material. Override onSlotChanged so that changes to the stack size trigger an update.
+        this.addSlotToContainer(new Slot(anvilMatrix, 1, 75, 47) {
+            @Override
+            public void onSlotChanged() {
+                super.onSlotChanged();
+                ContainerAnvilRepair.this.onCraftMatrixChanged(anvilMatrix);
+            }
+        });
+
+        // Add player inventory slots.
+        for (int row = 0; row < 3; ++row) {
+            for (int col = 0; col < 9; ++col) {
+                this.addSlotToContainer(new Slot(playerInv, col + row * 9 + 9, 8 + col * 18, 98 + row * 18));
+            }
+        }
+        for (int col = 0; col < 9; ++col) {
+            this.addSlotToContainer(new Slot(playerInv, col, 8 + col * 18, 156));
+        }
+
+        updateRepairResult();
+    }
+
+    @Override
+    public void onCraftMatrixChanged(IInventory inventory) {
+        updateRepairResult();
+        detectAndSendChanges();
+    }
+
+    /**
+     * Updates the output slot (and repair cost fields) based on the two input slots.
+     * Instead of forcing the damaged item’s stack to 1 (which deletes extra items),
+     * we create a copy with stackSize 1 for calculations. Then, when the repair is picked up,
+     * we subtract one from the original stack.
+     */
+    public void updateRepairResult() {
+        if (!this.worldObj.isRemote) {
+            repairMaterialConsumed = 0;
+            ItemStack input0 = anvilMatrix.getStackInRowAndColumn(0, 0);
+            ItemStack input1 = anvilMatrix.getStackInRowAndColumn(1, 0);
+
+            // If either input is missing, clear output.
+            if (input0 == null || input1 == null) {
+                repairCost = 0;
+                anvilResult.setInventorySlotContents(0, null);
+                return;
+            }
+
+            // Create a copy of the damaged item for calculation (stack size 1)
+            ItemStack calcItem = input0.copy();
+            calcItem.stackSize = 1;
+
+            // If the item is damageable and already fully repaired, show a message.
+            if (calcItem.isItemStackDamageable() && calcItem.getItemDamage() <= 0) {
+                repairCost = 0;
+                anvilResult.setInventorySlotContents(0, null);
+                return;
+            }
+
+            // Look for a matching recipe.
+            RecipeAnvil matchingRecipe = null;
+            for (IAnvilRecipe recipe : RecipeController.Instance.getAnvilList()) {
+                if (recipe.matches(input0, input1)) {
+                    matchingRecipe = (RecipeAnvil) recipe;
+                    break;
+                }
+            }
+
+            ItemStack output = null;
+            if (matchingRecipe != null) {
+                if(!matchingRecipe.availability.isAvailable(player)){
+                    return;
+                }
+
+                int baseXpCost = matchingRecipe.getXpCost();
+                // Assume repairPercentage is given as a percent (e.g. 20 for 20% per material)
+                float repairPercentage = matchingRecipe.getRepairPercentage() / 100.0f;
+
+                int maxDamage = calcItem.getMaxDamage();
+                int currentDamage = calcItem.getItemDamage();
+
+                // Fixed repair amount per material (at least 1 point)
+                int repairPerMaterial = (int) Math.floor(maxDamage * repairPercentage);
+                if (repairPerMaterial < 1) {
+                    repairPerMaterial = 1;
+                }
+
+                int availableMaterials = input1.stackSize;
+                int materialsUsed = 0;
+
+                while (currentDamage > 0 && materialsUsed < availableMaterials) {
+                    int repairThisIteration = repairPerMaterial;
+                    if (repairThisIteration > currentDamage) {
+                        repairThisIteration = currentDamage;
+                    }
+                    currentDamage -= repairThisIteration;
+                    materialsUsed++;
+
+                    // Stop if item is fully repaired.
+                    if (currentDamage <= 0) {
+                        break;
+                    }
+                }
+                int xpCost = baseXpCost * materialsUsed;
+
+                calcItem.setItemDamage(currentDamage);
+                if (player.experienceTotal >= xpCost) {
+                    output = calcItem;
+                }
+                repairMaterialConsumed = materialsUsed;
+                repairCost = xpCost;
+            } else {
+                repairCost = 0;
+            }
+
+            anvilResult.setInventorySlotContents(0, output);
+        }
+    }
+
+
+
+
+    // --- Sync Methods ---
+    @Override
+    public void addCraftingToCrafters(ICrafting listener) {
+        super.addCraftingToCrafters(listener);
+        listener.sendProgressBarUpdate(this, 0, this.repairCost);
+    }
+
+    @Override
+    public void detectAndSendChanges() {
+        super.detectAndSendChanges();
+        for (Object crafterObj : this.crafters) {
+            ((ICrafting) crafterObj).sendProgressBarUpdate(this, 0, this.repairCost);
+        }
+    }
+
+    @Override
+    public void updateProgressBar(int id, int data) {
+        if (id == 0) {
+            this.repairCost = data;
+        }
+    }
+    // --- End Sync Methods ---
+
+    @Override
+    public void onContainerClosed(EntityPlayer player) {
+        super.onContainerClosed(player);
+        if (!this.worldObj.isRemote) {
+            for (int i = 0; i < this.anvilMatrix.getSizeInventory(); i++) {
+                ItemStack stack = this.anvilMatrix.getStackInSlotOnClosing(i);
+                if (stack != null) {
+                    player.dropPlayerItemWithRandomChoice(stack, false);
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean canInteractWith(EntityPlayer player) {
+        return player.getDistanceSq((double)this.posX + 0.5D,
+            (double)this.posY + 0.5D,
+            (double)this.posZ + 0.5D) <= 64.0D;
+    }
+
+    @Override
+    public ItemStack transferStackInSlot(EntityPlayer player, int index) {
+        ItemStack copy = null;
+        Slot slot = (Slot)this.inventorySlots.get(index);
+        if (slot != null && slot.getHasStack()) {
+            ItemStack stack = slot.getStack();
+            copy = stack.copy();
+            if (index == 0) { // output slot
+                if (player.experienceTotal < this.repairCost) {
+                    return null;
+                }
+                if (!this.mergeItemStack(stack, 3, this.inventorySlots.size(), true)) {
+                    return null;
+                }
+                slot.onSlotChange(stack, copy);
+            } else if (index >= 1 && index <= 2) { // input slots
+                if (!this.mergeItemStack(stack, 3, this.inventorySlots.size(), false)) {
+                    return null;
+                }
+            } else { // player inventory
+                if (!this.mergeItemStack(stack, 1, 3, false)) {
+                    return null;
+                }
+            }
+            if (stack.stackSize == 0) {
+                slot.putStack(null);
+            } else {
+                slot.onSlotChanged();
+            }
+            if (stack.stackSize == copy.stackSize) {
+                return null;
+            }
+            slot.onPickupFromSlot(player, stack);
+        }
+        if (!this.worldObj.isRemote && player instanceof EntityPlayerMP) {
+            ((EntityPlayerMP) player).sendContainerToPlayer(this);
+        }
+        return copy;
+    }
+
+    @Override
+    public boolean func_94530_a(ItemStack stack, Slot slotIn) {
+        return slotIn.inventory != this.anvilResult && super.func_94530_a(stack, slotIn);
+    }
+
+    // Custom output slot: only allows pickup if the player has enough XP and,
+    // when picked up, consumes the required number of repair material items and
+    // subtracts one from the damaged item stack.
+    public class SlotAnvilOutput extends Slot {
+        private ContainerAnvilRepair container;
+
+        public SlotAnvilOutput(ContainerAnvilRepair container, IInventory inventory, int index, int x, int y) {
+            super(inventory, index, x, y);
+            this.container = container;
+        }
+
+        @Override
+        public boolean isItemValid(ItemStack stack) {
+            return false;
+        }
+
+        @Override
+        public boolean canTakeStack(EntityPlayer player) {
+            return player.experienceTotal >= container.repairCost;
+        }
+
+        @Override
+        public void onPickupFromSlot(EntityPlayer player, ItemStack stack) {
+            if (player.experienceTotal < container.repairCost) {
+                container.updateRepairResult();
+                return;
+            }
+            if (!player.capabilities.isCreativeMode) {
+                player.addExperience(-container.repairCost);
+            }
+
+            ItemStack repairMat = container.anvilMatrix.getStackInRowAndColumn(1, 0);
+            if (repairMat != null) {
+                if (repairMat.stackSize > container.repairMaterialConsumed) {
+                    repairMat.stackSize -= container.repairMaterialConsumed;
+                } else {
+                    repairMat = null;
+                }
+                container.anvilMatrix.setInventorySlotContents(1, repairMat);
+            }
+
+            ItemStack input0 = container.anvilMatrix.getStackInRowAndColumn(0, 0);
+            if (input0 != null) {
+                if (input0.stackSize > 1) {
+                    input0.stackSize -= 1;
+                } else {
+                    input0 = null;
+                }
+                container.anvilMatrix.setInventorySlotContents(0, input0);
+            }
+            container.repairCost = 0;
+            container.updateRepairResult();
+            super.onPickupFromSlot(player, stack);
+        }
+    }
+}
diff --git a/src/main/java/noppes/npcs/containers/ContainerManageRecipes.java b/src/main/java/noppes/npcs/containers/ContainerManageRecipes.java
index a881df2ce..88a3c7851 100644
--- a/src/main/java/noppes/npcs/containers/ContainerManageRecipes.java
+++ b/src/main/java/noppes/npcs/containers/ContainerManageRecipes.java
@@ -6,6 +6,7 @@ import net.minecraft.inventory.InventoryBasic;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import noppes.npcs.NoppesUtilPlayer;
+import noppes.npcs.controllers.data.RecipeAnvil;
 import noppes.npcs.controllers.data.RecipeCarpentry;
 
 import java.util.ArrayList;
@@ -16,6 +17,7 @@ public class ContainerManageRecipes extends Container
 {
     private InventoryBasic craftingMatrix;
     public RecipeCarpentry recipe;
+    public RecipeAnvil recipeAnvil;
     public int size;
     public int width;
     private boolean init = false;
@@ -25,14 +27,21 @@ public class ContainerManageRecipes extends Container
     	this.width = size;
     	craftingMatrix = new InventoryBasic("crafting", false, this.size + 1);
     	recipe = new RecipeCarpentry("");
-    	addSlotToContainer(new Slot(craftingMatrix,0,87,61));
+        recipeAnvil = new RecipeAnvil();
+
+        if(width == 1){
+            addSlotToContainer(new Slot(craftingMatrix,0,102,35));
+        }
+        else {
+            addSlotToContainer(new Slot(craftingMatrix,0,87,61));
+        }
 
     	for(int i = 0; i < size;i++){
         	for(int j = 0; j < size;j++){
             	addSlotToContainer(new Slot(craftingMatrix, i * width + j + 1,j*18 + 8, i*18 + 35));
         	}
     	}
-        
+
         for(int i1 = 0; i1 < 3; i1++)
         {
             for(int l1 = 0; l1 < 9; l1++)
@@ -57,7 +66,7 @@ public class ContainerManageRecipes extends Container
 	public boolean canInteractWith(EntityPlayer entityplayer) {
 		return true;
 	}
-	
+
 	public void setRecipe(RecipeCarpentry recipe) {
     	craftingMatrix.setInventorySlotContents(0,recipe.getRecipeOutput());
     	for(int i = 0; i < width;i++){
@@ -70,85 +79,116 @@ public class ContainerManageRecipes extends Container
     	}
     	this.recipe = recipe;
 	}
-	public void saveRecipe(){
-		int nextChar = 0;
-		char[] chars = {'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P'};
-		Map<ItemStack,Character> nameMapping = new HashMap<ItemStack,Character>();
-		int firstRow = width,lastRow = 0,firstColumn = width,lastColumn = 0;
-		boolean seenRow = false;
-    	for(int i = 0; i < width;i++){
-    		boolean seenColumn = false;
-        	for(int j = 0; j < width;j++){
-	        	ItemStack item = craftingMatrix.getStackInSlot(i * width + j + 1);
-	        	if(item == null){
-	        		continue;
-	        	}else{
-	        		if(!seenColumn && j < firstColumn){
-	        			firstColumn = j;
-	        		}
-	        		if(j > lastColumn)
-	        			lastColumn = j;
-	        		
-	        		seenColumn = true;
-	        	}
-	        	Character letter = null;
-	        	for(ItemStack mapped : nameMapping.keySet()){
-	        		if(NoppesUtilPlayer.compareItems(mapped, item, recipe.ignoreDamage, recipe.ignoreNBT))
-	        			letter = nameMapping.get(mapped);
-	        	}
-	        	if(letter == null){
-	        		letter = chars[nextChar];
-	        		nextChar++;
-	        		nameMapping.put(item, letter);
-	        	}
-        	}
-        	if(seenColumn){
-        		if(!seenRow){
-	        		firstRow = i;
-	        		lastRow = i;
-	        		seenRow = true;
-        		}
-        		else{
-        			lastRow = i;
-        		}
-        	}
-        	
-    	}    	
-		ArrayList<Object> recipe = new ArrayList<Object>();
 
-    	for(int i = 0; i < width;i++){
-    		if(i < firstRow || i > lastRow)
-    			continue;
-    		String row = "";
-        	for(int j = 0; j < width;j++){
-        		if(j < firstColumn|| j > lastColumn)
-        			continue;
-	        	ItemStack item = craftingMatrix.getStackInSlot(i * width + j + 1);
-	        	if(item == null){
-	        		row += " ";
-	        		continue;
-	        	}
+    public void setRecipe(RecipeAnvil recipe) {
+        if (recipe.itemToRepair != null) {
+            ItemStack output = recipe.itemToRepair.copy();
+            if (output.isItemStackDamageable()) {
+                output.setItemDamage(0);
+            }
+            craftingMatrix.setInventorySlotContents(0, output);
+        } else {
+            craftingMatrix.setInventorySlotContents(0, null);
+        }
 
-	        	for(ItemStack mapped : nameMapping.keySet()){
-	        		if(NoppesUtilPlayer.compareItems(mapped, item, false, false)){
-	        			row += nameMapping.get(mapped);
-	        		}
-	        	}
-	        	
-        	}
-        	recipe.add(row);
-    	}
-		if(nameMapping.isEmpty()){
-			RecipeCarpentry r = new RecipeCarpentry(this.recipe.name);
-			r.copy(this.recipe);
-			this.recipe = r;
-			return;
-		}
-    	for(ItemStack mapped : nameMapping.keySet()){
-    		Character letter = nameMapping.get(mapped);
-    		recipe.add(letter);
-    		recipe.add(mapped);
-    	}
-    	this.recipe = RecipeCarpentry.saveRecipe(this.recipe, craftingMatrix.getStackInSlot(0), recipe.toArray());
-	}
+        craftingMatrix.setInventorySlotContents(1, recipe.repairMaterial);
+        for (int i = 2; i < craftingMatrix.getSizeInventory(); i++) {
+            craftingMatrix.setInventorySlotContents(i, null);
+        }
+
+        this.recipeAnvil = recipe;
+    }
+
+    public void saveRecipe(){
+        if(width == 1){
+            ItemStack output = craftingMatrix.getStackInSlot(0);
+            ItemStack repairMat = craftingMatrix.getStackInSlot(1);
+            if(output == null || repairMat == null){
+                return;
+            }
+
+            RecipeAnvil r = new RecipeAnvil();
+            r.copy(this.recipeAnvil);
+            r.name = this.recipeAnvil.name;
+            r.itemToRepair = output.copy();
+            r.repairMaterial = repairMat.copy();
+            this.recipeAnvil = RecipeAnvil.saveRecipe(r, output, repairMat);
+            return;
+        } else {
+            // Carpentry Recipe save (existing code)
+            int nextChar = 0;
+            char[] chars = {'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P'};
+            Map<ItemStack, Character> nameMapping = new HashMap<ItemStack, Character>();
+            int firstRow = width, lastRow = 0, firstColumn = width, lastColumn = 0;
+            boolean seenRow = false;
+            for (int i = 0; i < width; i++) {
+                boolean seenColumn = false;
+                for (int j = 0; j < width; j++) {
+                    ItemStack item = craftingMatrix.getStackInSlot(i * width + j + 1);
+                    if (item == null) {
+                        continue;
+                    } else {
+                        if (!seenColumn && j < firstColumn) {
+                            firstColumn = j;
+                        }
+                        if (j > lastColumn)
+                            lastColumn = j;
+                        seenColumn = true;
+                    }
+                    Character letter = null;
+                    for (ItemStack mapped : nameMapping.keySet()) {
+                        if (NoppesUtilPlayer.compareItems(mapped, item, recipe.ignoreDamage, recipe.ignoreNBT))
+                            letter = nameMapping.get(mapped);
+                    }
+                    if (letter == null) {
+                        letter = chars[nextChar];
+                        nextChar++;
+                        nameMapping.put(item, letter);
+                    }
+                }
+                if (seenColumn) {
+                    if (!seenRow) {
+                        firstRow = i;
+                        lastRow = i;
+                        seenRow = true;
+                    } else {
+                        lastRow = i;
+                    }
+                }
+            }
+            ArrayList<Object> recipeList = new ArrayList<Object>();
+            for (int i = 0; i < width; i++) {
+                if (i < firstRow || i > lastRow)
+                    continue;
+                String row = "";
+                for (int j = 0; j < width; j++) {
+                    if (j < firstColumn || j > lastColumn)
+                        continue;
+                    ItemStack item = craftingMatrix.getStackInSlot(i * width + j + 1);
+                    if (item == null) {
+                        row += " ";
+                        continue;
+                    }
+                    for (ItemStack mapped : nameMapping.keySet()) {
+                        if (NoppesUtilPlayer.compareItems(mapped, item, false, false)) {
+                            row += nameMapping.get(mapped);
+                        }
+                    }
+                }
+                recipeList.add(row);
+            }
+            if (nameMapping.isEmpty()) {
+                RecipeCarpentry r = new RecipeCarpentry(this.recipe.name);
+                r.copy(this.recipe);
+                this.recipe = r;
+                return;
+            }
+            for (ItemStack mapped : nameMapping.keySet()) {
+                Character letter = nameMapping.get(mapped);
+                recipeList.add(letter);
+                recipeList.add(mapped);
+            }
+            this.recipe = RecipeCarpentry.saveRecipe(this.recipe, craftingMatrix.getStackInSlot(0), recipeList.toArray());
+        }
+    }
 }
diff --git a/src/main/java/noppes/npcs/controllers/CustomEffectController.java b/src/main/java/noppes/npcs/controllers/CustomEffectController.java
new file mode 100644
index 000000000..a372edae3
--- /dev/null
+++ b/src/main/java/noppes/npcs/controllers/CustomEffectController.java
@@ -0,0 +1,579 @@
+package noppes.npcs.controllers;
+
+import kamkeel.npcs.controllers.SyncController;
+import kamkeel.npcs.network.enums.EnumSyncType;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.CompressedStreamTools;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import noppes.npcs.CustomNpcs;
+import noppes.npcs.LogWriter;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.api.entity.IPlayer;
+import noppes.npcs.api.handler.ICustomEffectHandler;
+import noppes.npcs.api.handler.data.ICustomEffect;
+import noppes.npcs.controllers.data.CustomEffect;
+import noppes.npcs.controllers.data.EffectKey;
+import noppes.npcs.controllers.data.EffectScript;
+import noppes.npcs.controllers.data.PlayerEffect;
+import noppes.npcs.util.NBTJsonUtil;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.zip.GZIPInputStream;
+
+import static noppes.npcs.scripted.event.PlayerEvent.EffectEvent.ExpirationType;
+
+public class CustomEffectController implements ICustomEffectHandler {
+
+    public static CustomEffectController Instance = new CustomEffectController();
+    public HashMap<Integer, HashMap<Integer, CustomEffect>> indexMapper = new HashMap<>();
+
+    public HashMap<Integer, CustomEffect> customEffectsSync = new HashMap<>();
+    public HashMap<Integer, CustomEffect> customEffects = new HashMap<>();
+
+    public HashMap<Integer, EffectScript> customEffectScriptHandlers = new HashMap<>();
+    private HashMap<Integer, String> bootOrder;
+
+    private int lastUsedID = 0;
+    public ConcurrentHashMap<UUID, ConcurrentHashMap<EffectKey, PlayerEffect>> playerEffects = new ConcurrentHashMap<>();
+
+    public CustomEffectController() {}
+
+    public static CustomEffectController getInstance() {
+        return Instance;
+    }
+
+    public <T extends CustomEffect> void registerEffectMap(int index, HashMap<Integer, T> effectHashMap) {
+        HashMap<Integer, CustomEffect> map = new HashMap<>(effectHashMap);
+        indexMapper.put(index, map);
+    }
+
+    public void load() {
+        lastUsedID = 0;
+        playerEffects.clear();
+        bootOrder = new HashMap<>();
+        LogWriter.info("Loading custom effects...");
+        readCustomEffectMap();
+        loadCustomEffects();
+        LogWriter.info("Done loading custom effects.");
+    }
+
+    public void runEffects(EntityPlayer player) {
+        Map<EffectKey, PlayerEffect> current = getPlayerEffects(player);
+        for (Map.Entry<EffectKey, PlayerEffect> entry : current.entrySet()) {
+            int id = entry.getKey().getId();
+            int index = entry.getKey().getIndex();
+            CustomEffect effect = get(id, index);
+            if (effect != null) {
+                effect.runEffect(player, entry.getValue());
+            }
+        }
+    }
+
+    public void killEffects(EntityPlayer player) {
+        Map<EffectKey, PlayerEffect> current = getPlayerEffects(player);
+        Iterator<Map.Entry<EffectKey, PlayerEffect>> iterator = current.entrySet().iterator();
+        while (iterator.hasNext()) {
+            Map.Entry<EffectKey, PlayerEffect> entry = iterator.next();
+            int id = entry.getKey().getId();
+            int index = entry.getKey().getIndex();
+            CustomEffect effect = get(id, index);
+            if (effect != null) {
+                if (effect.lossOnDeath) {
+                    effect.onRemoved(player, entry.getValue(), ExpirationType.DEATH);
+                    iterator.remove();
+                }
+            } else {
+                iterator.remove();
+            }
+        }
+    }
+
+    @Override
+    public ICustomEffect createEffect(String name) {
+        if (has(name))
+            return get(name);
+
+        CustomEffect effect = new CustomEffect();
+        effect.name = name;
+
+        if (effect.id == -1) {
+            int id = getUnusedId();
+            while (customEffects.containsKey(id)) {
+                id = getUnusedId();
+            }
+            effect.id = id;
+        }
+        customEffects.put(effect.id, effect);
+        return effect;
+    }
+
+    @Override
+    public ICustomEffect getEffect(String name) {
+        return get(name);
+    }
+
+    @Override
+    public void deleteEffect(String name) {
+        ICustomEffect effect = getEffect(name);
+        if (effect != null) {
+            CustomEffect foundEffect = customEffects.remove(effect.getID());
+            customEffectScriptHandlers.remove(effect.getID());
+            if (foundEffect != null && foundEffect.name != null) {
+                File dir = this.getDir();
+                for (File file : dir.listFiles()) {
+                    if (!file.isFile() || !file.getName().endsWith(".json"))
+                        continue;
+                    if (file.getName().equals(foundEffect.name + ".json")) {
+                        file.delete();
+                        SyncController.syncRemove(EnumSyncType.CUSTOM_EFFECTS, foundEffect.getID());
+                        break;
+                    }
+                }
+                saveEffectLoadMap();
+            }
+        }
+    }
+
+    public void delete(int id) {
+        ICustomEffect effect = get(id);
+        if (effect != null) {
+            CustomEffect foundEffect = customEffects.remove(effect.getID());
+            customEffectScriptHandlers.remove(effect.getID());
+            if (foundEffect != null && foundEffect.name != null) {
+                File dir = this.getDir();
+                for (File file : dir.listFiles()) {
+                    if (!file.isFile() || !file.getName().endsWith(".json"))
+                        continue;
+                    if (file.getName().equals(foundEffect.name + ".json")) {
+                        file.delete();
+                        SyncController.syncRemove(EnumSyncType.CUSTOM_EFFECTS, foundEffect.getID());
+                        break;
+                    }
+                }
+                saveEffectLoadMap();
+            }
+        }
+    }
+
+    public int getUnusedId() {
+        for (int catid : customEffects.keySet()) {
+            if (catid > lastUsedID)
+                lastUsedID = catid;
+        }
+        lastUsedID++;
+        return lastUsedID;
+    }
+
+
+    public CustomEffect get(int id, int index) {
+        HashMap<Integer, CustomEffect> effectMap = indexMapper.get(index);
+        return effectMap != null ? effectMap.get(id) : null;
+    }
+
+    public CustomEffect get(int id) {
+        return get(id, 0);
+    }
+
+    public boolean has(int id, int index) {
+        HashMap<Integer, CustomEffect> effectMap = indexMapper.get(index);
+        return effectMap != null && effectMap.containsKey(id);
+    }
+
+    public boolean has(int id) {
+        return has(id, 0);
+    }
+
+    public CustomEffect get(String name, int index) {
+        HashMap<Integer, CustomEffect> effectMap = indexMapper.get(index);
+        if (effectMap != null) {
+            for (CustomEffect effect : effectMap.values()) {
+                if (effect.getName().equalsIgnoreCase(name)) {
+                    return effect;
+                }
+            }
+        }
+        return null;
+    }
+
+    public CustomEffect get(String name) {
+        return get(name, 0);
+    }
+
+    public boolean has(String name, int index) {
+        return get(name, index) != null;
+    }
+
+    public boolean has(String name) {
+        return has(name, 0);
+    }
+
+    public ConcurrentHashMap<EffectKey, PlayerEffect> getPlayerEffects(EntityPlayer player) {
+        UUID playerId = NoppesUtilServer.getUUID(player);
+        ConcurrentHashMap<EffectKey, PlayerEffect> effects = playerEffects.get(playerId);
+        if (effects == null) {
+            effects = new ConcurrentHashMap<>();
+            playerEffects.put(playerId, effects);
+        }
+        return effects;
+    }
+
+    public void removeEffect(EntityPlayer player, PlayerEffect effect, ExpirationType type) {
+        if (effect == null)
+            return;
+
+        Map<EffectKey, PlayerEffect> currentEffects = getPlayerEffects(player);
+        EffectKey key = new EffectKey(effect.id, effect.index);
+        if (currentEffects.containsKey(key)) {
+            CustomEffect parent = get(effect.id, effect.index);
+            if (parent != null) {
+                parent.onRemoved(player, effect, type);
+            }
+            currentEffects.remove(key);
+        }
+    }
+
+    @Override
+    public boolean hasEffect(IPlayer player, int id) {
+        if (player == null || player.getMCEntity() == null)
+            return false;
+        return hasEffect((EntityPlayer) player.getMCEntity(), id);
+    }
+
+    @Override
+    public boolean hasEffect(IPlayer player, ICustomEffect effect) {
+        return hasEffect((EntityPlayer) player, effect.getID(), effect.getIndex());
+    }
+
+    @Override
+    public int getEffectDuration(IPlayer player, int id) {
+        if (player == null || player.getMCEntity() == null)
+            return -1;
+        return getEffectDuration((EntityPlayer) player.getMCEntity(), id);
+    }
+
+    @Override
+    public int getEffectDuration(IPlayer player, ICustomEffect effect) {
+        return getEffectDuration(player, effect.getID());
+    }
+
+    @Override
+    public void applyEffect(IPlayer player, int id, int duration, byte level) {
+        if (player == null || player.getMCEntity() == null)
+            return;
+        applyEffect((EntityPlayer) player.getMCEntity(), id, duration, level);
+    }
+
+    @Override
+    public void applyEffect(IPlayer player, ICustomEffect effect, int duration, byte level) {
+        applyEffect(player, effect.getID(), duration, level);
+    }
+
+    @Override
+    public void removeEffect(IPlayer player, int id) {
+        if (player == null || player.getMCEntity() == null)
+            return;
+        removeEffect((EntityPlayer) player.getMCEntity(), id, ExpirationType.REMOVED);
+    }
+
+    @Override
+    public void removeEffect(IPlayer player, ICustomEffect effect) {
+        removeEffect((EntityPlayer) player.getMCEntity(), (PlayerEffect) effect, ExpirationType.REMOVED);
+    }
+
+    @Override
+    public void clearEffects(IPlayer player) {
+        if (player == null || player.getMCEntity() == null)
+            return;
+        clearEffects((EntityPlayer) player);
+    }
+
+    @Override
+    public ICustomEffect saveEffect(ICustomEffect customEffect) {
+        if (customEffect.getID() < 0) {
+            customEffect.setID(getUnusedId());
+            while (has(customEffect.getName()))
+                customEffect.setName(customEffect.getName() + "_");
+        } else {
+            CustomEffect existing = customEffects.get(customEffect.getID());
+            if (existing != null && !existing.name.equals(customEffect.getName()))
+                while (has(customEffect.getName()))
+                    customEffect.setName(customEffect.getName() + "_");
+        }
+
+        customEffects.remove(customEffect.getID());
+        customEffects.put(customEffect.getID(), (CustomEffect) customEffect);
+
+        saveEffectLoadMap();
+
+        File dir = this.getDir();
+        if (!dir.exists())
+            dir.mkdirs();
+
+        File file = new File(dir, customEffect.getName() + ".json_new");
+        File file2 = new File(dir, customEffect.getName() + ".json");
+
+        try {
+            NBTTagCompound nbtTagCompound = ((CustomEffect) customEffect).writeToNBT(true);
+            NBTJsonUtil.SaveFile(file, nbtTagCompound);
+            if (file2.exists())
+                file2.delete();
+            file.renameTo(file2);
+            nbtTagCompound.removeTag("ScriptData");
+            SyncController.syncUpdate(EnumSyncType.CUSTOM_EFFECTS, -1, nbtTagCompound);
+        } catch (Exception e) {
+            LogWriter.except(e);
+        }
+        return customEffects.get(customEffect.getID());
+    }
+
+    public void clearEffects(EntityPlayer player) {
+        Map<EffectKey, PlayerEffect> effects = getPlayerEffects(player);
+        if (effects != null) {
+            effects.clear();
+        }
+    }
+
+    public void clearEffect(EntityPlayer player, int id) {
+        clearEffect(player, id, 0);
+    }
+
+    public void clearEffect(EntityPlayer player, int id, int index) {
+        Map<EffectKey, PlayerEffect> effects = getPlayerEffects(player);
+        if (effects != null) {
+            effects.remove(new EffectKey(id, index));
+        }
+    }
+
+
+    public boolean hasEffect(EntityPlayer player, int id) {
+        return hasEffect(player, id, 0);
+    }
+
+    public boolean hasEffect(EntityPlayer player, int id, int index) {
+        return getPlayerEffects(player).containsKey(new EffectKey(id, index));
+    }
+
+    public int getEffectDuration(EntityPlayer player, int id) {
+        return getEffectDuration(player, id, 0);
+    }
+
+    public int getEffectDuration(EntityPlayer player, int id, int index) {
+        PlayerEffect effect = getPlayerEffects(player).get(new EffectKey(id, index));
+        return effect != null ? effect.duration : -1;
+    }
+
+    public void applyEffect(EntityPlayer player, int id, int duration, byte level) {
+        applyEffect(player, id, duration, level, 0);
+    }
+
+    public void applyEffect(EntityPlayer player, int id, int duration, byte level, int index) {
+        if (player == null || id <= 0) return;
+        Map<EffectKey, PlayerEffect> currentEffects = getPlayerEffects(player);
+        CustomEffect parent = get(id, index);
+        if (parent != null) {
+            PlayerEffect playerEffect = new PlayerEffect(id, duration, level);
+            playerEffect.index = index;
+            currentEffects.put(new EffectKey(id, index), playerEffect);
+            parent.onAdded(player, playerEffect);
+        }
+    }
+
+    public void removeEffect(EntityPlayer player, int id) {
+        removeEffect(player, id, 0, ExpirationType.REMOVED);
+    }
+
+    public void removeEffect(EntityPlayer player, int id, ExpirationType type) {
+        removeEffect(player, id, 0, type);
+    }
+
+    public void removeEffect(EntityPlayer player, int id, int index) {
+        removeEffect(player, id, index, ExpirationType.REMOVED);
+    }
+
+    public void removeEffect(EntityPlayer player, int id, int index, ExpirationType type) {
+        if (player == null || id <= 0) return;
+        Map<EffectKey, PlayerEffect> currentEffects = getPlayerEffects(player);
+        EffectKey key = new EffectKey(id, index);
+        PlayerEffect effect = currentEffects.get(key);
+        if (effect != null) {
+            this.removeEffect(player, effect, type);
+        }
+    }
+
+    public void decrementEffects(EntityPlayer player) {
+        Iterator<PlayerEffect> iterator = getPlayerEffects(player).values().iterator();
+        IPlayer iPlayer = NoppesUtilServer.getIPlayer(player);
+        while (iterator.hasNext()) {
+            PlayerEffect effect = iterator.next();
+            if (effect == null) {
+                iterator.remove();
+                continue;
+            }
+            if (effect.duration == -100)
+                continue;
+            if (effect.duration <= 0) {
+                CustomEffect parent = CustomEffectController.Instance.get(effect.id);
+                if (parent != null) {
+                    parent.onRemoved(player, effect, ExpirationType.RUN_OUT);
+                }
+                iterator.remove();
+                continue;
+            }
+            effect.duration--;
+        }
+    }
+
+    public File getMapDir() {
+        File dir = CustomNpcs.getWorldSaveDirectory();
+        if (!dir.exists())
+            dir.mkdir();
+        return dir;
+    }
+
+    private void loadCustomEffects() {
+        customEffects.clear();
+
+        File dir = getDir();
+        if (!dir.exists()) {
+            dir.mkdir();
+        } else {
+            for (File file : dir.listFiles()) {
+                if (!file.isFile() || !file.getName().endsWith(".json"))
+                    continue;
+                try {
+                    CustomEffect effect = new CustomEffect();
+                    effect.readFromNBT(NBTJsonUtil.LoadFile(file));
+                    effect.name = file.getName().substring(0, file.getName().length() - 5);
+                    if (effect.id == -1) {
+                        effect.id = getUnusedId();
+                    }
+                    int originalID = effect.id;
+                    int setID = effect.id;
+                    while (bootOrder.containsKey(setID) || customEffects.containsKey(setID)) {
+                        if (bootOrder.containsKey(setID))
+                            if (bootOrder.get(setID).equals(effect.name))
+                                break;
+                        setID++;
+                    }
+                    effect.id = setID;
+                    if (originalID != setID) {
+                        LogWriter.info("Found Custom Effect ID Mismatch: " + effect.name + ", New ID: " + setID);
+                        effect.save();
+                    }
+                    customEffects.put(effect.id, effect);
+                } catch (Exception e) {
+                    LogWriter.error("Error loading: " + file.getAbsolutePath(), e);
+                }
+            }
+        }
+        registerEffectMap(0, customEffects);
+        saveEffectLoadMap();
+    }
+
+    public HashMap<Integer, CustomEffect> getEffectMap(int index){
+        if(indexMapper.containsKey(index)){
+            return getEffectMap(index);
+        }
+        return null;
+    }
+
+    private File getDir() {
+        return new File(CustomNpcs.getWorldSaveDirectory(), "customeffects");
+    }
+
+    private void saveEffectLoadMap() {
+        try {
+            File saveDir = getMapDir();
+            File file = new File(saveDir, "customeffects.dat_new");
+            File file1 = new File(saveDir, "customeffects.dat_old");
+            File file2 = new File(saveDir, "customeffects.dat");
+            CompressedStreamTools.writeCompressed(this.writeMapNBT(), new FileOutputStream(file));
+            if (file1.exists()) {
+                file1.delete();
+            }
+            file2.renameTo(file1);
+            if (file2.exists()) {
+                file2.delete();
+            }
+            file.renameTo(file2);
+            if (file.exists()) {
+                file.delete();
+            }
+        } catch (Exception e) {
+            LogWriter.except(e);
+        }
+    }
+
+    private NBTTagCompound writeMapNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        NBTTagList customEffectsList = new NBTTagList();
+        for (Integer key : this.customEffects.keySet()) {
+            CustomEffect customEffect = this.customEffects.get(key);
+            if (!customEffect.getName().isEmpty()) {
+                NBTTagCompound effectCompound = new NBTTagCompound();
+                effectCompound.setString("Name", customEffect.getName());
+                effectCompound.setInteger("ID", key);
+                customEffectsList.appendTag(effectCompound);
+            }
+        }
+        nbt.setTag("CustomEffects", customEffectsList);
+        nbt.setInteger("lastID", lastUsedID);
+        return nbt;
+    }
+
+    private void readCustomEffectMap() {
+        bootOrder.clear();
+        try {
+            File file = new File(getMapDir(), "customeffects.dat");
+            if (file.exists()) {
+                loadCustomEffectMap(file);
+            }
+        } catch (Exception e) {
+            try {
+                File file = new File(getMapDir(), "customeffects.dat_old");
+                if (file.exists()) {
+                    loadCustomEffectMap(file);
+                }
+            } catch (Exception ignored) {}
+        }
+    }
+
+    private void loadCustomEffectMap(File file) throws IOException {
+        DataInputStream dis = new DataInputStream(new BufferedInputStream(new GZIPInputStream(new FileInputStream(file))));
+        readCustomEffectMap(dis);
+        dis.close();
+    }
+
+    private void readCustomEffectMap(DataInputStream stream) throws IOException {
+        NBTTagCompound nbtCompound = CompressedStreamTools.read(stream);
+        this.readMapNBT(nbtCompound);
+    }
+
+    private void readMapNBT(NBTTagCompound compound) {
+        lastUsedID = compound.getInteger("lastID");
+        NBTTagList list = compound.getTagList("CustomEffects", 10);
+        if (list != null) {
+            for (int i = 0; i < list.tagCount(); i++) {
+                NBTTagCompound nbttagcompound = list.getCompoundTagAt(i);
+                String effectName = nbttagcompound.getString("Name");
+                Integer key = nbttagcompound.getInteger("ID");
+                bootOrder.put(key, effectName);
+            }
+        }
+    }
+
+    public void deleteEffectFile(String prevName) {
+        File dir = this.getDir();
+        if (!dir.exists())
+            dir.mkdirs();
+        File file2 = new File(dir, prevName + ".json");
+        if (file2.exists())
+            file2.delete();
+    }
+}
diff --git a/src/main/java/noppes/npcs/controllers/CustomGuiController.java b/src/main/java/noppes/npcs/controllers/CustomGuiController.java
index dc4817b39..2e1423820 100644
--- a/src/main/java/noppes/npcs/controllers/CustomGuiController.java
+++ b/src/main/java/noppes/npcs/controllers/CustomGuiController.java
@@ -1,15 +1,17 @@
 package noppes.npcs.controllers;
 
 import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import kamkeel.npcs.network.packets.data.script.ScriptOverlayDataPacket;
+import kamkeel.npcs.util.ByteBufUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagList;
 import noppes.npcs.CustomNpcs;
-import noppes.npcs.Server;
 import noppes.npcs.api.entity.IPlayer;
 import noppes.npcs.api.item.IItemStack;
 import noppes.npcs.constants.EnumGuiType;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.constants.EnumScriptType;
 import noppes.npcs.containers.ContainerCustomGui;
 import noppes.npcs.scripted.NpcAPI;
@@ -27,13 +29,13 @@ public class CustomGuiController {
         EntityPlayerMP entityPlayerMP = (EntityPlayerMP) player.getMCEntity();
         entityPlayerMP.openGui(CustomNpcs.instance, EnumGuiType.CustomGui.ordinal(), player.getWorld().getMCWorld(), gui.getSlots().size(), 0, 0);
         ((ContainerCustomGui)((EntityPlayerMP)player.getMCEntity()).openContainer).setGui(gui, (EntityPlayer)player.getMCEntity());
-        Server.sendDataChecked((EntityPlayerMP)player.getMCEntity(), EnumPacketClient.GUI_DATA, new Object[]{gui.toNBT()});
+        GuiDataPacket.sendGuiData((EntityPlayerMP)player.getMCEntity(), gui.toNBT());
     }
 
     public static boolean updateGui(IPlayer player, ScriptGui gui) {
         if (((EntityPlayerMP)player.getMCEntity()).openContainer instanceof ContainerCustomGui) {
             ((ContainerCustomGui)((EntityPlayerMP)player.getMCEntity()).openContainer).setGui(gui, (EntityPlayer)player.getMCEntity());
-            Server.sendDataChecked((EntityPlayerMP)player.getMCEntity(), EnumPacketClient.GUI_DATA, new Object[]{gui.toNBT()});
+            GuiDataPacket.sendGuiData((EntityPlayerMP)player.getMCEntity(), gui.toNBT());
             return true;
         } else {
             return false;
@@ -41,11 +43,11 @@ public class CustomGuiController {
     }
 
     public static void openOverlay(IPlayer player, ScriptOverlay gui) {
-        Server.sendDataChecked((EntityPlayerMP)player.getMCEntity(), EnumPacketClient.SCRIPT_OVERLAY_DATA, new Object[]{gui.toNBT()});
+        PacketHandler.Instance.sendToPlayer(new ScriptOverlayDataPacket(gui.toNBT()), (EntityPlayerMP)player.getMCEntity());
     }
 
     public static boolean updateOverlay(IPlayer player, ScriptOverlay gui) {
-        Server.sendDataChecked((EntityPlayerMP)player.getMCEntity(), EnumPacketClient.SCRIPT_OVERLAY_DATA, new Object[]{gui.toNBT()});
+        PacketHandler.Instance.sendToPlayer(new ScriptOverlayDataPacket(gui.toNBT()), (EntityPlayerMP)player.getMCEntity());
         return true;
     }
 
@@ -130,7 +132,7 @@ public class CustomGuiController {
 
     public static String[] readScrollSelection(ByteBuf buffer) {
         try {
-            NBTTagList list = Server.readNBT(buffer).getTagList("selection", 8);
+            NBTTagList list = ByteBufUtils.readNBT(buffer).getTagList("selection", 8);
             String[] selection = new String[list.tagCount()];
 
             for(int i = 0; i < list.tagCount(); ++i) {
diff --git a/src/main/java/noppes/npcs/controllers/DialogController.java b/src/main/java/noppes/npcs/controllers/DialogController.java
index b25f88c91..a892f934c 100644
--- a/src/main/java/noppes/npcs/controllers/DialogController.java
+++ b/src/main/java/noppes/npcs/controllers/DialogController.java
@@ -1,18 +1,17 @@
 package noppes.npcs.controllers;
 
+import kamkeel.npcs.controllers.SyncController;
+import kamkeel.npcs.network.enums.EnumSyncType;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import noppes.npcs.CustomNpcs;
 import noppes.npcs.LogWriter;
 import noppes.npcs.NoppesStringUtils;
-import noppes.npcs.Server;
 import noppes.npcs.api.handler.IDialogHandler;
 import noppes.npcs.api.handler.data.IDialog;
 import noppes.npcs.api.handler.data.IDialogCategory;
 import noppes.npcs.constants.EnumOptionType;
-import noppes.npcs.constants.EnumPacketClient;
-import noppes.npcs.constants.SyncType;
 import noppes.npcs.controllers.data.Dialog;
 import noppes.npcs.controllers.data.DialogCategory;
 import noppes.npcs.controllers.data.DialogOption;
@@ -92,6 +91,7 @@ public class DialogController implements IDialogHandler {
 			}
 		}
 	}
+
 	private DialogCategory loadCategoryDir(File dir) {
 		DialogCategory category = new DialogCategory();
 		category.title = dir.getName();
@@ -104,6 +104,11 @@ public class DialogController implements IDialogHandler {
 				dialog.readNBTPartial(NBTJsonUtil.LoadFile(file));
 				category.dialogs.put(dialog.id, dialog);
 				dialog.category = category;
+
+                if (dialog.text != null && dialog.text.length() > 15000) {
+                    LogWriter.error("Extremely big dialog loaded: [ID: " + dialog.id + "] Title: "
+                        + dialog.title + " (Length: " + dialog.text.length() + " chars)");
+                }
 			}
 			catch(Exception e){
 				LogWriter.error("Error loading: " + file.getAbsolutePath(), e);
@@ -230,7 +235,7 @@ public class DialogController implements IDialogHandler {
 				dir.mkdirs();
 		}
 		categories.put(category.id, category);
-        SyncController.updateDialogCat(category);
+        SyncController.syncUpdate(EnumSyncType.DIALOG_CATEGORY, -1, SyncController.updateDialogCat(category));
 	}
 
 	public void removeCategory(int category){
@@ -243,8 +248,8 @@ public class DialogController implements IDialogHandler {
 		for(int dia : cat.dialogs.keySet())
 			dialogs.remove(dia);
 		categories.remove(category);
-        Server.sendToAll(EnumPacketClient.SYNC_REMOVE, SyncType.DIALOG_CATEGORY, category);
-	}
+        SyncController.syncRemove(EnumSyncType.DIALOG_CATEGORY, category);
+    }
 
 	private boolean containsCategoryName(String name) {
 		name = name.toLowerCase();
@@ -291,7 +296,7 @@ public class DialogController implements IDialogHandler {
 			if(file2.exists())
 				file2.delete();
 			file.renameTo(file2);
-            Server.sendToAll(EnumPacketClient.SYNC_UPDATE, SyncType.DIALOG, dialog.writeToNBT(new NBTTagCompound()), category.id);
+            SyncController.syncUpdate(EnumSyncType.DIALOG, category.id, dialog.writeToNBT(new NBTTagCompound()));
 		} catch (Exception e) {
 			LogWriter.except(e);
 		}
@@ -305,7 +310,7 @@ public class DialogController implements IDialogHandler {
 			return;
 		category.dialogs.remove(dialog.id);
 		dialogs.remove(dialog.id);
-        Server.sendToAll(EnumPacketClient.SYNC_REMOVE, SyncType.DIALOG, dialog.id);
+        SyncController.syncRemove(EnumSyncType.DIALOG, dialog.id);
 	}
 
 	private File getDir(){
diff --git a/src/main/java/noppes/npcs/controllers/FactionController.java b/src/main/java/noppes/npcs/controllers/FactionController.java
index 7536cdb97..9ab4b6311 100644
--- a/src/main/java/noppes/npcs/controllers/FactionController.java
+++ b/src/main/java/noppes/npcs/controllers/FactionController.java
@@ -1,15 +1,14 @@
 package noppes.npcs.controllers;
 
+import kamkeel.npcs.controllers.SyncController;
+import kamkeel.npcs.network.enums.EnumSyncType;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import noppes.npcs.CustomNpcs;
 import noppes.npcs.LogWriter;
-import noppes.npcs.Server;
 import noppes.npcs.api.handler.IFactionHandler;
 import noppes.npcs.api.handler.data.IFaction;
-import noppes.npcs.constants.EnumPacketClient;
-import noppes.npcs.constants.SyncType;
 import noppes.npcs.controllers.data.Faction;
 
 import java.io.*;
@@ -158,7 +157,7 @@ public class FactionController implements IFactionHandler {
 
         NBTTagCompound facCompound = new NBTTagCompound();
         faction.writeNBT(facCompound);
-        Server.sendToAll(EnumPacketClient.SYNC_UPDATE, SyncType.FACTION, facCompound);
+        SyncController.syncUpdate(EnumSyncType.FACTION, -1, facCompound);
 		saveFactions();
 	}
 
@@ -193,7 +192,7 @@ public class FactionController implements IFactionHandler {
 			} else {
 				this.saveFactions();
 				faction.id = -1;
-                Server.sendToAll(EnumPacketClient.SYNC_REMOVE, SyncType.FACTION, id);
+                SyncController.syncRemove(EnumSyncType.FACTION, id);
 				return faction;
 			}
 		} else {
diff --git a/src/main/java/noppes/npcs/controllers/LinkedNpcController.java b/src/main/java/noppes/npcs/controllers/LinkedNpcController.java
index 3685affd6..35cc8ae9b 100644
--- a/src/main/java/noppes/npcs/controllers/LinkedNpcController.java
+++ b/src/main/java/noppes/npcs/controllers/LinkedNpcController.java
@@ -18,7 +18,7 @@ import java.util.List;
 public class LinkedNpcController {
 	public static LinkedNpcController Instance;
 	public List<LinkedData> list = new ArrayList<LinkedData>();
-	
+
 	public LinkedNpcController(){
 		Instance = this;
 		load();
@@ -30,14 +30,14 @@ public class LinkedNpcController {
 			LogWriter.except(e);
 		}
 	}
-	
+
 	public File getDir(){
 		File dir = new File(CustomNpcs.getWorldSaveDirectory(), "linkednpcs");
 		if(!dir.exists())
 			dir.mkdir();
 		return dir;
 	}
-	
+
 	private void loadNpcs(){
 		LogWriter.info("Loading Linked Npcs");
 		File dir = getDir();
@@ -56,12 +56,12 @@ public class LinkedNpcController {
 					}
 				}
 			}
-			
+
 			this.list = list;
 		}
 		LogWriter.info("Done loading Linked Npcs");
 	}
-	
+
 	public void save(){
 		for(LinkedData npc : list){
 			try {
@@ -71,17 +71,17 @@ public class LinkedNpcController {
 			}
 		}
 	}
-	
+
 	private void saveNpc(LinkedData npc) throws IOException {
 		File file = new File(getDir(), npc.name + ".json_new");
-        File file1 = new File(getDir(), npc.name + ".json");	
+        File file1 = new File(getDir(), npc.name + ".json");
 		try{
 			NBTJsonUtil.SaveFile(file, npc.getNBT());
 			if(file1.exists()){
 				file1.delete();
 			}
 			file.renameTo(file1);
-			
+
 		} catch (JsonException e) {
 			LogWriter.except(e);
 		}
@@ -91,16 +91,16 @@ public class LinkedNpcController {
 		public String name = "LinkedNpc";
 		public long time = 0;
 		public NBTTagCompound data = new NBTTagCompound();
-		
+
 		public LinkedData(){
 			time = System.currentTimeMillis();
 		}
-		
+
 		public void setNBT(NBTTagCompound compound){
 			name = compound.getString("LinkedName");
 			data = compound.getCompoundTag("NPCData");
 		}
-		
+
 		public NBTTagCompound getNBT(){
 			NBTTagCompound compound = new NBTTagCompound();
 			compound.setString("LinkedName", name);
@@ -123,29 +123,29 @@ public class LinkedNpcController {
 			if(npc.posX == 0 && npc.posY == 0 && npc.posX == 0)
 				return;
 			npc.linkedLast = data.time;
-			List<int[]> points = npc.ai.getMovingPath();
+			List<int[]> points = npc.ais.getMovingPath();
 
 			NBTTagCompound compound = NBTTags.NBTMerge(readNpcData(npc), data.data);
-						
+
 			npc.display.readToNBT(compound);
 			npc.stats.readToNBT(compound);
 			npc.advanced.readToNBT(compound);
 			npc.inventory.readEntityFromNBT(compound);
 			if(compound.hasKey("ModelData"))
 				((EntityCustomNpc)npc).modelData.readFromNBT(compound.getCompoundTag("ModelData"));
-			
-			npc.ai.readToNBT(compound);
+
+			npc.ais.readToNBT(compound);
 			npc.transform.readToNBT(compound);
-			npc.ai.setMovingPath(points);
-			
+			npc.ais.setMovingPath(points);
+
 			npc.updateClient = true;
 		}
 	}
-	
+
 	private void cleanTags(NBTTagCompound compound){
 		compound.removeTag("MovingPathNew");
 	}
-	
+
 	public LinkedData getData(String name){
 		for(LinkedData data : list){
 			if(data.name.equalsIgnoreCase(name))
@@ -153,26 +153,26 @@ public class LinkedNpcController {
 		}
 		return null;
 	}
-	
+
 	private NBTTagCompound readNpcData(EntityNPCInterface npc){
 		NBTTagCompound compound = new NBTTagCompound();
 		npc.display.writeToNBT(compound);
 		npc.inventory.writeEntityToNBT(compound);
 		npc.stats.writeToNBT(compound);
-		npc.ai.writeToNBT(compound);
+		npc.ais.writeToNBT(compound);
 		npc.advanced.writeToNBT(compound);
 		npc.transform.writeToNBT(compound);
 		compound.setTag("ModelData", ((EntityCustomNpc)npc).modelData.writeToNBT());
 		return compound;
 	}
-	
+
 	public void saveNpcData(EntityNPCInterface npc) {
 		NBTTagCompound compound = readNpcData(npc);
 		cleanTags(compound);
-		
+
 		if(npc.linkedData.data.equals(compound))
 			return;
-		
+
 		npc.linkedData.data = compound;
 		npc.linkedData.time = System.currentTimeMillis();
 		save();
@@ -185,11 +185,11 @@ public class LinkedNpcController {
 		}
 		save();
 	}
-	
+
 	public void addData(String name){
 		if(getData(name) != null || name.isEmpty())
 			return;
-		
+
 		LinkedData data = new LinkedData();
 		data.name = name;
 		list.add(data);
diff --git a/src/main/java/noppes/npcs/controllers/LinkedScriptedItemController.java b/src/main/java/noppes/npcs/controllers/LinkedScriptedItemController.java
new file mode 100644
index 000000000..eaba4baaa
--- /dev/null
+++ b/src/main/java/noppes/npcs/controllers/LinkedScriptedItemController.java
@@ -0,0 +1,114 @@
+package noppes.npcs.controllers;
+
+
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.CustomNpcs;
+import noppes.npcs.LogWriter;
+import noppes.npcs.util.JsonException;
+import noppes.npcs.util.NBTJsonUtil;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class LinkedScriptedItemController {
+    public static LinkedScriptedItemController Instance;
+    public List<LinkedScriptedItemData> list = new ArrayList<>();
+
+    public LinkedScriptedItemController() {
+        Instance = this;
+        load();
+    }
+
+    public File getDir() {
+        File dir = new File(CustomNpcs.getWorldSaveDirectory(), "linkeditems");
+        if (!dir.exists()) {
+            dir.mkdirs();
+        }
+        return dir;
+    }
+
+    public void load() {
+        File dir = getDir();
+        File[] files = dir.listFiles((d, name) -> name.endsWith(".json"));
+        if(files == null) return;
+        for (File file : files) {
+            try {
+                NBTTagCompound compound = NBTJsonUtil.LoadFile(file);
+                LinkedScriptedItemData data = new LinkedScriptedItemData();
+                data.loadFromNBT(compound);
+                list.add(data);
+            } catch (Exception e) {
+                LogWriter.error("Error loading linked items: " + file.getAbsolutePath(), e);
+            }
+        }
+    }
+
+    public void save() {
+        File dir = getDir();
+        for (LinkedScriptedItemData data : list) {
+            try {
+                File file = new File(dir, data.name + ".json_new");
+                NBTJsonUtil.SaveFile(file, data.saveToNBT());
+            } catch (IOException e) {
+                LogWriter.except(e);
+            } catch (JsonException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    public LinkedScriptedItemData getData(String name) {
+        for (LinkedScriptedItemData data : list) {
+            if (data.name.equalsIgnoreCase(name)) {
+                return data;
+            }
+        }
+        return null;
+    }
+
+    public void addData(String name, NBTTagCompound scriptData) {
+        if (name.isEmpty() || getData(name) != null)
+            return;
+        LinkedScriptedItemData data = new LinkedScriptedItemData();
+        data.name = name;
+        data.scriptData = scriptData;
+        data.time = System.currentTimeMillis();
+        list.add(data);
+        save();
+    }
+
+    public void updateData(String name, NBTTagCompound scriptData) {
+        LinkedScriptedItemData data = getData(name);
+        if (data != null) {
+            data.scriptData = scriptData;
+            data.time = System.currentTimeMillis();
+            save();
+        }
+    }
+
+    public static class LinkedScriptedItemData {
+        public String name = "LinkedScriptedItem";
+        public long time;
+        public NBTTagCompound scriptData = new NBTTagCompound();
+
+        public LinkedScriptedItemData() {
+            time = System.currentTimeMillis();
+        }
+
+        public void loadFromNBT(NBTTagCompound compound) {
+            name = compound.getString("LinkedScriptName");
+            scriptData = compound.getCompoundTag("ScriptData");
+            time = compound.getLong("Time");
+        }
+
+        public NBTTagCompound saveToNBT() {
+            NBTTagCompound compound = new NBTTagCompound();
+            compound.setString("LinkedScriptName", name);
+            compound.setTag("ScriptData", scriptData);
+            compound.setLong("Time", time);
+            return compound;
+        }
+    }
+}
diff --git a/src/main/java/noppes/npcs/controllers/MagicController.java b/src/main/java/noppes/npcs/controllers/MagicController.java
index 30b2bed89..c92465252 100644
--- a/src/main/java/noppes/npcs/controllers/MagicController.java
+++ b/src/main/java/noppes/npcs/controllers/MagicController.java
@@ -1,204 +1,598 @@
 package noppes.npcs.controllers;
 
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
+import noppes.npcs.CustomItems;
 import noppes.npcs.CustomNpcs;
 import noppes.npcs.LogWriter;
-import noppes.npcs.Server;
 import noppes.npcs.api.handler.data.IMagic;
-import noppes.npcs.constants.EnumPacketClient;
-import noppes.npcs.constants.SyncType;
 import noppes.npcs.controllers.data.Magic;
 
 import java.io.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.zip.GZIPInputStream;
 
 public class MagicController {
-    public HashMap<Integer, Magic> magicSync = new HashMap<Integer,Magic>();
-	public HashMap<Integer,Magic> magics;
+    public HashMap<Integer, Magic> magicSync = new HashMap<Integer, Magic>();
+    public HashMap<Integer, Magic> magics;
 
-	private static MagicController instance = new MagicController();
+    private static MagicController instance;
 
-	private int lastUsedID = 0;
+    private int lastUsedID = 0;
 
-	public MagicController(){
-		instance = this;
-		magics = new HashMap<Integer, Magic>();
-	}
+    public MagicController() {
+        instance = this;
+        magics = new HashMap<Integer, Magic>();
+    }
 
-	public static MagicController getInstance(){
-		return instance;
-	}
+    public static MagicController getInstance() {
+        return instance;
+    }
 
-	public Magic getMagic(int magic) {
-		return magics.get(magic);
-	}
+    public Magic getMagic(int magic) {
+        return magics.get(magic);
+    }
 
-	public void load(){
+    public void load() {
         magics = new HashMap<Integer, Magic>();
         lastUsedID = 0;
-		File saveDir = CustomNpcs.getWorldSaveDirectory();
-		if(saveDir == null){
-			return;
-		}
-		try {
-			File file = new File(saveDir, "magic.dat");
-			if(file.exists()){
-				loadMagicFile(file);
-			}
-		} catch (Exception e) {
-			try {
-				File file = new File(saveDir, "magic.dat_old");
-				if(file.exists()){
-					loadMagicFile(file);
-				}
-
-			} catch (Exception ee) {
-			}
-		}
-
-        if(magics.isEmpty()){
-            magics.put(0,new Magic(0,"Nature", 0x00DD00));
-            magics.put(1,new Magic(1,"Arcane", 0xF2DD00));
-            magics.put(2,new Magic(2,"Ice", 0xDD0000));
-            magics.put(3,new Magic(3,"Fire", 0xDD0000));
-            magics.put(4,new Magic(4,"Dark", 0xDD0000));
-            magics.put(5,new Magic(5,"Holy", 0xDD0000));
+        File saveDir = CustomNpcs.getWorldSaveDirectory();
+        if (saveDir == null) {
+            return;
         }
-	}
+        try {
+            File file = new File(saveDir, "magic.dat");
+            if (file.exists()) {
+                loadMagicFile(file);
+            }
+        } catch (Exception e) {
+            try {
+                File file = new File(saveDir, "magic.dat_old");
+                if (file.exists()) {
+                    loadMagicFile(file);
+                }
+            } catch (Exception ee) { }
+        }
+        magics.clear();
+        if (false) {
+            // Create default Pokémon types
+            Magic normal   = new Magic(0, "Normal", 0xA8A878);
+            normal.setIconItem(new ItemStack(net.minecraft.init.Items.paper));  // using paper for Normal
 
-	private void loadMagicFile(File file) throws IOException{
-		DataInputStream var1 = new DataInputStream(new BufferedInputStream(new GZIPInputStream(new FileInputStream(file))));
-		loadMagic(var1);
-		var1.close();
-	}
+            Magic fire     = new Magic(1, "Fire", 0xF08030);
+            fire.setIconItem(new ItemStack(net.minecraft.init.Items.flint));    // flint for Fire
 
-	public void loadMagic(DataInputStream stream) throws IOException{
-		HashMap<Integer,Magic> magic = new HashMap<Integer,Magic>();
-		NBTTagCompound nbttagcompound1 = CompressedStreamTools.read(stream);
-		lastUsedID = nbttagcompound1.getInteger("lastID");
-		NBTTagList list = nbttagcompound1.getTagList("NPCMagic", 10);
+            Magic water    = new Magic(2, "Water", 0x6890F0);
+            water.setIconItem(new ItemStack(net.minecraft.init.Items.water_bucket)); // water bucket
 
-		if(list != null){
-			for(int i = 0; i < list.tagCount(); i++)
-			{
-				NBTTagCompound nbttagcompound = list.getCompoundTagAt(i);
-				Magic loadMagic = new Magic();
-				loadMagic.readNBT(nbttagcompound);
-				magic.put(loadMagic.id,loadMagic);
-			}
-		}
-		this.magics = magic;
-	}
-	public NBTTagCompound getNBT(){
-		NBTTagList list = new NBTTagList();
-		for(int slot : magics.keySet()){
-			Magic mag = magics.get(slot);
-			NBTTagCompound nbtfactions = new NBTTagCompound();
-			mag.writeNBT(nbtfactions);
-			list.appendTag(nbtfactions);
-		}
-		NBTTagCompound nbttagcompound = new NBTTagCompound();
-		nbttagcompound.setInteger("lastID", lastUsedID);
-		nbttagcompound.setTag("NPCFactions", list);
-		return nbttagcompound;
-	}
-	public void saveFactions(){
-		try {
-			File saveDir = CustomNpcs.getWorldSaveDirectory();
-			File file = new File(saveDir, "magic.dat_new");
-			File file1 = new File(saveDir, "magic.dat_old");
-			File file2 = new File(saveDir, "magic.dat");
-			CompressedStreamTools.writeCompressed(getNBT(), new FileOutputStream(file));
-			if(file1.exists())
-			{
-				file1.delete();
-			}
-			file2.renameTo(file1);
-			if(file2.exists())
-			{
-				file2.delete();
-			}
-			file.renameTo(file2);
-			if(file.exists())
-			{
-				file.delete();
-			}
-		} catch (Exception e) {
-			LogWriter.except(e);
-		}
-	}
+            Magic electric = new Magic(3, "Electric", 0xF8D030);
+            electric.setIconItem(new ItemStack(net.minecraft.init.Items.redstone)); // redstone
 
-	public Magic get(int magicID) {
-		return magics.get(magicID);
-	}
+            Magic grass    = new Magic(4, "Grass", 0x78C850);
+            grass.setIconItem(new ItemStack(net.minecraft.init.Items.wheat_seeds));  // wheat seeds
 
-	public List<IMagic> list() {
-		return new ArrayList(this.magics.values());
-	}
+            Magic ice      = new Magic(5, "Ice", 0x98D8D8);
+            ice.setIconItem(new ItemStack(net.minecraft.init.Items.snowball));       // snowball for Ice
 
-	public void saveMagic(Magic mag) {
+            Magic fighting = new Magic(6, "Fighting", 0xC03028);
+            fighting.setIconItem(new ItemStack(net.minecraft.init.Items.iron_sword));  // sword for Fighting
 
-		if(mag.id < 0){
-			mag.id = getUnusedId();
-			while(hasName(mag.name))
-				mag.name += "_";
-		}
-		else{
-			Magic existing = magics.get(mag.id);
-			if(existing != null && !existing.name.equals(mag.name))
-				while(hasName(mag.name))
-					mag.name += "_";
-		}
-		magics.remove(mag.id);
-		magics.put(mag.id, mag);
+            Magic poison   = new Magic(7, "Poison", 0xA040A0);
+            poison.setIconItem(new ItemStack(net.minecraft.init.Items.potionitem));    // potion item for Poison
+
+            Magic ground   = new Magic(8, "Ground", 0xE0C068);
+            ground.setIconItem(new ItemStack(Blocks.dirt));          // dirt for Ground
+
+            Magic flying   = new Magic(9, "Flying", 0xA890F0);
+            flying.setIconItem(new ItemStack(net.minecraft.init.Items.feather));       // feather for Flying
+
+            Magic psychic  = new Magic(10, "Psychic", 0xF85888);
+            psychic.setIconItem(new ItemStack(net.minecraft.init.Items.ender_pearl));  // ender pearl for Psychic
+
+            Magic bug      = new Magic(11, "Bug", 0xA8B820);
+            bug.setIconItem(new ItemStack(net.minecraft.init.Items.spider_eye));       // spider eye for Bug
+
+            Magic rock     = new Magic(12, "Rock", 0xB8A038);
+            rock.setIconItem(new ItemStack(Blocks.cobblestone));     // cobblestone for Rock
+
+            Magic ghost    = new Magic(13, "Ghost", 0x705898);
+            ghost.setIconItem(new ItemStack(net.minecraft.init.Items.skull));          // skull for Ghost
+
+            Magic dragon   = new Magic(14, "Dragon", 0x7038F8);
+            dragon.setIconItem(new ItemStack(Blocks.dragon_egg));    // dragon egg
+
+            Magic dark     = new Magic(15, "Dark", 0x705848);
+            dark.setIconItem(new ItemStack(net.minecraft.init.Items.coal));            // coal for Dark
+
+            Magic steel    = new Magic(16, "Steel", 0xB8B8D0);
+            steel.setIconItem(new ItemStack(net.minecraft.init.Items.iron_ingot));     // iron ingot for Steel
+
+            Magic fairy    = new Magic(17, "Fairy", 0xEE99AC);
+            fairy.setIconItem(new ItemStack(net.minecraft.init.Items.sugar));          // sugar for Fairy
+
+            // Now set weaknesses (using a multiplier of 2.0f to indicate “double damage”).
+            // The following is based on a common Pokémon type chart.
+            normal.weaknesses.put(fighting.id, 2.0f);
+
+            fire.weaknesses.put(water.id, 2.0f);
+            fire.weaknesses.put(ground.id, 2.0f);
+            fire.weaknesses.put(rock.id, 2.0f);
+
+            water.weaknesses.put(electric.id, 2.0f);
+            water.weaknesses.put(grass.id, 2.0f);
+
+            electric.weaknesses.put(ground.id, 2.0f);
+
+            grass.weaknesses.put(fire.id, 2.0f);
+            grass.weaknesses.put(ice.id, 2.0f);
+            grass.weaknesses.put(poison.id, 2.0f);
+            grass.weaknesses.put(flying.id, 2.0f);
+            grass.weaknesses.put(bug.id, 2.0f);
+
+            ice.weaknesses.put(fire.id, 2.0f);
+            ice.weaknesses.put(fighting.id, 2.0f);
+            ice.weaknesses.put(rock.id, 2.0f);
+            ice.weaknesses.put(steel.id, 2.0f);
+
+            fighting.weaknesses.put(flying.id, 2.0f);
+            fighting.weaknesses.put(psychic.id, 2.0f);
+            fighting.weaknesses.put(fairy.id, 2.0f);
+
+            poison.weaknesses.put(ground.id, 2.0f);
+            poison.weaknesses.put(psychic.id, 2.0f);
+
+            ground.weaknesses.put(water.id, 2.0f);
+            ground.weaknesses.put(grass.id, 2.0f);
+            ground.weaknesses.put(ice.id, 2.0f);
+
+            flying.weaknesses.put(electric.id, 2.0f);
+            flying.weaknesses.put(ice.id, 2.0f);
+            flying.weaknesses.put(rock.id, 2.0f);
+
+            psychic.weaknesses.put(bug.id, 2.0f);
+            psychic.weaknesses.put(ghost.id, 2.0f);
+            psychic.weaknesses.put(dark.id, 2.0f);
+
+            bug.weaknesses.put(fire.id, 2.0f);
+            bug.weaknesses.put(flying.id, 2.0f);
+            bug.weaknesses.put(rock.id, 2.0f);
+
+            rock.weaknesses.put(water.id, 2.0f);
+            rock.weaknesses.put(grass.id, 2.0f);
+            rock.weaknesses.put(fighting.id, 2.0f);
+            rock.weaknesses.put(ground.id, 2.0f);
+            rock.weaknesses.put(steel.id, 2.0f);
+
+            ghost.weaknesses.put(ghost.id, 2.0f);
+            ghost.weaknesses.put(dark.id, 2.0f);
+
+            dragon.weaknesses.put(ice.id, 2.0f);
+            dragon.weaknesses.put(dragon.id, 2.0f);
+            dragon.weaknesses.put(fairy.id, 2.0f);
+
+            dark.weaknesses.put(fighting.id, 2.0f);
+            dark.weaknesses.put(bug.id, 2.0f);
+            dark.weaknesses.put(fairy.id, 2.0f);
+
+            steel.weaknesses.put(fire.id, 2.0f);
+            steel.weaknesses.put(fighting.id, 2.0f);
+            steel.weaknesses.put(ground.id, 2.0f);
+
+            fairy.weaknesses.put(poison.id, 2.0f);
+            fairy.weaknesses.put(steel.id, 2.0f);
+
+            // Register the types.
+            magics.put(normal.id, normal);
+            magics.put(fire.id, fire);
+            magics.put(water.id, water);
+            magics.put(electric.id, electric);
+            magics.put(grass.id, grass);
+            magics.put(ice.id, ice);
+            magics.put(fighting.id, fighting);
+            magics.put(poison.id, poison);
+            magics.put(ground.id, ground);
+            magics.put(flying.id, flying);
+            magics.put(psychic.id, psychic);
+            magics.put(bug.id, bug);
+            magics.put(rock.id, rock);
+            magics.put(ghost.id, ghost);
+            magics.put(dragon.id, dragon);
+            magics.put(dark.id, dark);
+            magics.put(steel.id, steel);
+            magics.put(fairy.id, fairy);
+        }
+
+        if (true) {
+            // Create default magics
+            Magic earth = new Magic(0, "Earth", 0x00DD00, 1, 1);
+            earth.setIconItem(new ItemStack(CustomItems.earthElement));
+
+            Magic water = new Magic(1, "Water", 0xF2DD00, 1, 2);
+            water.setIconItem(new ItemStack(CustomItems.waterElement));
+
+            Magic fire    = new Magic(2, "Fire", 0xDD0000, 1, 3);
+            fire.setIconItem(new ItemStack(CustomItems.spellFire));
+
+            Magic air   = new Magic(3, "Air", 0xDD0000, 1, 0);
+            air.setIconItem(new ItemStack(CustomItems.airElement));
+
+            Magic dark   = new Magic(4, "Dark", 0xDD0000, 0, 3);
+            dark.setIconItem(new ItemStack(CustomItems.spellDark));
+
+            Magic holy   = new Magic(5, "Holy", 0xDD0000, 0, 1);
+            holy.setIconItem(new ItemStack(CustomItems.spellHoly));
+
+            Magic nature   = new Magic(6, "Nature", 0xDD0000, 0, 0);
+            nature.setIconItem(new ItemStack(CustomItems.spellNature));
+
+            Magic arcane   = new Magic(7, "Arcane", 0xDD0000, 0, 2);
+            arcane.setIconItem(new ItemStack(CustomItems.spellArcane));
+
+            // Insiders
+            earth.weaknesses.put(air.id, 0.60f);
+            water.weaknesses.put(earth.id, 0.60f);
+            fire.weaknesses.put(water.id, 0.60f);
+            air.weaknesses.put(fire.id, 0.60f);
+
+            // Outsiders
+            dark.weaknesses.put(nature.id, 0.60f);
+            nature.weaknesses.put(holy.id, 0.60f);
+            holy.weaknesses.put(arcane.id, 0.60f);
+            arcane.weaknesses.put(dark.id, 0.60f);
+
+            // Cross Interactions
+            earth.weaknesses.put(nature.id, 0.30f);
+            water.weaknesses.put(holy.id, 0.30f);
+            fire.weaknesses.put(arcane.id, 0.30f);
+            air.weaknesses.put(dark.id, 0.30f);
+            dark.weaknesses.put(fire.id, 0.30f);
+            nature.weaknesses.put(air.id, 0.30f);
+            holy.weaknesses.put(earth.id, 0.30f);
+            arcane.weaknesses.put(water.id, 0.30f);
+
+            // Add them to the registry
+            magics.put(earth.id, earth);
+            magics.put(water.id, water);
+            magics.put(fire.id, fire);
+            magics.put(air.id, air);
+            magics.put(dark.id, dark);
+            magics.put(holy.id, holy);
+            magics.put(nature.id, nature);
+            magics.put(arcane.id, arcane);
+        }
+        printAllMagicInteractions();
+    }
+
+    private void loadMagicFile(File file) throws IOException {
+        DataInputStream stream = new DataInputStream(
+            new BufferedInputStream(new GZIPInputStream(new FileInputStream(file)))
+        );
+        loadMagic(stream);
+        stream.close();
+    }
+
+    public void loadMagic(DataInputStream stream) throws IOException {
+        HashMap<Integer, Magic> magic = new HashMap<Integer, Magic>();
+        NBTTagCompound nbttagcompound1 = CompressedStreamTools.read(stream);
+        lastUsedID = nbttagcompound1.getInteger("lastID");
+        NBTTagList list = nbttagcompound1.getTagList("NPCMagic", 10); // using "NPCMagic" as tag
+
+        if (list != null) {
+            for (int i = 0; i < list.tagCount(); i++) {
+                NBTTagCompound nbttagcompound = list.getCompoundTagAt(i);
+                Magic loadMagic = new Magic();
+                loadMagic.readNBT(nbttagcompound);
+                magic.put(loadMagic.id, loadMagic);
+            }
+        }
+        this.magics = magic;
+    }
+
+    public NBTTagCompound getNBT() {
+        NBTTagList list = new NBTTagList();
+        for (int slot : magics.keySet()) {
+            Magic mag = magics.get(slot);
+            NBTTagCompound nbtMagic = new NBTTagCompound();
+            mag.writeNBT(nbtMagic);
+            list.appendTag(nbtMagic);
+        }
+        NBTTagCompound nbttagcompound = new NBTTagCompound();
+        nbttagcompound.setInteger("lastID", lastUsedID);
+        nbttagcompound.setTag("NPCMagic", list); // use same tag as loadMagic
+        return nbttagcompound;
+    }
+
+    public void saveFactions() {
+        try {
+            File saveDir = CustomNpcs.getWorldSaveDirectory();
+            File file = new File(saveDir, "magic.dat_new");
+            File file1 = new File(saveDir, "magic.dat_old");
+            File file2 = new File(saveDir, "magic.dat");
+            CompressedStreamTools.writeCompressed(getNBT(), new FileOutputStream(file));
+            if (file1.exists()) {
+                file1.delete();
+            }
+            file2.renameTo(file1);
+            if (file2.exists()) {
+                file2.delete();
+            }
+            file.renameTo(file2);
+            if (file.exists()) {
+                file.delete();
+            }
+        } catch (Exception e) {
+            LogWriter.except(e);
+        }
+    }
+
+    public Magic get(int magicID) {
+        return magics.get(magicID);
+    }
+
+    public List<IMagic> list() {
+        return new ArrayList<IMagic>(this.magics.values());
+    }
+
+    public void saveMagic(Magic mag) {
+        if (mag.id < 0) {
+            mag.id = getUnusedId();
+            while (hasName(mag.name))
+                mag.name += "_";
+        } else {
+            Magic existing = magics.get(mag.id);
+            if (existing != null && !existing.name.equals(mag.name))
+                while (hasName(mag.name))
+                    mag.name += "_";
+        }
+        magics.remove(mag.id);
+        magics.put(mag.id, mag);
 
         NBTTagCompound facCompound = new NBTTagCompound();
         mag.writeNBT(facCompound);
-        Server.sendToAll(EnumPacketClient.SYNC_UPDATE, SyncType.MAGIC, facCompound);
-		saveFactions();
-	}
+        // Server.sendToAll(EnumPacketClient.SYNC_UPDATE, SyncType.MAGIC, facCompound);
+        saveFactions();
+    }
 
-	public int getUnusedId(){
-		if(lastUsedID == 0){
-			for(int catid : magics.keySet())
-				if(catid > lastUsedID)
-					lastUsedID = catid;
-		}
-		lastUsedID++;
-		return lastUsedID;
-	}
+    public int getUnusedId() {
+        if (lastUsedID == 0) {
+            for (int catid : magics.keySet())
+                if (catid > lastUsedID)
+                    lastUsedID = catid;
+        }
+        lastUsedID++;
+        return lastUsedID;
+    }
 
-	public boolean hasName(String newName) {
-		if(newName.trim().isEmpty())
-			return true;
-		for(Magic mag : magics.values())
-			if(mag.name.equals(newName))
-				return true;
-		return false;
-	}
+    public boolean hasName(String newName) {
+        if (newName.trim().isEmpty())
+            return true;
+        for (Magic mag : magics.values())
+            if (mag.name.equals(newName))
+                return true;
+        return false;
+    }
 
-	public Magic getMagicFromName(String magicName){
-		for (Map.Entry<Integer,Magic> entryMag: MagicController.getInstance().magics.entrySet()){
-			if (entryMag.getValue().name.equalsIgnoreCase(magicName)){
-				return entryMag.getValue();
-			}
-		}
-		return null;
-	}
+    public Magic getMagicFromName(String magicName) {
+        for (Map.Entry<Integer, Magic> entryMag : MagicController.getInstance().magics.entrySet()) {
+            if (entryMag.getValue().name.equalsIgnoreCase(magicName)) {
+                return entryMag.getValue();
+            }
+        }
+        return null;
+    }
 
-	public String[] getNames() {
-		String[] names = new String[magics.size()];
-		int i = 0;
-		for(Magic mag : magics.values()){
-			names[i] = mag.name.toLowerCase();
-			i++;
-		}
-		return names;
-	}
+    public String[] getNames() {
+        String[] names = new String[magics.size()];
+        int i = 0;
+        for (Magic mag : magics.values()) {
+            names[i] = mag.name.toLowerCase();
+            i++;
+        }
+        return names;
+    }
+
+    // --- New functions for applying magic NBT stats and calculating damage ---
+
+    /**
+     * Applies magic-type damage to an item. A weapon/item can have multiple magic damage values.
+     * The damage is stored under a compound tag "MagicDamage" where each key is the magic ID.
+     */
+    public static void addMagicDamageToItem(ItemStack item, int magicId, float damage) {
+        if (item == null) return;
+        if (item.stackTagCompound == null)
+            item.stackTagCompound = new NBTTagCompound();
+        NBTTagCompound compound = item.stackTagCompound;
+        NBTTagCompound magicDamage;
+        if (compound.hasKey("MagicDamage")) {
+            magicDamage = compound.getCompoundTag("MagicDamage");
+        } else {
+            magicDamage = new NBTTagCompound();
+        }
+        magicDamage.setFloat(String.valueOf(magicId), damage);
+        compound.setTag("MagicDamage", magicDamage);
+    }
+
+    /**
+     * Applies magic resistance to an armor piece.
+     * The resistance is stored under a compound tag "MagicResistances" with the magic ID as key.
+     */
+    public static void addMagicResistanceToArmor(ItemStack armor, int magicId, float resistance) {
+        if (armor == null) return;
+        if (armor.stackTagCompound == null)
+            armor.stackTagCompound = new NBTTagCompound();
+        NBTTagCompound compound = armor.stackTagCompound;
+        NBTTagCompound magicResist;
+        if (compound.hasKey("MagicResistances")) {
+            magicResist = compound.getCompoundTag("MagicResistances");
+        } else {
+            magicResist = new NBTTagCompound();
+        }
+        magicResist.setFloat(String.valueOf(magicId), resistance);
+        compound.setTag("MagicResistances", magicResist);
+    }
+
+    /**
+     * Given a collection of armor pieces, sums the resistance value for the specified magic ID.
+     */
+    public static float calculateTotalMagicResistance(int magicId, Iterable<ItemStack> armors) {
+        float totalResistance = 0.0F;
+        for (ItemStack armor : armors) {
+            if (armor != null && armor.hasTagCompound() && armor.stackTagCompound.hasKey("MagicResistances")) {
+                NBTTagCompound magicResist = armor.stackTagCompound.getCompoundTag("MagicResistances");
+                if (magicResist.hasKey(String.valueOf(magicId))) {
+                    totalResistance += magicResist.getFloat(String.valueOf(magicId));
+                }
+            }
+        }
+        return totalResistance;
+    }
+
+    /**
+     * Calculates the final magic damage after applying armor resistances.
+     * For a given magic type, the resistance is applied.
+     *
+     * @param magicId    the magic type
+     * @param baseDamage the base damage value
+     * @param armors     an Iterable collection of armor ItemStacks
+     * @return the final damage after reduction
+     */
+    public static float calculateFinalMagicDamage(int magicId, float baseDamage, Iterable<ItemStack> armors) {
+        if (getInstance().getMagic(magicId) == null) {
+            // If the magic type is not defined, treat it as non-magical.
+            return baseDamage;
+        }
+        float resistance = calculateTotalMagicResistance(magicId, armors);
+        // Resistance is assumed to be a fractional reduction (e.g., 0.2 = 20% reduction).
+        return baseDamage * (1.0F - resistance);
+    }
+
+    /**
+     * Extracts magic damage values from a weapon ItemStack.
+     * It looks for a compound tag "CNPCMagic" first; if not found, it falls back to "MagicDamage".
+     * Returns a mapping of magic ID to its damage value.
+     */
+    public static Map<Integer, Float> getMagicDamageFromItem(ItemStack item) {
+        Map<Integer, Float> damageMap = new HashMap<Integer, Float>();
+        if (item == null || item.stackTagCompound == null) return damageMap;
+        NBTTagCompound compound = item.stackTagCompound;
+        NBTTagCompound damageCompound = null;
+        if (compound.hasKey("CNPCMagic")) {
+            NBTTagCompound magicCompound = compound.getCompoundTag("CNPCMagic");
+            if (magicCompound.hasKey("MagicDamage")) {
+                damageCompound = magicCompound.getCompoundTag("MagicDamage");
+            }
+        } else if (compound.hasKey("MagicDamage")) {
+            damageCompound = compound.getCompoundTag("MagicDamage");
+        }
+        if (damageCompound != null) {
+            Set<String> keys = damageCompound.func_150296_c();
+            for (String key : keys) {
+                try {
+                    int magicId = Integer.parseInt(key);
+                    float dmg = damageCompound.getFloat(key);
+                    damageMap.put(magicId, dmg);
+                } catch (NumberFormatException e) {
+                    // Ignore non-integer keys.
+                }
+            }
+        }
+        return damageMap;
+    }
+
+    /**
+     * Extracts magic resistances from an armor ItemStack.
+     * It checks for a "CNPCMagic" container first; if not present, it falls back to "MagicResistances".
+     * Returns a mapping of magic ID to its resistance value.
+     */
+    public static Map<Integer, Float> getMagicResistancesFromItem(ItemStack item) {
+        Map<Integer, Float> resistMap = new HashMap<Integer, Float>();
+        if (item == null || item.stackTagCompound == null) return resistMap;
+        NBTTagCompound compound = item.stackTagCompound;
+        NBTTagCompound resistCompound = null;
+        if (compound.hasKey("CNPCMagic")) {
+            NBTTagCompound magicCompound = compound.getCompoundTag("CNPCMagic");
+            if (magicCompound.hasKey("MagicResistances")) {
+                resistCompound = magicCompound.getCompoundTag("MagicResistances");
+            }
+        } else if (compound.hasKey("MagicResistances")) {
+            resistCompound = compound.getCompoundTag("MagicResistances");
+        }
+        if (resistCompound != null) {
+            Set<String> keys = resistCompound.func_150296_c();
+            for (String key : keys) {
+                try {
+                    int magicId = Integer.parseInt(key);
+                    float res = resistCompound.getFloat(key);
+                    resistMap.put(magicId, res);
+                } catch (NumberFormatException e) {
+                    // Ignore non-integer keys.
+                }
+            }
+        }
+        return resistMap;
+    }
+
+    /**
+     * Validates whether an item (weapon or armor) contains any magic-related NBT.
+     */
+    public static boolean hasMagicStats(ItemStack item) {
+        if (item == null || item.stackTagCompound == null) return false;
+        NBTTagCompound compound = item.stackTagCompound;
+        return compound.hasKey("CNPCMagic") || compound.hasKey("MagicDamage") || compound.hasKey("MagicResistances");
+    }
+
+    /**
+     * Calculates a damage breakdown for each magic type from a weapon when applied against a set of armors.
+     * This function will ignore any magic with ID 0 (neutral), so only magic damage is returned.
+     * Returns a map where keys are magic IDs (non-zero) and values are the final damage for that type.
+     */
+    public static Map<Integer, Float> calculateDamageBreakdown(ItemStack weapon, Iterable<ItemStack> armors) {
+        Map<Integer, Float> breakdown = new HashMap<Integer, Float>();
+        Map<Integer, Float> weaponDamage = getMagicDamageFromItem(weapon);
+        for (Map.Entry<Integer, Float> entry : weaponDamage.entrySet()) {
+            int magicId = entry.getKey();
+            // Skip magic ID 0 (neutral)
+            if (magicId == 0) continue;
+            float dmg = entry.getValue();
+            float finalDmg = calculateFinalMagicDamage(magicId, dmg, armors);
+            breakdown.put(magicId, finalDmg);
+        }
+        return breakdown;
+    }
+
+    /**
+     * Calculates the total final magic damage of a weapon after applying the resistances of a set of armor pieces.
+     * This sums only the magic interactions (magic IDs other than 0).
+     */
+    public static float calculateTotalDamage(ItemStack weapon, Iterable<ItemStack> armors) {
+        float totalDamage = 0.0F;
+        Map<Integer, Float> breakdown = calculateDamageBreakdown(weapon, armors);
+        for (Float dmg : breakdown.values()) {
+            totalDamage += dmg;
+        }
+        return totalDamage;
+    }
+
+    /**
+     * Prints all magic interactions (weaknesses) in the registry.
+     * For each magic (defender) that has weaknesses, prints the corresponding attacker and the extra damage percentage.
+     * Format: "Magic ID: [attacker id], Name: "[attacker name]" does [percentage*100]% extra damage to Magic ID: [defender id], Name: "[defender name]".
+     */
+    public static void printAllMagicInteractions() {
+        MagicController mc = getInstance();
+        for (Magic defender : mc.magics.values()) {
+            for (Map.Entry<Integer, Float> entry : defender.weaknesses.entrySet()) {
+                int attackerId = entry.getKey();
+                float percentage = entry.getValue();
+                Magic attacker = mc.getMagic(attackerId);
+                if (attacker != null) {
+                    System.out.println("Magic ID: " + attacker.id + ", Name: \"" + attacker.name + "\" does "
+                        + (percentage * 100) + "% extra damage to Magic ID: " + defender.id + ", Name: \"" + defender.name + "\"");
+                }
+            }
+        }
+    }
 }
diff --git a/src/main/java/noppes/npcs/controllers/PartyController.java b/src/main/java/noppes/npcs/controllers/PartyController.java
index 1ceb2440d..c38c8647a 100644
--- a/src/main/java/noppes/npcs/controllers/PartyController.java
+++ b/src/main/java/noppes/npcs/controllers/PartyController.java
@@ -1,5 +1,8 @@
 package noppes.npcs.controllers;
 
+import kamkeel.npcs.network.packets.data.AchievementPacket;
+import kamkeel.npcs.network.packets.data.ChatAlertPacket;
+import kamkeel.npcs.network.packets.data.large.PartyDataPacket;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
@@ -8,8 +11,6 @@ import net.minecraft.nbt.NBTTagString;
 import noppes.npcs.EventHooks;
 import noppes.npcs.NoppesUtilPlayer;
 import noppes.npcs.NoppesUtilServer;
-import noppes.npcs.Server;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.constants.EnumQuestCompletion;
 import noppes.npcs.constants.EnumQuestType;
 import noppes.npcs.controllers.data.Party;
@@ -24,7 +25,7 @@ import java.util.HashMap;
 import java.util.UUID;
 import java.util.Vector;
 
-import static noppes.npcs.PacketHandlerServer.sendInviteData;
+import static kamkeel.npcs.network.packets.request.party.PartyInvitePacket.sendInviteData;
 
 public class PartyController {
     private static PartyController Instance;
@@ -68,8 +69,8 @@ public class PartyController {
                     playerData.partyUUID = null;
                     if(player != null){
                         sendInviteData((EntityPlayerMP) player);
-                        Server.sendData((EntityPlayerMP) player, EnumPacketClient.PARTY_MESSAGE,  "party.disbandAlert");
-                        Server.sendData((EntityPlayerMP) player, EnumPacketClient.CHAT, "\u00A7c", "party.disbandMessage", "!");
+                        AchievementPacket.sendAchievement((EntityPlayerMP) player, true,  "party.disbandAlert", "");
+                        ChatAlertPacket.sendChatAlert((EntityPlayerMP) player, "\u00A7c", "party.disbandMessage", "!");
                     }
                 }
             }
@@ -84,14 +85,14 @@ public class PartyController {
         for(String name : party.getPlayerNames()){
             EntityPlayer playerMP = NoppesUtilServer.getPlayerByName(name);
             if(playerMP != null){
-                Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.PARTY_MESSAGE,  "party.kickOtherAlert", kickPlayerName);
-                Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.CHAT, "\u00A7e", kickPlayerName, " \u00A74", "party.kickOtherChat", "!");
+                AchievementPacket.sendAchievement((EntityPlayerMP) playerMP, true,  "party.kickOtherAlert", kickPlayerName);
+                ChatAlertPacket.sendChatAlert((EntityPlayerMP) playerMP, "\u00A7e", kickPlayerName, " \u00A74", "party.kickOtherChat", "!");
             }
         }
 
         if(kickPlayer != null){
-            Server.sendData((EntityPlayerMP) kickPlayer, EnumPacketClient.PARTY_MESSAGE, "party.kickYouAlert", "");
-            Server.sendData((EntityPlayerMP) kickPlayer, EnumPacketClient.CHAT, "\u00A74", "party.kickYouChat", "!");
+            AchievementPacket.sendAchievement((EntityPlayerMP) kickPlayer, true,  "party.kickYouAlert", "");
+            ChatAlertPacket.sendChatAlert((EntityPlayerMP) kickPlayer, "\u00A74", "party.kickYouChat", "!");
         }
     }
 
@@ -102,12 +103,12 @@ public class PartyController {
         for(String name : party.getPlayerNames()){
             EntityPlayer playerMP = NoppesUtilServer.getPlayerByName(name);
             if(playerMP != null){
-                Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.PARTY_MESSAGE,  "party.leaveOtherAlert", leavingPlayer.getCommandSenderName());
-                Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.CHAT, "\u00A7e", leavingPlayer.getCommandSenderName(), " \u00A7c", "party.leaveOtherChat", "!");
+                AchievementPacket.sendAchievement((EntityPlayerMP) playerMP, true,  "party.leaveOtherAlert", leavingPlayer.getCommandSenderName());
+                ChatAlertPacket.sendChatAlert((EntityPlayerMP) playerMP, "\u00A7e", leavingPlayer.getCommandSenderName(), " \u00A7c", "party.leaveOtherChat", "!");
             }
         }
-        Server.sendData((EntityPlayerMP) leavingPlayer, EnumPacketClient.PARTY_MESSAGE, "party.leaveYouAlert", "");
-        Server.sendData((EntityPlayerMP) leavingPlayer, EnumPacketClient.CHAT, "\u00A7c", "party.leaveYouChat", "!");
+        AchievementPacket.sendAchievement((EntityPlayerMP) leavingPlayer, true,  "party.leaveYouAlert", "");
+        ChatAlertPacket.sendChatAlert((EntityPlayerMP) leavingPlayer, "\u00A7c", "party.leaveYouChat", "!");
     }
 
     public void pingPartyUpdate(Party party){
@@ -134,7 +135,7 @@ public class PartyController {
             if(playerMP != null){
                 PlayerData playerData = PlayerDataController.Instance.getPlayerData(playerMP);
                 if(playerData != null){
-                    Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.PARTY_DATA, compound);
+                    PartyDataPacket.sendPartyData((EntityPlayerMP) playerMP, compound);
                 }
             }
         }
@@ -165,7 +166,7 @@ public class PartyController {
             if(playerMP != null){
                 PlayerData playerData = PlayerDataController.Instance.getPlayerData(playerMP);
                 if(playerData != null){
-                    Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.PARTY_DATA, compound);
+                    PartyDataPacket.sendPartyData((EntityPlayerMP) playerMP, compound);
                 }
             }
         }
@@ -183,9 +184,7 @@ public class PartyController {
 
                 System.arraycopy(chatAlerts, 0, args, 1, chatAlerts.length);
                 args[args.length - 1] = "!"; // Add "!" at the end
-
-                // Pass args to Server.sendData using spread operator
-                Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.CHAT, args);
+                ChatAlertPacket.sendChatAlert((EntityPlayerMP) playerMP, args);
             }
         }
     }
diff --git a/src/main/java/noppes/npcs/controllers/PlayerQuestController.java b/src/main/java/noppes/npcs/controllers/PlayerQuestController.java
index 8a75bbcb1..20d6236e3 100644
--- a/src/main/java/noppes/npcs/controllers/PlayerQuestController.java
+++ b/src/main/java/noppes/npcs/controllers/PlayerQuestController.java
@@ -1,13 +1,13 @@
 package noppes.npcs.controllers;
 
+import kamkeel.npcs.network.packets.data.AchievementPacket;
+import kamkeel.npcs.network.packets.data.ChatAlertPacket;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.util.ChatComponentTranslation;
 import noppes.npcs.EventHooks;
 import noppes.npcs.NoppesStringUtils;
 import noppes.npcs.NoppesUtilServer;
-import noppes.npcs.Server;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.constants.EnumQuestRepeat;
 import noppes.npcs.constants.EnumQuestType;
 import noppes.npcs.controllers.data.PlayerData;
@@ -45,8 +45,8 @@ public class PlayerQuestController {
 
 			data.activeQuests.put(questData.quest.id,questData);
 			if (questData.sendAlerts) {
-				Server.sendData((EntityPlayerMP) player, EnumPacketClient.MESSAGE, "quest.newquest", questData.quest.title);
-				Server.sendData((EntityPlayerMP) player, EnumPacketClient.CHAT, "quest.newquest", ": ", questData.quest.title);
+                AchievementPacket.sendAchievement((EntityPlayerMP) player, false, "quest.newquest", questData.quest.title);
+                ChatAlertPacket.sendChatAlert((EntityPlayerMP) player, "quest.newquest", ": ", questData.quest.title);
 			}
             playerData.updateClient = true;
 		} else {
@@ -76,8 +76,8 @@ public class PlayerQuestController {
 			}
 		}
 		if (questData != null && questData.sendAlerts) {
-			Server.sendData((EntityPlayerMP) player, EnumPacketClient.MESSAGE, "quest.completed", questData.quest.title);
-			Server.sendData((EntityPlayerMP) player, EnumPacketClient.CHAT, "quest.completed", ": ", questData.quest.title);
+            AchievementPacket.sendAchievement((EntityPlayerMP) player, false, "quest.completed", questData.quest.title);
+            ChatAlertPacket.sendChatAlert((EntityPlayerMP) player, "quest.completed", ": ", questData.quest.title);
 		}
         playerdata.updateClient = true;
 	}
@@ -98,8 +98,8 @@ public class PlayerQuestController {
             }
         }
         if (questData != null && questData.sendAlerts) {
-            Server.sendData((EntityPlayerMP) player, EnumPacketClient.MESSAGE, "quest.completed", questData.quest.title);
-            Server.sendData((EntityPlayerMP) player, EnumPacketClient.CHAT, "quest.completed", ": ", questData.quest.title);
+            AchievementPacket.sendAchievement((EntityPlayerMP) player, false, "quest.completed", questData.quest.title);
+            ChatAlertPacket.sendChatAlert((EntityPlayerMP) player, "quest.completed", ": ", questData.quest.title);
         }
         playerdata.updateClient = true;
     }
diff --git a/src/main/java/noppes/npcs/controllers/QuestController.java b/src/main/java/noppes/npcs/controllers/QuestController.java
index e8ec57f7d..51051bcb4 100644
--- a/src/main/java/noppes/npcs/controllers/QuestController.java
+++ b/src/main/java/noppes/npcs/controllers/QuestController.java
@@ -1,17 +1,16 @@
 package noppes.npcs.controllers;
 
+import kamkeel.npcs.controllers.SyncController;
+import kamkeel.npcs.network.enums.EnumSyncType;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import noppes.npcs.CustomNpcs;
 import noppes.npcs.LogWriter;
 import noppes.npcs.NoppesStringUtils;
-import noppes.npcs.Server;
 import noppes.npcs.api.handler.IQuestHandler;
 import noppes.npcs.api.handler.data.IQuest;
 import noppes.npcs.api.handler.data.IQuestCategory;
-import noppes.npcs.constants.EnumPacketClient;
-import noppes.npcs.constants.SyncType;
 import noppes.npcs.controllers.data.Quest;
 import noppes.npcs.controllers.data.QuestCategory;
 import noppes.npcs.util.NBTJsonUtil;
@@ -146,7 +145,7 @@ public class QuestController implements IQuestHandler {
 		for(int dia : cat.quests.keySet())
 			quests.remove(dia);
 		categories.remove(category);
-        Server.sendToAll(EnumPacketClient.SYNC_REMOVE, SyncType.QUEST_CATEGORY, category);
+        SyncController.syncRemove(EnumSyncType.QUEST_CATEGORY, category);
 	}
 
 	public void saveCategory(QuestCategory category){
@@ -177,7 +176,7 @@ public class QuestController implements IQuestHandler {
 				dir.mkdirs();
 		}
 		categories.put(category.id, category);
-        SyncController.updateQuestCat(category);
+        SyncController.syncUpdate(EnumSyncType.QUEST_CATEGORY, -1, SyncController.updateQuestCat(category));
     }
 	private boolean containsCategoryName(String name) {
 		name = name.toLowerCase();
@@ -225,7 +224,7 @@ public class QuestController implements IQuestHandler {
 			if(file2.exists())
 				file2.delete();
 			file.renameTo(file2);
-            Server.sendToAll(EnumPacketClient.SYNC_UPDATE, SyncType.QUEST, quest.writeToNBT(new NBTTagCompound()), category.id);
+            SyncController.syncUpdate(EnumSyncType.QUEST, category.id, quest.writeToNBT(new NBTTagCompound()));
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
diff --git a/src/main/java/noppes/npcs/controllers/RecipeController.java b/src/main/java/noppes/npcs/controllers/RecipeController.java
index bd129f508..39894ce4d 100644
--- a/src/main/java/noppes/npcs/controllers/RecipeController.java
+++ b/src/main/java/noppes/npcs/controllers/RecipeController.java
@@ -1,5 +1,6 @@
 package noppes.npcs.controllers;
 
+import kamkeel.npcs.controllers.SyncController;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
@@ -8,7 +9,9 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import noppes.npcs.CustomNpcs;
 import noppes.npcs.api.handler.IRecipeHandler;
+import noppes.npcs.api.handler.data.IAnvilRecipe;
 import noppes.npcs.api.handler.data.IRecipe;
+import noppes.npcs.controllers.data.RecipeAnvil;
 import noppes.npcs.controllers.data.RecipeCarpentry;
 import noppes.npcs.controllers.data.RecipesDefault;
 
@@ -20,14 +23,19 @@ import java.util.*;
 
 public class RecipeController implements IRecipeHandler {
 	private static Collection<RecipeCarpentry> prevRecipes;
-	public HashMap<Integer,RecipeCarpentry> globalRecipes = new HashMap<Integer, RecipeCarpentry>();
-	public HashMap<Integer,RecipeCarpentry> anvilRecipes = new HashMap<Integer, RecipeCarpentry>();
-	public static RecipeController Instance;
+
+    public HashMap<Integer, RecipeCarpentry> globalRecipes = new HashMap<Integer, RecipeCarpentry>();
+	public HashMap<Integer, RecipeCarpentry> carpentryRecipes = new HashMap<Integer, RecipeCarpentry>();
+    public HashMap<Integer, RecipeAnvil> anvilRecipes = new HashMap<Integer, RecipeAnvil>();
+
+    public static RecipeController Instance;
 
 	public static final int version = 1;
 	public int nextId = 1;
+    public int nextAnvilId = 1;
 
-	public static HashMap<Integer,RecipeCarpentry> syncRecipes = new HashMap<Integer, RecipeCarpentry>();
+	public static HashMap<Integer, RecipeCarpentry> syncRecipes = new HashMap<Integer, RecipeCarpentry>();
+    public static HashMap<Integer, RecipeAnvil> syncAnvilRecipes = new HashMap<Integer, RecipeAnvil>();
 
 	public RecipeController(){
 		Instance = this;
@@ -36,6 +44,7 @@ public class RecipeController implements IRecipeHandler {
 		loadCategories();
 		reloadGlobalRecipes(globalRecipes);
 	}
+
 	public static void reloadGlobalRecipes(HashMap<Integer,RecipeCarpentry> globalRecipes){
 		List list = CraftingManager.getInstance().getRecipeList();
 		if(prevRecipes != null){
@@ -59,7 +68,8 @@ public class RecipeController implements IRecipeHandler {
 	        }
 	        else{
 	    		globalRecipes.clear();
-	    		anvilRecipes.clear();
+	    		carpentryRecipes.clear();
+                anvilRecipes.clear();
 	    		loadDefaultRecipes(-1);
 	        }
 		} catch (Exception e) {
@@ -84,23 +94,34 @@ public class RecipeController implements IRecipeHandler {
 	private void loadCategories(File file) throws Exception{
         NBTTagCompound nbttagcompound1 = CompressedStreamTools.readCompressed(new FileInputStream(file));
         nextId = nbttagcompound1.getInteger("LastId");
+        nextAnvilId = nbttagcompound1.getInteger("LastAnvilId");
         NBTTagList list = nbttagcompound1.getTagList("Data", 10);
         HashMap<Integer,RecipeCarpentry> globalRecipes = new HashMap<Integer, RecipeCarpentry>();
-        HashMap<Integer,RecipeCarpentry> anvilRecipes = new HashMap<Integer, RecipeCarpentry>();
+        HashMap<Integer,RecipeCarpentry> carpentryRecipes = new HashMap<Integer, RecipeCarpentry>();
+        HashMap<Integer,RecipeAnvil> anvilRecipes = new HashMap<Integer, RecipeAnvil>();
         if(list != null){
             for(int i = 0; i < list.tagCount(); i++)
             {
-        		RecipeCarpentry recipe = RecipeCarpentry.read(list.getCompoundTagAt(i));
-            	if(recipe.isGlobal)
-            		globalRecipes.put(recipe.id,recipe);
-            	else
-            		anvilRecipes.put(recipe.id,recipe);
-            	if(recipe.id > nextId)
-            		nextId = recipe.id;
+                NBTTagCompound compound = list.getCompoundTagAt(i);
+                if(compound.hasKey("IsAnvil")){
+                    RecipeAnvil anvil = RecipeAnvil.read(compound);
+                    anvilRecipes.put(anvil.id, anvil);
+                    if(anvil.id > nextAnvilId)
+                        nextAnvilId = anvil.id;
+                } else {
+                    RecipeCarpentry recipe = RecipeCarpentry.read(compound);
+                    if(recipe.isGlobal)
+                        globalRecipes.put(recipe.id,recipe);
+                    else
+                        carpentryRecipes.put(recipe.id,recipe);
+                    if(recipe.id > nextId)
+                        nextId = recipe.id;
+                }
             }
         }
-        this.anvilRecipes = anvilRecipes;
+        this.carpentryRecipes = carpentryRecipes;
         this.globalRecipes = globalRecipes;
+        this.anvilRecipes = anvilRecipes;
 		loadDefaultRecipes(nbttagcompound1.getInteger("Version"));
 	}
 	private void saveCategories(){
@@ -110,12 +131,16 @@ public class RecipeController implements IRecipeHandler {
 	        for(RecipeCarpentry recipe : globalRecipes.values()){
 	        	list.appendTag(recipe.writeNBT());
 	        }
-	        for(RecipeCarpentry recipe : anvilRecipes.values()){
+	        for(RecipeCarpentry recipe : carpentryRecipes.values()){
 	        	list.appendTag(recipe.writeNBT());
 	        }
+            for(RecipeAnvil recipe : anvilRecipes.values()){
+                list.appendTag(recipe.writeNBT());
+            }
 	        NBTTagCompound nbttagcompound = new NBTTagCompound();
 	        nbttagcompound.setTag("Data", list);
 	        nbttagcompound.setInteger("LastId", nextId);
+            nbttagcompound.setInteger("LastAnvilId", nextAnvilId);
 	        nbttagcompound.setInteger("Version", version);
             File file = new File(saveDir, "recipes.dat_new");
             File file1 = new File(saveDir, "recipes.dat_old");
@@ -141,7 +166,7 @@ public class RecipeController implements IRecipeHandler {
 	}
 
     public RecipeCarpentry findMatchingRecipe(InventoryCrafting par1InventoryCrafting){
-    	for(RecipeCarpentry recipe : anvilRecipes.values()){
+    	for(RecipeCarpentry recipe : carpentryRecipes.values()){
     		if(recipe.isValid() && recipe.matches(par1InventoryCrafting,null))
     			return recipe;
     	}
@@ -151,11 +176,17 @@ public class RecipeController implements IRecipeHandler {
 	public RecipeCarpentry getRecipe(int id) {
 		if(globalRecipes.containsKey(id))
 			return globalRecipes.get(id);
-		if(anvilRecipes.containsKey(id))
-			return anvilRecipes.get(id);
+		if(carpentryRecipes.containsKey(id))
+			return carpentryRecipes.get(id);
 		return null;
 	}
 
+    public RecipeAnvil getAnvilRecipe(int id) {
+        if(anvilRecipes.containsKey(id))
+            return anvilRecipes.get(id);
+        return null;
+    }
+
 	public RecipeCarpentry saveRecipe(NBTTagCompound compound) throws IOException {
 		RecipeCarpentry recipe = RecipeCarpentry.read(compound);
 
@@ -171,61 +202,130 @@ public class RecipeController implements IRecipeHandler {
 				recipe.name += "_";
 		}
 		if(recipe.isGlobal){
-			anvilRecipes.remove(recipe.id);
+			carpentryRecipes.remove(recipe.id);
 			globalRecipes.put(recipe.id, recipe);
 		}
 		else{
 			globalRecipes.remove(recipe.id);
-			anvilRecipes.put(recipe.id, recipe);
+			carpentryRecipes.put(recipe.id, recipe);
 		}
 		saveCategories();
 		reloadGlobalRecipes(globalRecipes);
 		return recipe;
 	}
 
+    public RecipeAnvil saveAnvilRecipe(NBTTagCompound compound) throws IOException {
+        RecipeAnvil recipe = RecipeAnvil.read(compound);
+
+        RecipeAnvil current = getAnvilRecipe(recipe.id);
+        if(current != null && !current.name.equals(recipe.name)){
+            while(containsAnvilRecipeName(recipe.name))
+                recipe.name += "_";
+        }
+
+        if(recipe.id == -1){
+            recipe.id = getUniqueAnvilId();
+            while(containsAnvilRecipeName(recipe.name))
+                recipe.name += "_";
+        }
+
+        anvilRecipes.put(recipe.id, recipe);
+        saveCategories();
+        return recipe;
+    }
+
 	private int getUniqueId() {
 		return nextId++;
 	}
+
+    private int getUniqueAnvilId() {
+        return nextAnvilId++;
+    }
+
 	private boolean containsRecipeName(String name) {
 		name = name.toLowerCase();
 		for(RecipeCarpentry recipe : globalRecipes.values()){
 			if(recipe.name.toLowerCase().equals(name))
 				return true;
 		}
-		for(RecipeCarpentry recipe : anvilRecipes.values()){
+		for(RecipeCarpentry recipe : carpentryRecipes.values()){
 			if(recipe.name.toLowerCase().equals(name))
 				return true;
 		}
 		return false;
 	}
 
+    private boolean containsAnvilRecipeName(String name) {
+        name = name.toLowerCase();
+        for(RecipeAnvil recipe : anvilRecipes.values()){
+            if(recipe.name.toLowerCase().equals(name))
+                return true;
+        }
+        return false;
+    }
+
 	public RecipeCarpentry delete(int id) {
 		RecipeCarpentry recipe = getRecipe(id);
         if(recipe == null)
             return null;
-		globalRecipes.remove(recipe.id);
-		anvilRecipes.remove(recipe.id);
+		RecipeCarpentry globalRecipe = globalRecipes.remove(recipe.id);
+        if(globalRecipe != null)
+            SyncController.syncAllWorkbenchRecipes();
+
+        RecipeCarpentry carpentry = carpentryRecipes.remove(recipe.id);
+        if(carpentry != null)
+            SyncController.syncAllCarpentryRecipes();
+
 		saveCategories();
 		reloadGlobalRecipes(globalRecipes);
 		return recipe;
 	}
-	public void addRecipe(RecipeCarpentry recipeAnvil) {
-		recipeAnvil.id = getUniqueId();
-		if(!recipeAnvil.isGlobal)
-			RecipeController.Instance.anvilRecipes.put(recipeAnvil.id, recipeAnvil);
+
+    public RecipeAnvil deleteAnvil(int id) {
+        RecipeAnvil recipe = getAnvilRecipe(id);
+        if(recipe == null)
+            return null;
+
+        RecipeAnvil anvilRecipe = anvilRecipes.remove(recipe.id);
+        if(anvilRecipe != null)
+            SyncController.syncAllAnvilRecipes();
+
+        saveCategories();
+        return recipe;
+    }
+
+	public void addRecipe(RecipeCarpentry recipeCarpentry) {
+		recipeCarpentry.id = getUniqueId();
+		if(!recipeCarpentry.isGlobal)
+			RecipeController.Instance.carpentryRecipes.put(recipeCarpentry.id, recipeCarpentry);
 		else{
-			RecipeController.Instance.globalRecipes.put(recipeAnvil.id, recipeAnvil);
+			RecipeController.Instance.globalRecipes.put(recipeCarpentry.id, recipeCarpentry);
 		}
 	}
 
+    public void addAnvilRecipe(RecipeAnvil recipeAnvil) {
+        recipeAnvil.id = getUniqueAnvilId();
+        anvilRecipes.put(recipeAnvil.id, recipeAnvil);
+    }
+
+    @Override
 	public List<IRecipe> getGlobalList() {
 		return new ArrayList(this.globalRecipes.values());
 	}
 
+    @Override
 	public List<IRecipe> getCarpentryList() {
-		return new ArrayList(this.anvilRecipes.values());
+		return new ArrayList(this.carpentryRecipes.values());
 	}
 
+    @Override
+    public List<IAnvilRecipe> getAnvilList() {
+        List<IAnvilRecipe> list = new ArrayList<>();
+        list.addAll(anvilRecipes.values());
+        return list;
+    }
+
+    @Override
 	public void addRecipe(String name, boolean global, ItemStack result, Object... objects) {
 		RecipeCarpentry recipe = new RecipeCarpentry(name);
 		recipe.isGlobal = global;
@@ -238,6 +338,7 @@ public class RecipeController implements IRecipeHandler {
 		}
 	}
 
+    @Override
 	public void addRecipe(String name, boolean global, ItemStack result, int width, int height, ItemStack... objects) {
 		ArrayList<ItemStack> list = new ArrayList<>();
 		int var9 = objects.length;
@@ -259,4 +360,14 @@ public class RecipeController implements IRecipeHandler {
 			var12.printStackTrace();
 		}
 	}
+
+    @Override
+    public void addAnvilRecipe(String name, boolean global, ItemStack itemToRepair, ItemStack repairMaterial, int xpCost, float repairPercentage) {
+        RecipeAnvil recipe = new RecipeAnvil(name, itemToRepair, repairMaterial, xpCost, repairPercentage);
+        try {
+            this.saveAnvilRecipe(recipe.writeNBT());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/src/main/java/noppes/npcs/controllers/ScriptContainer.java b/src/main/java/noppes/npcs/controllers/ScriptContainer.java
index e5affe66b..8ed7045d3 100644
--- a/src/main/java/noppes/npcs/controllers/ScriptContainer.java
+++ b/src/main/java/noppes/npcs/controllers/ScriptContainer.java
@@ -132,7 +132,7 @@ public class ScriptContainer {
             var14.printStackTrace(pw);
         } finally {
             String errorString = sw.getBuffer().toString().trim();
-            this.appandConsole(errorString);
+            this.appendConsole(errorString);
             pw.close();
         }
     }
@@ -201,14 +201,14 @@ public class ScriptContainer {
                 e.printStackTrace(pw);
             }
             finally {
-                appandConsole(sw.getBuffer().toString().trim());
+                appendConsole(sw.getBuffer().toString().trim());
                 pw.close();
                 Current = null;
             }
         }
     }
 
-    public void appandConsole(String message) {
+    public void appendConsole(String message) {
         if (message != null && !message.isEmpty()) {
             long time = System.currentTimeMillis();
             if (this.console.containsKey(time)) {
diff --git a/src/main/java/noppes/npcs/controllers/SyncController.java b/src/main/java/noppes/npcs/controllers/SyncController.java
deleted file mode 100644
index 94d9efe73..000000000
--- a/src/main/java/noppes/npcs/controllers/SyncController.java
+++ /dev/null
@@ -1,346 +0,0 @@
-package noppes.npcs.controllers;
-
-import io.netty.buffer.ByteBuf;
-import kamkeel.addon.DBCAddon;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import noppes.npcs.NoppesUtilServer;
-import noppes.npcs.Server;
-import noppes.npcs.constants.EnumPacketClient;
-import noppes.npcs.constants.SyncType;
-import noppes.npcs.controllers.data.*;
-
-import java.util.HashMap;
-
-public class SyncController {
-
-	public static void syncPlayer(EntityPlayerMP player){
-		NBTTagList list = new NBTTagList();
-		NBTTagCompound compound = new NBTTagCompound();
-
-        ////////////////////////////////////////////////////////////////////////////////
-        // Faction Sync
-        for(Faction faction : FactionController.getInstance().factions.values()){
-            NBTTagCompound factioNBT = new NBTTagCompound();
-            faction.writeNBT(factioNBT);
-            list.appendTag(factioNBT);
-            if(list.tagCount() > 10){
-                compound = new NBTTagCompound();
-                compound.setTag("Data", list);
-                Server.sendData(player, EnumPacketClient.SYNC_ADD, SyncType.FACTION, compound);
-                list = new NBTTagList();
-            }
-        }
-        compound = new NBTTagCompound();
-        compound.setTag("Data", list);
-        Server.sendData(player, EnumPacketClient.SYNC_END, SyncType.FACTION, compound);
-        ////////////////////////////////////////////////////////////////////////////////
-
-        ////////////////////////////////////////////////////////////////////////////////
-        // Quest Sync
-        for(QuestCategory category : QuestController.Instance.categories.values()){
-            NBTTagCompound questCompound;
-            NBTTagList questList = new NBTTagList();
-            for(int questID : category.quests.keySet()){
-                Quest quest = category.quests.get(questID);
-                questList.appendTag(quest.writeToNBT(new NBTTagCompound()));
-                if(questList.tagCount() > 20){
-                    questCompound = new NBTTagCompound();
-                    questCompound.setTag("Data", questList);
-                    questCompound.setTag("CatNBT", category.writeSmallNBT(new NBTTagCompound()));
-                    Server.sendData(player, EnumPacketClient.SYNC_ADD, SyncType.QUEST_CATEGORY, questCompound);
-                    questList = new NBTTagList();
-                }
-            }
-            questCompound = new NBTTagCompound();
-            questCompound.setTag("Data", questList);
-            questCompound.setTag("CatNBT", category.writeSmallNBT(new NBTTagCompound()));
-            Server.sendData(player, EnumPacketClient.SYNC_ADD, SyncType.QUEST_CATEGORY, questCompound);
-        }
-        Server.sendData(player, EnumPacketClient.SYNC_END, SyncType.QUEST_CATEGORY, new NBTTagCompound());
-        ////////////////////////////////////////////////////////////////////////////////
-
-        ////////////////////////////////////////////////////////////////////////////////
-        // Dialog Sync
-        for(DialogCategory category : DialogController.Instance.categories.values()){
-            NBTTagCompound dialogCompound;
-            NBTTagList dialogList = new NBTTagList();
-            for(int dialogID : category.dialogs.keySet()){
-                Dialog dialog = category.dialogs.get(dialogID);
-                dialogList.appendTag(dialog.writeToNBT(new NBTTagCompound()));
-                if(dialogList.tagCount() > 20){
-                    dialogCompound = new NBTTagCompound();
-                    dialogCompound.setTag("Data", dialogList);
-                    dialogCompound.setTag("CatNBT", category.writeSmallNBT(new NBTTagCompound()));
-                    Server.sendData(player, EnumPacketClient.SYNC_ADD, SyncType.DIALOG_CATEGORY, dialogCompound);
-                    dialogList = new NBTTagList();
-                }
-            }
-            dialogCompound = new NBTTagCompound();
-            dialogCompound.setTag("Data", dialogList);
-            dialogCompound.setTag("CatNBT", category.writeSmallNBT(new NBTTagCompound()));
-            Server.sendData(player, EnumPacketClient.SYNC_ADD, SyncType.DIALOG_CATEGORY, dialogCompound);
-        }
-        Server.sendData(player, EnumPacketClient.SYNC_END, SyncType.DIALOG_CATEGORY, new NBTTagCompound());
-        ////////////////////////////////////////////////////////////////////////////////
-
-        DBCAddon.instance.syncPlayer(player);
-
-		PlayerData data = PlayerData.get(player);
-        if(data != null){
-            NoppesUtilServer.sendPlayerDataCompound(player, data.getSyncNBTFull(), false);
-        }
-	}
-
-	public static void syncAllDialogs() {
-        for(DialogCategory category : DialogController.Instance.categories.values()){
-            NBTTagCompound dialogCompound;
-            NBTTagList dialogList = new NBTTagList();
-            for(int dialogID : category.dialogs.keySet()){
-                Dialog dialog = category.dialogs.get(dialogID);
-                dialogList.appendTag(dialog.writeToNBT(new NBTTagCompound()));
-                if(dialogList.tagCount() > 20){
-                    dialogCompound = new NBTTagCompound();
-                    dialogCompound.setTag("Data", dialogList);
-                    dialogCompound.setTag("CatNBT", category.writeSmallNBT(new NBTTagCompound()));
-                    Server.sendToAll(EnumPacketClient.SYNC_ADD, SyncType.DIALOG_CATEGORY, dialogCompound);
-                    dialogList = new NBTTagList();
-                }
-            }
-            dialogCompound = new NBTTagCompound();
-            dialogCompound.setTag("Data", dialogList);
-            dialogCompound.setTag("CatNBT", category.writeSmallNBT(new NBTTagCompound()));
-            Server.sendToAll(EnumPacketClient.SYNC_ADD, SyncType.DIALOG_CATEGORY, dialogCompound);
-        }
-        Server.sendToAll(EnumPacketClient.SYNC_END, SyncType.DIALOG_CATEGORY, new NBTTagCompound());
-	}
-
-	public static void syncAllQuests() {
-        for(QuestCategory category : QuestController.Instance.categories.values()){
-            NBTTagCompound questCompound;
-            NBTTagList questList = new NBTTagList();
-            for(int questID : category.quests.keySet()){
-                Quest quest = category.quests.get(questID);
-                questList.appendTag(quest.writeToNBT(new NBTTagCompound()));
-                if(questList.tagCount() > 20){
-                    questCompound = new NBTTagCompound();
-                    questCompound.setTag("Data", questList);
-                    questCompound.setTag("CatNBT", category.writeSmallNBT(new NBTTagCompound()));
-                    Server.sendToAll(EnumPacketClient.SYNC_ADD, SyncType.QUEST_CATEGORY, questCompound);
-                    questList = new NBTTagList();
-                }
-            }
-            questCompound = new NBTTagCompound();
-            questCompound.setTag("Data", questList);
-            questCompound.setTag("CatNBT", category.writeSmallNBT(new NBTTagCompound()));
-            Server.sendToAll(EnumPacketClient.SYNC_ADD, SyncType.QUEST_CATEGORY, questCompound);
-        }
-        Server.sendToAll(EnumPacketClient.SYNC_END, SyncType.QUEST_CATEGORY, new NBTTagCompound());
-	}
-
-    public static void updateQuestCat(QuestCategory questCategory) {
-        NBTTagCompound questCompound;
-        NBTTagList questList = new NBTTagList();
-        for(int questID : questCategory.quests.keySet()){
-            Quest quest = questCategory.quests.get(questID);
-            questList.appendTag(quest.writeToNBT(new NBTTagCompound()));
-            if(questList.tagCount() > 20){
-                questCompound = new NBTTagCompound();
-                questCompound.setTag("Data", questList);
-                questCompound.setTag("CatNBT", questCategory.writeSmallNBT(new NBTTagCompound()));
-                Server.sendToAll(EnumPacketClient.SYNC_UPDATE, SyncType.QUEST_CATEGORY, questCompound);
-                questList = new NBTTagList();
-            }
-        }
-        questCompound = new NBTTagCompound();
-        questCompound.setTag("Data", questList);
-        questCompound.setTag("CatNBT", questCategory.writeSmallNBT(new NBTTagCompound()));
-        Server.sendToAll(EnumPacketClient.SYNC_UPDATE, SyncType.QUEST_CATEGORY, questCompound);
-    }
-
-    public static void updateDialogCat(DialogCategory dialogCategory) {
-        NBTTagCompound dialogCompound;
-        NBTTagList dialogList = new NBTTagList();
-        for(int questID : dialogCategory.dialogs.keySet()){
-            Dialog dialog = dialogCategory.dialogs.get(questID);
-            dialogList.appendTag(dialog.writeToNBT(new NBTTagCompound()));
-            if(dialogList.tagCount() > 20){
-                dialogCompound = new NBTTagCompound();
-                dialogCompound.setTag("Data", dialogList);
-                dialogCompound.setTag("CatNBT", dialogCategory.writeSmallNBT(new NBTTagCompound()));
-                Server.sendToAll(EnumPacketClient.SYNC_UPDATE, SyncType.DIALOG_CATEGORY, dialogCompound);
-                dialogList = new NBTTagList();
-            }
-        }
-        dialogCompound = new NBTTagCompound();
-        dialogCompound.setTag("Data", dialogList);
-        dialogCompound.setTag("CatNBT", dialogCategory.writeSmallNBT(new NBTTagCompound()));
-        Server.sendToAll(EnumPacketClient.SYNC_UPDATE, SyncType.DIALOG_CATEGORY, dialogCompound);
-    }
-
-	public static void clientSync(int synctype, NBTTagCompound compound, boolean syncEnd) {
-		if(synctype == SyncType.FACTION){
-			NBTTagList list = compound.getTagList("Data", 10);
-            for(int i = 0; i < list.tagCount(); i++)
-            {
-	            Faction faction = new Faction();
-	            faction.readNBT(list.getCompoundTagAt(i));
-            	FactionController.getInstance().factionsSync.put(faction.id, faction);
-            }
-	        if(syncEnd){
-	        	FactionController.getInstance().factions = FactionController.getInstance().factionsSync;
-	        	FactionController.getInstance().factionsSync = new HashMap<Integer, Faction>();
-	        }
-		}
-		else if(synctype == SyncType.QUEST_CATEGORY){
-            if(!compound.hasNoTags()){
-                QuestCategory category = new QuestCategory();
-                category.readSmallNBT(compound.getCompoundTag("CatNBT"));
-                NBTTagList list = compound.getTagList("Data", 10);
-                if(QuestController.Instance.categoriesSync.containsKey(category.id)){
-                    category = QuestController.Instance.categoriesSync.get(category.id);
-                    category.readSmallNBT(compound.getCompoundTag("CatNBT"));
-                }
-                for(int i = 0; i < list.tagCount(); i++)
-                {
-                    Quest quest = new Quest();
-                    quest.readNBT(list.getCompoundTagAt(i));
-                    quest.category = category;
-                    category.quests.put(quest.id, quest);
-                }
-                QuestController.Instance.categoriesSync.put(category.id, category);
-            }
-	        if(syncEnd){
-	        	HashMap<Integer,Quest> quests = new HashMap<Integer, Quest>();
-	        	for(QuestCategory category : QuestController.Instance.categoriesSync.values()){
-	        		for(Quest quest : category.quests.values()){
-	        			quests.put(quest.id, quest);
-	        		}
-	        	}
-	        	QuestController.Instance.categories = QuestController.Instance.categoriesSync;
-	        	QuestController.Instance.quests = quests;
-	        	QuestController.Instance.categoriesSync = new HashMap<Integer, QuestCategory>();
-	        }
-		}
-		else if(synctype == SyncType.DIALOG_CATEGORY){
-            if(!compound.hasNoTags()){
-                DialogCategory category = new DialogCategory();
-                category.readSmallNBT(compound.getCompoundTag("CatNBT"));
-                NBTTagList list = compound.getTagList("Data", 10);
-                if(DialogController.Instance.categoriesSync.containsKey(category.id)){
-                    category = DialogController.Instance.categoriesSync.get(category.id);
-                    category.readSmallNBT(compound.getCompoundTag("CatNBT"));
-                }
-                for(int i = 0; i < list.tagCount(); i++)
-                {
-                    Dialog dialog = new Dialog();
-                    dialog.readNBT(list.getCompoundTagAt(i));
-                    dialog.category = category;
-                    category.dialogs.put(dialog.id, dialog);
-                }
-                DialogController.Instance.categoriesSync.put(category.id, category);
-            }
-	        if(syncEnd){
-	        	HashMap<Integer,Dialog> dialogs = new HashMap<Integer, Dialog>();
-	        	for(DialogCategory category : DialogController.Instance.categoriesSync.values()){
-	        		for(Dialog dialog : category.dialogs.values()){
-	        			dialogs.put(dialog.id, dialog);
-	        		}
-	        	}
-	        	DialogController.Instance.categories = DialogController.Instance.categoriesSync;
-	        	DialogController.Instance.dialogs = dialogs;
-	        	DialogController.Instance.categoriesSync = new HashMap<Integer, DialogCategory>();
-	        }
-		}
-	}
-
-	public static void clientSyncUpdate(int synctype, NBTTagCompound compound, ByteBuf buffer) {
-		if(synctype == SyncType.FACTION){
-			Faction faction = new Faction();
-			faction.readNBT(compound);
-			FactionController.getInstance().factions.put(faction.id, faction);
-		}
-		else if(synctype == SyncType.DIALOG){
-			DialogCategory category = DialogController.Instance.categories.get(buffer.readInt());
-			Dialog dialog = new Dialog();
-            dialog.category = category;
-			dialog.readNBT(compound);
-			DialogController.Instance.dialogs.put(dialog.id, dialog);
-			category.dialogs.put(dialog.id, dialog);
-		}
-		else if(synctype == SyncType.DIALOG_CATEGORY){
-            DialogCategory category = new DialogCategory();
-            category.readSmallNBT(compound.getCompoundTag("CatNBT"));
-            NBTTagList list = compound.getTagList("Data", 10);
-            if(DialogController.Instance.categoriesSync.containsKey(category.id)){
-                category = DialogController.Instance.categoriesSync.get(category.id);
-                category.readSmallNBT(compound.getCompoundTag("CatNBT"));
-            }
-            for(int i = 0; i < list.tagCount(); i++)
-            {
-                Dialog dialog = new Dialog();
-                dialog.readNBT(list.getCompoundTagAt(i));
-                dialog.category = category;
-                category.dialogs.put(dialog.id, dialog);
-            }
-            DialogController.Instance.categories.put(category.id, category);
-		}
-		else if(synctype == SyncType.QUEST){
-			QuestCategory category = QuestController.Instance.categories.get(buffer.readInt());
-			Quest quest = new Quest();
-            quest.category = category;
-			quest.readNBT(compound);
-			QuestController.Instance.quests.put(quest.id, quest);
-			category.quests.put(quest.id, quest);
-		}
-		else if(synctype == SyncType.QUEST_CATEGORY){
-			QuestCategory category = new QuestCategory();
-            category.readSmallNBT(compound.getCompoundTag("CatNBT"));
-            NBTTagList list = compound.getTagList("Data", 10);
-            if(QuestController.Instance.categoriesSync.containsKey(category.id)){
-                category = QuestController.Instance.categoriesSync.get(category.id);
-                category.readSmallNBT(compound.getCompoundTag("CatNBT"));
-            }
-            for(int i = 0; i < list.tagCount(); i++)
-            {
-                Quest quest = new Quest();
-                quest.readNBT(list.getCompoundTagAt(i));
-                quest.category = category;
-                category.quests.put(quest.id, quest);
-            }
-			QuestController.Instance.categories.put(category.id, category);
-		}
-	}
-
-	public static void clientSyncRemove(int synctype, int id) {
-		if(synctype == SyncType.FACTION){
-			FactionController.getInstance().factions.remove(id);
-		}
-		else if(synctype == SyncType.DIALOG){
-			Dialog dialog = DialogController.Instance.dialogs.remove(id);
-			if(dialog != null) {
-				dialog.category.dialogs.remove(id);
-			}
-		}
-		else if(synctype == SyncType.DIALOG_CATEGORY){
-			DialogCategory category = DialogController.Instance.categories.remove(id);
-			if(category != null) {
-				DialogController.Instance.dialogs.keySet().removeAll(category.dialogs.keySet());
-			}
-		}
-		else if(synctype == SyncType.QUEST){
-			Quest quest = QuestController.Instance.quests.remove(id);
-			if(quest != null) {
-				quest.category.quests.remove(id);
-			}
-		}
-		else if(synctype == SyncType.QUEST_CATEGORY){
-			QuestCategory category = QuestController.Instance.categories.remove(id);
-			if(category != null) {
-				QuestController.Instance.quests.keySet().removeAll(category.quests.keySet());
-			}
-		}
-	}
-
-}
diff --git a/src/main/java/noppes/npcs/controllers/data/AnimationData.java b/src/main/java/noppes/npcs/controllers/data/AnimationData.java
index 71818a669..06af050d4 100644
--- a/src/main/java/noppes/npcs/controllers/data/AnimationData.java
+++ b/src/main/java/noppes/npcs/controllers/data/AnimationData.java
@@ -3,6 +3,8 @@ package noppes.npcs.controllers.data;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.packets.data.UpdateAnimationsPacket;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -18,7 +20,6 @@ import noppes.npcs.api.entity.IEntity;
 import noppes.npcs.api.handler.data.IAnimation;
 import noppes.npcs.api.handler.data.IAnimationData;
 import noppes.npcs.constants.EnumAnimationPart;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.controllers.PlayerDataController;
 import noppes.npcs.entity.EntityNPCInterface;
 import noppes.npcs.scripted.NpcAPI;
@@ -228,7 +229,7 @@ public class AnimationData implements IAnimationData {
             data.setInteger("EntityId", entity.getEntityId());
         }
 
-        Server.sendData((EntityPlayerMP) ((PlayerData) parent).player, EnumPacketClient.UPDATE_ANIMATIONS, data, entity.getCommandSenderName());
+        PacketHandler.Instance.sendToPlayer(new UpdateAnimationsPacket(data, entity.getCommandSenderName()), (EntityPlayerMP) ((PlayerData) parent).player);
         return true;
     }
 
diff --git a/src/main/java/noppes/npcs/controllers/data/Availability.java b/src/main/java/noppes/npcs/controllers/data/Availability.java
index 1b039d730..1704e5b97 100644
--- a/src/main/java/noppes/npcs/controllers/data/Availability.java
+++ b/src/main/java/noppes/npcs/controllers/data/Availability.java
@@ -1,8 +1,11 @@
 package noppes.npcs.controllers.data;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.MathHelper;
+import net.minecraft.util.StatCollector;
 import noppes.npcs.ICompatibilty;
 import noppes.npcs.VersionCompatibility;
 import noppes.npcs.api.entity.IPlayer;
@@ -13,6 +16,9 @@ import noppes.npcs.controllers.PlayerQuestController;
 import noppes.npcs.controllers.QuestController;
 import noppes.npcs.scripted.CustomNPCsException;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class Availability implements ICompatibilty, IAvailability {
 	public int version = VersionCompatibility.ModRev;
 
@@ -124,6 +130,31 @@ public class Availability implements ICompatibilty, IAvailability {
 		compound.setInteger("AvailabilityMinPlayerLevel", minPlayerLevel);
 		return compound;
     }
+
+    public boolean isDefault() {
+        return dialogAvailable == EnumAvailabilityDialog.Always &&
+            dialog2Available == EnumAvailabilityDialog.Always &&
+            dialog3Available == EnumAvailabilityDialog.Always &&
+            dialog4Available == EnumAvailabilityDialog.Always &&
+            dialogId == -1 &&
+
+            questAvailable == EnumAvailabilityQuest.Always &&
+            quest2Available == EnumAvailabilityQuest.Always &&
+            quest3Available == EnumAvailabilityQuest.Always &&
+            quest4Available == EnumAvailabilityQuest.Always &&
+            questId == -1 &&
+
+            factionAvailable == EnumAvailabilityFactionType.Always &&
+            faction2Available == EnumAvailabilityFactionType.Always &&
+            factionId == -1 &&
+            faction2Id == -1 &&
+            factionStance == EnumAvailabilityFaction.Friendly &&
+            faction2Stance == EnumAvailabilityFaction.Friendly &&
+
+            daytime == EnumDayTime.Always &&
+            minPlayerLevel == 0;
+    }
+
 	public void setFactionAvailability(int value) {
     	factionAvailable =  EnumAvailabilityFactionType.values()[value];
 	}
@@ -177,6 +208,64 @@ public class Availability implements ICompatibilty, IAvailability {
 		return true;
 	}
 
+    @SideOnly(Side.CLIENT)
+    public List<String> isAvailableText(EntityPlayer player) {
+        List<String> errors = new ArrayList<String>();
+
+        // Check daytime conditions.
+        if (daytime == EnumDayTime.Day) {
+            long time = player.worldObj.getWorldTime() % 24000;
+            if (time > 12000) {
+                errors.add(StatCollector.translateToLocal("availability.error.day"));
+            }
+        } else if (daytime == EnumDayTime.Night) {
+            long time = player.worldObj.getWorldTime() % 24000;
+            if (time < 12000) {
+                errors.add(StatCollector.translateToLocal("availability.error.night"));
+            }
+        }
+
+        // Check dialog conditions.
+        if (!dialogAvailable(dialogId, dialogAvailable, player)) {
+            errors.add(StatCollector.translateToLocalFormatted("availability.error.dialog", dialogAvailable.toString(), dialogId));
+        }
+        if (!dialogAvailable(dialog2Id, dialog2Available, player)) {
+            errors.add(StatCollector.translateToLocalFormatted("availability.error.dialog", dialog2Available.toString(), dialog2Id));
+        }
+        if (!dialogAvailable(dialog3Id, dialog3Available, player)) {
+            errors.add(StatCollector.translateToLocalFormatted("availability.error.dialog", dialog3Available.toString(), dialog3Id));
+        }
+        if (!dialogAvailable(dialog4Id, dialog4Available, player)) {
+            errors.add(StatCollector.translateToLocalFormatted("availability.error.dialog", dialog4Available.toString(), dialog4Id));
+        }
+
+        // Check quest conditions.
+        if (!questAvailable(questId, questAvailable, player)) {
+            errors.add(StatCollector.translateToLocalFormatted("availability.error.quest", questAvailable.toString(), questId));
+        }
+        if (!questAvailable(quest2Id, quest2Available, player)) {
+            errors.add(StatCollector.translateToLocalFormatted("availability.error.quest", quest2Available.toString(), quest2Id));
+        }
+        if (!questAvailable(quest3Id, quest3Available, player)) {
+            errors.add(StatCollector.translateToLocalFormatted("availability.error.quest", quest3Available.toString(), quest3Id));
+        }
+        if (!questAvailable(quest4Id, quest4Available, player)) {
+            errors.add(StatCollector.translateToLocalFormatted("availability.error.quest", quest4Available.toString(), quest4Id));
+        }
+
+        // Check faction conditions.
+        if (!factionAvailable(factionId, factionStance, factionAvailable, player)) {
+            errors.add(StatCollector.translateToLocalFormatted("availability.error.faction", factionAvailable.toString(), factionStance.toString(), factionId));
+        }
+        if (!factionAvailable(faction2Id, faction2Stance, faction2Available, player)) {
+            errors.add(StatCollector.translateToLocalFormatted("availability.error.faction", faction2Available.toString(), faction2Stance.toString(), faction2Id));
+        }
+        if (player.experienceLevel < minPlayerLevel) {
+            errors.add(StatCollector.translateToLocalFormatted("availability.error.xp", minPlayerLevel));
+        }
+        return errors;
+    }
+
 	private boolean factionAvailable(int id, EnumAvailabilityFaction stance, EnumAvailabilityFactionType available, EntityPlayer player) {
 		if(available == EnumAvailabilityFactionType.Always)
 			return true;
diff --git a/src/main/java/noppes/npcs/controllers/data/BankData.java b/src/main/java/noppes/npcs/controllers/data/BankData.java
index 95fa3aa1e..d08001f18 100644
--- a/src/main/java/noppes/npcs/controllers/data/BankData.java
+++ b/src/main/java/noppes/npcs/controllers/data/BankData.java
@@ -1,5 +1,6 @@
 package noppes.npcs.controllers.data;
 
+import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.inventory.Container;
@@ -9,9 +10,7 @@ import net.minecraft.nbt.NBTTagList;
 import noppes.npcs.NBTTags;
 import noppes.npcs.NoppesUtilServer;
 import noppes.npcs.NpcMiscInventory;
-import noppes.npcs.Server;
 import noppes.npcs.constants.EnumGuiType;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.containers.ContainerNPCBankInterface;
 import noppes.npcs.controllers.BankController;
 import noppes.npcs.entity.EntityNPCInterface;
@@ -108,7 +107,8 @@ public class BankData {
 			if (container != null)
 				container.setCurrency(item);
 		}
-		Server.sendDataChecked((EntityPlayerMP) player, EnumPacketClient.GUI_DATA, compound);
+
+        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
 	}
 	private ContainerNPCBankInterface getContainer(EntityPlayer player){
 		Container con = player.openContainer;
diff --git a/src/main/java/noppes/npcs/controllers/data/CustomEffect.java b/src/main/java/noppes/npcs/controllers/data/CustomEffect.java
new file mode 100644
index 000000000..03520eee8
--- /dev/null
+++ b/src/main/java/noppes/npcs/controllers/data/CustomEffect.java
@@ -0,0 +1,318 @@
+package noppes.npcs.controllers.data;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.Constants;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.api.entity.IPlayer;
+import noppes.npcs.api.handler.data.ICustomEffect;
+import noppes.npcs.controllers.CustomEffectController;
+import noppes.npcs.scripted.event.PlayerEvent;
+
+import java.util.function.Consumer;
+
+public class CustomEffect implements ICustomEffect {
+    public int id = -1;
+
+    public String name = "";
+    public boolean lossOnDeath = true;
+    public int length = 30;
+
+    // Must be a multiple of 10
+    public int everyXTick = 20;
+
+    public String icon = "";
+    // CustomNpcPlusDBC.ID + ":textures/gui/icons.png";
+    public int iconX = 0, iconY = 0;
+
+    /**
+     * Experimental script stuff.
+     */
+    public Consumer<PlayerEvent.EffectEvent.Added> onAddedConsumer;
+    public Consumer<PlayerEvent.EffectEvent.Ticked> onTickConsumer;
+    public Consumer<PlayerEvent.EffectEvent.Removed> onRemovedConsumer;
+    public String menuName = "§aNEW EFFECT";
+    public int width = 16, height = 16;
+
+    public int index = 0;
+
+    public CustomEffect() {}
+
+    public CustomEffect(int id) {
+        this.id = id;
+    }
+
+    public CustomEffect(int id, String name) {
+        this(id);
+        this.name = name;
+    }
+
+    @Override
+    public int getID() {
+        return this.id;
+    }
+
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    @Override
+    public void setMenuName(String name) {
+        if (name != null && !name.isEmpty())
+            this.menuName = name.replaceAll("&", "§");
+    }
+
+    @Override
+    public String getMenuName() {
+        return menuName;
+    }
+
+    @Override
+    public void setName(String name) {
+        if (name != null && !name.isEmpty())
+            this.name = name;
+    }
+
+    @Override
+    public String getIcon() {
+        return icon;
+    }
+
+    @Override
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    @Override
+    public int getEveryXTick() {
+        return everyXTick;
+    }
+
+    @Override
+    public void setEveryXTick(int everyXTick) {
+        if (everyXTick < 10)
+            everyXTick = 10;
+        int remainder = everyXTick % 10;
+        if (remainder >= 5)
+            everyXTick += 10 - remainder;
+        else
+            everyXTick -= remainder;
+        this.everyXTick = everyXTick;
+    }
+
+    @Override
+    public int getIconX() {
+        return iconX;
+    }
+
+    @Override
+    public void setIconX(int iconX) {
+        this.iconX = iconX;
+    }
+
+    @Override
+    public int getIconY() {
+        return iconY;
+    }
+
+    @Override
+    public void setIconY(int iconY) {
+        this.iconY = iconY;
+    }
+
+    @Override
+    public int getWidth() {
+        return this.width;
+    }
+
+    @Override
+    public int getHeight() {
+        return this.height;
+    }
+
+    @Override
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    @Override
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    @Override
+    public boolean isLossOnDeath() {
+        return lossOnDeath;
+    }
+
+    @Override
+    public void setLossOnDeath(boolean lossOnDeath) {
+        this.lossOnDeath = lossOnDeath;
+    }
+
+    @Override
+    public ICustomEffect save() {
+        return CustomEffectController.getInstance().saveEffect(this);
+    }
+
+    @Override
+    public void setID(int id) {
+        this.id = id;
+    }
+
+    @Override
+    public int getIndex() {
+        return this.index;
+    }
+
+
+    public void onAdded(Consumer<PlayerEvent.EffectEvent.Added> function) {
+        onAddedConsumer = function;
+    }
+
+    public void onTick(Consumer<PlayerEvent.EffectEvent.Ticked> function) {
+        onTickConsumer = function;
+    }
+
+    public void onRemoved(Consumer<PlayerEvent.EffectEvent.Removed> function) {
+        onRemovedConsumer = function;
+    }
+
+    public void onAdded(EntityPlayer player, PlayerEffect playerEffect) {
+        IPlayer iPlayer = NoppesUtilServer.getIPlayer(player);
+
+        PlayerEvent.EffectEvent.Added event = new PlayerEvent.EffectEvent.Added(iPlayer, playerEffect);
+        if (onAddedConsumer != null) onAddedConsumer.accept(event);
+        EffectScript script = getScriptHandler();
+        if (script == null) {
+            return;
+        }
+
+        script.callScript(EffectScript.ScriptType.OnAdd, event);
+    }
+
+    public void onTick(EntityPlayer player, PlayerEffect playerEffect) {
+        IPlayer iPlayer = NoppesUtilServer.getIPlayer(player);
+        PlayerEvent.EffectEvent.Ticked event = new PlayerEvent.EffectEvent.Ticked(iPlayer, playerEffect);
+
+        if (onTickConsumer != null) {
+            onTickConsumer.accept(event);
+        }
+
+        EffectScript script = getScriptHandler();
+        if (script == null) {
+            return;
+        }
+
+        script.callScript(EffectScript.ScriptType.OnTick, event);
+    }
+
+    public void onRemoved(EntityPlayer player, PlayerEffect playerEffect, PlayerEvent.EffectEvent.ExpirationType type) {
+        IPlayer iPlayer = NoppesUtilServer.getIPlayer(player);
+
+        PlayerEvent.EffectEvent.Removed event = new PlayerEvent.EffectEvent.Removed(iPlayer, playerEffect, type);
+
+        if (onRemovedConsumer != null) {
+            onRemovedConsumer.accept(event);
+        }
+
+        EffectScript script = getScriptHandler();
+        if (script == null) {
+            return;
+        }
+
+        script.callScript(EffectScript.ScriptType.OnRemove, event);
+    }
+
+    public NBTTagCompound writeToNBT(boolean saveScripts) {
+        NBTTagCompound compound = new NBTTagCompound();
+        compound.setInteger("ID", id);
+        compound.setString("name", name);
+        compound.setString("menuName", menuName);
+        compound.setInteger("length", length);
+        compound.setInteger("everyXTick", everyXTick);
+        compound.setInteger("iconX", iconX);
+        compound.setInteger("iconY", iconY);
+        compound.setInteger("iconWidth", width);
+        compound.setInteger("iconHeight", height);
+        compound.setString("icon", icon);
+        compound.setBoolean("lossOnDeath", lossOnDeath);
+
+//        if (saveScripts && scriptContainer != null) {
+        if (saveScripts) {
+            NBTTagCompound scriptData = new NBTTagCompound();
+            EffectScript handler = getScriptHandler();
+            if (handler != null)
+                handler.writeToNBT(scriptData);
+            compound.setTag("ScriptData", scriptData);
+        }
+
+        return compound;
+    }
+
+    public void readFromNBT(NBTTagCompound compound) {
+        if (compound.hasKey("ID"))
+            id = compound.getInteger("ID");
+        else
+            id = CustomEffectController.Instance.getUnusedId();
+        name = compound.getString("name");
+
+        if (compound.hasKey("menuName", Constants.NBT.TAG_STRING))
+            menuName = compound.getString("menuName");
+        else
+            menuName = name;
+
+        length = compound.getInteger("length");
+        everyXTick = compound.getInteger("everyXTick");
+        iconX = compound.getInteger("iconX");
+        iconY = compound.getInteger("iconY");
+
+        if (compound.hasKey("iconWidth", Constants.NBT.TAG_INT))
+            width = compound.getInteger("iconWidth");
+        else
+            width = 16;
+
+        if (compound.hasKey("iconHeight", Constants.NBT.TAG_INT))
+            height = compound.getInteger("iconHeight");
+        else
+            height = 16;
+
+        icon = compound.getString("icon");
+        lossOnDeath = compound.getBoolean("lossOnDeath");
+
+        if (compound.hasKey("ScriptData", Constants.NBT.TAG_COMPOUND)) {
+            EffectScript handler = new EffectScript();
+            handler.readFromNBT(compound.getCompoundTag("ScriptData"));
+            setScriptHandler(handler);
+        }
+
+    }
+
+    public CustomEffect cloneEffect() {
+        CustomEffect newEffect = new CustomEffect();
+        newEffect.readFromNBT(this.writeToNBT(true));
+        newEffect.id = -1;
+        return newEffect;
+    }
+
+    public EffectScript getScriptHandler() {
+        return CustomEffectController.getInstance().customEffectScriptHandlers.get(this.id);
+    }
+    public void setScriptHandler(EffectScript handler) {
+        CustomEffectController.getInstance().customEffectScriptHandlers.put(this.id, handler);
+    }
+
+    public EffectScript getOrCreateScriptHandler() {
+        EffectScript data = getScriptHandler();
+        if (data == null)
+            setScriptHandler(data =new EffectScript());
+        return data;
+    }
+
+    public void runEffect(EntityPlayer player, PlayerEffect playerEffect) {
+        if (player.ticksExisted % everyXTick == 0) {
+            onTick(player, playerEffect);
+        }
+    }
+}
diff --git a/src/main/java/noppes/npcs/controllers/data/DataTransform.java b/src/main/java/noppes/npcs/controllers/data/DataTransform.java
index ad5402165..37a0571f0 100644
--- a/src/main/java/noppes/npcs/controllers/data/DataTransform.java
+++ b/src/main/java/noppes/npcs/controllers/data/DataTransform.java
@@ -18,13 +18,13 @@ public class DataTransform {
 	public NBTTagCompound stats;
 	public NBTTagCompound role;
 	public NBTTagCompound job;
-	
+
 	public boolean hasDisplay, hasAi, hasAdvanced, hasInv, hasStats, hasRole, hasJob, isActive;
-	
+
 	private EntityNPCInterface npc;
-	
+
 	public boolean editingModus = false;
-	
+
 	public DataTransform(EntityNPCInterface npc){
 		this.npc = npc;
 	}
@@ -47,11 +47,11 @@ public class DataTransform {
     		compound.setTag("TransformRole", role);
     	if(hasJob)
     		compound.setTag("TransformJob", job);
-    	
+
     	return compound;
     }
-    
-	public Object writeOptions(NBTTagCompound compound) {
+
+	public NBTTagCompound writeOptions(NBTTagCompound compound) {
     	compound.setBoolean("TransformHasDisplay", hasDisplay);
     	compound.setBoolean("TransformHasAI", hasAi);
     	compound.setBoolean("TransformHasAdvanced", hasAdvanced);
@@ -62,20 +62,20 @@ public class DataTransform {
     	compound.setBoolean("TransformEditingModus", editingModus);
 		return compound;
 	}
-    
+
 
     public void readToNBT(NBTTagCompound compound) {
     	isActive = compound.getBoolean("TransformIsActive");
     	readOptions(compound);
     	display = hasDisplay?compound.getCompoundTag("TransformDisplay"): getDisplay();
-    	ai = hasAi?compound.getCompoundTag("TransformAI"): npc.ai.writeToNBT(new NBTTagCompound());
+    	ai = hasAi?compound.getCompoundTag("TransformAI"): npc.ais.writeToNBT(new NBTTagCompound());
     	advanced = hasAdvanced?compound.getCompoundTag("TransformAdvanced"): getAdvanced();
     	inv = hasInv?compound.getCompoundTag("TransformInv"): npc.inventory.writeEntityToNBT(new NBTTagCompound());
     	stats = hasStats?compound.getCompoundTag("TransformStats"): npc.stats.writeToNBT(new NBTTagCompound());
     	job = hasJob?compound.getCompoundTag("TransformJob"): getJob();
     	role = hasRole?compound.getCompoundTag("TransformRole"): getRole();
     }
-    
+
     public NBTTagCompound getJob() {
     	NBTTagCompound compound = new NBTTagCompound();
 
@@ -83,17 +83,17 @@ public class DataTransform {
         if (npc.advanced.job != EnumJobType.None && npc.jobInterface != null) {
             npc.jobInterface.writeToNBT(compound);
         }
-    	
+
     	return compound;
 	}
     public NBTTagCompound getRole() {
     	NBTTagCompound compound = new NBTTagCompound();
 
-        compound.setInteger("Role", npc.advanced.role.ordinal());        
+        compound.setInteger("Role", npc.advanced.role.ordinal());
         if (npc.advanced.role != EnumRoleType.None && npc.roleInterface != null) {
             npc.roleInterface.writeToNBT(compound);
         }
-    	
+
     	return compound;
 	}
 
@@ -102,7 +102,7 @@ public class DataTransform {
     	if(npc instanceof EntityCustomNpc){
     		compound.setTag("ModelData", ((EntityCustomNpc)npc).modelData.writeToNBT());
     	}
-    	
+
     	return compound;
     }
 
@@ -119,7 +119,7 @@ public class DataTransform {
 
     	npc.advanced.job = jopType;
     	npc.advanced.role = roleType;
-    	
+
     	return compound;
 	}
 
@@ -132,7 +132,7 @@ public class DataTransform {
 		boolean hadStats = hasStats;
 		boolean hadRole = hasRole;
 		boolean hadJob = hasJob;
-		
+
     	hasDisplay = compound.getBoolean("TransformHasDisplay");
     	hasAi = compound.getBoolean("TransformHasAI");
     	hasAdvanced = compound.getBoolean("TransformHasAdvanced");
@@ -146,7 +146,7 @@ public class DataTransform {
     		display = getDisplay();
     	}
     	if(hasAi && !hadAI)
-    		ai = npc.ai.writeToNBT(new NBTTagCompound());
+    		ai = npc.ais.writeToNBT(new NBTTagCompound());
     	if(hasStats && !hadStats)
     		stats = npc.stats.writeToNBT(new NBTTagCompound());
     	if(hasInv && !hadInv)
@@ -158,7 +158,7 @@ public class DataTransform {
     	if(hasRole && !hadRole)
     		role = getRole();
     }
-    
+
     public boolean isValid(){
     	return hasAdvanced || hasAi || hasDisplay || hasInv || hasStats || hasJob || hasRole;
     }
@@ -166,14 +166,14 @@ public class DataTransform {
 
 	public NBTTagCompound processAdvanced(NBTTagCompound compoundAdv,
 			NBTTagCompound compoundRole, NBTTagCompound compoundJob) {
-		
+
 		if(hasAdvanced)
 			compoundAdv = advanced;
 		if(hasRole)
 			compoundRole = role;
 		if(hasJob)
 			compoundJob = job;
-		
+
 		Set<String> names = compoundRole.func_150296_c();
 		for(String name : names)
 			compoundAdv.setTag(name, compoundRole.getTag(name));
@@ -181,10 +181,10 @@ public class DataTransform {
 		names = compoundJob.func_150296_c();
 		for(String name : names)
 			compoundAdv.setTag(name, compoundJob.getTag(name));
-		
+
 		return compoundAdv;
 	}
-	
+
 	public void transform(boolean isActive){
 		if(this.isActive == isActive)
 			return;
@@ -205,14 +205,14 @@ public class DataTransform {
 			NBTTagCompound compoundAdv = getAdvanced();
 			NBTTagCompound compoundRole = getRole();
 			NBTTagCompound compoundJob = getJob();
-			
+
 			NBTTagCompound compound = processAdvanced(compoundAdv, compoundRole, compoundJob);
 			npc.advanced.readToNBT(compound);
-	        if (npc.advanced.role != EnumRoleType.None && npc.roleInterface != null) 
+	        if (npc.advanced.role != EnumRoleType.None && npc.roleInterface != null)
 	        	npc.roleInterface.readFromNBT(NBTTags.NBTMerge(compoundRole, compound));
 	        if (npc.advanced.job != EnumJobType.None && npc.jobInterface != null)
-	        	npc.jobInterface.readFromNBT(NBTTags.NBTMerge(compoundJob, compound));   
-	        
+	        	npc.jobInterface.readFromNBT(NBTTags.NBTMerge(compoundJob, compound));
+
 			if(hasAdvanced)
 				advanced = compoundAdv;
 			if(hasRole)
@@ -221,8 +221,8 @@ public class DataTransform {
 				job = compoundJob;
     	}
     	if(hasAi){
-			NBTTagCompound compound = npc.ai.writeToNBT(new NBTTagCompound());
-			npc.ai.readToNBT(NBTTags.NBTMerge(compound, ai));
+			NBTTagCompound compound = npc.ais.writeToNBT(new NBTTagCompound());
+			npc.ais.readToNBT(NBTTags.NBTMerge(compound, ai));
 			ai = compound;
 	    	npc.setCurrentAnimation(EnumAnimation.NONE);
     	}
diff --git a/src/main/java/noppes/npcs/controllers/data/EffectKey.java b/src/main/java/noppes/npcs/controllers/data/EffectKey.java
new file mode 100644
index 000000000..c64468f0b
--- /dev/null
+++ b/src/main/java/noppes/npcs/controllers/data/EffectKey.java
@@ -0,0 +1,37 @@
+package noppes.npcs.controllers.data;
+
+public class EffectKey {
+    private final int id;
+    private final int index;
+
+    public EffectKey(int key1, int key2) {
+        this.id = key1;
+        this.index = key2;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof EffectKey)) return false;
+        EffectKey that = (EffectKey) o;
+        return id == that.id && index == that.index;
+    }
+
+    @Override
+    public int hashCode() {
+        return 31 * id + index;
+    }
+
+    @Override
+    public String toString() {
+        return "EffectKey{" + "key1=" + id + ", key2=" + index + '}';
+    }
+}
diff --git a/src/main/java/noppes/npcs/controllers/data/EffectScript.java b/src/main/java/noppes/npcs/controllers/data/EffectScript.java
new file mode 100644
index 000000000..45dda2e9b
--- /dev/null
+++ b/src/main/java/noppes/npcs/controllers/data/EffectScript.java
@@ -0,0 +1,181 @@
+package noppes.npcs.controllers.data;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.eventhandler.Event;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.Constants;
+import noppes.npcs.config.ConfigScript;
+import noppes.npcs.controllers.ScriptContainer;
+import noppes.npcs.controllers.ScriptController;
+import noppes.npcs.scripted.NpcAPI;
+import noppes.npcs.scripted.event.PlayerEvent;
+
+import javax.script.ScriptEngine;
+import java.io.IOException;
+import java.util.*;
+
+public class EffectScript implements IScriptHandler {
+    public ScriptContainer container;
+    public String scriptLanguage = "ECMAScript";
+    public boolean enabled = false;
+
+
+    public NBTTagCompound writeToNBT(NBTTagCompound compound) {
+        compound.setString("ScriptLanguage", scriptLanguage);
+        compound.setBoolean("ScriptEnabled", enabled);
+
+        if (container != null)
+            compound.setTag("ScriptContent", container.writeToNBT(new NBTTagCompound()));
+        return compound;
+    }
+
+    public EffectScript readFromNBT(NBTTagCompound compound) {
+        scriptLanguage = compound.getString("ScriptLanguage");
+        enabled = compound.getBoolean("ScriptEnabled");
+
+        if (compound.hasKey("ScriptContent", Constants.NBT.TAG_COMPOUND)) {
+            container = new ScriptContainer(this);
+            container.readFromNBT(compound.getCompoundTag("ScriptContent"));
+        }
+        return this;
+    }
+
+    public void callScript(ScriptType type, PlayerEvent.EffectEvent event) {
+        callScript(type.function, event);
+    }
+
+    public boolean isEnabled() {
+        return this.enabled && ScriptController.HasStart && container != null && ConfigScript.ScriptingEnabled;
+    }
+
+        @Override
+    public void callScript(String s, Event event) {
+        if (!this.isEnabled()) {
+            return;
+        }
+
+        ScriptEngine engine = container.engine;
+        engine.put("API", NpcAPI.Instance());
+
+        for (Map.Entry<String, Object> engineObjects : NpcAPI.engineObjects.entrySet()) {
+            engine.put(engineObjects.getKey(), engineObjects.getValue());
+        }
+
+        container.run(s, event);
+    }
+
+    @Override
+    public boolean isClient() {
+        return FMLCommonHandler.instance().getEffectiveSide().isClient();
+    }
+
+    @Override
+    public boolean getEnabled() {
+        return this.enabled;
+    }
+
+    @Override
+    public void setEnabled(boolean b) {
+        this.enabled = b;
+    }
+
+    @Override
+    public String getLanguage() {
+        return this.scriptLanguage;
+    }
+
+    @Override
+    public void setLanguage(String s) {
+        this.scriptLanguage = s;
+    }
+
+    @Override
+    public void setScripts(List<ScriptContainer> list) {
+        if (list == null || list.isEmpty()) {
+            container = null;
+            return;
+        }
+        container = list.get(0);
+    }
+
+    @Override
+    public List<ScriptContainer> getScripts() {
+        if (container == null)
+            return new ArrayList<>();
+        return Collections.singletonList(container);
+    }
+
+    @Override
+    public String noticeString() {
+        return "";
+    }
+
+    @Override
+    public Map<Long, String> getConsoleText() {
+        TreeMap<Long, String> map = new TreeMap();
+        int tab = 0;
+        Iterator var3 = this.getScripts().iterator();
+
+        while(var3.hasNext()) {
+            ScriptContainer script = (ScriptContainer)var3.next();
+            ++tab;
+            Iterator var5 = script.console.entrySet().iterator();
+
+            while(var5.hasNext()) {
+                Map.Entry<Long, String> longStringEntry = (Map.Entry)var5.next();
+                map.put(longStringEntry.getKey(), " tab " + tab + ":\n" + (String)longStringEntry.getValue());
+            }
+        }
+
+        return map;
+    }
+
+    @Override
+    public void clearConsole() {
+        Iterator var1 = this.getScripts().iterator();
+
+        while(var1.hasNext()) {
+            ScriptContainer script = (ScriptContainer)var1.next();
+            script.console.clear();
+        }
+    }
+
+    public void saveScript(ByteBuf buffer) throws IOException {
+        int tab = buffer.readInt();
+        int totalScripts = buffer.readInt();
+        if (totalScripts == 0) {
+            this.container = null;
+        }
+
+        if (tab == 0) {
+            NBTTagCompound tabCompound = ByteBufUtils.readNBT(buffer);
+            ScriptContainer script = new ScriptContainer(this);
+            script.readFromNBT(tabCompound);
+            this.container = script;
+        } else {
+            NBTTagCompound compound = ByteBufUtils.readNBT(buffer);
+            this.setLanguage(compound.getString("ScriptLanguage"));
+            if (!ScriptController.Instance.languages.containsKey(this.getLanguage())) {
+                if (!ScriptController.Instance.languages.isEmpty()) {
+                    this.setLanguage((String) ScriptController.Instance.languages.keySet().toArray()[0]);
+                } else {
+                    this.setLanguage("ECMAScript");
+                }
+            }
+            this.setEnabled(compound.getBoolean("ScriptEnabled"));
+        }
+    }
+
+    public enum ScriptType {
+        OnAdd("onAdded"),
+        OnTick("onTick"),
+        OnRemove("onRemove");
+
+        public final String function;
+        ScriptType(String functionName) {
+            this.function = functionName;
+        }
+    }
+}
diff --git a/src/main/java/noppes/npcs/controllers/data/LinkedItemData.java b/src/main/java/noppes/npcs/controllers/data/LinkedItemData.java
new file mode 100644
index 000000000..b95b1384f
--- /dev/null
+++ b/src/main/java/noppes/npcs/controllers/data/LinkedItemData.java
@@ -0,0 +1,30 @@
+package noppes.npcs.controllers.data;
+
+public class LinkedItemData {
+
+    // Utilitzed within a Scripted Item
+    //
+    public int version = 1;
+
+    public boolean durabilityShow = false;
+    public double durabilityValue = 1.0D;
+    public int durabilityColor = -1;
+    public int itemColor = 0x8B4513;
+    public int stackSize = 64;
+
+    public int maxItemUseDuration = 20;
+    public int itemUseAction = 0;
+
+    public boolean isNormalItem = false;
+    public boolean isTool = false;
+    public int digSpeed = 1;
+    public int armorType = -2; //-2: Fits in no armor slot,  -1: Fits in all slots, 0 - 4: Fits in Head -> Boots slot respectively
+    public int enchantability;
+
+    public String texture = "minecraft:textures/items/iron_pickaxe.png";
+
+    public float translateX, translateY, translateZ;
+    public float scaleX = 1.0F, scaleY = 1.0F, scaleZ = 1.0F;
+    public float rotationX, rotationY, rotationZ;
+    public float rotationXRate, rotationYRate, rotationZRate;
+}
diff --git a/src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java b/src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java
new file mode 100644
index 000000000..4fd57dba3
--- /dev/null
+++ b/src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java
@@ -0,0 +1,165 @@
+package noppes.npcs.controllers.data;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.eventhandler.Event;
+import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.util.ByteBufUtils;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.Constants;
+import noppes.npcs.config.ConfigScript;
+import noppes.npcs.controllers.ScriptContainer;
+import noppes.npcs.controllers.ScriptController;
+import noppes.npcs.scripted.NpcAPI;
+
+import javax.script.ScriptEngine;
+import java.io.IOException;
+import java.util.*;
+
+public class LinkedItemScript implements IScriptHandler {
+    public ScriptContainer container;
+    public String scriptLanguage = "ECMAScript";
+    public boolean enabled = false;
+
+
+    public NBTTagCompound writeToNBT(NBTTagCompound compound) {
+        compound.setString("ScriptLanguage", scriptLanguage);
+        compound.setBoolean("ScriptEnabled", enabled);
+
+        if (container != null)
+            compound.setTag("ScriptContent", container.writeToNBT(new NBTTagCompound()));
+        return compound;
+    }
+
+    public LinkedItemScript readFromNBT(NBTTagCompound compound) {
+        scriptLanguage = compound.getString("ScriptLanguage");
+        enabled = compound.getBoolean("ScriptEnabled");
+
+        if (compound.hasKey("ScriptContent", Constants.NBT.TAG_COMPOUND)) {
+            container = new ScriptContainer(this);
+            container.readFromNBT(compound.getCompoundTag("ScriptContent"));
+        }
+        return this;
+    }
+
+    public boolean isEnabled() {
+        return this.enabled && ScriptController.HasStart && container != null && ConfigScript.ScriptingEnabled;
+    }
+
+        @Override
+    public void callScript(String s, Event event) {
+        if (!this.isEnabled()) {
+            return;
+        }
+
+        ScriptEngine engine = container.engine;
+        engine.put("API", NpcAPI.Instance());
+
+        for (Map.Entry<String, Object> engineObjects : NpcAPI.engineObjects.entrySet()) {
+            engine.put(engineObjects.getKey(), engineObjects.getValue());
+        }
+
+        container.run(s, event);
+    }
+
+    @Override
+    public boolean isClient() {
+        return FMLCommonHandler.instance().getEffectiveSide().isClient();
+    }
+
+    @Override
+    public boolean getEnabled() {
+        return this.enabled;
+    }
+
+    @Override
+    public void setEnabled(boolean b) {
+        this.enabled = b;
+    }
+
+    @Override
+    public String getLanguage() {
+        return this.scriptLanguage;
+    }
+
+    @Override
+    public void setLanguage(String s) {
+        this.scriptLanguage = s;
+    }
+
+    @Override
+    public void setScripts(List<ScriptContainer> list) {
+        if (list == null || list.isEmpty()) {
+            container = null;
+            return;
+        }
+        container = list.get(0);
+    }
+
+    @Override
+    public List<ScriptContainer> getScripts() {
+        if (container == null)
+            return new ArrayList<>();
+        return Collections.singletonList(container);
+    }
+
+    @Override
+    public String noticeString() {
+        return "";
+    }
+
+    @Override
+    public Map<Long, String> getConsoleText() {
+        TreeMap<Long, String> map = new TreeMap();
+        int tab = 0;
+        Iterator var3 = this.getScripts().iterator();
+
+        while(var3.hasNext()) {
+            ScriptContainer script = (ScriptContainer)var3.next();
+            ++tab;
+            Iterator var5 = script.console.entrySet().iterator();
+
+            while(var5.hasNext()) {
+                Map.Entry<Long, String> longStringEntry = (Map.Entry)var5.next();
+                map.put(longStringEntry.getKey(), " tab " + tab + ":\n" + (String)longStringEntry.getValue());
+            }
+        }
+
+        return map;
+    }
+
+    @Override
+    public void clearConsole() {
+        Iterator var1 = this.getScripts().iterator();
+
+        while(var1.hasNext()) {
+            ScriptContainer script = (ScriptContainer)var1.next();
+            script.console.clear();
+        }
+    }
+
+    public void saveScript(ByteBuf buffer) throws IOException {
+        int tab = buffer.readInt();
+        int totalScripts = buffer.readInt();
+        if (totalScripts == 0) {
+            this.container = null;
+        }
+
+        if (tab == 0) {
+            NBTTagCompound tabCompound = ByteBufUtils.readNBT(buffer);
+            ScriptContainer script = new ScriptContainer(this);
+            script.readFromNBT(tabCompound);
+            this.container = script;
+        } else {
+            NBTTagCompound compound = ByteBufUtils.readNBT(buffer);
+            this.setLanguage(compound.getString("ScriptLanguage"));
+            if (!ScriptController.Instance.languages.containsKey(this.getLanguage())) {
+                if (!ScriptController.Instance.languages.isEmpty()) {
+                    this.setLanguage((String) ScriptController.Instance.languages.keySet().toArray()[0]);
+                } else {
+                    this.setLanguage("ECMAScript");
+                }
+            }
+            this.setEnabled(compound.getBoolean("ScriptEnabled"));
+        }
+    }
+}
diff --git a/src/main/java/noppes/npcs/controllers/data/Magic.java b/src/main/java/noppes/npcs/controllers/data/Magic.java
index 96811f3ab..1b5636bc1 100644
--- a/src/main/java/noppes/npcs/controllers/data/Magic.java
+++ b/src/main/java/noppes/npcs/controllers/data/Magic.java
@@ -1,54 +1,165 @@
 package noppes.npcs.controllers.data;
 
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import noppes.npcs.api.handler.data.IMagic;
 import noppes.npcs.controllers.MagicController;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class Magic implements IMagic {
-	public String name = "";
-	public int color = Integer.parseInt("FF00", 16);
+    public String name = "";
+    public int color = Integer.parseInt("FF00", 16);
+    public int id = -1;
 
-	public int id = -1;
+    public int index;
+    public int priority;
 
-    public Magic(){}
+    // Icon as an ItemStack or as a texture file
+    public ItemStack iconItem = null;
+    public String iconTexture = "";
 
-	public Magic(int id, String name, int color){
-		this.name = name;
-		this.color = color;
-		this.id = id;
-	}
-	public static String formatName(String name){
-		name = name.toLowerCase().trim();
-		return name.substring(0, 1).toUpperCase() + name.substring(1);
-	}
-	public void readNBT(NBTTagCompound compound){
+    // Weaknesses mapping: key = magic ID this magic is weak against,
+    // value = extra damage percentage (as a fraction, e.g. 0.2 for 20% extra damage)
+    public Map<Integer, Float> weaknesses = new HashMap<Integer, Float>();
+
+    public Magic() {}
+
+    public Magic(int id, String name, int color) {
+        this.name = name;
+        this.color = color;
+        this.id = id;
+    }
+
+    public Magic(int id, String name, int color, int index, int priority) {
+        this.name = name;
+        this.color = color;
+        this.id = id;
+        this.index = index;
+        this.priority = priority;
+    }
+
+    public static String formatName(String name) {
+        name = name.toLowerCase().trim();
+        return name.substring(0, 1).toUpperCase() + name.substring(1);
+    }
+
+    public void readNBT(NBTTagCompound compound) {
         name = compound.getString("Name");
         color = compound.getInteger("Color");
         id = compound.getInteger("Slot");
-	}
-	public void writeNBT(NBTTagCompound compound){
-		compound.setInteger("Slot", id);
-		compound.setString("Name", name);
-		compound.setInteger("Color", color);
-	}
+        index = compound.getInteger("Index");
+        priority = compound.getInteger("Priority");
 
-	public int getId() {
-		return this.id;
-	}
+        if(compound.hasKey("IconItem")){
+            NBTTagCompound itemTag = compound.getCompoundTag("IconItem");
+            iconItem = ItemStack.loadItemStackFromNBT(itemTag);
+        }
+        iconTexture = compound.getString("IconTexture");
 
-	public String getName() {
-		return this.name;
-	}
+        // Read the weaknesses mapping from NBT.
+        weaknesses.clear();
+        if(compound.hasKey("Weaknesses")) {
+            NBTTagList weaknessList = compound.getTagList("Weaknesses", 10); // compound tags
+            for(int i = 0; i < weaknessList.tagCount(); i++){
+                NBTTagCompound weaknessTag = weaknessList.getCompoundTagAt(i);
+                int weakMagicId = weaknessTag.getInteger("MagicID");
+                float percentage = weaknessTag.getFloat("Percentage");
+                weaknesses.put(weakMagicId, percentage);
+            }
+        }
+    }
 
-	public void setName(String name) { this.name = name; }
+    public void writeNBT(NBTTagCompound compound) {
+        compound.setInteger("Slot", id);
+        compound.setString("Name", name);
+        compound.setInteger("Color", color);
+        compound.setInteger("Index", index);
+        compound.setInteger("Priority", priority);
 
-	public void setColor(int color) { this.color = color; }
+        if(iconItem != null) {
+            NBTTagCompound itemTag = new NBTTagCompound();
+            iconItem.writeToNBT(itemTag);
+            compound.setTag("IconItem", itemTag);
+        }
+        if(iconTexture != null && !iconTexture.isEmpty()){
+            compound.setString("IconTexture", iconTexture);
+        }
 
-	public int getColor() {
-		return this.color;
-	}
+        // Write the weaknesses mapping.
+        NBTTagList weaknessList = new NBTTagList();
+        for(Map.Entry<Integer, Float> entry : weaknesses.entrySet()){
+            NBTTagCompound weaknessTag = new NBTTagCompound();
+            weaknessTag.setInteger("MagicID", entry.getKey());
+            weaknessTag.setFloat("Percentage", entry.getValue());
+            weaknessList.appendTag(weaknessTag);
+        }
+        compound.setTag("Weaknesses", weaknessList);
+    }
 
-	public void save() {
-		MagicController.getInstance().saveMagic(this);
-	}
+    public int getId() {
+        return this.id;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getPriority() {
+        return priority;
+    }
+
+    public void setPriority(int priority) {
+        this.priority = priority;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+    public void setColor(int color) {
+        this.color = color;
+    }
+
+    public int getColor() {
+        return this.color;
+    }
+
+    public void save() {
+        MagicController.getInstance().saveMagic(this);
+    }
+
+    public void setIconItem(ItemStack item) {
+        this.iconItem = item;
+    }
+
+    public ItemStack getIconItem() {
+        return this.iconItem;
+    }
+
+    public void setIconTexture(String texture) {
+        this.iconTexture = texture;
+    }
+
+    public String getIconTexture() {
+        return this.iconTexture;
+    }
+
+    public void setWeaknesses(Map<Integer, Float> weaknesses) {
+        this.weaknesses = weaknesses;
+    }
+
+    public Map<Integer, Float> getWeaknesses() {
+        return this.weaknesses;
+    }
 }
diff --git a/src/main/java/noppes/npcs/controllers/data/MarkData.java b/src/main/java/noppes/npcs/controllers/data/MarkData.java
index 27a9923f4..15f89ddda 100644
--- a/src/main/java/noppes/npcs/controllers/data/MarkData.java
+++ b/src/main/java/noppes/npcs/controllers/data/MarkData.java
@@ -1,15 +1,15 @@
 package noppes.npcs.controllers.data;
 
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.packets.data.MarkDataPacket;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.world.World;
 import net.minecraftforge.common.IExtendedEntityProperties;
-import noppes.npcs.Server;
 import noppes.npcs.api.entity.data.IMark;
 import noppes.npcs.api.handler.data.IAvailability;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.constants.MarkType;
 import noppes.npcs.entity.EntityNPCInterface;
 
@@ -102,7 +102,7 @@ public class MarkData implements IExtendedEntityProperties {
     public void init(Entity entity, World world) {}
 
     public void syncClients() {
-        Server.sendToAll(EnumPacketClient.MARK_DATA, entity.getEntityId(), getNBT());
+        PacketHandler.Instance.sendToAll(new MarkDataPacket(entity.getEntityId(), getNBT()));
     }
 
     public class Mark implements IMark {
diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerData.java b/src/main/java/noppes/npcs/controllers/data/PlayerData.java
index 86dfa91dd..92e32e654 100644
--- a/src/main/java/noppes/npcs/controllers/data/PlayerData.java
+++ b/src/main/java/noppes/npcs/controllers/data/PlayerData.java
@@ -1,6 +1,9 @@
 package noppes.npcs.controllers.data;
 
-import kamkeel.addon.DBCAddon;
+import kamkeel.npcs.addon.DBCAddon;
+import kamkeel.npcs.network.packets.data.AchievementPacket;
+import kamkeel.npcs.network.packets.data.ChatAlertPacket;
+import kamkeel.npcs.network.packets.request.party.PartyInvitePacket;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -10,12 +13,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.IExtendedEntityProperties;
 import noppes.npcs.CustomNpcs;
 import noppes.npcs.LogWriter;
-import noppes.npcs.PacketHandlerServer;
-import noppes.npcs.Server;
 import noppes.npcs.api.entity.ICustomNpc;
 import noppes.npcs.api.handler.*;
 import noppes.npcs.config.ConfigMain;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.constants.EnumRoleType;
 import noppes.npcs.controllers.PartyController;
 import noppes.npcs.controllers.PlayerDataController;
@@ -43,7 +43,7 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
 	public PlayerItemGiverData itemgiverData = new PlayerItemGiverData(this);
 	public PlayerMailData mailData = new PlayerMailData(this);
 	public AnimationData animationData = new AnimationData(this);
-
+    public PlayerEffectData effectData = new PlayerEffectData(this);
 	public DataTimers timers = new DataTimers(this);
 	public DataSkinOverlays skinOverlays = new DataSkinOverlays(this);
 
@@ -96,6 +96,7 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
 		timers.readFromNBT(data);
 		skinOverlays.readFromNBT(data);
 		animationData.readFromNBT(data);
+        effectData.readFromNBT(data);
 
 		if(player != null){
 			playername = player.getCommandSenderName();
@@ -135,6 +136,7 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
         timers.writeToNBT(compound);
         skinOverlays.writeToNBT(compound);
         animationData.writeToNBT(compound);
+        effectData.writeToNBT(compound);
 
         compound.setString("PlayerName", playername);
         compound.setString("UUID", uuid);
@@ -164,6 +166,16 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
         factionData.loadNBTData(data);
     }
 
+    public NBTTagCompound getPlayerEffects(){
+        NBTTagCompound compound = new NBTTagCompound();
+        effectData.writeToNBT(compound);
+        return compound;
+    }
+
+    public void setPlayerEffects(NBTTagCompound data){
+        effectData.readFromNBT(data);
+    }
+
     public NBTTagCompound getSyncNBTFull() {
         if(player != null){
             playername = player.getCommandSenderName();
@@ -265,15 +277,16 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
 	public void inviteToParty(Party party) {
 		if (party != null && this.partyUUID == null && !this.partyInvites.contains(party.getPartyUUID())) {
 			this.partyInvites.add(party.getPartyUUID());
-			Server.sendData((EntityPlayerMP)this.player, EnumPacketClient.PARTY_MESSAGE, "party.inviteAlert", party.getPartyLeader().getCommandSenderName());
-			Server.sendData((EntityPlayerMP)this.player, EnumPacketClient.CHAT, "\u00A7a", "party.inviteChat", " ", party.getPartyLeader().getCommandSenderName(), "!");
+
+            AchievementPacket.sendAchievement((EntityPlayerMP) player, true, "party.inviteAlert", party.getPartyLeader().getCommandSenderName());
+            ChatAlertPacket.sendChatAlert((EntityPlayerMP) player, "\u00A7a", "party.inviteChat", " ", party.getPartyLeader().getCommandSenderName(), "!");
 		}
 	}
 
 	public void ignoreInvite(UUID uuid) {
 		if (uuid != null) {
 			this.partyInvites.remove(uuid);
-			PacketHandlerServer.sendInviteData((EntityPlayerMP) player);
+			PartyInvitePacket.sendInviteData((EntityPlayerMP) player);
 		}
 	}
 
diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerEffect.java b/src/main/java/noppes/npcs/controllers/data/PlayerEffect.java
new file mode 100644
index 000000000..b06aec95e
--- /dev/null
+++ b/src/main/java/noppes/npcs/controllers/data/PlayerEffect.java
@@ -0,0 +1,102 @@
+package noppes.npcs.controllers.data;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.api.entity.IPlayer;
+import noppes.npcs.api.handler.data.IPlayerEffect;
+import noppes.npcs.controllers.CustomEffectController;
+
+public class PlayerEffect implements IPlayerEffect {
+    public int id;
+    public int duration;
+    public byte level;
+    public int index;
+
+    public PlayerEffect(int id, int duration, byte level) {
+        this.id = id;
+        this.duration = duration;
+        this.level = level;
+    }
+
+    public static PlayerEffect readEffectData(NBTTagCompound nbt) {
+        int id = nbt.getInteger("Id");
+        int index = nbt.getInteger("Index");
+        if (id > 0) {
+            CustomEffectController controller = CustomEffectController.getInstance();
+            boolean found = controller.has(id);
+//                StatusEffectController.getInstance().customEffects.containsKey(id);
+            if (found) {
+                byte level = nbt.getByte("Level");
+                int dur = nbt.getInteger("Dur");
+                return new PlayerEffect(id, dur, level);
+            }
+        }
+        return null;
+    }
+
+    public NBTTagCompound writeEffectData(NBTTagCompound nbt) {
+        nbt.setInteger("Id", this.id);
+        nbt.setByte("Level", this.level);
+        nbt.setInteger("Dur", this.duration);
+        nbt.setInteger("Index", this.index);
+        return nbt;
+    }
+
+    @Override
+    public void kill() {
+        duration = 0;
+    }
+
+    @Override
+    public int getId() {
+        return id;
+    }
+
+    @Override
+    public int getDuration() {
+        return duration;
+    }
+
+    @Override
+    public void setDuration(int duration) {
+        this.duration = duration;
+    }
+
+    @Override
+    public byte getLevel() {
+        return level;
+    }
+
+    @Override
+    public void setLevel(byte level) {
+        this.level = level;
+    }
+
+    @Override
+    public String getName() {
+        CustomEffect effect = CustomEffectController.getInstance().get(this.id);
+        if(effect != null)
+            return effect.getName();
+
+        return "UNKNOWN";
+    }
+
+    @Override
+    public void performEffect(IPlayer player) {
+        if (player != null && player.getMCEntity() != null && player.getMCEntity() instanceof EntityPlayer) {
+            CustomEffect effect = CustomEffectController.getInstance().get(this.id);
+            if(effect != null)
+                effect.onTick((EntityPlayer) player.getMCEntity(), this);
+        }
+    }
+
+    @Override
+    public int getIndex() {
+        return this.index;
+    }
+
+    @Override
+    public void setIndex(int index) {
+        this.index = index;
+    }
+}
diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerEffectData.java b/src/main/java/noppes/npcs/controllers/data/PlayerEffectData.java
new file mode 100644
index 000000000..7cde61002
--- /dev/null
+++ b/src/main/java/noppes/npcs/controllers/data/PlayerEffectData.java
@@ -0,0 +1,87 @@
+package noppes.npcs.controllers.data;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class PlayerEffectData {
+    private final PlayerData parent;
+    private ConcurrentHashMap<EffectKey, PlayerEffect> effects = new ConcurrentHashMap<>();
+
+    public PlayerEffectData(PlayerData playerData){
+        this.parent = playerData;
+    }
+
+    public NBTTagCompound writeToNBT(NBTTagCompound compound) {
+        NBTTagList list = new NBTTagList();
+        for (Map.Entry<EffectKey, PlayerEffect> entry : effects.entrySet()) {
+            NBTTagCompound effectCompound = new NBTTagCompound();
+            effectCompound.setInteger("id", entry.getKey().getId());
+            effectCompound.setInteger("index", entry.getKey().getIndex());
+            effectCompound.setInteger("duration", entry.getValue().duration);
+            effectCompound.setByte("level", entry.getValue().level);
+            list.appendTag(effectCompound);
+        }
+        compound.setTag("Effects", list);
+        return compound;
+    }
+
+    public void readFromNBT(NBTTagCompound compound) {
+        HashSet<EffectKey> newKeys = new HashSet<>();
+        if (compound.hasKey("Effects")) {
+            NBTTagList list = compound.getTagList("Effects", 10);
+            for (int i = 0; i < list.tagCount(); i++) {
+                NBTTagCompound effectCompound = list.getCompoundTagAt(i);
+                int id = effectCompound.getInteger("id");
+                int index = effectCompound.getInteger("index");
+                int duration = effectCompound.getInteger("duration");
+                byte level = effectCompound.getByte("level");
+                EffectKey key = new EffectKey(id, index);
+                newKeys.add(key);
+                PlayerEffect effect = effects.get(key);
+                if (effect != null) {
+                    effect.duration = duration;
+                    effect.level = level;
+                } else {
+                    effect = new PlayerEffect(id, duration, level);
+                    effect.index = index;
+                    effects.put(key, effect);
+                }
+            }
+        }
+        Iterator<EffectKey> it = effects.keySet().iterator();
+        while (it.hasNext()) {
+            EffectKey key = it.next();
+            if (!newKeys.contains(key)) {
+                it.remove();
+            }
+        }
+    }
+
+    public ConcurrentHashMap<EffectKey, PlayerEffect> getEffects() {
+        return effects;
+    }
+
+    public void setEffects(ConcurrentHashMap<EffectKey, PlayerEffect> effects) {
+        this.effects = effects;
+    }
+
+    public PlayerEffect getPlayerEffect(int id, int index) {
+        return effects.get(new EffectKey(id, index));
+    }
+
+    public PlayerEffect getPlayerEffect(int id) {
+        return getPlayerEffect(id, 0);
+    }
+
+    public boolean hasPlayerEffect(int id, int index) {
+        return effects.containsKey(new EffectKey(id, index));
+    }
+
+    public boolean hasPlayerEffect(int id) {
+        return hasPlayerEffect(id, 0);
+    }
+}
diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerMail.java b/src/main/java/noppes/npcs/controllers/data/PlayerMail.java
index 68baa0d80..a35cb23d3 100644
--- a/src/main/java/noppes/npcs/controllers/data/PlayerMail.java
+++ b/src/main/java/noppes/npcs/controllers/data/PlayerMail.java
@@ -23,9 +23,9 @@ public class PlayerMail implements IInventory, IPlayerMail {
 	public int questId = -1;
 	public String questTitle = "";
 	public ItemStack[] items = new ItemStack[4];
-	
+
 	public long timePast;
-	
+
 	public void readNBT(NBTTagCompound compound) {
 		subject = compound.getString("Subject");
 		sender = compound.getString("Sender");
@@ -81,7 +81,7 @@ public class PlayerMail implements IInventory, IPlayerMail {
         compound.setTag("MailItems", nbttaglist);
 		return compound;
 	}
-	
+
 	public boolean isValid(){
 		return !subject.isEmpty() && !message.hasNoTags() && !sender.isEmpty();
 	}
@@ -168,20 +168,20 @@ public class PlayerMail implements IInventory, IPlayerMail {
 
 	@Override
 	public String getInventoryName() {
-		// TODO Auto-generated method stub
+
 		return null;
 	}
 
 	@Override
 	public boolean hasCustomInventoryName() {
-		// TODO Auto-generated method stub
+
 		return false;
 	}
 
 	@Override
 	public void markDirty() {
-		// TODO Auto-generated method stub
-		
+
+
 	}
 
 	@Override
@@ -191,7 +191,7 @@ public class PlayerMail implements IInventory, IPlayerMail {
 
 	@Override
 	public void openInventory() {
-		
+
 	}
 
 	@Override
diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java b/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java
index 3acf88cd6..134f80312 100644
--- a/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java
+++ b/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java
@@ -1,16 +1,18 @@
 package noppes.npcs.controllers.data;
 
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.packets.data.AchievementPacket;
+import kamkeel.npcs.network.packets.data.ChatAlertPacket;
+import kamkeel.npcs.network.packets.data.OverlayQuestTrackingPacket;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import noppes.npcs.EventHooks;
 import noppes.npcs.NoppesUtilPlayer;
-import noppes.npcs.Server;
 import noppes.npcs.api.handler.IPlayerQuestData;
 import noppes.npcs.api.handler.data.IParty;
 import noppes.npcs.api.handler.data.IQuest;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.constants.EnumQuestCompletion;
 import noppes.npcs.constants.EnumQuestRepeat;
 import noppes.npcs.constants.EnumQuestType;
@@ -201,8 +203,8 @@ public class PlayerQuestData implements IPlayerQuestData {
 	public void untrackQuest() {
 		if (this.trackedQuest != null) {
 			this.trackedQuest = null;
-			Server.sendData((EntityPlayerMP) this.parent.player, EnumPacketClient.OVERLAY_QUEST_TRACKING);
-		}
+            PacketHandler.Instance.sendToPlayer(new OverlayQuestTrackingPacket(new NBTTagCompound()), (EntityPlayerMP) this.parent.player);
+        }
 	}
 
 	public IQuest getTrackedQuest() {
@@ -217,9 +219,9 @@ public class PlayerQuestData implements IPlayerQuestData {
 			return;
 		QuestData questdata = new QuestData(quest);
 		activeQuests.put(id, questdata);
-		Server.sendData((EntityPlayerMP)parent.player, EnumPacketClient.MESSAGE, "quest.newquest", quest.title);
-		Server.sendData((EntityPlayerMP)parent.player, EnumPacketClient.CHAT, "quest.newquest", ": ", quest.title);
 
+        AchievementPacket.sendAchievement((EntityPlayerMP) parent.player, false, "quest.newquest", quest.title);
+        ChatAlertPacket.sendChatAlert((EntityPlayerMP) parent.player, "quest.newquest", ": ", quest.title);
         parent.updateClient = true;
 	}
 
diff --git a/src/main/java/noppes/npcs/controllers/data/Quest.java b/src/main/java/noppes/npcs/controllers/data/Quest.java
index d780ee053..0643b20c9 100644
--- a/src/main/java/noppes/npcs/controllers/data/Quest.java
+++ b/src/main/java/noppes/npcs/controllers/data/Quest.java
@@ -1,5 +1,6 @@
 package noppes.npcs.controllers.data;
 
+import kamkeel.npcs.network.packets.data.QuestCompletionPacket;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
@@ -7,7 +8,6 @@ import noppes.npcs.*;
 import noppes.npcs.api.IContainer;
 import noppes.npcs.api.entity.IPlayer;
 import noppes.npcs.api.handler.data.*;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.constants.EnumQuestCompletion;
 import noppes.npcs.constants.EnumQuestRepeat;
 import noppes.npcs.constants.EnumQuestType;
@@ -139,7 +139,7 @@ public class Quest implements ICompatibilty, IQuest {
 
 	public boolean instantComplete(EntityPlayer player, QuestData data) {
 		if(completion == EnumQuestCompletion.Instant && NoppesUtilPlayer.questCompletion((EntityPlayerMP) player, data.quest.id)){
-			Server.sendData((EntityPlayerMP)player, EnumPacketClient.QUEST_COMPLETION, data.quest.writeToNBT(new NBTTagCompound()));
+            QuestCompletionPacket.sendQuestComplete((EntityPlayerMP)player, data.quest.writeToNBT(new NBTTagCompound()));
 			return true;
 		}
 		return false;
diff --git a/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java b/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java
new file mode 100644
index 000000000..02f7919a7
--- /dev/null
+++ b/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java
@@ -0,0 +1,151 @@
+package noppes.npcs.controllers.data;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.NoppesUtilPlayer;
+import noppes.npcs.NoppesUtilServer;
+import noppes.npcs.api.handler.data.IAnvilRecipe;
+import noppes.npcs.controllers.data.Availability;
+
+public class RecipeAnvil implements IAnvilRecipe {
+    public int id = -1;
+    public String name = "";
+    public Availability availability = new Availability();
+
+    public boolean ignoreRepairItemNBT = false;
+    public boolean ignoreRepairMaterialNBT = false;
+    public boolean ignoreRepairMaterialDamage = false;
+
+    public ItemStack itemToRepair;
+    public ItemStack repairMaterial;
+
+    public int xpCost;
+    public float repairPercentage;
+
+    private boolean isAnvil = true;
+
+    public RecipeAnvil() { }
+
+    public RecipeAnvil(String name, ItemStack itemToRepair, ItemStack repairMaterial, int xpCost, float repairPercentage) {
+        this.name = name;
+        this.itemToRepair = itemToRepair;
+        this.repairMaterial = repairMaterial;
+        this.xpCost = xpCost;
+        this.repairPercentage = repairPercentage;
+    }
+
+    public static RecipeAnvil read(NBTTagCompound compound) {
+        RecipeAnvil recipe = new RecipeAnvil();
+        recipe.id = compound.getInteger("ID");
+        recipe.name = compound.getString("Name");
+        recipe.availability.readFromNBT(compound.getCompoundTag("Availability"));
+        recipe.xpCost = compound.getInteger("XPCost");
+        recipe.repairPercentage = compound.getFloat("RepairPercentage");
+        recipe.itemToRepair = NoppesUtilServer.readItem(compound.getCompoundTag("ItemToRepair"));
+        recipe.repairMaterial = NoppesUtilServer.readItem(compound.getCompoundTag("RepairMaterial"));
+        recipe.ignoreRepairMaterialNBT = compound.getBoolean("IgnoreRepairMatNBT");
+        recipe.ignoreRepairItemNBT = compound.getBoolean("IgnoreRepairItemNBT");
+        recipe.ignoreRepairMaterialDamage = compound.getBoolean("IgnoreRepairMatDamage");
+        recipe.isAnvil = true;
+        return recipe;
+    }
+
+    public NBTTagCompound writeNBT() {
+        NBTTagCompound compound = new NBTTagCompound();
+        compound.setInteger("ID", id);
+        compound.setString("Name", name);
+        compound.setTag("Availability", availability.writeToNBT(new NBTTagCompound()));
+        compound.setInteger("XPCost", xpCost);
+        compound.setFloat("RepairPercentage", repairPercentage);
+        if(itemToRepair != null){
+            compound.setTag("ItemToRepair", NoppesUtilServer.writeItem(itemToRepair, new NBTTagCompound()));
+        }
+        if(repairMaterial != null){
+            compound.setTag("RepairMaterial", NoppesUtilServer.writeItem(repairMaterial, new NBTTagCompound()));
+        }
+        compound.setBoolean("IgnoreRepairMatNBT", ignoreRepairMaterialNBT);
+        compound.setBoolean("IgnoreRepairItemNBT", ignoreRepairItemNBT);
+        compound.setBoolean("IgnoreRepairMatDamage", ignoreRepairMaterialDamage);
+        compound.setBoolean("IsAnvil", true);
+        return compound;
+    }
+
+    @Override
+    public int getXpCost() {
+        return xpCost;
+    }
+
+    @Override
+    public float getRepairPercentage() {
+        return repairPercentage;
+    }
+
+    @Override
+    public boolean matches(ItemStack inputItem, ItemStack inputRepairMaterial) {
+        if (inputItem == null || inputRepairMaterial == null) return false;
+        if (!NoppesUtilPlayer.compareItems(this.itemToRepair, inputItem, true, this.ignoreRepairItemNBT)) {
+            return false;
+        }
+        if (!NoppesUtilPlayer.compareItems(this.repairMaterial, inputRepairMaterial, this.ignoreRepairMaterialDamage, this.ignoreRepairMaterialNBT)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public ItemStack getResult(ItemStack inputItem) {
+        if (inputItem == null)
+            return null;
+        ItemStack result = inputItem.copy();
+        if (!result.isItemStackDamageable())
+            return result;
+        int maxDamage = result.getMaxDamage();
+        int repairAmount = (int) (maxDamage * repairPercentage);
+        int currentDamage = result.getItemDamage();
+        int newDamage = currentDamage - repairAmount;
+        if (newDamage < 0) newDamage = 0;
+        result.setItemDamage(newDamage);
+        return result;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getID() {
+        return this.id;
+    }
+
+    public static RecipeAnvil saveRecipe(RecipeAnvil recipe, ItemStack output, ItemStack repairMaterial) {
+        if (output != null) {
+            recipe.itemToRepair = output.copy();
+            if (recipe.itemToRepair.isItemStackDamageable()) {
+                recipe.itemToRepair.setItemDamage(0);
+            }
+        } else {
+            recipe.itemToRepair = null;
+        }
+        recipe.repairMaterial = (repairMaterial == null ? null : repairMaterial.copy());
+        return recipe;
+    }
+
+    public boolean isValid() {
+        return itemToRepair != null && repairMaterial != null;
+    }
+
+    /**
+     * Creates and returns a deep copy of this RecipeAnvil.
+     */
+    public void copy(RecipeAnvil recipe) {
+        this.id = recipe.id;
+        this.name = recipe.name;
+        this.availability = recipe.availability;
+        this.ignoreRepairMaterialDamage = recipe.ignoreRepairMaterialDamage;
+        this.ignoreRepairItemNBT = recipe.ignoreRepairItemNBT;
+        this.ignoreRepairMaterialNBT = recipe.ignoreRepairMaterialNBT;
+        this.repairPercentage = recipe.repairPercentage;;
+        this.xpCost = recipe.xpCost;
+    }
+}
diff --git a/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java b/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java
index 3c1607a2a..809d59df4 100644
--- a/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java
+++ b/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java
@@ -23,7 +23,7 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe {
     public boolean isGlobal = false;
     public boolean ignoreDamage = false;
     public boolean ignoreNBT = false;
-    
+
 
     public RecipeCarpentry(int width, int height, ItemStack[] recipe, ItemStack result){
     	super(width, height, recipe, result);
@@ -32,9 +32,9 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe {
     	super(0, 0, new ItemStack[0], null);
     	this.name = name;
     }
-    
+
     public static RecipeCarpentry read(NBTTagCompound compound){
-    	RecipeCarpentry recipe = new RecipeCarpentry(compound.getInteger("Width"), compound.getInteger("Height"), 
+    	RecipeCarpentry recipe = new RecipeCarpentry(compound.getInteger("Width"), compound.getInteger("Height"),
     			NBTTags.getItemStackArray(compound.getTagList("Materials", 10)), NoppesUtilServer.readItem(compound.getCompoundTag("Item")));
 		recipe.name = compound.getString("Name");
 		recipe.id = compound.getInteger("ID");
@@ -42,7 +42,7 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe {
 		recipe.ignoreDamage = compound.getBoolean("IgnoreDamage");
 		recipe.ignoreNBT = compound.getBoolean("IgnoreNBT");
 		recipe.isGlobal = compound.getBoolean("Global");
-		
+
 		return recipe;
     }
 
@@ -188,15 +188,14 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe {
                 var15[var9] = null;
             }
         }
-        RecipeCarpentry newrecipe = new RecipeCarpentry(var5, var6, var15, par1ItemStack);    
+        RecipeCarpentry newrecipe = new RecipeCarpentry(var5, var6, var15, par1ItemStack);
         newrecipe.copy(recipe);
         if(var5 == 4 || var6 == 4)
         	newrecipe.isGlobal = false;
-        
-        
-        
+
         return newrecipe;
     }
+
     public void copy(RecipeCarpentry recipe) {
 		this.id = recipe.id;
 		this.name = recipe.name;
@@ -205,7 +204,7 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe {
 		this.ignoreDamage = recipe.ignoreDamage;
 		this.ignoreNBT = recipe.ignoreNBT;
 	}
-    
+
 	public ItemStack getCraftingItem(int i){
     	if(recipeItems == null || i >= recipeItems.length)
     		return null;
diff --git a/src/main/java/noppes/npcs/controllers/data/RecipesDefault.java b/src/main/java/noppes/npcs/controllers/data/RecipesDefault.java
index 3ef4ffdb3..8583290c9 100644
--- a/src/main/java/noppes/npcs/controllers/data/RecipesDefault.java
+++ b/src/main/java/noppes/npcs/controllers/data/RecipesDefault.java
@@ -18,18 +18,18 @@ public class RecipesDefault {
 			item = new ItemStack((Block)ob);
 		else
 			item = (ItemStack) ob;
-		
-		RecipeCarpentry recipeAnvil = new RecipeCarpentry(name);
-		recipeAnvil.isGlobal = isGlobal;
-		recipeAnvil = RecipeCarpentry.saveRecipe(recipeAnvil, item, recipe);
-		RecipeController.Instance.addRecipe(recipeAnvil);
+
+		RecipeCarpentry recipeCarpentry = new RecipeCarpentry(name);
+		recipeCarpentry.isGlobal = isGlobal;
+		recipeCarpentry = RecipeCarpentry.saveRecipe(recipeCarpentry, item, recipe);
+		RecipeController.Instance.addRecipe(recipeCarpentry);
 	}
 	public static void loadDefaultRecipes(int i) {
 		if(i < 0){
 			addRecipe("Npc Wand", CustomItems.wand, true, "XX"," Y"," Y",'X', Items.bread,'Y', Items.stick);
 			addRecipe("Mob Cloner", CustomItems.cloner, true, "XX","XY"," Y",'X', Items.bread,'Y', Items.stick);
 			addRecipe("Carpentry Bench", CustomItems.carpentyBench, true, "XYX","Z Z","Z Z", 'X', Blocks.planks, 'Z', Items.stick, 'Y', Blocks.crafting_table);
-			
+
 			if(!ConfigMain.DisableExtraItems){
 				addRecipe("Mana", CustomItems.mana, true, "XY",'X',Items.redstone,'Y',Items.glowstone_dust);
 				addRecipe("Gun Wooden", CustomItems.gunWood, false, "XXXY"," ZM ","  M ",'Y', Blocks.lever, 'M', Items.stick, 'Z', Blocks.stone_button,'X', Blocks.planks);
@@ -39,7 +39,7 @@ public class RecipesDefault {
 				addRecipe("Gun Diamond", CustomItems.gunDiamond, false, "XXXY"," ZM ","  M ",'Y', Blocks.lever, 'M', Items.stick, 'Z', Blocks.stone_button,'X', Items.diamond);
 				addRecipe("Gun Emerald", CustomItems.gunEmerald, false, "XXXY"," ZM ","  M ",'Y', Blocks.lever, 'M', Items.stick, 'Z', Blocks.stone_button,'X', Items.emerald);
 				addRecipe("Gun Bronze", CustomItems.gunBronze, false, "XXXY"," ZM ","  M ",'Y', Blocks.lever, 'M', Items.stick, 'Z', Blocks.stone_button,'X', CustomItems.bronze_ingot);
-	
+
 				addRecipe("Bullet Wooden", CustomItems.bulletWood, true, "X",'X', Blocks.planks);
 				addRecipe("Bullet Stone", CustomItems.bulletStone, true, "X",'X', Blocks.cobblestone);
 				addRecipe("Bullet Iron", CustomItems.bulletIron, true, "X",'X', Items.iron_ingot);
@@ -56,96 +56,96 @@ public class RecipesDefault {
 				addRecipe("WallBanner Iron", new ItemStack(CustomItems.wallBanner, 1, 2), false, "XXX","ZZZ","ZZZ","Z Z",'Z', Blocks.wool, 'X', Items.iron_ingot);
 				addRecipe("WallBanner Gold", new ItemStack(CustomItems.wallBanner, 1, 3), false, "XXX","ZZZ","ZZZ","Z Z",'Z', Blocks.wool, 'X', Items.gold_ingot);
 				addRecipe("WallBanner Diamond", new ItemStack(CustomItems.wallBanner, 1, 4), false, "XXX","ZZZ","ZZZ","Z Z",'Z', Blocks.wool, 'X', Items.diamond);
-	
+
 				addRecipe("Banner Wooden", new ItemStack(CustomItems.banner, 1, 0), false, " X "," Z "," Z ","ZZZ", 'X', new ItemStack(CustomItems.wallBanner,1,0), 'Z', Blocks.planks);
 				addRecipe("Banner Stone", new ItemStack(CustomItems.banner, 1, 1), false, " X "," Z "," Z ","ZZZ", 'X', new ItemStack(CustomItems.wallBanner,1,1), 'Z', Blocks.cobblestone);
 				addRecipe("Banner Iron", new ItemStack(CustomItems.banner, 1, 2), false, " X "," Z "," Z ","ZZZ", 'X', new ItemStack(CustomItems.wallBanner,1,2), 'Z', Items.iron_ingot);
 				addRecipe("Banner Gold", new ItemStack(CustomItems.banner, 1, 3), false, " X "," Z "," Z ","ZZZ", 'X', new ItemStack(CustomItems.wallBanner,1,3), 'Z', Items.gold_ingot);
 				addRecipe("Banner Diamond", new ItemStack(CustomItems.banner, 1, 4), false, " X "," Z "," Z ","ZZZ", 'X', new ItemStack(CustomItems.wallBanner,1,4), 'Z', Items.diamond);
-	
+
 				addRecipe("Lamp Wooden", new ItemStack(CustomItems.tallLamp, 1, 0), false, "YXY"," Z "," Z ","ZZZ", 'X', Blocks.torch, 'Y', Blocks.wool, 'Z', Blocks.planks);
 				addRecipe("Lamp Stone", new ItemStack(CustomItems.tallLamp, 1, 1), false, "YXY"," Z "," Z ","ZZZ", 'X', Blocks.torch, 'Y', Blocks.wool, 'Z', Blocks.cobblestone);
 				addRecipe("Lamp Iron", new ItemStack(CustomItems.tallLamp, 1, 2), false, "YXY"," Z "," Z ","ZZZ", 'X', Blocks.torch, 'Y', Blocks.wool, 'Z', Items.iron_ingot);
 				addRecipe("Lamp Gold", new ItemStack(CustomItems.tallLamp, 1, 3), false, "YXY"," Z "," Z ","ZZZ", 'X', Blocks.torch, 'Y', Blocks.wool, 'Z', Items.gold_ingot);
 				addRecipe("Lamp Diamond", new ItemStack(CustomItems.tallLamp, 1, 4), false, "YXY"," Z "," Z ","ZZZ", 'X', Blocks.torch, 'Y', Blocks.wool, 'Z', Items.diamond);
-	
+
 				addRecipe("Chair Wooden1", new ItemStack(CustomItems.chair, 1, 0), false, "  X", "  X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,0));
 				addRecipe("Chair Wooden2", new ItemStack(CustomItems.chair, 1, 1), false, "  X", "  X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,1));
 				addRecipe("Chair Wooden3", new ItemStack(CustomItems.chair, 1, 2), false, "  X", "  X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,2));
 				addRecipe("Chair Wooden4", new ItemStack(CustomItems.chair, 1, 3), false, "  X", "  X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,3));
 				addRecipe("Chair Wooden5", new ItemStack(CustomItems.chair, 1, 4), false, "  X", "  X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,4));
 				addRecipe("Chair Wooden6", new ItemStack(CustomItems.chair, 1, 5), false, "  X", "  X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,5));
-	
+
 				addRecipe("Crate Wooden1", new ItemStack(CustomItems.crate, 1, 0), false, "XXXX","X  X","X  X","XXXX", 'X', new ItemStack(Blocks.planks,1,0));
 				addRecipe("Crate Wooden2", new ItemStack(CustomItems.crate, 1, 1), false, "XXXX","X  X","X  X","XXXX", 'X', new ItemStack(Blocks.planks,1,1));
 				addRecipe("Crate Wooden3", new ItemStack(CustomItems.crate, 1, 2), false, "XXXX","X  X","X  X","XXXX", 'X', new ItemStack(Blocks.planks,1,2));
 				addRecipe("Crate Wooden4", new ItemStack(CustomItems.crate, 1, 3), false, "XXXX","X  X","X  X","XXXX", 'X', new ItemStack(Blocks.planks,1,3));
 				addRecipe("Crate Wooden5", new ItemStack(CustomItems.crate, 1, 4), false, "XXXX","X  X","X  X","XXXX", 'X', new ItemStack(Blocks.planks,1,4));
 				addRecipe("Crate Wooden6", new ItemStack(CustomItems.crate, 1, 5), false, "XXXX","X  X","X  X","XXXX", 'X', new ItemStack(Blocks.planks,1,5));
-	
+
 				addRecipe("WeaponRack Wooden1", new ItemStack(CustomItems.weaponsRack, 1, 0), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,0),'Y', Items.stick);
 				addRecipe("WeaponRack Wooden2", new ItemStack(CustomItems.weaponsRack, 1, 1), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,1),'Y', Items.stick);
 				addRecipe("WeaponRack Wooden3", new ItemStack(CustomItems.weaponsRack, 1, 2), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,2),'Y', Items.stick);
 				addRecipe("WeaponRack Wooden4", new ItemStack(CustomItems.weaponsRack, 1, 3), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,3),'Y', Items.stick);
 				addRecipe("WeaponRack Wooden5", new ItemStack(CustomItems.weaponsRack, 1, 4), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,4),'Y', Items.stick);
 				addRecipe("WeaponRack Wooden6", new ItemStack(CustomItems.weaponsRack, 1, 5), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,5),'Y', Items.stick);
-	
+
 				addRecipe("Couch Wooden1", new ItemStack(CustomItems.couchWood, 1, 0), false, "   X","   X","XXXX","X  X", 'X', new ItemStack(Blocks.planks,1,0));
 				addRecipe("Couch Wooden2", new ItemStack(CustomItems.couchWood, 1, 1), false, "   X","   X","XXXX","X  X", 'X', new ItemStack(Blocks.planks,1,1));
 				addRecipe("Couch Wooden3", new ItemStack(CustomItems.couchWood, 1, 2), false, "   X","   X","XXXX","X  X", 'X', new ItemStack(Blocks.planks,1,2));
 				addRecipe("Couch Wooden4", new ItemStack(CustomItems.couchWood, 1, 3), false, "   X","   X","XXXX","X  X", 'X', new ItemStack(Blocks.planks,1,3));
 				addRecipe("Couch Wooden5", new ItemStack(CustomItems.couchWood, 1, 4), false, "   X","   X","XXXX","X  X", 'X', new ItemStack(Blocks.planks,1,4));
 				addRecipe("Couch Wooden6", new ItemStack(CustomItems.couchWood, 1, 5), false, "   X","   X","XXXX","X  X", 'X', new ItemStack(Blocks.planks,1,5));
-	
+
 				addRecipe("Couch Wool1", new ItemStack(CustomItems.couchWool, 1, 0), false, "   Z", "   Z","ZZZZ","X  X", 'X', new ItemStack(Blocks.planks,1,0), 'Z', Blocks.wool);
 				addRecipe("Couch Wool2", new ItemStack(CustomItems.couchWool, 1, 1), false, "   Z", "   Z","ZZZZ","X  X", 'X', new ItemStack(Blocks.planks,1,1), 'Z', Blocks.wool);
 				addRecipe("Couch Wool3", new ItemStack(CustomItems.couchWool, 1, 2), false, "   Z", "   Z","ZZZZ","X  X", 'X', new ItemStack(Blocks.planks,1,2), 'Z', Blocks.wool);
 				addRecipe("Couch Wool4", new ItemStack(CustomItems.couchWool, 1, 3), false, "   Z", "   Z","ZZZZ","X  X", 'X', new ItemStack(Blocks.planks,1,3), 'Z', Blocks.wool);
 				addRecipe("Couch Wool5", new ItemStack(CustomItems.couchWool, 1, 4), false, "   Z", "   Z","ZZZZ","X  X", 'X', new ItemStack(Blocks.planks,1,4), 'Z', Blocks.wool);
 				addRecipe("Couch Wool6", new ItemStack(CustomItems.couchWool, 1, 5), false, "   Z", "   Z","ZZZZ","X  X", 'X', new ItemStack(Blocks.planks,1,5), 'Z', Blocks.wool);
-	
+
 				addRecipe("Table Wood1", new ItemStack(CustomItems.table, 1, 0), false, "XXXX","X  X","X  X", 'X', new ItemStack(Blocks.planks,1,0), 'Z', Blocks.wool);
 				addRecipe("Table Wood2", new ItemStack(CustomItems.table, 1, 1), false, "XXXX","X  X","X  X", 'X', new ItemStack(Blocks.planks,1,1), 'Z', Blocks.wool);
 				addRecipe("Table Wood3", new ItemStack(CustomItems.table, 1, 2), false, "XXXX","X  X","X  X", 'X', new ItemStack(Blocks.planks,1,2), 'Z', Blocks.wool);
 				addRecipe("Table Wood4", new ItemStack(CustomItems.table, 1, 3), false, "XXXX","X  X","X  X", 'X', new ItemStack(Blocks.planks,1,3), 'Z', Blocks.wool);
 				addRecipe("Table Wood5", new ItemStack(CustomItems.table, 1, 4), false, "XXXX","X  X","X  X", 'X', new ItemStack(Blocks.planks,1,4), 'Z', Blocks.wool);
 				addRecipe("Table Wood6", new ItemStack(CustomItems.table, 1, 5), false, "XXXX","X  X","X  X", 'X', new ItemStack(Blocks.planks,1,5), 'Z', Blocks.wool);
-	
-				addRecipe("Stool Wood1", new ItemStack(CustomItems.stool, 1, 0), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,0));
-				addRecipe("Stool Wood2", new ItemStack(CustomItems.stool, 1, 1), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,1));
-				addRecipe("Stool Wood3", new ItemStack(CustomItems.stool, 1, 2), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,2));
-				addRecipe("Stool Wood4", new ItemStack(CustomItems.stool, 1, 3), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,3));
-				addRecipe("Stool Wood5", new ItemStack(CustomItems.stool, 1, 4), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,4));
-				addRecipe("Stool Wood6", new ItemStack(CustomItems.stool, 1, 5), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,5));
-	
+
+				addRecipe("noppes.npcs.client.model.blocks.Stool Wood1", new ItemStack(CustomItems.stool, 1, 0), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,0));
+				addRecipe("noppes.npcs.client.model.blocks.Stool Wood2", new ItemStack(CustomItems.stool, 1, 1), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,1));
+				addRecipe("noppes.npcs.client.model.blocks.Stool Wood3", new ItemStack(CustomItems.stool, 1, 2), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,2));
+				addRecipe("noppes.npcs.client.model.blocks.Stool Wood4", new ItemStack(CustomItems.stool, 1, 3), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,3));
+				addRecipe("noppes.npcs.client.model.blocks.Stool Wood5", new ItemStack(CustomItems.stool, 1, 4), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,4));
+				addRecipe("noppes.npcs.client.model.blocks.Stool Wood6", new ItemStack(CustomItems.stool, 1, 5), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,5));
+
 				addRecipe("Barrel Wood1", new ItemStack(CustomItems.barrel, 1, 0), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,0));
 				addRecipe("Barrel Wood2", new ItemStack(CustomItems.barrel, 1, 1), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,1));
 				addRecipe("Barrel Wood3", new ItemStack(CustomItems.barrel, 1, 2), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,2));
 				addRecipe("Barrel Wood4", new ItemStack(CustomItems.barrel, 1, 3), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,3));
 				addRecipe("Barrel Wood5", new ItemStack(CustomItems.barrel, 1, 4), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,4));
 				addRecipe("Barrel Wood6", new ItemStack(CustomItems.barrel, 1, 5), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,5));
-	
+
 				addRecipe("Shelf Wood1", new ItemStack(CustomItems.shelf, 2, 0), false, "XXX","XY ","X  ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,0));
 				addRecipe("Shelf Wood2", new ItemStack(CustomItems.shelf, 2, 1), false, "XXX","XY ","X  ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,1));
 				addRecipe("Shelf Wood3", new ItemStack(CustomItems.shelf, 2, 2), false, "XXX","XY ","X  ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,2));
 				addRecipe("Shelf Wood4", new ItemStack(CustomItems.shelf, 2, 3), false, "XXX","XY ","X  ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,3));
 				addRecipe("Shelf Wood5", new ItemStack(CustomItems.shelf, 2, 4), false, "XXX","XY ","X  ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,4));
 				addRecipe("Shelf Wood6", new ItemStack(CustomItems.shelf, 2, 5), false, "XXX","XY ","X  ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,5));
-	
+
 				addRecipe("Beam Wood1", new ItemStack(CustomItems.beam, 2, 0), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,0));
 				addRecipe("Beam Wood2", new ItemStack(CustomItems.beam, 2, 1), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,1));
 				addRecipe("Beam Wood3", new ItemStack(CustomItems.beam, 2, 2), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,2));
 				addRecipe("Beam Wood4", new ItemStack(CustomItems.beam, 2, 3), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,3));
 				addRecipe("Beam Wood5", new ItemStack(CustomItems.beam, 2, 4), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,4));
 				addRecipe("Beam Wood6", new ItemStack(CustomItems.beam, 2, 5), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,5));
-	
+
 				addRecipe("Sign Wood1", new ItemStack(CustomItems.sign, 1, 0), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,0), 'Y', Items.iron_ingot);
 				addRecipe("Sign Wood2", new ItemStack(CustomItems.sign, 1, 1), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,1), 'Y', Items.iron_ingot);
 				addRecipe("Sign Wood3", new ItemStack(CustomItems.sign, 1, 2), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,2), 'Y', Items.iron_ingot);
 				addRecipe("Sign Wood4", new ItemStack(CustomItems.sign, 1, 3), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,3), 'Y', Items.iron_ingot);
 				addRecipe("Sign Wood5", new ItemStack(CustomItems.sign, 1, 4), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,4), 'Y', Items.iron_ingot);
 				addRecipe("Sign Wood6", new ItemStack(CustomItems.sign, 1, 5), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,5), 'Y', Items.iron_ingot);
-				
+
 				addRecipe("Lamp", new ItemStack(CustomItems.lamp), false, "XXX","YZY","XXX", 'X', Items.iron_ingot, 'Y', Blocks.glass, 'Z', Blocks.torch);
 				addRecipe("Candle", new ItemStack(CustomItems.candle), false, "XZX"," X ", 'X', Items.iron_ingot, 'Z', Blocks.torch);
 				addRecipe("BigSign", new ItemStack(CustomItems.bigsign, 2), false, "XXX","XXX","XXX", 'X', Blocks.planks);
@@ -159,7 +159,7 @@ public class RecipesDefault {
 				addRecipe("Battle Axe5", CustomItems.battleAxeDiamond, false, "XX","XY"," Y", " Y", 'Y', Items.stick, 'X', Items.diamond);
 				addRecipe("Battle Axe6", CustomItems.battleAxeBronze, false, "XX","XY"," Y", " Y", 'Y', Items.stick, 'X', CustomItems.bronze_ingot);
 				addRecipe("Battle Axe7", CustomItems.battleAxeEmerald, false, "XX","XY"," Y", " Y", 'Y', Items.stick, 'X', Items.emerald);
-	
+
 				addRecipe("Halberd1", CustomItems.halberdWood, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', Blocks.planks);
 				addRecipe("Halberd2", CustomItems.halberdStone, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', Blocks.cobblestone);
 				addRecipe("Halberd3", CustomItems.halberdIron, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', Items.iron_ingot);
@@ -167,7 +167,7 @@ public class RecipesDefault {
 				addRecipe("Halberd5", CustomItems.halberdDiamond, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', Items.diamond);
 				addRecipe("Halberd6", CustomItems.halberdBronze, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', CustomItems.bronze_ingot);
 				addRecipe("Halberd7", CustomItems.halberdEmerald, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', Items.emerald);
-	
+
 				addRecipe("Glaive1", CustomItems.glaiveWood, false, "X   "," Y  ","  Y ", "   X", 'Y', Items.stick, 'X', Blocks.planks);
 				addRecipe("Glaive2", CustomItems.glaiveStone, false, "X   "," Y  ","  Y ", "   X", 'Y', Items.stick, 'X', Blocks.cobblestone);
 				addRecipe("Glaive3", CustomItems.glaiveIron, false, "X   "," Y  ","  Y ", "   X", 'Y', Items.stick, 'X', Items.iron_ingot);
@@ -175,7 +175,7 @@ public class RecipesDefault {
 				addRecipe("Glaive5", CustomItems.glaiveDiamond, false, "X   "," Y  ","  Y ", "   X", 'Y', Items.stick, 'X', Items.diamond);
 				addRecipe("Glaive6", CustomItems.glaiveBronze, false, "X   "," Y  ","  Y ", "   X", 'Y', Items.stick, 'X', CustomItems.bronze_ingot);
 				addRecipe("Glaive7", CustomItems.glaiveEmerald, false, "X   "," Y  ","  Y ", "   X", 'Y', Items.stick, 'X', Items.emerald);
-	
+
 				addRecipe("Trident1", CustomItems.tridentWood, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', Blocks.planks);
 				addRecipe("Trident2", CustomItems.tridentStone, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', Blocks.cobblestone);
 				addRecipe("Trident3", CustomItems.tridentIron, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', Items.iron_ingot);
@@ -183,7 +183,7 @@ public class RecipesDefault {
 				addRecipe("Trident5", CustomItems.tridentDiamond, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', Items.diamond);
 				addRecipe("Trident6", CustomItems.tridentBronze, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', CustomItems.bronze_ingot);
 				addRecipe("Trident7", CustomItems.tridentEmerald, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', Items.emerald);
-			
+
 			}
 		}
 	}
diff --git a/src/main/java/noppes/npcs/entity/EntityNPCFlying.java b/src/main/java/noppes/npcs/entity/EntityNPCFlying.java
index 58d5c0c67..580e646e0 100644
--- a/src/main/java/noppes/npcs/entity/EntityNPCFlying.java
+++ b/src/main/java/noppes/npcs/entity/EntityNPCFlying.java
@@ -15,7 +15,7 @@ public abstract class EntityNPCFlying extends EntityNPCInterface {
 
     @Override
     public boolean canFly(){
-        return ai.movementType == 1;
+        return ais.movementType == 1;
     }
 
     @Override
@@ -46,15 +46,15 @@ public abstract class EntityNPCFlying extends EntityNPCInterface {
         double heightOffGround = this.posY - this.worldObj.getTopSolidOrLiquidBlock((int) this.posX, (int) this.posZ);
         if (heightOffGround < 0) {
             Vec3 pos = Vec3.createVectorHelper(this.posX,this.posY,this.posZ);
-            Vec3 posLimit = Vec3.createVectorHelper(this.posX,this.posY - this.ai.flyHeightLimit,this.posZ);
+            Vec3 posLimit = Vec3.createVectorHelper(this.posX,this.posY - this.ais.flyHeightLimit,this.posZ);
             MovingObjectPosition mob = this.worldObj.rayTraceBlocks(pos,posLimit,true);
             if (mob == null || mob.typeOfHit == MovingObjectPosition.MovingObjectType.MISS) {
                 aboveLimit = true;
             }
-        } else if (heightOffGround > this.ai.flyHeightLimit) {
+        } else if (heightOffGround > this.ais.flyHeightLimit) {
             aboveLimit = true;
         }
-        if (aboveLimit && this.ai.hasFlyLimit || (heightOffGround < Math.ceil(this.height) && this.motionY == 0)) {
+        if (aboveLimit && this.ais.hasFlyLimit || (heightOffGround < Math.ceil(this.height) && this.motionY == 0)) {
             this.flyLimitAllow = false;
             if (!this.getNavigator().noPath() && this.motionY > 0) {
                 this.motionY = 0;
@@ -70,7 +70,7 @@ public abstract class EntityNPCFlying extends EntityNPCInterface {
         this.motionY = d3;
 
         if (this.getNavigator().noPath()) {
-            this.motionY = -Math.abs(this.ai.flyGravity);
+            this.motionY = -Math.abs(this.ais.flyGravity);
         }
 
         this.updateLimbSwing();
diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
index 4353d3395..9b826bdd2 100644
--- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
+++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
@@ -5,8 +5,16 @@ import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
-import kamkeel.addon.DBCAddon;
-import kamkeel.addon.client.DBCClient;
+import kamkeel.npcs.addon.DBCAddon;
+import kamkeel.npcs.addon.client.DBCClient;
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.enums.EnumSoundOperation;
+import kamkeel.npcs.network.packets.data.ChatBubblePacket;
+import kamkeel.npcs.network.packets.data.QuestCompletionPacket;
+import kamkeel.npcs.network.packets.data.SoundManagementPacket;
+import kamkeel.npcs.network.packets.data.npc.UpdateNpcPacket;
+import kamkeel.npcs.network.packets.data.npc.WeaponNpcPacket;
+import kamkeel.npcs.util.ByteBufUtils;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;
@@ -33,7 +41,6 @@ import net.minecraft.network.play.server.S0BPacketAnimation;
 import net.minecraft.pathfinding.PathNavigate;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.*;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
@@ -81,7 +88,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 	public static FakePlayer chateventPlayer;
 	public DataDisplay display;
 	public DataStats stats;
-	public DataAI ai;
+	public DataAI ais;
 	public DataAdvanced advanced;
 	public DataInventory inventory;
 	public DataScript script;
@@ -165,7 +172,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 
 		display = new DataDisplay(this);
 		stats = new DataStats(this);
-		ai = new DataAI(this);
+		ais = new DataAI(this);
 		advanced = new DataAdvanced(this);
 		inventory = new DataInventory(this);
 		transform = new DataTransform(this);
@@ -217,10 +224,9 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 					if(itemstack1!=null){
 						itemstack1.writeToNBT(itemNBT);
 					}
-					for(Object obj: MinecraftServer.getServer().getConfigurationManager().playerEntityList){
-						Server.sendData((EntityPlayerMP) obj, EnumPacketClient.SYNC_WEAPON, getEntityId(), i, itemNBT);
-					}
-					inventory.prevWeapons.put(i,itemstack1 == null ? null : itemstack1.copy());
+
+                    PacketHandler.Instance.sendTracking(new WeaponNpcPacket(getEntityId(), i, itemNBT), this);
+                    inventory.prevWeapons.put(i,itemstack1 == null ? null : itemstack1.copy());
 				}
 			}
 			this.timers.update();
@@ -407,8 +413,8 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 	public void updateClient() {
 		NBTTagCompound compound = writeSpawnData();
 		compound.setInteger("EntityId", getEntityId());
-		Server.sendAssociatedData(this, EnumPacketClient.UPDATE_NPC, compound);
-		updateClient = false;
+        PacketHandler.Instance.sendTracking(new UpdateNpcPacket(compound), this);
+        updateClient = false;
 	}
 
 	@Override
@@ -448,7 +454,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
         }
 		else if (data != null){
 			NoppesUtilPlayer.questCompletion((EntityPlayerMP) player, data.quest.id);
-			Server.sendData((EntityPlayerMP)player, EnumPacketClient.QUEST_COMPLETION, data.quest.writeToNBT(new NBTTagCompound()));
+            QuestCompletionPacket.sendQuestComplete((EntityPlayerMP)player, data.quest.writeToNBT(new NBTTagCompound()));
 		}
 		else if (dialog != null){
 			NoppesUtilServer.openDialog(player, this, dialog, 0);
@@ -503,7 +509,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 	}
 
 	public void addInteract(EntityLivingBase entity){
-		if( !ai.stopAndInteract || isAttacking() || !entity.isEntityAlive())
+		if( !ais.stopAndInteract || isAttacking() || !entity.isEntityAlive())
 			return;
 		if((ticksExisted - lastInteract)  < 180)
 			interactingEntities.clear();
@@ -516,7 +522,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 	public boolean isInteracting(){
 		if((ticksExisted - lastInteract) < 40 || isRemote() && getBoolFlag(2))
 			return true;
-		return ai.stopAndInteract && !interactingEntities.isEmpty() && (ticksExisted - lastInteract)  < 180;
+		return ais.stopAndInteract && !interactingEntities.isEmpty() && (ticksExisted - lastInteract)  < 180;
 	}
 
 	private Dialog getDialog(EntityPlayer player) {
@@ -576,21 +582,21 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 		try{
 			if (isAttacking()){
 				if (getAttackTarget() != null) {
-					if (ai.combatPolicy != EnumCombatPolicy.Brute) {
+					if (ais.combatPolicy != EnumCombatPolicy.Brute) {
 						boolean closerTargetFound = this.getDistanceSqToEntity(getAttackTarget()) > this.getDistanceSqToEntity(attackingEntity);
-						switch (ai.combatPolicy) {
+						switch (ais.combatPolicy) {
 							case Flip:
 								if (closerTargetFound) {
 									setAttackTarget(attackingEntity);
 								}
 								break;
 							case Stubborn:
-								if (closerTargetFound && combatHandler.shouldChangeTarget(ai.tacticalChance)) {
+								if (closerTargetFound && combatHandler.shouldChangeTarget(ais.tacticalChance)) {
 									setAttackTarget(attackingEntity);
 								}
 								break;
 							case Tactical:
-								if (attackingEntity != getAttackTarget() && combatHandler.shouldSwitchTactically(getAttackTarget(), attackingEntity, ai.tacticalChance > 50)) {
+								if (attackingEntity != getAttackTarget() && combatHandler.shouldSwitchTactically(getAttackTarget(), attackingEntity, ais.tacticalChance > 50)) {
 									setAttackTarget(attackingEntity);
 								}
 								break;
@@ -607,7 +613,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 					if (npc.isKilled() || !npc.advanced.defendFaction || npc.faction.id != faction.id)
 						continue;
 
-					if (npc.canSee(this) || npc.ai.directLOS || npc.canSee(attackingEntity))
+					if (npc.canSee(this) || npc.ais.directLOS || npc.canSee(attackingEntity))
 						npc.onAttack(attackingEntity);
 				}
 				setAttackTarget(attackingEntity);
@@ -622,7 +628,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 		}
 	}
 	public void onAttack(EntityLivingBase entity) {
-		if (entity == null || entity == this || isAttacking() || ai.onAttack == 3 || entity == getOwner())
+		if (entity == null || entity == this || isAttacking() || ais.onAttack == 3 || entity == getOwner())
 			return;
 		super.setAttackTarget(entity);
 	}
@@ -647,7 +653,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 				if(EventHooks.onNPCTargetLost(this, getAttackTarget(), entity))
 					return;
 			}
-			if (entity != null && entity != this && ai.onAttack != 3 && !isAttacking()) {
+			if (entity != null && entity != this && ais.onAttack != 3 && !isAttacking()) {
 				Line line = advanced.getAttackLine();
 				if (line != null)
 					saySurrounding(line.formatTarget(entity));
@@ -720,7 +726,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 		IEntitySelector attackEntitySelector = new NPCAttackSelector(this);
 		this.targetTasks.addTask(0, new EntityAIClearTarget(this));
 		this.targetTasks.addTask(1, new EntityAIHurtByTarget(this, false));
-		this.targetTasks.addTask(2, new EntityAIClosestTarget(this, EntityLivingBase.class, 4, this.ai.directLOS, false, attackEntitySelector));
+		this.targetTasks.addTask(2, new EntityAIClosestTarget(this, EntityLivingBase.class, 4, this.ais.directLOS, false, attackEntitySelector));
 		this.targetTasks.addTask(3, new EntityAIOwnerHurtByTarget(this));
 		this.targetTasks.addTask(4, new EntityAIOwnerHurtTarget(this));
 
@@ -754,49 +760,49 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
         removeTask(aiRange);
         aiLeap = aiAttackTarget = aiResponse = aiSprint = aiRange = null;
 
-		if (this.ai.canSprint)
+		if (this.ais.canSprint)
 			this.tasks.addTask(this.taskCount++, new EntityAISprintToTarget(this));
 
-		if (this.ai.onAttack == 1)
+		if (this.ais.onAttack == 1)
 			this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIPanic(this, 1.2F));
-		else if (this.ai.onAttack == 2)  {
+		else if (this.ais.onAttack == 2)  {
 			this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIAvoidTarget(this));
 		}
-		else if (this.ai.onAttack == 0) {
+		else if (this.ais.onAttack == 0) {
 			this.setLeapTask();
-			if (this.inventory.getProjectile() == null || this.ai.useRangeMelee == 2)
+			if (this.inventory.getProjectile() == null || this.ais.useRangeMelee == 2)
 			{
-				switch(this.ai.tacticalVariant)
+				switch(this.ais.tacticalVariant)
 				{
-					case Dodge : this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIZigZagTarget(this, 1.2D, this.ai.tacticalRadius)); break;
-					case Surround : this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIOrbitTarget(this, 1.2D, this.ai.tacticalRadius, true)); break;
+					case Dodge : this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIZigZagTarget(this, 1.2D, this.ais.tacticalRadius)); break;
+					case Surround : this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIOrbitTarget(this, 1.2D, this.ais.tacticalRadius, true)); break;
 					case HitNRun : this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIAvoidTarget(this)); break;
-					case Ambush : this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIAmbushTarget(this, 1.2D, this.ai.tacticalRadius, false)); break;
-					case Stalk : this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIStalkTarget(this, this.ai.tacticalRadius)); break;
+					case Ambush : this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIAmbushTarget(this, 1.2D, this.ais.tacticalRadius, false)); break;
+					case Stalk : this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIStalkTarget(this, this.ais.tacticalRadius)); break;
 					default :
 				}
 			}
 			else
 			{
-				switch(this.ai.tacticalVariant)
+				switch(this.ais.tacticalVariant)
 				{
 					case Dodge : this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIDodgeShoot(this)); break;
 					case Surround : this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIOrbitTarget(this, 1.2D, stats.rangedRange, false)); break;
 					case HitNRun : this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIAvoidTarget(this)); break;
-					case Ambush : this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIAmbushTarget(this, 1.2D, this.ai.tacticalRadius, false)); break;
-					case Stalk : this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIStalkTarget(this, this.ai.tacticalRadius)); break;
+					case Ambush : this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIAmbushTarget(this, 1.2D, this.ais.tacticalRadius, false)); break;
+					case Stalk : this.tasks.addTask(this.taskCount++, aiResponse = new EntityAIStalkTarget(this, this.ais.tacticalRadius)); break;
                     default :
 				}
 			}
 			this.tasks.addTask(this.taskCount, aiAttackTarget = new EntityAIAttackTarget(this));
-			((EntityAIAttackTarget)aiAttackTarget).navOverride(ai.tacticalVariant == EnumNavType.None);
+			((EntityAIAttackTarget)aiAttackTarget).navOverride(ais.tacticalVariant == EnumNavType.None);
 
 			if(this.inventory.getProjectile() != null){
 				this.tasks.addTask(this.taskCount++, aiRange = new EntityAIRangedAttack(this));
-				aiRange.navOverride(ai.tacticalVariant == EnumNavType.None);
+				aiRange.navOverride(ais.tacticalVariant == EnumNavType.None);
 			}
 		}
-		else if (this.ai.onAttack == 3) {
+		else if (this.ais.onAttack == 3) {
 			//do nothing
 		}
 	}
@@ -805,10 +811,10 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 	 * Branch task function for setting if an NPC wanders or not
 	 */
 	public void setMoveType(){
-		if (ai.movingType == EnumMovingType.Wandering){
+		if (ais.movingType == EnumMovingType.Wandering){
 			this.tasks.addTask(this.taskCount++, new EntityAIWander(this));
 		}
-		if (ai.movingType == EnumMovingType.MovingPath){
+		if (ais.movingType == EnumMovingType.MovingPath){
 			this.tasks.addTask(this.taskCount++, new EntityAIMovingPath(this));
 		}
 	}
@@ -819,11 +825,11 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 		if(canFly()) //currently flying does not support opening doors
 			return;
 		EntityAIBase aiDoor = null;
-		if (this.ai.doorInteract == 1)
+		if (this.ais.doorInteract == 1)
 		{
 			this.tasks.addTask(this.taskCount++, aiDoor = new EntityAIOpenDoor(this, true));
 		}
-		else if (this.ai.doorInteract == 0)
+		else if (this.ais.doorInteract == 0)
 		{
 			this.tasks.addTask(this.taskCount++, aiDoor = new EntityAIBustDoor(this));
 		}
@@ -834,11 +840,11 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 	 * Branch task function for finding shelter under the appropriate conditions
 	 */
 	public void seekShelter() {
-		if (this.ai.findShelter == 0)
+		if (this.ais.findShelter == 0)
 		{
 			this.tasks.addTask(this.taskCount++, new EntityAIMoveIndoors(this));
 		}
-		else if (this.ai.findShelter == 1)
+		else if (this.ais.findShelter == 1)
 		{
 			if(!canFly()) // doesnt work when flying
 				this.tasks.addTask(this.taskCount++, new EntityAIRestrictSun(this));
@@ -850,9 +856,9 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 	 * Branch task function for leaping
 	 */
 	public void setLeapTask() {
-		if (this.ai.leapType == 1)
+		if (this.ais.leapType == 1)
 			this.tasks.addTask(this.taskCount++, aiLeap = new EntityAILeapAtTarget(this, 0.4F));
-		if (this.ai.leapType == 2)
+		if (this.ais.leapType == 2)
 			this.tasks.addTask(this.taskCount++, aiLeap = new EntityAIPounceTarget(this));
 	}
 
@@ -862,7 +868,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 	public void addRegularEntries() {
 		this.tasks.addTask(this.taskCount++, new EntityAIFollow(this));
 		this.tasks.addTask(this.taskCount++, new EntityAIReturn(this));
-		if (this.ai.standingType != EnumStandingType.NoRotation && this.ai.standingType != EnumStandingType.HeadRotation)
+		if (this.ais.standingType != EnumStandingType.NoRotation && this.ais.standingType != EnumStandingType.HeadRotation)
 			this.tasks.addTask(this.taskCount++, new EntityAIWatchClosest(this, EntityLivingBase.class, 5.0F));
 		this.tasks.addTask(this.taskCount++, new EntityAILook(this));
 		this.tasks.addTask(this.taskCount++, new EntityAIWorldLines(this));
@@ -877,7 +883,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 	 * Function for getting proper move speeds. This way we don't have to modify them every time we use them.
 	 */
 	public float getSpeed() {
-		return (float)ai.getWalkingSpeed() / 20.0F;
+		return (float) ais.getWalkingSpeed() / 20.0F;
 	}
 
 	@Override
@@ -1020,9 +1026,9 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 			return;
 
 		if(!line.getSound().isEmpty()){
-			Server.sendData((EntityPlayerMP)player, EnumPacketClient.PLAY_SOUND, line.getSound(), (float)posX, (float)posY, (float)posZ);
-		}
-		Server.sendData((EntityPlayerMP)player, EnumPacketClient.CHATBUBBLE, this.getEntityId(), line.getText(), !line.hideText());
+            PacketHandler.Instance.sendToPlayer(new SoundManagementPacket(EnumSoundOperation.PLAY_SOUND, line.getSound(), (float)posX, (float)posY, (float)posZ), (EntityPlayerMP)player);
+        }
+        PacketHandler.Instance.sendToPlayer(new ChatBubblePacket(this.getEntityId(), line.getText(), !line.hideText()), (EntityPlayerMP)player);
 	}
 	public boolean getAlwaysRenderNameTagForRender(){
 		return true;
@@ -1036,7 +1042,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 
 		display.readToNBT(compound);
 		stats.readToNBT(compound);
-		ai.readToNBT(compound);
+		ais.readToNBT(compound);
 		script.readFromNBT(compound);
 		script.readEventsFromNBT(compound);
 		timers.readFromNBT(compound);
@@ -1070,7 +1076,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 		super.writeEntityToNBT(compound);
 		display.writeToNBT(compound);
 		stats.writeToNBT(compound);
-		ai.writeToNBT(compound);
+		ais.writeToNBT(compound);
 		script.writeToNBT(compound);
 		script.writeEventsToNBT(compound);
 		timers.writeToNBT(compound);
@@ -1154,7 +1160,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 		this.setRevengeTarget(null);
 		this.deathTime = 0;
 		//fleeingTick = 0;
-		if(ai.returnToStart && !hasOwner() && !this.isRemote())
+		if(ais.returnToStart && !hasOwner() && !this.isRemote())
 			setLocationAndAngles(getStartXPos(), getStartYPos(), getStartZPos(), rotationYaw, rotationPitch);
 		killedtime = 0;
 		extinguish();
@@ -1170,7 +1176,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 		currentAnimation = EnumAnimation.NONE;
 		updateHitbox();
 		updateAI = true;
-		ai.movingPos = 0;
+		ais.movingPos = 0;
 		if(getOwner() != null){
 			getOwner().setLastAttacker(null);
 		}
@@ -1393,20 +1399,20 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 
 	public float getStartXPos(){
 
-		return getStartPos()[0] + ai.bodyOffsetX / 10;
+		return getStartPos()[0] + ais.bodyOffsetX / 10;
 	}
 
 	public float getStartZPos(){
-		return getStartPos()[2] + ai.bodyOffsetZ / 10;
+		return getStartPos()[2] + ais.bodyOffsetZ / 10;
 	}
 
 	public int[] getStartPos(){
-		if(ai.startPos == null || ai.startPos.length != 3)
-			ai.startPos = new int[] {
+		if(ais.startPos == null || ais.startPos.length != 3)
+			ais.startPos = new int[] {
 					MathHelper.floor_double(posX),
 					MathHelper.floor_double(posY),
 					MathHelper.floor_double(posZ) };
-		return ai.startPos;
+		return ais.startPos;
 	}
 
 	public boolean isVeryNearAssignedPlace() {
@@ -1507,7 +1513,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 	}
 
 	public boolean isWalking() {
-		return ai.movingType != EnumMovingType.Standing || isAttacking() || isFollower() || getBoolFlag(1);
+		return ais.movingType != EnumMovingType.Standing || isAttacking() || isFollower() || getBoolFlag(1);
 	}
 
 	public void setBoolFlag(boolean bo, int id){
@@ -1618,7 +1624,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 	@Override
 	public void writeSpawnData(ByteBuf buffer) {
 		try {
-			Server.writeNBT(buffer, writeSpawnData());
+			ByteBufUtils.writeNBT(buffer, writeSpawnData());
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
@@ -1630,12 +1636,12 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 		compound.setDouble("MaxHealth", stats.maxHealth);
 		compound.setTag("Armor", NBTTags.nbtItemStackList(inventory.getArmor()));
 		compound.setTag("Weapons", NBTTags.nbtItemStackList(inventory.getWeapons()));
-		compound.setInteger("Speed", ai.getWalkingSpeed());
+		compound.setInteger("Speed", ais.getWalkingSpeed());
 		compound.setBoolean("DeadBody", stats.hideKilledBody);
-		compound.setInteger("StandingState", ai.standingType.ordinal());
-		compound.setInteger("MovingState", ai.movingType.ordinal());
-		compound.setInteger("Orientation", ai.orientation);
-		compound.setFloat("OffsetY",ai.bodyOffsetY);
+		compound.setInteger("StandingState", ais.standingType.ordinal());
+		compound.setInteger("MovingState", ais.movingType.ordinal());
+		compound.setInteger("Orientation", ais.orientation);
+		compound.setFloat("OffsetY", ais.bodyOffsetY);
 		compound.setInteger("Role", advanced.role.ordinal());
 		compound.setInteger("Job", advanced.job.ordinal());
 		if(advanced.job == EnumJobType.Bard){
@@ -1657,18 +1663,18 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 	@Override
 	public void readSpawnData(ByteBuf buf) {
 		try {
-			readSpawnData(Server.readNBT(buf));
+			readSpawnData(ByteBufUtils.readNBT(buf));
 		} catch (IOException e) {
 		}
 	}
 	public void readSpawnData(NBTTagCompound compound) {
 		stats.maxHealth = compound.getDouble("MaxHealth");
-		ai.setWalkingSpeed(compound.getInteger("Speed"));
+		ais.setWalkingSpeed(compound.getInteger("Speed"));
 		stats.hideKilledBody = compound.getBoolean("DeadBody");
-		ai.standingType = EnumStandingType.values()[compound.getInteger("StandingState") % EnumStandingType.values().length];
-		ai.movingType = EnumMovingType.values()[compound.getInteger("MovingState") % EnumMovingType.values().length];
-		ai.orientation = compound.getInteger("Orientation");
-		ai.bodyOffsetY=compound.getFloat("OffsetY");
+		ais.standingType = EnumStandingType.values()[compound.getInteger("StandingState") % EnumStandingType.values().length];
+		ais.movingType = EnumMovingType.values()[compound.getInteger("MovingState") % EnumMovingType.values().length];
+		ais.orientation = compound.getInteger("Orientation");
+		ais.bodyOffsetY=compound.getFloat("OffsetY");
 
 		this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(stats.maxHealth);
 		inventory.setArmor(NBTTags.getItemStackList(compound.getTagList("Armor", 10)));
@@ -1744,7 +1750,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 
 	public void setAvoidWater(boolean avoidWater) {
 		this.getNavigator().setAvoidsWater(avoidWater);
-		ai.avoidsWater = avoidWater;
+		ais.avoidsWater = avoidWater;
 	}
 	@Override
 	protected void fall(float par1) {
@@ -1941,7 +1947,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 	@Override
 	public void setHomeArea(int x, int y, int z, int range){
 		super.setHomeArea(x, y, z, range);
-		ai.startPos = new int[]{x, y, z};
+		ais.startPos = new int[]{x, y, z};
 	}
 
 	@Override
diff --git a/src/main/java/noppes/npcs/entity/EntityProjectile.java b/src/main/java/noppes/npcs/entity/EntityProjectile.java
index 5e08eb3ae..e3e581df2 100644
--- a/src/main/java/noppes/npcs/entity/EntityProjectile.java
+++ b/src/main/java/noppes/npcs/entity/EntityProjectile.java
@@ -2,7 +2,7 @@ package noppes.npcs.entity;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import kamkeel.addon.DBCAddon;
+import kamkeel.npcs.addon.DBCAddon;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -27,7 +27,6 @@ import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
 import noppes.npcs.DataStats;
 import noppes.npcs.EventHooks;
-import noppes.npcs.NpcDamageSource;
 import noppes.npcs.api.IPos;
 import noppes.npcs.api.IWorld;
 import noppes.npcs.api.entity.IEntity;
diff --git a/src/main/java/noppes/npcs/entity/data/DataSkinOverlays.java b/src/main/java/noppes/npcs/entity/data/DataSkinOverlays.java
index e9d51495c..92b408696 100644
--- a/src/main/java/noppes/npcs/entity/data/DataSkinOverlays.java
+++ b/src/main/java/noppes/npcs/entity/data/DataSkinOverlays.java
@@ -1,12 +1,12 @@
 package noppes.npcs.entity.data;
 
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.packets.data.PlayerUpdateSkinOverlaysPacket;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import noppes.npcs.Server;
 import noppes.npcs.api.ISkinOverlay;
 import noppes.npcs.api.handler.IOverlayHandler;
 import noppes.npcs.config.ConfigMain;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.controllers.data.PlayerData;
 import noppes.npcs.controllers.data.SkinOverlay;
 import noppes.npcs.entity.EntityNPCInterface;
@@ -54,7 +54,7 @@ public class DataSkinOverlays implements IOverlayHandler {
             if (parent instanceof PlayerData && ((PlayerData) parent).player != null) {
                 NBTTagCompound compound = this.writeToNBT(new NBTTagCompound());
                 ((PlayerData) parent).player.getEntityData().setTag("SkinOverlayData", compound.getTagList("SkinOverlayData", 10));
-                Server.sendToAll(EnumPacketClient.PLAYER_UPDATE_SKIN_OVERLAYS, ((PlayerData) parent).player.getCommandSenderName(), compound);
+                PacketHandler.Instance.sendToAll(new PlayerUpdateSkinOverlaysPacket(((PlayerData) parent).player.getCommandSenderName(), compound));
             } else if (parent instanceof EntityNPCInterface) {
                 ((EntityNPCInterface) parent).updateClient = true;
             }
diff --git a/src/main/java/noppes/npcs/entity/old/EntityNpcMonsterFemale.java b/src/main/java/noppes/npcs/entity/old/EntityNpcMonsterFemale.java
index a41398172..e66c806b8 100644
--- a/src/main/java/noppes/npcs/entity/old/EntityNpcMonsterFemale.java
+++ b/src/main/java/noppes/npcs/entity/old/EntityNpcMonsterFemale.java
@@ -39,7 +39,7 @@ public class EntityNpcMonsterFemale extends EntityNPCInterface
 			data.modelScale.legs.setScale(0.92f,0.92f);
 			data.modelScale.arms.setScale(0.80f,0.92f);
 			data.modelScale.body.setScale(0.92f, 0.92f);
-	    	npc.ai.animationType = EnumAnimation.HUG;
+	    	npc.ais.animationType = EnumAnimation.HUG;
 	    	worldObj.spawnEntityInWorld(npc);
     	}
     	super.onUpdate();
diff --git a/src/main/java/noppes/npcs/entity/old/EntityNpcMonsterMale.java b/src/main/java/noppes/npcs/entity/old/EntityNpcMonsterMale.java
index f01bf1cb3..2a81ac253 100644
--- a/src/main/java/noppes/npcs/entity/old/EntityNpcMonsterMale.java
+++ b/src/main/java/noppes/npcs/entity/old/EntityNpcMonsterMale.java
@@ -1,6 +1,6 @@
 // Decompiled by Jad v1.5.8g. Copyright 2001 Pavel Kouznetsov.
 // Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces deadcode fieldsfirst 
+// Decompiler options: packimports(3) braces deadcode fieldsfirst
 
 package noppes.npcs.entity.old;
 
@@ -11,7 +11,7 @@ import noppes.npcs.entity.EntityCustomNpc;
 import noppes.npcs.entity.EntityNPCInterface;
 
 // Referenced classes of package net.minecraft.src:
-//            EntityAnimal, Item, EntityPlayer, InventoryPlayer, 
+//            EntityAnimal, Item, EntityPlayer, InventoryPlayer,
 //            ItemStack, World, NBTTagCompound
 
 public class EntityNpcMonsterMale extends EntityNPCInterface
@@ -21,17 +21,17 @@ public class EntityNpcMonsterMale extends EntityNPCInterface
         super(world);
         display.texture = "customnpcs:textures/entity/monstermale/ZombieSteve.png";
     }
-    
+
     public void onUpdate(){
     	isDead = true;
 
     	if(!worldObj.isRemote){
 	    	NBTTagCompound compound = new NBTTagCompound();
-	    	
+
 	    	writeToNBT(compound);
 	    	EntityCustomNpc npc = new EntityCustomNpc(worldObj);
 	    	npc.readFromNBT(compound);
-	    	npc.ai.animationType = EnumAnimation.HUG;
+	    	npc.ais.animationType = EnumAnimation.HUG;
 	    	worldObj.spawnEntityInWorld(npc);
     	}
     	super.onUpdate();
diff --git a/src/main/java/noppes/npcs/items/ItemLinked.java b/src/main/java/noppes/npcs/items/ItemLinked.java
new file mode 100644
index 000000000..c20d97424
--- /dev/null
+++ b/src/main/java/noppes/npcs/items/ItemLinked.java
@@ -0,0 +1,158 @@
+package noppes.npcs.items;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.world.World;
+import noppes.npcs.CustomItems;
+import noppes.npcs.CustomNpcs;
+import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.EventHooks;
+import noppes.npcs.api.item.IItemStack;
+import noppes.npcs.config.ConfigScript;
+import noppes.npcs.constants.EnumGuiType;
+import noppes.npcs.scripted.NpcAPI;
+import noppes.npcs.scripted.event.ItemEvent;
+import noppes.npcs.scripted.item.ScriptCustomItem;
+import org.lwjgl.opengl.GL11;
+
+public class ItemLinked extends Item implements ItemRenderInterface {
+
+    public ItemLinked() {
+        maxStackSize = 1;
+        CustomNpcs.proxy.registerItem(this);
+        setHasSubtypes(true);
+    }
+
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister par1IconRegister){
+        this.itemIcon = Items.iron_pickaxe.getIconFromDamage(0);
+    }
+
+    @Override
+    public int getColorFromItemStack(ItemStack itemStack, int par2){
+        return 0x8B4513;
+    }
+
+    @Override
+    public boolean requiresMultipleRenderPasses(){
+        return true;
+    }
+
+    @Override
+    public Item setUnlocalizedName(String name){
+        GameRegistry.registerItem(this, name);
+        return super.setUnlocalizedName(name);
+    }
+
+    public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
+    {
+        player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
+        return stack;
+    }
+
+    @Override
+    public boolean onEntitySwing(EntityLivingBase entityLivingBase, ItemStack stack){
+        if (entityLivingBase.worldObj.isRemote) {
+            return false;
+        }
+
+        IItemStack istack = NpcAPI.Instance().getIItemStack(stack);
+        ItemEvent.AttackEvent eve = new ItemEvent.AttackEvent( (ScriptCustomItem) istack, NpcAPI.Instance().getIEntity(entityLivingBase), 2, null);
+        return EventHooks.onScriptItemAttack((ScriptCustomItem) istack, eve);
+    }
+
+    public int getMaxItemUseDuration(ItemStack stack){
+        return (new ScriptCustomItem(stack)).getMaxItemUseDuration();
+    }
+
+    public static ScriptCustomItem GetWrapper(ItemStack stack) {
+        return new ScriptCustomItem(stack);
+    }
+
+    public boolean showDurabilityBar(ItemStack stack) {
+        IItemStack istack = NpcAPI.Instance().getIItemStack(stack);
+        return istack instanceof ScriptCustomItem && (new ScriptCustomItem(stack)).itemDisplay.durabilityShow;
+    }
+
+    public double getDurabilityForDisplay(ItemStack stack) {
+        IItemStack istack = NpcAPI.Instance().getIItemStack(stack);
+        return istack instanceof ScriptCustomItem ? 1.0D - (new ScriptCustomItem(stack)).durabilityValue : 1.0D;
+    }
+
+    public int getItemStackLimit(ItemStack stack) {
+        IItemStack istack = NpcAPI.Instance().getIItemStack(stack);
+        return istack instanceof ScriptCustomItem ? (new ScriptCustomItem(stack)).getMaxStackSize() : super.getItemStackLimit(stack);
+    }
+
+    public boolean isItemTool(ItemStack stack)
+    {
+        IItemStack istack = NpcAPI.Instance().getIItemStack(stack);
+        return istack instanceof ScriptCustomItem ? (new ScriptCustomItem(stack)).isTool() : super.isItemTool(stack);
+    }
+
+    public float getDigSpeed(ItemStack stack, Block block, int metadata)
+    {
+        IItemStack istack = NpcAPI.Instance().getIItemStack(stack);
+        return istack instanceof ScriptCustomItem ? (new ScriptCustomItem(stack)).getDigSpeed() : super.getDigSpeed(stack, block, metadata);
+    }
+
+    public boolean isValidArmor(ItemStack stack, int armorType, Entity entity)
+    {
+        IItemStack istack = NpcAPI.Instance().getIItemStack(stack);
+
+        if((new ScriptCustomItem(stack)).getArmorType() == -1)
+            return true;
+
+        return istack instanceof ScriptCustomItem ? armorType == (new ScriptCustomItem(stack)).getArmorType() : super.isValidArmor(stack, armorType, entity);
+    }
+
+    public int getItemEnchantability(ItemStack stack)
+    {
+        IItemStack istack = NpcAPI.Instance().getIItemStack(stack);
+        return istack instanceof ScriptCustomItem ? (new ScriptCustomItem(stack)).getEnchantability() : super.getItemEnchantability(stack);
+    }
+
+    public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker) {
+        IItemStack istack = NpcAPI.Instance().getIItemStack(stack);
+        ItemEvent.AttackEvent eve = new ItemEvent.AttackEvent( (ScriptCustomItem) istack, NpcAPI.Instance().getIEntity(attacker), 1, NpcAPI.Instance().getIEntity(target));
+        return EventHooks.onScriptItemAttack((ScriptCustomItem) istack, eve);
+    }
+
+    public EnumAction getItemUseAction(ItemStack stack)
+    {
+        IItemStack istack = NpcAPI.Instance().getIItemStack(stack);
+        if (istack instanceof ScriptCustomItem) {
+            switch (((ScriptCustomItem) istack).getItemUseAction()) {
+                case 0:
+                    return EnumAction.none;
+                case 1:
+                    return EnumAction.block;
+                case 2:
+                    return EnumAction.bow;
+                case 3:
+                    return EnumAction.eat;
+                case 4:
+                    return EnumAction.drink;
+            }
+        }
+        return super.getItemUseAction(stack);
+    }
+
+    @Override
+    public void renderSpecial() {}
+
+    public void renderOffset(ScriptCustomItem scriptCustomItem) {
+        GL11.glTranslatef(0.135F * scriptCustomItem.itemDisplay.scaleX, 0.2F * scriptCustomItem.itemDisplay.scaleY, 0.07F * scriptCustomItem.itemDisplay.scaleZ);
+    }
+}
diff --git a/src/main/java/noppes/npcs/items/ItemNpcMovingPath.java b/src/main/java/noppes/npcs/items/ItemNpcMovingPath.java
index eaf5eab05..bb758e178 100644
--- a/src/main/java/noppes/npcs/items/ItemNpcMovingPath.java
+++ b/src/main/java/noppes/npcs/items/ItemNpcMovingPath.java
@@ -46,7 +46,7 @@ public class ItemNpcMovingPath extends Item{
 		EntityNPCInterface npc = getNpc(par1ItemStack, par3World);
 		if(npc == null)
 			return false;
-		List<int[]> list = npc.ai.getMovingPath();
+		List<int[]> list = npc.ais.getMovingPath();
 		int[] pos = list.get(list.size() - 1);
 		list.add(new int[]{x,y,z});
 
diff --git a/src/main/java/noppes/npcs/items/ItemNpcWand.java b/src/main/java/noppes/npcs/items/ItemNpcWand.java
index 7a12585dd..6d6477f5a 100644
--- a/src/main/java/noppes/npcs/items/ItemNpcWand.java
+++ b/src/main/java/noppes/npcs/items/ItemNpcWand.java
@@ -49,7 +49,7 @@ public class ItemNpcWand extends Item{
 		}
 		else if(CustomNpcsPermissions.hasPermission(player, CustomNpcsPermissions.NPC_CREATE)){
 			EntityCustomNpc npc = new EntityCustomNpc(par3World);
-	    	npc.ai.startPos = new int[]{par4,par5,par6};
+	    	npc.ais.startPos = new int[]{par4,par5,par6};
 
 			npc.setLocationAndAngles((float)par4 + 0.5F, npc.getStartYPos(), (float)par6 + 0.5F, player.rotationYaw, player.rotationPitch);
 
diff --git a/src/main/java/noppes/npcs/items/ItemScripted.java b/src/main/java/noppes/npcs/items/ItemScripted.java
index 49c5ef3da..5fdcf5751 100644
--- a/src/main/java/noppes/npcs/items/ItemScripted.java
+++ b/src/main/java/noppes/npcs/items/ItemScripted.java
@@ -89,7 +89,7 @@ public class ItemScripted extends Item implements ItemRenderInterface {
 
     public boolean showDurabilityBar(ItemStack stack) {
         IItemStack istack = NpcAPI.Instance().getIItemStack(stack);
-        return istack instanceof ScriptCustomItem && (new ScriptCustomItem(stack)).durabilityShow;
+        return istack instanceof ScriptCustomItem && (new ScriptCustomItem(stack)).itemDisplay.durabilityShow;
     }
 
     public double getDurabilityForDisplay(ItemStack stack) {
@@ -160,6 +160,6 @@ public class ItemScripted extends Item implements ItemRenderInterface {
     public void renderSpecial() {}
 
     public void renderOffset(ScriptCustomItem scriptCustomItem) {
-        GL11.glTranslatef(0.135F * scriptCustomItem.scaleX, 0.2F * scriptCustomItem.scaleY, 0.07F * scriptCustomItem.scaleZ);
+        GL11.glTranslatef(0.135F * scriptCustomItem.itemDisplay.scaleX, 0.2F * scriptCustomItem.itemDisplay.scaleY, 0.07F * scriptCustomItem.itemDisplay.scaleZ);
     }
 }
diff --git a/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java b/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java
index 686f52a86..6e3480040 100644
--- a/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java
+++ b/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java
@@ -41,7 +41,7 @@ public class ItemSoulstoneFilled extends Item {
     	if(stack.stackTagCompound == null || !stack.stackTagCompound.hasKey("Entity", 10)){
     		list.add(EnumChatFormatting.RED + "Error");
     		return;
-    	}    	
+    	}
     	String name = StatCollector.translateToLocal(stack.stackTagCompound.getString("Name"));
     	if(stack.stackTagCompound.hasKey("DisplayName"))
     		name = stack.stackTagCompound.getString("DisplayName") + " (" + name + ")";
@@ -55,17 +55,17 @@ public class ItemSoulstoneFilled extends Item {
     		list.add(text);
     	}
     }
-    
+
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_){
     	if(!spawn(player, stack, world, x, y, z))
     		return false;
-		
+
 		if(!player.capabilities.isCreativeMode)
 			stack.splitStack(1);
     	return true;
     }
-    
+
     public boolean spawn(EntityPlayer player, ItemStack stack, World world, int x, int y, int z){
         if(world.isRemote)
         	return true;
@@ -86,7 +86,7 @@ public class ItemSoulstoneFilled extends Item {
 		}
     	if(entity instanceof EntityNPCInterface){
     		EntityNPCInterface npc = (EntityNPCInterface) entity;
-    		npc.ai.startPos = new int[]{x, y, z};
+    		npc.ais.startPos = new int[]{x, y, z};
     		npc.setHealth(npc.getMaxHealth());
 			npc.setPosition((float)x + 0.5F, npc.getStartYPos(), (float)z + 0.5F);
 			npc.advanced.soulStonePlayerName = sourceName;
diff --git a/src/main/java/noppes/npcs/roles/JobItemGiver.java b/src/main/java/noppes/npcs/roles/JobItemGiver.java
index ea69aa07e..8a72ff2aa 100644
--- a/src/main/java/noppes/npcs/roles/JobItemGiver.java
+++ b/src/main/java/noppes/npcs/roles/JobItemGiver.java
@@ -268,7 +268,7 @@ public class JobItemGiver extends JobInterface{
 
 	@Override
 	public void killed() {
-		// TODO Auto-generated method stub
+
 
 	}
 
@@ -280,7 +280,7 @@ public class JobItemGiver extends JobInterface{
 
 	@Override
 	public void delete() {
-		// TODO Auto-generated method stub
+
 
 	}
 }
diff --git a/src/main/java/noppes/npcs/roles/JobSpawner.java b/src/main/java/noppes/npcs/roles/JobSpawner.java
index e5aca69e1..ae1099d38 100644
--- a/src/main/java/noppes/npcs/roles/JobSpawner.java
+++ b/src/main/java/noppes/npcs/roles/JobSpawner.java
@@ -388,7 +388,7 @@ public class JobSpawner extends JobInterface{
 			if (living instanceof EntityNPCInterface) {
 				EntityNPCInterface snpc = (EntityNPCInterface) living;
 				snpc.stats.spawnCycle = 3;
-				snpc.ai.returnToStart = false;
+				snpc.ais.returnToStart = false;
 				snpc.stats.canDespawn = true;
 				snpc.stats.playerSetCanDespawn = true;
 			}
diff --git a/src/main/java/noppes/npcs/roles/RoleCompanion.java b/src/main/java/noppes/npcs/roles/RoleCompanion.java
index f1a3d5c9d..7e5a904a9 100644
--- a/src/main/java/noppes/npcs/roles/RoleCompanion.java
+++ b/src/main/java/noppes/npcs/roles/RoleCompanion.java
@@ -36,23 +36,23 @@ public class RoleCompanion extends RoleInterface {
 	public boolean canAge = true;
 	public long ticksActive = 0;
 	public EnumCompanionStage stage = EnumCompanionStage.FULLGROWN;
-	
+
 	public EntityPlayer owner = null;
 	public int companionID;
-	
+
 	public EnumCompanionJobs job = EnumCompanionJobs.NONE;
 	public CompanionJobInterface jobInterface = null;
-	
-	public boolean hasInv = true;	
+
+	public boolean hasInv = true;
 	public boolean defendOwner = true;
-	
+
 	public CompanionFoodStats foodstats = new CompanionFoodStats();
 	private int eatingTicks = 20;
 	private ItemStack eating = null;
 	private int eatingDelay = 00;
-	
+
 	public int currentExp = 0;
-	
+
 	public RoleCompanion(EntityNPCInterface npc) {
 		super(npc);
 		inventory = new NpcMiscInventory(12);
@@ -91,29 +91,29 @@ public class RoleCompanion extends RoleInterface {
     			eatingDelay--;
     			return;
     		}
-    		
+
 			ItemStack prev = eating;
 			eating = getFood();
-			
+
 			if(prev != null && eating == null)
 				npc.setRoleDataWatcher("");
-    		
+
 			if(prev == null && eating != null){
 				npc.setRoleDataWatcher("eating");
 				eatingTicks = 20;
 			}
-			
+
 			if(isEating()){
 				doEating();
 			}
-			
+
 		}
 		else if(eating != null && !isSitting()){
 			eating = null;
 			eatingDelay = 20;
 			npc.setRoleDataWatcher("");
 		}
-		
+
 		ticksActive++;
 		if(canAge && stage != EnumCompanionStage.FULLGROWN){
 			if(stage == EnumCompanionStage.BABY && ticksActive > EnumCompanionStage.CHILD.matureAge){
@@ -134,7 +134,7 @@ public class RoleCompanion extends RoleInterface {
 	public void clientUpdate() {
 		if(npc.getRoleDataWatcher().equals("eating")){
 			eating = getFood();
-			
+
 			if(isEating()){
 				doEating();
 			}
@@ -142,7 +142,7 @@ public class RoleCompanion extends RoleInterface {
 		else if(eating != null){
 			eating = null;
 		}
-		
+
 	}
 	private void doEating(){
     	if(npc.worldObj.isRemote){
@@ -164,9 +164,9 @@ public class RoleCompanion extends RoleInterface {
                 npc.worldObj.spawnParticle(s, vec31.xCoord, vec31.yCoord, vec31.zCoord, vec3.xCoord, vec3.yCoord + 0.0D, vec3.zCoord);
             }
     	}
-    	else{    		
+    	else{
 			eatingTicks--;
-	
+
 			if(eatingTicks <= 0){
 				if(inventory.decrStackSize(eating, 1)){
 					ItemFood food = (ItemFood) eating.getItem();
@@ -183,19 +183,19 @@ public class RoleCompanion extends RoleInterface {
 			}
     	}
 	}
-	
+
 	public void matureTo(EnumCompanionStage stage){
 		this.stage = stage;
 		EntityCustomNpc npc = (EntityCustomNpc) this.npc;
-		npc.ai.animationType = stage.animation;
+		npc.ais.animationType = stage.animation;
 		if(stage == EnumCompanionStage.BABY){
 			npc.modelData.modelScale.arms.setScale(0.5f, 0.5f, 0.5f);
 			npc.modelData.modelScale.legs.setScale(0.5f, 0.5f, 0.5f);
 			npc.modelData.modelScale.body.setScale(0.5f, 0.5f, 0.5f);
 			npc.modelData.modelScale.head.setScale(0.7f, 0.7f, 0.7f);
-			
-			npc.ai.onAttack = 1;
-			npc.ai.setWalkingSpeed(3);
+
+			npc.ais.onAttack = 1;
+			npc.ais.setWalkingSpeed(3);
 			if(!talents.containsKey(EnumCompanionTalent.INVENTORY))
 				talents.put(EnumCompanionTalent.INVENTORY, 0);
 		}
@@ -205,8 +205,8 @@ public class RoleCompanion extends RoleInterface {
 			npc.modelData.modelScale.body.setScale(0.6f, 0.6f, 0.6f);
 			npc.modelData.modelScale.head.setScale(0.8f, 0.8f, 0.8f);
 
-			npc.ai.onAttack = 0;
-			npc.ai.setWalkingSpeed(4);
+			npc.ais.onAttack = 0;
+			npc.ais.setWalkingSpeed(4);
 			if(!talents.containsKey(EnumCompanionTalent.SWORD))
 				talents.put(EnumCompanionTalent.SWORD, 0);
 		}
@@ -216,10 +216,10 @@ public class RoleCompanion extends RoleInterface {
 			npc.modelData.modelScale.body.setScale(0.8f, 0.8f, 0.8f);
 			npc.modelData.modelScale.head.setScale(0.9f, 0.9f, 0.9f);
 
-			npc.ai.onAttack = 0;
-			npc.ai.setWalkingSpeed(5);
+			npc.ais.onAttack = 0;
+			npc.ais.setWalkingSpeed(5);
 			if(!talents.containsKey(EnumCompanionTalent.ARMOR))
-				talents.put(EnumCompanionTalent.ARMOR, 0);			
+				talents.put(EnumCompanionTalent.ARMOR, 0);
 		}
 		if(stage == EnumCompanionStage.ADULT || stage == EnumCompanionStage.FULLGROWN){
 			npc.modelData.modelScale.arms.setScale(1f, 1f, 1f);
@@ -227,8 +227,8 @@ public class RoleCompanion extends RoleInterface {
 			npc.modelData.modelScale.body.setScale(1f, 1f, 1f);
 			npc.modelData.modelScale.head.setScale(1f, 1f, 1f);
 
-			npc.ai.onAttack = 0;
-			npc.ai.setWalkingSpeed(5);
+			npc.ais.onAttack = 0;
+			npc.ais.setWalkingSpeed(5);
 		}
 	}
 
@@ -246,13 +246,13 @@ public class RoleCompanion extends RoleInterface {
 
 		compound.setBoolean("CompanionHasInv", hasInv);
 		compound.setBoolean("CompanionDefendOwner", defendOwner);
-		
+
 		foodstats.writeNBT(compound);
-		
+
 		compound.setInteger("CompanionJob", job.ordinal());
 		if(jobInterface != null)
 			compound.setTag("CompanionJobData", jobInterface.getNBT());
-		
+
 		NBTTagList list = new NBTTagList();
 		for(EnumCompanionTalent talent : talents.keySet()){
 			NBTTagCompound c = new NBTTagCompound();
@@ -275,12 +275,12 @@ public class RoleCompanion extends RoleInterface {
 		currentExp = compound.getInteger("CompanionExp");
 		canAge = compound.getBoolean("CompanionCanAge");
 		ticksActive = compound.getLong("CompanionAge");
-		
+
 		hasInv = compound.getBoolean("CompanionHasInv");
 		defendOwner = compound.getBoolean("CompanionDefendOwner");
-		
+
 		foodstats.readNBT(compound);
-		
+
 		NBTTagList list = compound.getTagList("CompanionTalents", 10);
 		Map<EnumCompanionTalent, Integer> talents = new TreeMap<EnumCompanionTalent, Integer>();
 		for(int i = 0; i < list.tagCount(); i++){
@@ -289,7 +289,7 @@ public class RoleCompanion extends RoleInterface {
 			talents.put(talent, c.getInteger("Exp"));
 		}
 		this.talents = talents;
-		
+
 		setJob(compound.getInteger("CompanionJob"));
 		if(jobInterface != null)
 			jobInterface.setNBT(compound.getCompoundTag("CompanionJobData"));
@@ -306,7 +306,7 @@ public class RoleCompanion extends RoleInterface {
 			jobInterface = new CompanionGuard();
 		else
 			jobInterface = null;
-		
+
 		if(jobInterface != null)
 			jobInterface.npc = npc;
 	}
@@ -324,37 +324,37 @@ public class RoleCompanion extends RoleInterface {
 			setSitting(!isSitting());
 		}
 	}
-	
+
 	public int getTotalLevel(){
 		int level = 0;
 		for(EnumCompanionTalent talent : talents.keySet())
 			level += this.getTalentLevel(talent);
 		return level;
 	}
-	
+
 	public int getMaxExp(){
 		return 500 + getTotalLevel() * 200;
 	}
-	
+
 	public void addExp(int exp){
 		if(canAddExp(exp))
 			this.currentExp += exp;
 	}
-	
+
 	public boolean canAddExp(int exp){
 		int newExp = this.currentExp + exp;
 		return newExp >= 0 && newExp < getMaxExp();
 	}
-	
+
 	public void gainExp(int chance){
 		if(npc.getRNG().nextInt(chance) == 0)
 			addExp(1);
 	}
-	
+
 	private void openGui(EntityPlayer player){
 		NoppesUtilServer.sendOpenGui(player, EnumGuiType.Companion, npc);
 	}
-	
+
 	public EntityPlayer getOwner(){
 		if(uuid == null || uuid.isEmpty())
 			return null;
@@ -365,7 +365,7 @@ public class RoleCompanion extends RoleInterface {
 	        }
 		}
 		catch(IllegalArgumentException ex){
-			
+
 		}
     	return null;
 	}
@@ -379,11 +379,11 @@ public class RoleCompanion extends RoleInterface {
 	public boolean hasTalent(EnumCompanionTalent talent) {
 		return getTalentLevel(talent) > 0;
 	}
-	
+
 	public int getTalentLevel(EnumCompanionTalent talent){
 		if(!talents.containsKey(talent))
 			return 0;
-		
+
 		int exp = talents.get(talent);
 		if(exp >= 5000)
 			return 5;
@@ -409,10 +409,10 @@ public class RoleCompanion extends RoleInterface {
 		if(exp < 1700)
 			return 1700;
 		if(exp < 3000)
-			return 3000;		
+			return 3000;
 		return 5000;
 	}
-	
+
 	public void levelSword(){
 		if(!talents.containsKey(EnumCompanionTalent.SWORD))
 			return;
@@ -432,11 +432,11 @@ public class RoleCompanion extends RoleInterface {
 	public void setExp(EnumCompanionTalent talent, int exp) {
 		talents.put(talent, exp);
 	}
-	
+
 	private boolean isWeapon(ItemStack item) {
 		if(item == null || item.getItem() == null)
 			return false;
-		return item.getItem() instanceof ItemSword || 
+		return item.getItem() instanceof ItemSword ||
 				item.getItem() instanceof ItemBow ||
 				item.getItem() == Item.getItemFromBlock(Blocks.cobblestone);
 	}
@@ -450,21 +450,21 @@ public class RoleCompanion extends RoleInterface {
 
 		if(item.getItem() instanceof ItemBow)
 			return this.getTalentLevel(EnumCompanionTalent.RANGED) > 2;
-			
+
 		if(item.getItem() == Item.getItemFromBlock(Blocks.cobblestone))
 			return this.getTalentLevel(EnumCompanionTalent.RANGED) > 1;
-			
+
 		return false;
 	}
-	
+
 	public boolean canWearArmor(ItemStack item){
 		int level = getTalentLevel(EnumCompanionTalent.ARMOR);
 		if(item == null || !(item.getItem() instanceof ItemArmor) || level <= 0)
 			return false;
-			
+
 		if(level >= 5)
 			return true;
-		
+
 		ItemArmor armor = (ItemArmor) item.getItem();
 		int reduction = ObfuscationReflectionHelper.getPrivateValue(ArmorMaterial.class, armor.getArmorMaterial(), 5);
 		if(reduction <= 5 && level >= 1)
@@ -476,7 +476,7 @@ public class RoleCompanion extends RoleInterface {
 		if(reduction <= 33 && level >= 4)
 			return true;
 		return false;
-	}	
+	}
 	public boolean canWearSword(ItemStack item){
 		int level = getTalentLevel(EnumCompanionTalent.SWORD);
 		if(item == null || !(item.getItem() instanceof ItemSword) || level <= 0)
@@ -485,7 +485,7 @@ public class RoleCompanion extends RoleInterface {
 			return true;
 		return getSwordDamage(item) - level < 4;
 	}
-	
+
 	private double getSwordDamage(ItemStack item){
 		if(item == null || !(item.getItem() instanceof ItemSword))
 			return 0;
@@ -501,8 +501,8 @@ public class RoleCompanion extends RoleInterface {
         }
 		return 0;
 	}
-	
-	public void setStats(){		
+
+	public void setStats(){
 		ItemStack weapon = npc.inventory.getWeapon();
 		npc.stats.setAttackStrength((float) (1 + getSwordDamage(weapon)));
 		npc.stats.healthRegen = 0;
@@ -516,10 +516,10 @@ public class RoleCompanion extends RoleInterface {
 				npc.inventory.setProjectile(new ItemStack(Items.arrow));
 			}
 		}
-		
+
 		inventory.setSize(2 + getTalentLevel(EnumCompanionTalent.INVENTORY) * 2);
 	}
-	
+
 	public void setSelfsuficient(boolean bo){
 		if(owner == null || jobInterface != null && bo == jobInterface.isSelfSufficient())
 			return;
@@ -531,27 +531,27 @@ public class RoleCompanion extends RoleInterface {
 			((CompanionGuard)jobInterface).isStanding = bo;
 		else if(job == EnumCompanionJobs.FARMER)
 			((CompanionFarmer)jobInterface).isStanding = bo;
-		
+
 	}
-	
+
 	public void setSitting(boolean sit){
 		if(sit){
-			npc.ai.animationType = EnumAnimation.SITTING;
-			npc.ai.onAttack = 3;
-			npc.ai.startPos = new int[]{MathHelper.floor_double(npc.posX), 
+			npc.ais.animationType = EnumAnimation.SITTING;
+			npc.ais.onAttack = 3;
+			npc.ais.startPos = new int[]{MathHelper.floor_double(npc.posX),
 					MathHelper.floor_double(npc.posY), MathHelper.floor_double(npc.posZ)};
 			npc.getNavigator().clearPathEntity();
-			npc.setPositionAndUpdate(npc.ai.startPos[0] + 0.5, npc.posY, npc.ai.startPos[2] + 0.5);
+			npc.setPositionAndUpdate(npc.ais.startPos[0] + 0.5, npc.posY, npc.ais.startPos[2] + 0.5);
 		}
 		else{
-			npc.ai.animationType = stage.animation;
-			npc.ai.onAttack = 0;
+			npc.ais.animationType = stage.animation;
+			npc.ais.onAttack = 0;
 		}
 		npc.setResponse();
 	}
-	
+
 	public boolean isSitting(){
-		return npc.ai.animationType == EnumAnimation.SITTING;
+		return npc.ais.animationType == EnumAnimation.SITTING;
 	}
 
 	public float applyArmorCalculations(DamageSource source, float damage) {
@@ -565,7 +565,7 @@ public class RoleCompanion extends RoleInterface {
         }
 		return damage;
 	}
-	
+
     private void damageArmor(float damage){
         damage /= 4.0F;
 
@@ -586,7 +586,7 @@ public class RoleCompanion extends RoleInterface {
         }
         this.gainExp(hasArmor?4:8);
     }
-	
+
 	public int getTotalArmorValue(){
     	int armorValue = 0;
     	for(ItemStack armor : npc.inventory.getArmor().values()){
@@ -601,7 +601,7 @@ public class RoleCompanion extends RoleInterface {
 			return false;
 		return owner != null && !isSitting();
 	}
-	
+
 	@Override
 	public boolean defendOwner() {
 		if(!defendOwner || owner == null || stage == EnumCompanionStage.BABY || jobInterface != null && jobInterface.isSelfSufficient())
@@ -611,7 +611,7 @@ public class RoleCompanion extends RoleInterface {
 
 	public int followRange() {
 		return 9 + 12 * stage.ordinal();
-		
+
 	}
 
 	public boolean hasOwner() {
diff --git a/src/main/java/noppes/npcs/scripted/ScriptParticle.java b/src/main/java/noppes/npcs/scripted/ScriptParticle.java
index 8cc313d80..e6c89fb9e 100644
--- a/src/main/java/noppes/npcs/scripted/ScriptParticle.java
+++ b/src/main/java/noppes/npcs/scripted/ScriptParticle.java
@@ -146,8 +146,20 @@ public class ScriptParticle implements IParticle {
     }
 
     public void spawn(IWorld world, double x, double y, double z){
+        double prevX = this.x;
+        double prevY = this.y;
+        double prevZ = this.z;
+
+        this.x = x;
+        this.y = y;
+        this.z = z;
+
         NBTTagCompound compound = this.writeToNBT();
         NoppesUtilServer.spawnScriptedParticle(compound, world.getDimensionID());
+
+        this.x = prevX;
+        this.y = prevY;
+        this.z = prevZ;
     }
 
     public void spawnOnEntity(IEntity entity) {
diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java b/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java
index 828803ed0..2d7f904e4 100644
--- a/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java
+++ b/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java
@@ -149,4 +149,16 @@ public class ScriptLiving<T extends EntityLiving> extends ScriptLivingBase<T> im
 	public boolean canBeSteered() {
 		return this.entity.canBeSteered();
 	}
+
+    @Override
+    public void setRotation(float rotation){
+        super.setRotation(rotation);
+        entity.getLookHelper().setLookPosition(getX(), getY(), getZ(), rotation, getPitch());
+    }
+
+    @Override
+    public void setPitch(float rotation){
+        super.setPitch(rotation);
+        entity.getLookHelper().setLookPosition(getX(), getY(), getZ(), getRotation(), rotation);
+    }
 }
diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java
index 33e38d308..f49e8f213 100644
--- a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java
+++ b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java
@@ -225,6 +225,16 @@ public class ScriptLivingBase<T extends EntityLivingBase> extends ScriptEntity<T
 		return getMCEntity();
 	}
 
+    @Override
+    public float getRotation(){
+        return entity.renderYawOffset;
+    }
+
+    @Override
+    public void setRotation(float rotation){
+        entity.renderYawOffset = rotation;
+    }
+
 	/**
 	 * Makes the entity swing its hand
 	 */
diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
index d9f02a23a..45694f845 100644
--- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
+++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
@@ -93,21 +93,28 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 	}
 
 	public void setRotation(float rotation){
-		npc.ai.orientation = (int)rotation;
-		super.setRotation(rotation);
+        super.setRotation(rotation);
+        int r = (int) rotation;
+        if(npc.ais.orientation != r) {
+            npc.updateClient = true;
+            npc.rotationYawHead = npc.rotationYaw = npc.renderYawOffset = npc.ais.orientation = r;
+            npc.prevRenderYawOffset = r;
+            npc.prevRotationYaw = r;
+            npc.prevRotationYawHead = r;
+        }
 	}
 
 	public void setRotationType(int rotationType){
 		for (EnumStandingType e : EnumStandingType.values()) {
 			if (e.ordinal() == rotationType) {
-				npc.ai.standingType = e;
+				npc.ais.standingType = e;
 				break;
 			}
 		}
 	}
 
 	public int getRotationType(){
-		return npc.ai.standingType.ordinal();
+		return npc.ais.standingType.ordinal();
 	}
 
 	/**
@@ -116,7 +123,7 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 	public void setMovingType(int movingType){
 		for(EnumMovingType e : EnumMovingType.values()) {
 			if (e.ordinal() == movingType) {
-				npc.ai.movingType = e;
+				npc.ais.movingType = e;
 				break;
 			}
 		}
@@ -126,7 +133,7 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 	 * @return The moving type of the npc. 0 = standing, 1 = wandering, 2 = moving path
 	 */
 	public int getMovingType(){
-		return npc.ai.movingType.ordinal();
+		return npc.ais.movingType.ordinal();
 	}
 
 	/**
@@ -170,7 +177,7 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 	}
 
 	public IPos getHome() {
-		return NpcAPI.Instance().getIPos(npc.ai.startPos[0],npc.ai.startPos[1],npc.ai.startPos[2]);
+		return NpcAPI.Instance().getIPos(npc.ais.startPos[0],npc.ais.startPos[1],npc.ais.startPos[2]);
 	}
 
 	/**
@@ -184,7 +191,7 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 	 * @param x The home x position
 	 */
 	public void setHomeX(int x){
-		npc.ai.startPos[0] = x;
+		npc.ais.startPos[0] = x;
 	}
 
 	/**
@@ -198,7 +205,7 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 	 * @param y The home y position
 	 */
 	public void setHomeY(int y){
-		npc.ai.startPos[1] = y;
+		npc.ais.startPos[1] = y;
 	}
 
 	/**
@@ -212,7 +219,7 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 	 * @param z The home x position
 	 */
 	public void setHomeZ(int z){
-		npc.ai.startPos[2] = z;
+		npc.ais.startPos[2] = z;
 	}
 
 	/**
@@ -221,11 +228,11 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 	 * @param z The home z position
 	 */
 	public void setHome(int x, int y, int z){
-		npc.ai.startPos = new int[]{x, y, z};
+		npc.ais.startPos = new int[]{x, y, z};
 	}
 
 	public void setHome(IPos pos){
-		npc.ai.startPos = new int[]{pos.getX(), pos.getY(), pos.getZ()};
+		npc.ais.startPos = new int[]{pos.getX(), pos.getY(), pos.getZ()};
 	}
 
 	/**
@@ -240,14 +247,14 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 	 * @param bo Whether or not the npc will try to return to his home position
 	 */
 	public void setReturnToHome(boolean bo){
-		npc.ai.returnToStart = bo;
+		npc.ais.returnToStart = bo;
 	}
 
 	/**
 	 * @return Whether or not the npc returns home
 	 */
 	public boolean getReturnToHome(){
-		return npc.ai.returnToStart;
+		return npc.ais.returnToStart;
 	}
 
 	/**
@@ -697,29 +704,29 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 	 */
 	public void setAnimation(int type){
 		if(type == AnimationType.NORMAL)
-			npc.ai.animationType = EnumAnimation.NONE;
+			npc.ais.animationType = EnumAnimation.NONE;
 		else if(type == AnimationType.SITTING)
-			npc.ai.animationType = EnumAnimation.SITTING;
+			npc.ais.animationType = EnumAnimation.SITTING;
 		else if(type == AnimationType.DANCING)
-			npc.ai.animationType = EnumAnimation.DANCING;
+			npc.ais.animationType = EnumAnimation.DANCING;
 		else if(type == AnimationType.SNEAKING)
-			npc.ai.animationType = EnumAnimation.SNEAKING;
+			npc.ais.animationType = EnumAnimation.SNEAKING;
 		else if(type == AnimationType.LYING)
-			npc.ai.animationType = EnumAnimation.LYING;
+			npc.ais.animationType = EnumAnimation.LYING;
 		else if(type == AnimationType.HUGGING)
-			npc.ai.animationType = EnumAnimation.HUG;
+			npc.ais.animationType = EnumAnimation.HUG;
 	}
 
 	public void setTacticalVariant(int variant){
 		if(variant > EnumNavType.values().length-1 || variant < 0)
 			return;
 
-		npc.ai.tacticalVariant = EnumNavType.values()[variant];
-		npc.ai.directLOS = EnumNavType.values()[variant] != EnumNavType.Stalk && npc.ai.directLOS;
+		npc.ais.tacticalVariant = EnumNavType.values()[variant];
+		npc.ais.directLOS = EnumNavType.values()[variant] != EnumNavType.Stalk && npc.ais.directLOS;
 	}
 
 	public int getTacticalVariant(){
-		return npc.ai.tacticalVariant.ordinal();
+		return npc.ais.tacticalVariant.ordinal();
 	}
 
 	public void setTacticalVariant(String variant){
@@ -732,22 +739,22 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 		if(!found)
 			return;
 
-		npc.ai.tacticalVariant = EnumNavType.valueOf(variant);
+		npc.ais.tacticalVariant = EnumNavType.valueOf(variant);
 	}
 
 	public String getTacticalVariantName(){
-		return npc.ai.tacticalVariant.name();
+		return npc.ais.tacticalVariant.name();
 	}
 
 	public void setCombatPolicy(int variant){
 		if(variant > EnumCombatPolicy.values().length-1 || variant < 0)
 			return;
 
-		npc.ai.combatPolicy = EnumCombatPolicy.values()[variant];
+		npc.ais.combatPolicy = EnumCombatPolicy.values()[variant];
 	}
 
 	public int getCombatPolicy(){
-		return npc.ai.combatPolicy.ordinal();
+		return npc.ais.combatPolicy.ordinal();
 	}
 
 	public void setCombatPolicy(String variant){
@@ -760,22 +767,22 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 		if(!found)
 			return;
 
-		npc.ai.combatPolicy = EnumCombatPolicy.valueOf(variant);
+		npc.ais.combatPolicy = EnumCombatPolicy.valueOf(variant);
 	}
 
 	public String getCombatPolicyName(){
-		return npc.ai.combatPolicy.name();
+		return npc.ais.combatPolicy.name();
 	}
 
 	public void setTacticalRadius(int tacticalRadius){
 		if(tacticalRadius < 0)
 			tacticalRadius = 0;
 
-		npc.ai.tacticalRadius = tacticalRadius;
+		npc.ais.tacticalRadius = tacticalRadius;
 	}
 
 	public int getTacticalRadius(){
-		return npc.ai.tacticalRadius;
+		return npc.ais.tacticalRadius;
 	}
 
 	public void setIgnoreCobweb(boolean ignore){
@@ -789,21 +796,21 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 	public void setOnFoundEnemy(int onAttack){
 		if(onAttack < 0 || onAttack > 3)
 			return;
-		npc.ai.onAttack = onAttack;
+		npc.ais.onAttack = onAttack;
 	}
 
 	public int onFoundEnemy(){
-		return npc.ai.onAttack;
+		return npc.ais.onAttack;
 	}
 
 	public void setShelterFrom(int shelterFrom){
 		if(shelterFrom < 0 || shelterFrom > 2)
 			return;
-		npc.ai.findShelter = shelterFrom;
+		npc.ais.findShelter = shelterFrom;
 	}
 
 	public int getShelterFrom(){
-		return npc.ai.findShelter;
+		return npc.ais.findShelter;
 	}
 
 	public boolean hasLivingAnimation() {
@@ -1188,7 +1195,7 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 		if (type > 3)
 			type = 3;
 
-		npc.ai.onAttack = type;
+		npc.ais.onAttack = type;
 		npc.updateTasks();
 	}
 
@@ -1254,22 +1261,22 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 			fly = 1;
 		else fly = 0;
 
-		npc.ai.movementType = fly;
+		npc.ais.movementType = fly;
 	}
 
 	public boolean canFly(){
-		return npc.ai.movementType == 1;
+		return npc.ais.movementType == 1;
 	}
 
 	public void setFlySpeed(double flySpeed){
 		if(flySpeed < 0.0D)
 			flySpeed = 0.0D;
 
-		npc.ai.flySpeed = flySpeed;
+		npc.ais.flySpeed = flySpeed;
 	}
 
 	public double getFlySpeed(double flySpeed){
-		return npc.ai.flySpeed;
+		return npc.ais.flySpeed;
 	}
 
 	public void setFlyGravity(double flyGravity){
@@ -1278,36 +1285,36 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 		if(flyGravity > 1.0D)
 			flyGravity = 1.0D;
 
-		npc.ai.flyGravity = flyGravity;
+		npc.ais.flyGravity = flyGravity;
 	}
 
 	public double getFlyGravity(double flySpeed){
-		return npc.ai.flyGravity;
+		return npc.ais.flyGravity;
 	}
 
 	public void setFlyHeightLimit(int flyHeightLimit){
 		if(flyHeightLimit < 0)
 			flyHeightLimit = 0;
 
-		this.npc.ai.flyHeightLimit = flyHeightLimit;
+		this.npc.ais.flyHeightLimit = flyHeightLimit;
 	}
 	public int getFlyHeightLimit(int flyHeightLimit){
-		return this.npc.ai.flyHeightLimit;
+		return this.npc.ais.flyHeightLimit;
 	}
 
 	public void limitFlyHeight(boolean limit){
-		this.npc.ai.hasFlyLimit = limit;
+		this.npc.ais.hasFlyLimit = limit;
 	}
 	public boolean isFlyHeightLimited(boolean limit){
-		return this.npc.ai.hasFlyLimit;
+		return this.npc.ais.hasFlyLimit;
 	}
 
 	public void setSpeed(double speed) {
-		npc.ai.setWalkingSpeed(speed);
+		npc.ais.setWalkingSpeed(speed);
 	}
 
 	public double getSpeed() {
-		return npc.ai.getWalkingSpeed();
+		return npc.ais.getWalkingSpeed();
 	}
 
 	public void setSkinType(byte type) {
diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java
index 8eef50b4e..86485c5b6 100644
--- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java
+++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java
@@ -1,5 +1,10 @@
 package noppes.npcs.scripted.entity;
 
+import kamkeel.npcs.network.PacketHandler;
+import kamkeel.npcs.network.packets.data.AchievementPacket;
+import kamkeel.npcs.network.packets.data.ChatAlertPacket;
+import kamkeel.npcs.network.packets.data.gui.GuiClosePacket;
+import kamkeel.npcs.network.packets.data.script.ScriptOverlayClosePacket;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
@@ -27,7 +32,6 @@ import noppes.npcs.api.item.IItemStack;
 import noppes.npcs.api.overlay.ICustomOverlay;
 import noppes.npcs.compat.PixelmonHelper;
 import noppes.npcs.config.ConfigScript;
-import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.constants.EnumQuestRepeat;
 import noppes.npcs.constants.EnumQuestType;
 import noppes.npcs.containers.ContainerCustomGui;
@@ -45,7 +49,6 @@ import noppes.npcs.util.ValueUtil;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 
 public class ScriptPlayer<T extends EntityPlayerMP> extends ScriptLivingBase<T> implements IPlayer {
 	public T player;
@@ -263,8 +266,9 @@ public class ScriptPlayer<T extends EntityPlayerMP> extends ScriptLivingBase<T>
         	return;
         QuestData questdata = new QuestData(quest);
         data.questData.activeQuests.put(id, questdata);
-		Server.sendData((EntityPlayerMP)player, EnumPacketClient.MESSAGE, "quest.newquest", quest.title);
-		Server.sendData((EntityPlayerMP)player, EnumPacketClient.CHAT, "quest.newquest", ": ", quest.title);
+
+        AchievementPacket.sendAchievement((EntityPlayerMP) player, false, "quest.newquest", quest.title);
+        ChatAlertPacket.sendChatAlert((EntityPlayerMP) player, "quest.newquest", ": ", quest.title);
         data.updateClient = true;
 	}
 
@@ -756,7 +760,7 @@ public class ScriptPlayer<T extends EntityPlayerMP> extends ScriptLivingBase<T>
 
 	public void closeGui() {
 		((EntityPlayerMP)this.entity).closeContainer();
-		Server.sendData((EntityPlayerMP)this.entity, EnumPacketClient.GUI_CLOSE, -1, new NBTTagCompound());
+        GuiClosePacket.closeGUI(player, -1 , new NBTTagCompound());
 	}
 
 	public void showCustomOverlay(ICustomOverlay overlay) {
@@ -764,8 +768,8 @@ public class ScriptPlayer<T extends EntityPlayerMP> extends ScriptLivingBase<T>
 	}
 
 	public void closeOverlay(int id) {
-		Server.sendData((EntityPlayerMP)this.entity, EnumPacketClient.SCRIPT_OVERLAY_CLOSE, id, new NBTTagCompound());
-	}
+        PacketHandler.Instance.sendToPlayer(new ScriptOverlayClosePacket(id), (EntityPlayerMP)this.entity);
+    }
 
 	public IOverlayHandler getOverlays() {
 		return this.getData().skinOverlays;
diff --git a/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java b/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java
index e181668ac..a0d1fcfbb 100644
--- a/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java
+++ b/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java
@@ -14,6 +14,7 @@ import noppes.npcs.api.entity.IEntity;
 import noppes.npcs.api.entity.IEntityLivingBase;
 import noppes.npcs.api.entity.IPlayer;
 import noppes.npcs.api.event.IPlayerEvent;
+import noppes.npcs.api.handler.data.IPlayerEffect;
 import noppes.npcs.api.item.IItemStack;
 import noppes.npcs.constants.EnumScriptType;
 import noppes.npcs.scripted.NpcAPI;
@@ -949,4 +950,59 @@ public class PlayerEvent extends CustomNPCsEvent implements IPlayerEvent {
             return EnumScriptType.RANGED_LAUNCHED.function;
         }
     }
+
+    public static class EffectEvent extends PlayerEvent implements IPlayerEvent.EffectEvent {
+
+        public final IPlayerEffect effect;
+
+        public EffectEvent(IPlayer player, IPlayerEffect statusEffect) {
+            super(player);
+            this.effect = statusEffect;
+        }
+
+        @Override
+        public IPlayerEffect getEffect() {
+            return this.effect;
+        }
+
+        public static class Added extends PlayerEvent.EffectEvent implements IPlayerEvent.EffectEvent.Added {
+
+            public Added(IPlayer player, IPlayerEffect statusEffect) {
+                super(player, statusEffect);
+            }
+
+        }
+        public static class Ticked extends PlayerEvent.EffectEvent implements IPlayerEvent.EffectEvent.Ticked {
+
+            public Ticked(IPlayer player, IPlayerEffect statusEffect) {
+                super(player, statusEffect);
+            }
+
+        }
+        public static class Removed extends PlayerEvent.EffectEvent implements IPlayerEvent.EffectEvent.Removed {
+
+            private final ExpirationType type;
+
+            public Removed(IPlayer player, IPlayerEffect statusEffect, ExpirationType type) {
+                super(player, statusEffect);
+                this.type = type;
+            }
+
+            @Override
+            public boolean hasTimerRunOut() {
+                return type == ExpirationType.RUN_OUT;
+            }
+
+            @Override
+            public boolean causedByDeath() {
+                return type == ExpirationType.DEATH;
+            }
+        }
+
+        public enum ExpirationType {
+            REMOVED,
+            RUN_OUT,
+            DEATH
+        }
+    }
 }
diff --git a/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java b/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java
index fc4c4968f..4559dd758 100644
--- a/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java
+++ b/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java
@@ -21,10 +21,7 @@ public class ScriptCustomItem extends ScriptItemStack implements IItemCustom, IN
     public boolean enabled = false;
     public boolean loaded = false;
 
-    public boolean durabilityShow = false;
     public double durabilityValue = 1.0D;
-    public int durabilityColor = -1;
-    public int itemColor = 0x8B4513;
     public int stackSize = 64;
 
     public int maxItemUseDuration = 20;
@@ -36,12 +33,8 @@ public class ScriptCustomItem extends ScriptItemStack implements IItemCustom, IN
     public int armorType = -2; //-2: Fits in no armor slot,  -1: Fits in all slots, 0 - 4: Fits in Head -> Boots slot respectively
     public int enchantability;
 
-    public String texture = "minecraft:textures/items/iron_pickaxe.png";
+    public Display itemDisplay = new Display();
 
-    public float translateX, translateY, translateZ;
-    public float scaleX = 1.0F, scaleY = 1.0F, scaleZ = 1.0F;
-    public float rotationX, rotationY, rotationZ;
-    public float rotationXRate, rotationYRate, rotationZRate;
     public long lastInited = -1;
 
     public ScriptCustomItem(ItemStack item) {
@@ -148,13 +141,13 @@ public class ScriptCustomItem extends ScriptItemStack implements IItemCustom, IN
     }
 
     public String getTexture() {
-        return this.texture == null ? "" : this.texture;
+        return this.itemDisplay.texture == null ? "" : this.itemDisplay.texture;
     }
 
     public void setTexture(String texture){
         if(texture == null)
             texture = "";
-        this.texture = texture;
+        this.itemDisplay.texture = texture;
         saveItemData();
     }
 
@@ -218,29 +211,29 @@ public class ScriptCustomItem extends ScriptItemStack implements IItemCustom, IN
     }
 
     public boolean getDurabilityShow() {
-        return this.durabilityShow;
+        return this.itemDisplay.durabilityShow;
     }
 
     public void setDurabilityShow(boolean bo) {
-        this.durabilityShow = bo;
+        this.itemDisplay.durabilityShow = bo;
         saveItemData();
     }
 
     public int getDurabilityColor() {
-        return this.durabilityColor;
+        return this.itemDisplay.durabilityColor;
     }
 
     public void setDurabilityColor(int color) {
-        this.durabilityColor = color;
+        this.itemDisplay.durabilityColor = color;
         saveItemData();
     }
 
     public int getColor() {
-        return this.itemColor;
+        return this.itemDisplay.itemColor;
     }
 
     public void setColor(int color) {
-        this.itemColor = color;
+        this.itemDisplay.itemColor = color;
         saveItemData();
     }
 
@@ -272,79 +265,79 @@ public class ScriptCustomItem extends ScriptItemStack implements IItemCustom, IN
     }
 
     public void setRotation(float rotationX, float rotationY, float rotationZ){
-        this.rotationX = rotationX;
-        this.rotationY = rotationY;
-        this.rotationZ = rotationZ;
+        this.itemDisplay.rotationX = rotationX;
+        this.itemDisplay.rotationY = rotationY;
+        this.itemDisplay.rotationZ = rotationZ;
         saveItemData();
     }
 
     public void setRotationRate(float rotationXRate, float rotationYRate, float rotationZRate){
-        this.rotationXRate = rotationXRate;
-        this.rotationYRate = rotationYRate;
-        this.rotationZRate = rotationZRate;
+        this.itemDisplay.rotationXRate = rotationXRate;
+        this.itemDisplay.rotationYRate = rotationYRate;
+        this.itemDisplay.rotationZRate = rotationZRate;
         saveItemData();
     }
 
     public void setScale(float scaleX, float scaleY, float scaleZ){
-        this.scaleX = scaleX;
-        this.scaleY = scaleY;
-        this.scaleZ = scaleZ;
+        this.itemDisplay.scaleX = scaleX;
+        this.itemDisplay.scaleY = scaleY;
+        this.itemDisplay.scaleZ = scaleZ;
         saveItemData();
     }
 
     public void setTranslate(float translateX, float translateY, float translateZ){
-        this.translateX = translateX;
-        this.translateY = translateY;
-        this.translateZ = translateZ;
+        this.itemDisplay.translateX = translateX;
+        this.itemDisplay.translateY = translateY;
+        this.itemDisplay.translateZ = translateZ;
         saveItemData();
     }
 
     public float getRotationX() {
-        return rotationX;
+        return this.itemDisplay.rotationX;
     }
 
     public float getRotationY() {
-        return rotationY;
+        return this.itemDisplay.rotationY;
     }
 
     public float getRotationZ() {
-        return rotationZ;
+        return this.itemDisplay.rotationZ;
     }
 
     public float getRotationXRate() {
-        return rotationXRate;
+        return this.itemDisplay.rotationXRate;
     }
 
     public float getRotationYRate() {
-        return rotationYRate;
+        return this.itemDisplay.rotationYRate;
     }
 
     public float getRotationZRate() {
-        return rotationZRate;
+        return this.itemDisplay.rotationZRate;
     }
 
     public float getScaleX() {
-        return scaleX;
+        return this.itemDisplay.scaleX;
     }
 
     public float getScaleY() {
-        return scaleY;
+        return this.itemDisplay.scaleY;
     }
 
     public float getScaleZ() {
-        return scaleZ;
+        return this.itemDisplay.scaleZ;
     }
 
     public float getTranslateX() {
-        return translateX;
+        return this.itemDisplay.translateX;
     }
 
     public float getTranslateY() {
-        return translateY;
+        return this.itemDisplay.translateY;
     }
 
     public float getTranslateZ() {
-        return translateZ;
+        return this.itemDisplay.translateZ;
     }
 
     public NBTTagCompound getMCNbt() {
@@ -360,28 +353,28 @@ public class ScriptCustomItem extends ScriptItemStack implements IItemCustom, IN
     }
 
     public NBTTagCompound getItemNBT(NBTTagCompound compound) {
-        compound.setBoolean("DurabilityShow",this.durabilityShow);
+        compound.setBoolean("DurabilityShow",this.itemDisplay.durabilityShow);
         compound.setDouble("DurabilityValue",this.durabilityValue);
-        compound.setInteger("DurabilityColor",this.durabilityColor );
-        compound.setInteger("ItemColor",this.itemColor);
+        compound.setInteger("DurabilityColor",this.itemDisplay.durabilityColor );
+        compound.setInteger("ItemColor",this.itemDisplay.itemColor);
         compound.setInteger("MaxStackSize",this.stackSize);
-        compound.setString("ItemTexture",this.texture);
+        compound.setString("ItemTexture",this.itemDisplay.texture);
 
-        compound.setFloat("RotationX",this.rotationX);
-        compound.setFloat("RotationY",this.rotationY);
-        compound.setFloat("RotationZ",this.rotationZ);
+        compound.setFloat("RotationX",this.itemDisplay.rotationX);
+        compound.setFloat("RotationY",this.itemDisplay.rotationY);
+        compound.setFloat("RotationZ",this.itemDisplay.rotationZ);
 
-        compound.setFloat("RotationXRate",this.rotationXRate);
-        compound.setFloat("RotationYRate",this.rotationYRate);
-        compound.setFloat("RotationZRate",this.rotationZRate);
+        compound.setFloat("RotationXRate",this.itemDisplay.rotationXRate);
+        compound.setFloat("RotationYRate",this.itemDisplay.rotationYRate);
+        compound.setFloat("RotationZRate",this.itemDisplay.rotationZRate);
 
-        compound.setFloat("ScaleX",this.scaleX);
-        compound.setFloat("ScaleY",this.scaleY);
-        compound.setFloat("ScaleZ",this.scaleZ);
+        compound.setFloat("ScaleX",this.itemDisplay.scaleX);
+        compound.setFloat("ScaleY",this.itemDisplay.scaleY);
+        compound.setFloat("ScaleZ",this.itemDisplay.scaleZ);
 
-        compound.setFloat("TranslateX",this.translateX);
-        compound.setFloat("TranslateY",this.translateY);
-        compound.setFloat("TranslateZ",this.translateZ);
+        compound.setFloat("TranslateX",this.itemDisplay.translateX);
+        compound.setFloat("TranslateY",this.itemDisplay.translateY);
+        compound.setFloat("TranslateZ",this.itemDisplay.translateZ);
 
         compound.setBoolean("IsTool", this.isTool);
         compound.setBoolean("IsNormalItem", this.isNormalItem);
@@ -395,30 +388,30 @@ public class ScriptCustomItem extends ScriptItemStack implements IItemCustom, IN
     }
 
     public void setItemNBT(NBTTagCompound compound) {
-        this.durabilityShow = compound.getBoolean("DurabilityShow");
+        this.itemDisplay.durabilityShow = compound.getBoolean("DurabilityShow");
         this.durabilityValue = compound.getDouble("DurabilityValue");
         if (compound.hasKey("DurabilityColor")) {
-            this.durabilityColor = compound.getInteger("DurabilityColor");
+            this.itemDisplay.durabilityColor = compound.getInteger("DurabilityColor");
         }
-        this.itemColor = compound.getInteger("ItemColor");
+        this.itemDisplay.itemColor = compound.getInteger("ItemColor");
         this.stackSize = compound.getInteger("MaxStackSize");
-        this.texture = compound.getString("ItemTexture");
+        this.itemDisplay.texture = compound.getString("ItemTexture");
 
-        this.rotationX = compound.getFloat("RotationX");
-        this.rotationY = compound.getFloat("RotationY");
-        this.rotationZ = compound.getFloat("RotationZ");
+        this.itemDisplay.rotationX = compound.getFloat("RotationX");
+        this.itemDisplay.rotationY = compound.getFloat("RotationY");
+        this.itemDisplay.rotationZ = compound.getFloat("RotationZ");
 
-        this.rotationXRate = compound.getFloat("RotationXRate");
-        this.rotationYRate = compound.getFloat("RotationYRate");
-        this.rotationZRate = compound.getFloat("RotationZRate");
+        this.itemDisplay.rotationXRate = compound.getFloat("RotationXRate");
+        this.itemDisplay.rotationYRate = compound.getFloat("RotationYRate");
+        this.itemDisplay.rotationZRate = compound.getFloat("RotationZRate");
 
-        this.scaleX = compound.getFloat("ScaleX");
-        this.scaleY = compound.getFloat("ScaleY");
-        this.scaleZ = compound.getFloat("ScaleZ");
+        this.itemDisplay.scaleX = compound.getFloat("ScaleX");
+        this.itemDisplay.scaleY = compound.getFloat("ScaleY");
+        this.itemDisplay.scaleZ = compound.getFloat("ScaleZ");
 
-        this.translateX = compound.getFloat("TranslateX");
-        this.translateY = compound.getFloat("TranslateY");
-        this.translateZ = compound.getFloat("TranslateZ");
+        this.itemDisplay.translateX = compound.getFloat("TranslateX");
+        this.itemDisplay.translateY = compound.getFloat("TranslateY");
+        this.itemDisplay.translateZ = compound.getFloat("TranslateZ");
 
         this.isTool = compound.getBoolean("IsTool");
         this.isNormalItem = compound.getBoolean("IsNormalItem");
@@ -461,4 +454,16 @@ public class ScriptCustomItem extends ScriptItemStack implements IItemCustom, IN
             this.setItemNBT(c.getCompoundTag("ItemData"));
         }
     }
+
+
+    public static class Display {
+        public String texture = "minecraft:textures/items/iron_pickaxe.png";
+        public float translateX, translateY, translateZ;
+        public int itemColor = 0x8B4513;
+        public float scaleX = 1.0F, scaleY = 1.0F, scaleZ = 1.0F;
+        public float rotationX, rotationY, rotationZ;
+        public float rotationXRate, rotationYRate, rotationZRate;
+        public boolean durabilityShow = false;
+        public int durabilityColor = -1;
+    }
 }
diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java b/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java
index bba7409fd..888bc77f1 100644
--- a/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java
+++ b/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java
@@ -1,7 +1,6 @@
 package tconstruct.client.tabs;
 
-import kamkeel.addon.DBCAddon;
-import kamkeel.addon.client.DBCClient;
+import kamkeel.npcs.addon.client.DBCClient;
 import net.minecraft.client.Minecraft;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/resources/assets/customnpcs/lang/de_DE.lang b/src/main/resources/assets/customnpcs/lang/de_DE.lang
index 72d987994..318e029d4 100644
--- a/src/main/resources/assets/customnpcs/lang/de_DE.lang
+++ b/src/main/resources/assets/customnpcs/lang/de_DE.lang
@@ -346,7 +346,7 @@ global.banks=Banken
 global.transport=Transport
 global.playerdata=PlayerData
 global.recipes=Rezepte
-global.naturalspawn=Natural Spawns
+global.naturalspawn=Spawns
 
 bank.slot=Slot
 bank.unlock=Freischalten
diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang
index 1ea355b10..818bf09ad 100644
--- a/src/main/resources/assets/customnpcs/lang/en_US.lang
+++ b/src/main/resources/assets/customnpcs/lang/en_US.lang
@@ -88,8 +88,14 @@ gui.sunlight=Sunlight
 gui.always=Always
 gui.untilclose=UntilClose
 gui.whenavailable=OnTheMove
-gui.ignoreDamage=Ignore damage
+gui.ignoreDamage=Ignore Damage
 gui.ignoreNBT=Ignore NBT
+gui.ignoreMatDamage=Ignore Material DMG
+gui.ignoreMatNBT=Ignore Material NBT
+gui.ignoreItemNBT=Ignore Item NBT
+gui.repairPercent=Repair %
+gui.material=Material
+gui.xpCost=XP Cost
 gui.recordHistory=Record History
 gui.minrange=MinimumRange
 gui.engagedistance=EngageDistance
@@ -137,6 +143,7 @@ gui.loading=Loading
 gui.off=Off
 gui.on=On
 gui.sure=Are you sure?
+gui.available=Requirements Met
 
 party.accept=Accept
 party.allowParty=Allow Partying
@@ -320,6 +327,13 @@ availability.areaNotAvailble=You can't go this way
 availability.permission=You don't have permission to do this
 availability.editIcon=For the next 10 seconds you can set any item icon by right clicking
 
+availability.error.day=Only During Day
+availability.error.night=Only During Night
+availability.error.dialog=%s Dialog %d
+availability.error.quest=%s Quest %d
+availability.error.faction=%s %s Faction %d
+availability.error.xp=Exp Level %d
+
 spawning.availableBiomes=Available Biomes
 spawning.spawningBiomes=Spawning Biomes
 spawning.availableDimensions=Available Dimensions
@@ -521,8 +535,9 @@ global.banks=Banks
 global.transport=Transport
 global.playerdata=PlayerData
 global.recipes=Recipes
-global.naturalspawn=Natural Spawns
+global.naturalspawn=Spawns
 global.linked=Linked
+global.customeffects=Effects
 
 bank.slot=Slot
 bank.unlock=Unlock
@@ -1242,3 +1257,17 @@ tint.hurt=Hurt Tint
 hitbox.hitbox=Hitbox
 hitbox.width=Width Scale
 hitbox.height=Height Scale
+
+general.menuName=Menu Name
+
+effect.runsEveryX=Runs every X tick
+effect.defaultLength=Default length
+
+# These are supposed to be shorter
+effect.editor.runsEveryX=Every X tick
+effect.editor.defaultLength=Length
+effect.editor.height=Height
+effect.editor.width=Width
+effect.editor.xPos=X Pos
+effect.editor.yPos=Y Pos
+effect.editor.lossOnDeath=Loss on Death
diff --git a/src/main/resources/assets/customnpcs/lang/ru_RU.lang b/src/main/resources/assets/customnpcs/lang/ru_RU.lang
index f6f3d74ad..a729216e5 100644
--- a/src/main/resources/assets/customnpcs/lang/ru_RU.lang
+++ b/src/main/resources/assets/customnpcs/lang/ru_RU.lang
@@ -362,7 +362,7 @@ global.banks=Сберегатели
 global.transport=Транспортёры
 global.playerdata=Данные игроков
 global.recipes=Рецепты
-global.naturalspawn=Естественные спауны 
+global.naturalspawn=Спавнится
 global.linked=Связи
 
 bank.slot=Слот
diff --git a/src/main/resources/assets/customnpcs/textures/gui/anvil.png b/src/main/resources/assets/customnpcs/textures/gui/anvil.png
new file mode 100644
index 000000000..bfc3c4bbc
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/gui/anvil.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/gui/icons.png b/src/main/resources/assets/customnpcs/textures/gui/icons.png
index 79e25f858..a0bd71c26 100644
Binary files a/src/main/resources/assets/customnpcs/textures/gui/icons.png and b/src/main/resources/assets/customnpcs/textures/gui/icons.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/gui/recipesAnvil.png b/src/main/resources/assets/customnpcs/textures/gui/recipesAnvil.png
new file mode 100644
index 000000000..31402d367
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/gui/recipesAnvil.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/BarrelTrim.png b/src/main/resources/assets/customnpcs/textures/models/BarrelTrim.png
deleted file mode 100644
index 6269af2a1..000000000
Binary files a/src/main/resources/assets/customnpcs/textures/models/BarrelTrim.png and /dev/null differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/CampfireCoals.png b/src/main/resources/assets/customnpcs/textures/models/CampfireCoals.png
new file mode 100644
index 000000000..f2732b51b
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/CampfireCoals.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorDiamond.png b/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorDiamond.png
new file mode 100644
index 000000000..e55449a68
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorDiamond.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorGold.png b/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorGold.png
new file mode 100644
index 000000000..93e842ac5
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorGold.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorIron.png b/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorIron.png
new file mode 100644
index 000000000..be5d28b16
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorIron.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorStone.png b/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorStone.png
new file mode 100644
index 000000000..ae032ed57
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorStone.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorWood.png b/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorWood.png
new file mode 100644
index 000000000..79cdae7a1
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorWood.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/curved.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/curved.png
new file mode 100644
index 000000000..6287fe972
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/banner/flag/curved.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/normal.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/normal.png
new file mode 100644
index 000000000..951ac7312
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/banner/flag/normal.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/pointy.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/pointy.png
new file mode 100644
index 000000000..2bceb94cd
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/banner/flag/pointy.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/torn.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/torn.png
new file mode 100644
index 000000000..1eeb7c55d
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/banner/flag/torn.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/triangle.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/triangle.png
new file mode 100644
index 000000000..aed0c6050
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/banner/flag/triangle.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/barrel/oak_lid.png b/src/main/resources/assets/customnpcs/textures/models/barrel/oak_lid.png
new file mode 100644
index 000000000..6a15e0367
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/barrel/oak_lid.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/barrel/trim.png b/src/main/resources/assets/customnpcs/textures/models/barrel/trim.png
new file mode 100644
index 000000000..f3db64fb9
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/barrel/trim.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/chair/acacia.png b/src/main/resources/assets/customnpcs/textures/models/chair/acacia.png
new file mode 100644
index 000000000..65e9fa940
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/chair/acacia.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/chair/birch.png b/src/main/resources/assets/customnpcs/textures/models/chair/birch.png
new file mode 100644
index 000000000..cc108d174
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/chair/birch.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/chair/dark_oak.png b/src/main/resources/assets/customnpcs/textures/models/chair/dark_oak.png
new file mode 100644
index 000000000..cf6c641d2
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/chair/dark_oak.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/chair/jungle.png b/src/main/resources/assets/customnpcs/textures/models/chair/jungle.png
new file mode 100644
index 000000000..40dda68db
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/chair/jungle.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/chair/oak.png b/src/main/resources/assets/customnpcs/textures/models/chair/oak.png
new file mode 100644
index 000000000..97099c7dc
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/chair/oak.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/chair/spruce.png b/src/main/resources/assets/customnpcs/textures/models/chair/spruce.png
new file mode 100644
index 000000000..ae8753c7f
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/chair/spruce.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/flame.png b/src/main/resources/assets/customnpcs/textures/models/flame.png
new file mode 100644
index 000000000..35a37eaef
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/flame.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/flame.png.mcmeta b/src/main/resources/assets/customnpcs/textures/models/flame.png.mcmeta
new file mode 100644
index 000000000..503173546
--- /dev/null
+++ b/src/main/resources/assets/customnpcs/textures/models/flame.png.mcmeta
@@ -0,0 +1,17 @@
+{
+  "animation": {
+    "frametime": 2,
+    "interpolate": true,
+    "frames": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8
+    ]
+  }
+}
diff --git a/src/main/resources/assets/customnpcs/textures/models/flame_single.png b/src/main/resources/assets/customnpcs/textures/models/flame_single.png
new file mode 100644
index 000000000..a913064f4
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/flame_single.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/BannerFlag.png b/src/main/resources/assets/customnpcs/textures/models/legacy/banner.png
similarity index 100%
rename from src/main/resources/assets/customnpcs/textures/models/BannerFlag.png
rename to src/main/resources/assets/customnpcs/textures/models/legacy/banner.png
diff --git a/src/main/resources/assets/customnpcs/textures/models/legacy/bench.png b/src/main/resources/assets/customnpcs/textures/models/legacy/bench.png
new file mode 100644
index 000000000..e94ff1936
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/legacy/bench.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/acacia.png b/src/main/resources/assets/customnpcs/textures/models/stool/acacia.png
new file mode 100644
index 000000000..7aa0dcbe2
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/stool/acacia.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/birch.png b/src/main/resources/assets/customnpcs/textures/models/stool/birch.png
new file mode 100644
index 000000000..bb79c657d
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/stool/birch.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/dark_oak.png b/src/main/resources/assets/customnpcs/textures/models/stool/dark_oak.png
new file mode 100644
index 000000000..8546647c0
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/stool/dark_oak.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/jungle.png b/src/main/resources/assets/customnpcs/textures/models/stool/jungle.png
new file mode 100644
index 000000000..4ba3ed52d
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/stool/jungle.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/oak.png b/src/main/resources/assets/customnpcs/textures/models/stool/oak.png
new file mode 100644
index 000000000..f14d9cd0d
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/stool/oak.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/spruce.png b/src/main/resources/assets/customnpcs/textures/models/stool/spruce.png
new file mode 100644
index 000000000..620ebddea
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/stool/spruce.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/table/acacia.png b/src/main/resources/assets/customnpcs/textures/models/table/acacia.png
new file mode 100644
index 000000000..ae87e7dbc
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/table/acacia.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/table/birch.png b/src/main/resources/assets/customnpcs/textures/models/table/birch.png
new file mode 100644
index 000000000..dea734bcb
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/table/birch.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/table/dark_oak.png b/src/main/resources/assets/customnpcs/textures/models/table/dark_oak.png
new file mode 100644
index 000000000..2ffc8f5f6
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/table/dark_oak.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/table/jungle.png b/src/main/resources/assets/customnpcs/textures/models/table/jungle.png
new file mode 100644
index 000000000..c1a2c1420
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/table/jungle.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/table/oak.png b/src/main/resources/assets/customnpcs/textures/models/table/oak.png
new file mode 100644
index 000000000..d087fc65c
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/table/oak.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/models/table/spruce.png b/src/main/resources/assets/customnpcs/textures/models/table/spruce.png
new file mode 100644
index 000000000..40607b4d1
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/table/spruce.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_0.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_0.png
new file mode 100644
index 000000000..727f1d6a5
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_0.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_1.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_1.png
new file mode 100644
index 000000000..8c07ee3b0
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_1.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_10.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_10.png
new file mode 100644
index 000000000..712c41cb1
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_10.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_11.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_11.png
new file mode 100644
index 000000000..7f3a7dbd2
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_11.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_2.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_2.png
new file mode 100644
index 000000000..81d1a98cd
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_2.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_3.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_3.png
new file mode 100644
index 000000000..4a5f8224d
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_3.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_4.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_4.png
new file mode 100644
index 000000000..17c35e5a7
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_4.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_5.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_5.png
new file mode 100644
index 000000000..3dbb32af4
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_5.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_6.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_6.png
new file mode 100644
index 000000000..1e5fec17e
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_6.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_7.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_7.png
new file mode 100644
index 000000000..ebef40c2a
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_7.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_8.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_8.png
new file mode 100644
index 000000000..a704e860a
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_8.png differ
diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_9.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_9.png
new file mode 100644
index 000000000..4dd14f324
Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_9.png differ