diff --git a/2006Redone Server/.classpath b/2006Redone Server/.classpath
index 022d4bf7..1aa2d7d5 100644
--- a/2006Redone Server/.classpath	
+++ b/2006Redone Server/.classpath	
@@ -8,6 +8,9 @@
 	<classpathentry kind="lib" path="libs/slf4j.jar"/>
 	<classpathentry kind="lib" path="libs/xpp3-1.1.4c.jar"/>
 	<classpathentry kind="lib" path="libs/xstream-1.4.1.jar"/>
+	<classpathentry kind="lib" path="libs/everythingrs-api.jar"/>
+	<classpathentry kind="lib" path="libs/javacord-api-3.0.4.jar"/>
+	<classpathentry kind="lib" path="libs/json-20190722.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/2006Redone Server/.gitignore b/2006Redone Server/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/2006Redone Server/.gitignore	
@@ -0,0 +1 @@
+/bin/
diff --git a/2006Redone Server/.settings/org.eclipse.jdt.core.prefs b/2006Redone Server/.settings/org.eclipse.jdt.core.prefs
index f13ff237..4bacee51 100644
--- a/2006Redone Server/.settings/org.eclipse.jdt.core.prefs	
+++ b/2006Redone Server/.settings/org.eclipse.jdt.core.prefs	
@@ -1,14 +1,14 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/2006Redone Server/src/redone/game/content/skills/fletching/LogCuttingInterface.java b/2006Redone Server/src/redone/game/content/skills/fletching/LogCuttingInterface.java
index 7d71b1c0..a239a3a7 100644
--- a/2006Redone Server/src/redone/game/content/skills/fletching/LogCuttingInterface.java	
+++ b/2006Redone Server/src/redone/game/content/skills/fletching/LogCuttingInterface.java	
@@ -20,11 +20,10 @@ public class LogCuttingInterface {
 	}
 
 	public static void Interface(Client c, int item) {
-		if (c.playerIsFletching == true && item > 1510 && item < 1522) {
-			c.getActionSender().sendMessage("You are already fletching!");
-			c.getPlayerAssistant().closeAllWindows();
+		if (c.playerIsFletching == true && (item > 1510 && item < 1522)) {
+			LogCutting.resetFletching(c);
 			return;
-		} else if (item < 1510 && item > 1521) {
+		} else if (c.playerIsFletching == true && (item < 1510 || item > 1521)) {
 			c.playerIsFletching = false;
 			c.getActionSender().sendMessage("Nothing interesting happens.");
 		}
diff --git a/2006Redone Server/src/redone/game/npcs/Npc.java b/2006Redone Server/src/redone/game/npcs/Npc.java
index a3a8875a..f27205df 100644
--- a/2006Redone Server/src/redone/game/npcs/Npc.java	
+++ b/2006Redone Server/src/redone/game/npcs/Npc.java	
@@ -64,7 +64,7 @@ public class Npc {
     	updateRequired = true;
 	}
 	
-	public boolean requestTransformTime(Client player, int itemId, int animation, final int currentId, final int newId, int transformTime, int npcId) {
+	public boolean requestTransformTime(Client player, int itemId, int animation, final int currentId, final int newId, int transformTime, final int npcId) {
 		if (!player.getItemAssistant().playerHasItem(itemId)) {
 			player.getActionSender().sendMessage("You need " + ItemAssistant.getItemName(itemId).toLowerCase() + " to do that.");
 			return false;