Access static methods in static ways and remove unused imports

25 files changed, 1247 insertions, 1336 deletions

diff --git a/src/main/java/me/Danker/TheMod.java b/src/main/java/me/Danker/TheMod.java
index 65372cc..8cb1203 100644
--- a/src/main/java/me/Danker/TheMod.java
+++ b/src/main/java/me/Danker/TheMod.java
@@ -91,7 +91,6 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
@@ -173,12 +172,10 @@ public class TheMod
     
     @EventHandler
     public void init(FMLInitializationEvent event) {
-		FMLCommonHandler.instance().bus().register(this);
 		MinecraftForge.EVENT_BUS.register(this);
 		MinecraftForge.EVENT_BUS.register(new PacketHandler());
 		
-		final ConfigHandler cf = new ConfigHandler();
-		cf.reloadConfig();
+		ConfigHandler.reloadConfig();
 		
 		// For golden enchants
 		t6Enchants.put("9Angler VI", "6Angler VI");
@@ -299,11 +296,10 @@ public class TheMod
 			
     		// MULTI THREAD DRIFTING
     		new Thread(() -> {
-    			APIHandler ah = new APIHandler();
     			EntityPlayer player = Minecraft.getMinecraft().thePlayer;	
     			
     			System.err.println("Checking for updates...");
-    			JsonObject latestRelease = ah.getResponse("https://api.github.com/repos/bowser0000/SkyblockMod/releases/latest");
+    			JsonObject latestRelease = APIHandler.getResponse("https://api.github.com/repos/bowser0000/SkyblockMod/releases/latest");
     			
     			String latestTag = latestRelease.get("tag_name").getAsString();
     			DefaultArtifactVersion currentVersion = new DefaultArtifactVersion(VERSION);
@@ -335,7 +331,6 @@ public class TheMod
     // It randomly broke, so I had to make it the highest priority
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     public void onChat(ClientChatReceivedEvent event) {
-    	final ToggleCommand tc = new ToggleCommand();
     	String message = StringUtils.stripControlCodes(event.message.getUnformattedText());
     	
     	if (!Utils.inSkyblock) return;
@@ -344,7 +339,7 @@ public class TheMod
     	if (event.type == 2) {
     		String[] actionBarSections = event.message.getUnformattedText().split(" {3,}");
     		for (String section : actionBarSections) {
-    			if (tc.skill50DisplayToggled) {
+    			if (ToggleCommand.skill50DisplayToggled) {
     				if (section.contains("+") && section.contains("/") && section.contains("(")) {
     					if (section.contains("Runecrafting")) return;
     					
@@ -393,17 +388,17 @@ public class TheMod
     	if (message.contains(":")) return;
     	
 		// Spirit Sceptre
-		if (!tc.sceptreMessages && message.contains("Your Spirit Sceptre hit ")) {
+		if (!ToggleCommand.sceptreMessages && message.contains("Your Spirit Sceptre hit ")) {
 			event.setCanceled(true);
 			return;
 		}
 		// Midas Staff
-		if (!tc.midasStaffMessages && message.contains("Your Molten Wave hit ")) {
+		if (!ToggleCommand.midasStaffMessages && message.contains("Your Molten Wave hit ")) {
 			event.setCanceled(true);
 			return;
 		}
 		// Heals
-		if (!tc.healMessages && message.contains(" health!") && (message.contains("You healed ") || message.contains(" healed you for "))) {
+		if (!ToggleCommand.healMessages && message.contains(" health!") && (message.contains("You healed ") || message.contains(" healed you for "))) {
 			event.setCanceled(true);
 			return;
 		}
@@ -436,7 +431,7 @@ public class TheMod
         	}
         }
     	
-		if (tc.gpartyToggled) {
+		if (ToggleCommand.gpartyToggled) {
 			if (message.contains(" has invited all members of ")) {
 				try {
 					final SystemTray tray = SystemTray.getSystemTray();
@@ -453,7 +448,7 @@ public class TheMod
 			}
 		}
 		
-		if (tc.golemAlertToggled) {
+		if (ToggleCommand.golemAlertToggled) {
 			if (message.contains("The ground begins to shake as an Endstone Protector rises from below!")) {
 				Utils.createTitle(EnumChatFormatting.RED + "GOLEM SPAWNING!", 3);
 			}
@@ -464,8 +459,6 @@ public class TheMod
 			ConfigHandler.writeDoubleConfig("misc", "cakeTime", cakeTime);
 		}
 		
-		final LootCommand lc = new LootCommand();
-		final ConfigHandler cf = new ConfigHandler();
 		boolean wolfRNG = false;
 		boolean spiderRNG = false;
 		boolean zombieRNG = false;
@@ -476,304 +469,303 @@ public class TheMod
 			for (String s : scoreboard) {
 				String sCleaned = ScoreboardHandler.cleanSB(s);
 				if (sCleaned.contains("Sven Packmaster")) {
-					lc.wolfBooks++;
-					cf.writeIntConfig("wolf", "book", lc.wolfBooks);
+					LootCommand.wolfBooks++;
+					ConfigHandler.writeIntConfig("wolf", "book", LootCommand.wolfBooks);
 				} else if (sCleaned.contains("Tarantula Broodfather")) {
-					lc.spiderBooks++;
-					cf.writeIntConfig("spider", "book", lc.spiderBooks);
+					LootCommand.spiderBooks++;
+					ConfigHandler.writeIntConfig("spider", "book", LootCommand.spiderBooks);
 				} else if (sCleaned.contains("Revenant Horror")) {
-					lc.zombieBooks++;
-					cf.writeIntConfig("zombie", "book", lc.zombieBooks);
+					LootCommand.zombieBooks++;
+					ConfigHandler.writeIntConfig("zombie", "book", LootCommand.zombieBooks);
 				}
 			}
 		}
 
 		// Wolf
 		if (message.contains("Talk to Maddox to claim your Wolf Slayer XP!")) {
-			lc.wolfSvens++;
-			lc.wolfSvensSession++;
-			if (lc.wolfBosses != -1) {
-				lc.wolfBosses++;
+			LootCommand.wolfSvens++;
+			LootCommand.wolfSvensSession++;
+			if (LootCommand.wolfBosses != -1) {
+				LootCommand.wolfBosses++;
 			}
-			if (lc.wolfBossesSession != -1) {
-				lc.wolfBossesSession++;
+			if (LootCommand.wolfBossesSession != -1) {
+				LootCommand.wolfBossesSession++;
 			}
-			cf.writeIntConfig("wolf", "svens", lc.wolfSvens);
-			cf.writeIntConfig("wolf", "bossRNG", lc.wolfBosses);
+			ConfigHandler.writeIntConfig("wolf", "svens", LootCommand.wolfSvens);
+			ConfigHandler.writeIntConfig("wolf", "bossRNG", LootCommand.wolfBosses);
 		} else if (message.contains("RARE DROP! (Hamster Wheel)")) {
-			lc.wolfWheelsDrops++;
-			lc.wolfWheelsDropsSession++;
-			cf.writeIntConfig("wolf", "wheelDrops", lc.wolfWheelsDrops);
+			LootCommand.wolfWheelsDrops++;
+			LootCommand.wolfWheelsDropsSession++;
+			ConfigHandler.writeIntConfig("wolf", "wheelDrops", LootCommand.wolfWheelsDrops);
 		} else if (message.contains("VERY RARE DROP!  (") && message.contains(" Spirit Rune I)")) { // Removing the unicode here *should* fix rune drops not counting
-			lc.wolfSpirits++;
-			lc.wolfSpiritsSession++;
-			cf.writeIntConfig("wolf", "spirit", lc.wolfSpirits);
+			LootCommand.wolfSpirits++;
+			LootCommand.wolfSpiritsSession++;
+			ConfigHandler.writeIntConfig("wolf", "spirit", LootCommand.wolfSpirits);
 		} else if (message.contains("CRAZY RARE DROP!  (Red Claw Egg)")) {
 			wolfRNG = true;
-			lc.wolfEggs++;
-			lc.wolfEggsSession++;
-			cf.writeIntConfig("wolf", "egg", lc.wolfEggs);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_RED + "RED CLAW EGG!", 3);
+			LootCommand.wolfEggs++;
+			LootCommand.wolfEggsSession++;
+			ConfigHandler.writeIntConfig("wolf", "egg", LootCommand.wolfEggs);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_RED + "RED CLAW EGG!", 3);
 		} else if (message.contains("CRAZY RARE DROP!  (") && message.contains(" Couture Rune I)")) {
 			wolfRNG = true;
-			lc.wolfCoutures++;
-			lc.wolfCouturesSession++;
-			cf.writeIntConfig("wolf", "couture", lc.wolfCoutures);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "COUTURE RUNE!", 3);
+			LootCommand.wolfCoutures++;
+			LootCommand.wolfCouturesSession++;
+			ConfigHandler.writeIntConfig("wolf", "couture", LootCommand.wolfCoutures);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "COUTURE RUNE!", 3);
 		} else if (message.contains("CRAZY RARE DROP!  (Grizzly Bait)") || message.contains("CRAZY RARE DROP! (Rename Me)")) { // How did Skyblock devs even manage to make this item Rename Me
 			wolfRNG = true;
-			lc.wolfBaits++;
-			lc.wolfBaitsSession++;
-			cf.writeIntConfig("wolf", "bait", lc.wolfBaits);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.AQUA + "GRIZZLY BAIT!", 3);
+			LootCommand.wolfBaits++;
+			LootCommand.wolfBaitsSession++;
+			ConfigHandler.writeIntConfig("wolf", "bait", LootCommand.wolfBaits);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.AQUA + "GRIZZLY BAIT!", 3);
 		} else if (message.contains("CRAZY RARE DROP!  (Overflux Capacitor)")) {
 			wolfRNG = true;
-			lc.wolfFluxes++;
-			lc.wolfFluxesSession++;
-			cf.writeIntConfig("wolf", "flux", lc.wolfFluxes);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "OVERFLUX CAPACITOR!", 5);
+			LootCommand.wolfFluxes++;
+			LootCommand.wolfFluxesSession++;
+			ConfigHandler.writeIntConfig("wolf", "flux", LootCommand.wolfFluxes);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "OVERFLUX CAPACITOR!", 5);
 		} else if (message.contains("Talk to Maddox to claim your Spider Slayer XP!")) { // Spider
-			lc.spiderTarantulas++;
-			lc.spiderTarantulasSession++;
-			if (lc.spiderBosses != -1) {
-				lc.spiderBosses++;
+			LootCommand.spiderTarantulas++;
+			LootCommand.spiderTarantulasSession++;
+			if (LootCommand.spiderBosses != -1) {
+				LootCommand.spiderBosses++;
 			}
-			if (lc.spiderBossesSession != -1) {
-				lc.spiderBossesSession++;
+			if (LootCommand.spiderBossesSession != -1) {
+				LootCommand.spiderBossesSession++;
 			}
-			cf.writeIntConfig("spider", "tarantulas", lc.spiderTarantulas);
-			cf.writeIntConfig("spider", "bossRNG", lc.spiderBosses);
+			ConfigHandler.writeIntConfig("spider", "tarantulas", LootCommand.spiderTarantulas);
+			ConfigHandler.writeIntConfig("spider", "bossRNG", LootCommand.spiderBosses);
 		} else if (message.contains("RARE DROP! (Toxic Arrow Poison)")) {
-			lc.spiderTAPDrops++;
-			lc.spiderTAPDropsSession++;
-			cf.writeIntConfig("spider", "tapDrops", lc.spiderTAPDrops);
+			LootCommand.spiderTAPDrops++;
+			LootCommand.spiderTAPDropsSession++;
+			ConfigHandler.writeIntConfig("spider", "tapDrops", LootCommand.spiderTAPDrops);
 		} else if (message.contains("VERY RARE DROP!  (") && message.contains(" Bite Rune I)")) {
-			lc.spiderBites++;
-			lc.spiderBitesSession++;
-			cf.writeIntConfig("spider", "bite", lc.spiderBites);
+			LootCommand.spiderBites++;
+			LootCommand.spiderBitesSession++;
+			ConfigHandler.writeIntConfig("spider", "bite", LootCommand.spiderBites);
 		} else if (message.contains("VERY RARE DROP!  (Spider Catalyst)")) {
-			lc.spiderCatalysts++;
-			lc.spiderCatalystsSession++;
-			cf.writeIntConfig("spider", "catalyst", lc.spiderCatalysts);
+			LootCommand.spiderCatalysts++;
+			LootCommand.spiderCatalystsSession++;
+			ConfigHandler.writeIntConfig("spider", "catalyst", LootCommand.spiderCatalysts);
 		} else if (message.contains("CRAZY RARE DROP!  (Fly Swatter)")) {
 			spiderRNG = true;
-			lc.spiderSwatters++;
-			lc.spiderSwattersSession++;
-			cf.writeIntConfig("spider", "swatter", lc.spiderSwatters);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.LIGHT_PURPLE + "FLY SWATTER!", 3);
+			LootCommand.spiderSwatters++;
+			LootCommand.spiderSwattersSession++;
+			ConfigHandler.writeIntConfig("spider", "swatter", LootCommand.spiderSwatters);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.LIGHT_PURPLE + "FLY SWATTER!", 3);
 		} else if (message.contains("CRAZY RARE DROP!  (Tarantula Talisman")) {
 			spiderRNG = true;
-			lc.spiderTalismans++;
-			lc.spiderTalismansSession++;
-			cf.writeIntConfig("spider", "talisman", lc.spiderTalismans);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "TARANTULA TALISMAN!", 3);
+			LootCommand.spiderTalismans++;
+			LootCommand.spiderTalismansSession++;
+			ConfigHandler.writeIntConfig("spider", "talisman", LootCommand.spiderTalismans);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "TARANTULA TALISMAN!", 3);
 		} else if (message.contains("CRAZY RARE DROP!  (Digested Mosquito)")) {
 			spiderRNG = true;
-			lc.spiderMosquitos++;
-			lc.spiderMosquitosSession++;
-			cf.writeIntConfig("spider", "mosquito", lc.spiderMosquitos);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "DIGESTED MOSQUITO!", 5);
+			LootCommand.spiderMosquitos++;
+			LootCommand.spiderMosquitosSession++;
+			ConfigHandler.writeIntConfig("spider", "mosquito", LootCommand.spiderMosquitos);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "DIGESTED MOSQUITO!", 5);
 		} else if (message.contains("Talk to Maddox to claim your Zombie Slayer XP!")) { // Zombie
-			lc.zombieRevs++;
-			lc.zombieRevsSession++;
-			if (lc.zombieBosses != -1) {
-				lc.zombieBosses++;
+			LootCommand.zombieRevs++;
+			LootCommand.zombieRevsSession++;
+			if (LootCommand.zombieBosses != -1) {
+				LootCommand.zombieBosses++;
 			}
-			if (lc.zombieBossesSession != 1) {
-				lc.zombieBossesSession++;
+			if (LootCommand.zombieBossesSession != 1) {
+				LootCommand.zombieBossesSession++;
 			}
-			cf.writeIntConfig("zombie", "revs", lc.zombieRevs);
-			cf.writeIntConfig("zombie", "bossRNG", lc.zombieBosses);
+			ConfigHandler.writeIntConfig("zombie", "revs", LootCommand.zombieRevs);
+			ConfigHandler.writeIntConfig("zombie", "bossRNG", LootCommand.zombieBosses);
 		} else if (message.contains("RARE DROP! (Foul Flesh)")) {
-			lc.zombieFoulFleshDrops++;
-			lc.zombieFoulFleshDropsSession++;
-			cf.writeIntConfig("zombie", "foulFleshDrops", lc.zombieFoulFleshDrops);
+			LootCommand.zombieFoulFleshDrops++;
+			LootCommand.zombieFoulFleshDropsSession++;
+			ConfigHandler.writeIntConfig("zombie", "foulFleshDrops", LootCommand.zombieFoulFleshDrops);
 		} else if (message.contains("VERY RARE DROP!  (Revenant Catalyst)")) {
-			lc.zombieRevCatas++;
-			lc.zombieRevCatasSession++;
-			cf.writeIntConfig("zombie", "revCatalyst", lc.zombieRevCatas);
+			LootCommand.zombieRevCatas++;
+			LootCommand.zombieRevCatasSession++;
+			ConfigHandler.writeIntConfig("zombie", "revCatalyst", LootCommand.zombieRevCatas);
 		} else if (message.contains("VERY RARE DROP!  (") && message.contains(" Pestilence Rune I)")) {
-			lc.zombiePestilences++;
-			lc.zombiePestilencesSession++;
-			cf.writeIntConfig("zombie", "pestilence", lc.zombiePestilences);
+			LootCommand.zombiePestilences++;
+			LootCommand.zombiePestilencesSession++;
+			ConfigHandler.writeIntConfig("zombie", "pestilence", LootCommand.zombiePestilences);
 		} else if (message.contains("VERY RARE DROP!  (Undead Catalyst)")) {
-			lc.zombieUndeadCatas++;
-			lc.zombieUndeadCatasSession++;
-			cf.writeIntConfig("zombie", "undeadCatalyst", lc.zombieUndeadCatas);
+			LootCommand.zombieUndeadCatas++;
+			LootCommand.zombieUndeadCatasSession++;
+			ConfigHandler.writeIntConfig("zombie", "undeadCatalyst", LootCommand.zombieUndeadCatas);
 		} else if (message.contains("CRAZY RARE DROP!  (Beheaded Horror)")) {
 			zombieRNG = true;
-			lc.zombieBeheadeds++;
-			lc.zombieBeheadedsSession++;
-			cf.writeIntConfig("zombie", "beheaded", lc.zombieBeheadeds);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "BEHEADED HORROR!", 3);
+			LootCommand.zombieBeheadeds++;
+			LootCommand.zombieBeheadedsSession++;
+			ConfigHandler.writeIntConfig("zombie", "beheaded", LootCommand.zombieBeheadeds);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "BEHEADED HORROR!", 3);
 		} else if (message.contains("CRAZY RARE DROP!  (") && message.contains(" Snake Rune I)")) {
 			zombieRNG = true;
-			lc.zombieSnakes++;
-			lc.zombieSnakesSession++;
-			cf.writeIntConfig("zombie", "snake", lc.zombieSnakes);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_GREEN + "SNAKE RUNE!", 3);
+			LootCommand.zombieSnakes++;
+			LootCommand.zombieSnakesSession++;
+			ConfigHandler.writeIntConfig("zombie", "snake", LootCommand.zombieSnakes);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_GREEN + "SNAKE RUNE!", 3);
 		} else if (message.contains("CRAZY RARE DROP!  (Scythe Blade)")) {
 			zombieRNG = true;
-			lc.zombieScythes++;
-			lc.zombieScythesSession++;
-			cf.writeIntConfig("zombie", "scythe", lc.zombieScythes);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "SCYTHE BLADE!", 5);
+			LootCommand.zombieScythes++;
+			LootCommand.zombieScythesSession++;
+			ConfigHandler.writeIntConfig("zombie", "scythe", LootCommand.zombieScythes);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "SCYTHE BLADE!", 5);
 		} else if (message.contains("GOOD CATCH!")) { // Fishing
-			lc.goodCatches++;
-			lc.goodCatchesSession++;
-			cf.writeIntConfig("fishing", "goodCatch", lc.goodCatches);
+			LootCommand.goodCatches++;
+			LootCommand.goodCatchesSession++;
+			ConfigHandler.writeIntConfig("fishing", "goodCatch", LootCommand.goodCatches);
 		} else if (message.contains("GREAT CATCH!")) {
-			lc.greatCatches++;
-			lc.greatCatchesSession++;
-			cf.writeIntConfig("fishing", "greatCatch", lc.greatCatches);
+			LootCommand.greatCatches++;
+			LootCommand.greatCatchesSession++;
+			ConfigHandler.writeIntConfig("fishing", "greatCatch", LootCommand.greatCatches);
 		} else if (message.contains("A Squid appeared")) {
-			lc.squids++;
-			lc.squidsSession++;
-			cf.writeIntConfig("fishing", "squid", lc.squids);
+			LootCommand.squids++;
+			LootCommand.squidsSession++;
+			ConfigHandler.writeIntConfig("fishing", "squid", LootCommand.squids);
 			increaseSeaCreatures();
 		} else if (message.contains("You caught a Sea Walker")) {
-			lc.seaWalkers++;
-			lc.seaWalkersSession++;
-			cf.writeIntConfig("fishing", "seaWalker", lc.seaWalkers);
+			LootCommand.seaWalkers++;
+			LootCommand.seaWalkersSession++;
+			ConfigHandler.writeIntConfig("fishing", "seaWalker", LootCommand.seaWalkers);
 			increaseSeaCreatures();
 		} else if (message.contains("Pitch darkness reveals a Night Squid")) {
-			lc.nightSquids++;
-			lc.nightSquidsSession++;
-			cf.writeIntConfig("fishing", "nightSquid", lc.nightSquids);
+			LootCommand.nightSquids++;
+			LootCommand.nightSquidsSession++;
+			ConfigHandler.writeIntConfig("fishing", "nightSquid", LootCommand.nightSquids);
 			increaseSeaCreatures();
 		} else if (message.contains("You stumbled upon a Sea Guardian")) {
-			lc.seaGuardians++;
-			lc.seaGuardiansSession++;
-			cf.writeIntConfig("fishing", "seaGuardian", lc.seaGuardians);
+			LootCommand.seaGuardians++;
+			LootCommand.seaGuardiansSession++;
+			ConfigHandler.writeIntConfig("fishing", "seaGuardian", LootCommand.seaGuardians);
 			increaseSeaCreatures();
 		} else if (message.contains("It looks like you've disrupted the Sea Witch's brewing session. Watch out, she's furious")) {
-			lc.seaWitches++;
-			lc.seaWitchesSession++;
-			cf.writeIntConfig("fishing", "seaWitch", lc.seaWitches);
+			LootCommand.seaWitches++;
+			LootCommand.seaWitchesSession++;
+			ConfigHandler.writeIntConfig("fishing", "seaWitch", LootCommand.seaWitches);
 			increaseSeaCreatures();
 		} else if (message.contains("You reeled in a Sea Archer")) {
-			lc.seaArchers++;
-			lc.seaArchersSession++;
-			cf.writeIntConfig("fishing", "seaArcher", lc.seaArchers);
+			LootCommand.seaArchers++;
+			LootCommand.seaArchersSession++;
+			ConfigHandler.writeIntConfig("fishing", "seaArcher", LootCommand.seaArchers);
 			increaseSeaCreatures();
 		} else if (message.contains("The Monster of the Deep has emerged")) {
-			lc.monsterOfTheDeeps++;
-			lc.monsterOfTheDeepsSession++;
-			cf.writeIntConfig("fishing", "monsterOfDeep", lc.monsterOfTheDeeps);
+			LootCommand.monsterOfTheDeeps++;
+			LootCommand.monsterOfTheDeepsSession++;
+			ConfigHandler.writeIntConfig("fishing", "monsterOfDeep", LootCommand.monsterOfTheDeeps);
 			increaseSeaCreatures();
 		} else if (message.contains("Huh? A Catfish")) {
-			lc.catfishes++;
-			lc.catfishesSession++;
-			cf.writeIntConfig("fishing", "catfish", lc.catfishes);
+			LootCommand.catfishes++;
+			LootCommand.catfishesSession++;
+			ConfigHandler.writeIntConfig("fishing", "catfish", LootCommand.catfishes);
 			increaseSeaCreatures();
 		} else if (message.contains("Is this even a fish? It's the Carrot King")) {
-			lc.carrotKings++;
-			lc.carrotKingsSession++;
-			cf.writeIntConfig("fishing", "carrotKing", lc.carrotKings);
+			LootCommand.carrotKings++;
+			LootCommand.carrotKingsSession++;
+			ConfigHandler.writeIntConfig("fishing", "carrotKing", LootCommand.carrotKings);
 			increaseSeaCreatures();
 		} else if (message.contains("Gross! A Sea Leech")) {
-			lc.seaLeeches++;
-			lc.seaLeechesSession++;
-			cf.writeIntConfig("fishing", "seaLeech", lc.seaLeeches);
+			LootCommand.seaLeeches++;
+			LootCommand.seaLeechesSession++;
+			ConfigHandler.writeIntConfig("fishing", "seaLeech", LootCommand.seaLeeches);
 			increaseSeaCreatures();
 		} else if (message.contains("You've discovered a Guardian Defender of the sea")) {
-			lc.guardianDefenders++;
-			lc.guardianDefendersSession++;
-			cf.writeIntConfig("fishing", "guardianDefender", lc.guardianDefenders);
+			LootCommand.guardianDefenders++;
+			LootCommand.guardianDefendersSession++;
+			ConfigHandler.writeIntConfig("fishing", "guardianDefender", LootCommand.guardianDefenders);
 			increaseSeaCreatures();
 		} else if (message.contains("You have awoken the Deep Sea Protector, prepare for a battle")) {
-			lc.deepSeaProtectors++;
-			lc.deepSeaProtectorsSession++;
-			cf.writeIntConfig("fishing", "deepSeaProtector", lc.deepSeaProtectors);
+			LootCommand.deepSeaProtectors++;
+			LootCommand.deepSeaProtectorsSession++;
+			ConfigHandler.writeIntConfig("fishing", "deepSeaProtector", LootCommand.deepSeaProtectors);
 			increaseSeaCreatures();
 		} else if (message.contains("The Water Hydra has come to test your strength")) {
-			lc.hydras++;
-			lc.hydrasSession++;
-			cf.writeIntConfig("fishing", "hydra", lc.hydras);
+			LootCommand.hydras++;
+			LootCommand.hydrasSession++;
+			ConfigHandler.writeIntConfig("fishing", "hydra", LootCommand.hydras);
 			increaseSeaCreatures();
 		} else if (message.contains("The Sea Emperor arises from the depths")) {
 			increaseSeaCreatures();
 			
-			lc.seaEmperors++;
-			lc.empTime = System.currentTimeMillis() / 1000;
-			lc.empSCs = 0;
-			lc.seaEmperorsSession++;
-			lc.empTimeSession = System.currentTimeMillis() / 1000;
-			lc.empSCsSession = 0;
-			cf.writeIntConfig("fishing", "seaEmperor", lc.seaEmperors);
-			cf.writeDoubleConfig("fishing", "empTime", lc.empTime);
-			cf.writeIntConfig("fishing", "empSC", lc.empSCs);
+			LootCommand.seaEmperors++;
+			LootCommand.empTime = System.currentTimeMillis() / 1000;
+			LootCommand.empSCs = 0;
+			LootCommand.seaEmperorsSession++;
+			LootCommand.empTimeSession = System.currentTimeMillis() / 1000;
+			LootCommand.empSCsSession = 0;
+			ConfigHandler.writeIntConfig("fishing", "seaEmperor", LootCommand.seaEmperors);
+			ConfigHandler.writeDoubleConfig("fishing", "empTime", LootCommand.empTime);
+			ConfigHandler.writeIntConfig("fishing", "empSC", LootCommand.empSCs);
 		} else if (message.contains("Frozen Steve fell into the pond long ago")) { // Fishing Winter
-			lc.frozenSteves++;
-			lc.frozenStevesSession++;
-			cf.writeIntConfig("fishing", "frozenSteve", lc.frozenSteves);
+			LootCommand.frozenSteves++;
+			LootCommand.frozenStevesSession++;
+			ConfigHandler.writeIntConfig("fishing", "frozenSteve", LootCommand.frozenSteves);
 			increaseSeaCreatures();
 		} else if (message.contains("It's a snowman! He looks harmless")) {
-			lc.frostyTheSnowmans++;
-			lc.frostyTheSnowmansSession++;
-			cf.writeIntConfig("fishing", "snowman", lc.frostyTheSnowmans);
+			LootCommand.frostyTheSnowmans++;
+			LootCommand.frostyTheSnowmansSession++;
+			ConfigHandler.writeIntConfig("fishing", "snowman", LootCommand.frostyTheSnowmans);
 			increaseSeaCreatures();
 		} else if (message.contains("stole Jerry's Gifts...get them back")) {
-			lc.grinches++;
-			lc.grinchesSession++;
-			cf.writeIntConfig("fishing", "grinch", lc.grinches);
+			LootCommand.grinches++;
+			LootCommand.grinchesSession++;
+			ConfigHandler.writeIntConfig("fishing", "grinch", LootCommand.grinches);
 			increaseSeaCreatures();
 		} else if (message.contains("What is this creature")) {
+			LootCommand.yetis++;
+			LootCommand.yetiTime = System.currentTimeMillis() / 1000;
+			LootCommand.yetiSCs = 0;
+			LootCommand.yetisSession++;
+			LootCommand.yetiTimeSession = System.currentTimeMillis() / 1000;
+			LootCommand.yetiSCsSession = 0;
+			ConfigHandler.writeIntConfig("fishing", "yeti", LootCommand.yetis);
+			ConfigHandler.writeDoubleConfig("fishing", "yetiTime", LootCommand.yetiTime);
+			ConfigHandler.writeIntConfig("fishing", "yetiSC", LootCommand.yetiSCs);
 			increaseSeaCreatures();
-			
-			lc.yetis++;
-			lc.yetiTime = System.currentTimeMillis() / 1000;
-			lc.yetiSCs = 0;
-			lc.yetisSession++;
-			lc.yetiTimeSession = System.currentTimeMillis() / 1000;
-			lc.yetiSCsSession = 0;
-			cf.writeIntConfig("fishing", "yeti", lc.yetis);
-			cf.writeDoubleConfig("fishing", "yetiTime", lc.yetiTime);
-			cf.writeIntConfig("fishing", "yetiSC", lc.yetiSCs);
 		} else if (message.contains("A tiny fin emerges from the water, you've caught a Nurse Shark")) { // Fishing Festival
-			lc.nurseSharks++;
-			lc.nurseSharksSession++;
-			cf.writeIntConfig("fishing", "nurseShark", lc.nurseSharks);
+			LootCommand.nurseSharks++;
+			LootCommand.nurseSharksSession++;
+			ConfigHandler.writeIntConfig("fishing", "nurseShark", LootCommand.nurseSharks);
 			increaseSeaCreatures();
 		} else if (message.contains("You spot a fin as blue as the water it came from, it's a Blue Shark")) {
-			lc.blueSharks++;
-			lc.blueSharksSession++;
-			cf.writeIntConfig("fishing", "blueShark", lc.blueSharks);
+			LootCommand.blueSharks++;
+			LootCommand.blueSharksSession++;
+			ConfigHandler.writeIntConfig("fishing", "blueShark", LootCommand.blueSharks);
 			increaseSeaCreatures();
 		} else if (message.contains("A striped beast bounds from the depths, the wild Tiger Shark")) {
-			lc.tigerSharks++;
-			lc.tigerSharksSession++;
-			cf.writeIntConfig("fishing", "tigerShark", lc.tigerSharks);
+			LootCommand.tigerSharks++;
+			LootCommand.tigerSharksSession++;
+			ConfigHandler.writeIntConfig("fishing", "tigerShark", LootCommand.tigerSharks);
 			increaseSeaCreatures();
 		} else if (message.contains("Hide no longer, a Great White Shark has tracked your scent and thirsts for your blood")) {
-			lc.greatWhiteSharks++;
-			lc.greatWhiteSharksSession++;
-			cf.writeIntConfig("fishing", "greatWhiteShark", lc.greatWhiteSharks);
+			LootCommand.greatWhiteSharks++;
+			LootCommand.greatWhiteSharksSession++;
+			ConfigHandler.writeIntConfig("fishing", "greatWhiteShark", LootCommand.greatWhiteSharks);
 			increaseSeaCreatures();
 		} else if (message.contains("Phew! It's only a Scarecrow")) {
-			lc.scarecrows++;
-			lc.scarecrowsSession++;
-			cf.writeIntConfig("fishing", "scarecrow", lc.scarecrows);
+			LootCommand.scarecrows++;
+			LootCommand.scarecrowsSession++;
+			ConfigHandler.writeIntConfig("fishing", "scarecrow", LootCommand.scarecrows);
 			increaseSeaCreatures();
 		} else if (message.contains("You hear trotting from beneath the waves, you caught a Nightmare")) {
-			lc.nightmares++;
-			lc.nightmaresSession++;
-			cf.writeIntConfig("fishing", "nightmare", lc.nightmares);
+			LootCommand.nightmares++;
+			LootCommand.nightmaresSession++;
+			ConfigHandler.writeIntConfig("fishing", "nightmare", LootCommand.nightmares);
 			increaseSeaCreatures();
 		} else if (message.contains("It must be a full moon, a Werewolf appears")) {
-			lc.werewolfs++;
-			lc.werewolfsSession++;
-			cf.writeIntConfig("fishing", "werewolf", lc.werewolfs);
+			LootCommand.werewolfs++;
+			LootCommand.werewolfsSession++;
+			ConfigHandler.writeIntConfig("fishing", "werewolf", LootCommand.werewolfs);
 			increaseSeaCreatures();
 		} else if (message.contains("The spirit of a long lost Phantom Fisher has come to haunt you")) {
-			lc.phantomFishers++;
-			lc.phantomFishersSession++;
-			cf.writeIntConfig("fishing", "phantomFisher", lc.phantomFishers);
+			LootCommand.phantomFishers++;
+			LootCommand.phantomFishersSession++;
+			ConfigHandler.writeIntConfig("fishing", "phantomFisher", LootCommand.phantomFishers);
 			increaseSeaCreatures();
 		} else if (message.contains("This can't be! The manifestation of death himself")) {
-			lc.grimReapers++;
-			lc.grimReapersSession++;
-			cf.writeIntConfig("fishing", "grimReaper", lc.grimReapers);
+			LootCommand.grimReapers++;
+			LootCommand.grimReapersSession++;
+			ConfigHandler.writeIntConfig("fishing", "grimReaper", LootCommand.grimReapers);
 			increaseSeaCreatures();
 		} else if (message.contains("Dungeon starts in 1 second.")) { // Dungeons Stuff
 		    dungeonStartTime = System.currentTimeMillis() / 1000 + 1;
@@ -799,29 +791,29 @@ public class TheMod
 				if (sCleaned.contains("The Catacombs (")) {
 					// Add time to floor
 					if (sCleaned.contains("F1")) {
-						lc.f1TimeSpent = Math.floor(lc.f1TimeSpent + timeToAdd);
-						lc.f1TimeSpentSession = Math.floor(lc.f1TimeSpentSession + timeToAdd);
-						cf.writeDoubleConfig("catacombs", "floorOneTime", lc.f1TimeSpent);
+						LootCommand.f1TimeSpent = Math.floor(LootCommand.f1TimeSpent + timeToAdd);
+						LootCommand.f1TimeSpentSession = Math.floor(LootCommand.f1TimeSpentSession + timeToAdd);
+						ConfigHandler.writeDoubleConfig("catacombs", "floorOneTime", LootCommand.f1TimeSpent);
 					} else if (sCleaned.contains("F2")) {
-						lc.f2TimeSpent = Math.floor(lc.f2TimeSpent + timeToAdd);
-						lc.f2TimeSpentSession = Math.floor(lc.f2TimeSpentSession + timeToAdd);
-						cf.writeDoubleConfig("catacombs", "floorTwoTime", lc.f2TimeSpent);
+						LootCommand.f2TimeSpent = Math.floor(LootCommand.f2TimeSpent + timeToAdd);
+						LootCommand.f2TimeSpentSession = Math.floor(LootCommand.f2TimeSpentSession + timeToAdd);
+						ConfigHandler.writeDoubleConfig("catacombs", "floorTwoTime", LootCommand.f2TimeSpent);
 					} else if (sCleaned.contains("F3")) {
-						lc.f3TimeSpent = Math.floor(lc.f3TimeSpent + timeToAdd);
-						lc.f3TimeSpentSession = Math.floor(lc.f3TimeSpentSession + timeToAdd);
-						cf.writeDoubleConfig("catacombs", "floorThreeTime", lc.f3TimeSpent);
+						LootCommand.f3TimeSpent = Math.floor(LootCommand.f3TimeSpent + timeToAdd);
+						LootCommand.f3TimeSpentSession = Math.floor(LootCommand.f3TimeSpentSession + timeToAdd);
+						ConfigHandler.writeDoubleConfig("catacombs", "floorThreeTime", LootCommand.f3TimeSpent);
 					} else if (sCleaned.contains("F4")) {
-						lc.f4TimeSpent = Math.floor(lc.f4TimeSpent + timeToAdd);
-						lc.f4TimeSpentSession = Math.floor(lc.f4TimeSpentSession + timeToAdd);
-						cf.writeDoubleConfig("catacombs", "floorFourTime", lc.f4TimeSpent);
+						LootCommand.f4TimeSpent = Math.floor(LootCommand.f4TimeSpent + timeToAdd);
+						LootCommand.f4TimeSpentSession = Math.floor(LootCommand.f4TimeSpentSession + timeToAdd);
+						ConfigHandler.writeDoubleConfig("catacombs", "floorFourTime", LootCommand.f4TimeSpent);
 					} else if (sCleaned.contains("F5")) {
-						lc.f5TimeSpent = Math.floor(lc.f5TimeSpent + timeToAdd);
-						lc.f5TimeSpentSession = Math.floor(lc.f5TimeSpentSession + timeToAdd);
-						cf.writeDoubleConfig("catacombs", "floorFiveTime", lc.f5TimeSpent);
+						LootCommand.f5TimeSpent = Math.floor(LootCommand.f5TimeSpent + timeToAdd);
+						LootCommand.f5TimeSpentSession = Math.floor(LootCommand.f5TimeSpentSession + timeToAdd);
+						ConfigHandler.writeDoubleConfig("catacombs", "floorFiveTime", LootCommand.f5TimeSpent);
 					} else if (sCleaned.contains("F6")) {
-						lc.f6TimeSpent = Math.floor(lc.f6TimeSpent + timeToAdd);
-						lc.f6TimeSpentSession = Math.floor(lc.f6TimeSpentSession + timeToAdd);
-						cf.writeDoubleConfig("catacombs", "floorSixTime", lc.f6TimeSpent);
+						LootCommand.f6TimeSpent = Math.floor(LootCommand.f6TimeSpent + timeToAdd);
+						LootCommand.f6TimeSpentSession = Math.floor(LootCommand.f6TimeSpentSession + timeToAdd);
+						ConfigHandler.writeDoubleConfig("catacombs", "floorSixTime", LootCommand.f6TimeSpent);
 					}
 				} else if (sCleaned.contains("Time Elapsed:")) {
 					// Get floor time
@@ -835,160 +827,160 @@ public class TheMod
 		}
 		
 		if (wolfRNG) {
-			lc.wolfTime = System.currentTimeMillis() / 1000;
-			lc.wolfBosses = 0;
-			lc.wolfTimeSession = System.currentTimeMillis() / 1000;
-			lc.wolfBossesSession = 0;
-			cf.writeDoubleConfig("wolf", "timeRNG", lc.wolfTime);
-			cf.writeIntConfig("wolf", "bossRNG", 0);
+			LootCommand.wolfTime = System.currentTimeMillis() / 1000;
+			LootCommand.wolfBosses = 0;
+			LootCommand.wolfTimeSession = System.currentTimeMillis() / 1000;
+			LootCommand.wolfBossesSession = 0;
+			ConfigHandler.writeDoubleConfig("wolf", "timeRNG", LootCommand.wolfTime);
+			ConfigHandler.writeIntConfig("wolf", "bossRNG", 0);
 		}
 		if (spiderRNG) {
-			lc.spiderTime = System.currentTimeMillis() / 1000;
-			lc.spiderBosses = 0;
-			lc.spiderTimeSession = System.currentTimeMillis() / 1000;
-			lc.spiderBossesSession = 0;
-			cf.writeDoubleConfig("spider", "timeRNG", lc.spiderTime);
-			cf.writeIntConfig("spider", "bossRNG", 0);
+			LootCommand.spiderTime = System.currentTimeMillis() / 1000;
+			LootCommand.spiderBosses = 0;
+			LootCommand.spiderTimeSession = System.currentTimeMillis() / 1000;
+			LootCommand.spiderBossesSession = 0;
+			ConfigHandler.writeDoubleConfig("spider", "timeRNG", LootCommand.spiderTime);
+			ConfigHandler.writeIntConfig("spider", "bossRNG", 0);
 		}
 		if (zombieRNG) {
-			lc.zombieTime = System.currentTimeMillis() / 1000;
-			lc.zombieBosses = 0;
-			lc.zombieTimeSession = System.currentTimeMillis() / 1000;
-			lc.zombieBossesSession = 0;
-			cf.writeDoubleConfig("zombie", "timeRNG", lc.zombieTime);
-			cf.writeIntConfig("zombie", "bossRNG", 0);
+			LootCommand.zombieTime = System.currentTimeMillis() / 1000;
+			LootCommand.zombieBosses = 0;
+			LootCommand.zombieTimeSession = System.currentTimeMillis() / 1000;
+			LootCommand.zombieBossesSession = 0;
+			ConfigHandler.writeDoubleConfig("zombie", "timeRNG", LootCommand.zombieTime);
+			ConfigHandler.writeIntConfig("zombie", "bossRNG", 0);
 		}
 		
 		// Dungeons Trackers
 		if (message.contains("    ")) {
 			if (message.contains("Recombobulator 3000")) {
-				lc.recombobulators++;
-				lc.recombobulatorsSession++;
-				cf.writeIntConfig("catacombs", "recombobulator", lc.recombobulators);
+				LootCommand.recombobulators++;
+				LootCommand.recombobulatorsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "recombobulator", LootCommand.recombobulators);
 			} else if (message.contains("Fuming Potato Book")) {
-				lc.fumingPotatoBooks++;
-				lc.fumingPotatoBooksSession++;
-				cf.writeIntConfig("catacombs", "fumingBooks", lc.fumingPotatoBooks);
+				LootCommand.fumingPotatoBooks++;
+				LootCommand.fumingPotatoBooksSession++;
+				ConfigHandler.writeIntConfig("catacombs", "fumingBooks", LootCommand.fumingPotatoBooks);
 			} else if (message.contains("Bonzo's Staff")) { // F1
-				lc.bonzoStaffs++;
-				lc.bonzoStaffsSession++;
-				cf.writeIntConfig("catacombs", "bonzoStaff", lc.bonzoStaffs);
+				LootCommand.bonzoStaffs++;
+				LootCommand.bonzoStaffsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "bonzoStaff", LootCommand.bonzoStaffs);
 			} else if (message.contains("Scarf's Studies")) { // F2
-				lc.scarfStudies++;
-				lc.scarfStudiesSession++;
-				cf.writeIntConfig("catacombs", "scarfStudies", lc.scarfStudies);
+				LootCommand.scarfStudies++;
+				LootCommand.scarfStudiesSession++;
+				ConfigHandler.writeIntConfig("catacombs", "scarfStudies", LootCommand.scarfStudies);
 			} else if (message.contains("Adaptive Helmet")) { // F3
-				lc.adaptiveHelms++;
-				lc.adaptiveHelmsSession++;
-				cf.writeIntConfig("catacombs", "adaptiveHelm", lc.adaptiveHelms);
+				LootCommand.adaptiveHelms++;
+				LootCommand.adaptiveHelmsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "adaptiveHelm", LootCommand.adaptiveHelms);
 			} else if (message.contains("Adaptive Chestplate")) {
-				lc.adaptiveChests++;
-				lc.adaptiveChestsSession++;
-				cf.writeIntConfig("catacombs", "adaptiveChest", lc.adaptiveChests);
+				LootCommand.adaptiveChests++;
+				LootCommand.adaptiveChestsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "adaptiveChest", LootCommand.adaptiveChests);
 			} else if (message.contains("Adaptive Leggings")) {
-				lc.adaptiveLegs++;
-				lc.adaptiveLegsSession++;
-				cf.writeIntConfig("catacombs", "adaptiveLegging", lc.adaptiveLegs);
+				LootCommand.adaptiveLegs++;
+				LootCommand.adaptiveLegsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "adaptiveLegging", LootCommand.adaptiveLegs);
 			} else if (message.contains("Adaptive Boots")) {
-				lc.adaptiveBoots++;
-				lc.adaptiveBootsSession++;
-				cf.writeIntConfig("catacombs", "adaptiveBoot", lc.adaptiveBoots);
+				LootCommand.adaptiveBoots++;
+				LootCommand.adaptiveBootsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "adaptiveBoot", LootCommand.adaptiveBoots);
 			} else if (message.contains("Adaptive Blade")) {
-				lc.adaptiveSwords++;
-				lc.adaptiveSwordsSession++;
-				cf.writeIntConfig("catacombs", "adaptiveSword", lc.adaptiveSwords);
+				LootCommand.adaptiveSwords++;
+				LootCommand.adaptiveSwordsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "adaptiveSword", LootCommand.adaptiveSwords);
 			} else if (message.contains("Spirit Wing")) { // F4
-				lc.spiritWings++;
-				lc.spiritWingsSession++;
-				cf.writeIntConfig("catacombs", "spiritWing", lc.spiritWings);
+				LootCommand.spiritWings++;
+				LootCommand.spiritWingsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "spiritWing", LootCommand.spiritWings);
 			} else if (message.contains("Spirit Bone")) {
-				lc.spiritBones++;
-				lc.spiritBonesSession++;
-				cf.writeIntConfig("catacombs", "spiritBone", lc.spiritBones);
+				LootCommand.spiritBones++;
+				LootCommand.spiritBonesSession++;
+				ConfigHandler.writeIntConfig("catacombs", "spiritBone", LootCommand.spiritBones);
 			} else if (message.contains("Spirit Boots")) {
-				lc.spiritBoots++;
-				lc.spiritBootsSession++;
-				cf.writeIntConfig("catacombs", "spiritBoot", lc.spiritBoots);
+				LootCommand.spiritBoots++;
+				LootCommand.spiritBootsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "spiritBoot", LootCommand.spiritBoots);
 			} else if (message.contains("[Lvl 1] Spirit")) {
 				String formattedMessage = event.message.getFormattedText();
 				// Unicode colour code messes up here, just gonna remove the symbols
 				if (formattedMessage.contains("5Spirit")) {
-					lc.epicSpiritPets++;
-					lc.epicSpiritPetsSession++;
-					cf.writeIntConfig("catacombs", "spiritPetEpic", lc.epicSpiritPets);
+					LootCommand.epicSpiritPets++;
+					LootCommand.epicSpiritPetsSession++;
+					ConfigHandler.writeIntConfig("catacombs", "spiritPetEpic", LootCommand.epicSpiritPets);
 				} else if (formattedMessage.contains("6Spirit")) {
-					lc.legSpiritPets++;
-					lc.legSpiritPetsSession++;
-					cf.writeIntConfig("catacombs", "spiritPetLeg", lc.legSpiritPets);
+					LootCommand.legSpiritPets++;
+					LootCommand.legSpiritPetsSession++;
+					ConfigHandler.writeIntConfig("catacombs", "spiritPetLeg", LootCommand.legSpiritPets);
 				} 
 			} else if (message.contains("Spirit Sword")) {
-				lc.spiritSwords++;
-				lc.spiritSwordsSession++;
-				cf.writeIntConfig("catacombs", "spiritSword", lc.spiritSwords);
+				LootCommand.spiritSwords++;
+				LootCommand.spiritSwordsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "spiritSword", LootCommand.spiritSwords);
 			} else if (message.contains("Spirit Bow")) {
-				lc.spiritBows++;
-				lc.spiritBowsSession++;
-				cf.writeIntConfig("catacombs", "spiritBow", lc.spiritBows);
+				LootCommand.spiritBows++;
+				LootCommand.spiritBowsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "spiritBow", LootCommand.spiritBows);
 			} else if (message.contains("Warped Stone")) { // F5
-				lc.warpedStones++;
-				lc.warpedStonesSession++;
-				cf.writeIntConfig("catacombs", "warpedStone", lc.warpedStones);
+				LootCommand.warpedStones++;
+				LootCommand.warpedStonesSession++;
+				ConfigHandler.writeIntConfig("catacombs", "warpedStone", LootCommand.warpedStones);
 			} else if (message.contains("Shadow Assassin Helmet")) {
-				lc.shadowAssHelms++;
-				lc.shadowAssHelmsSession++;
-				cf.writeIntConfig("catacombs", "shadowAssassinHelm", lc.shadowAssHelms);
+				LootCommand.shadowAssHelms++;
+				LootCommand.shadowAssHelmsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "shadowAssassinHelm", LootCommand.shadowAssHelms);
 			} else if (message.contains("Shadow Assassin Chestplate")) {
-				lc.shadowAssChests++;
-				lc.shadowAssChestsSession++;
-				cf.writeIntConfig("catacombs", "shadowAssassinChest", lc.shadowAssChests);
+				LootCommand.shadowAssChests++;
+				LootCommand.shadowAssChestsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "shadowAssassinChest", LootCommand.shadowAssChests);
 			} else if (message.contains("Shadow Assassin Leggings")) {
-				lc.shadowAssLegs++;
-				lc.shadowAssLegsSession++;
-				cf.writeIntConfig("catacombs", "shadowAssassinLegging", lc.shadowAssLegs);
+				LootCommand.shadowAssLegs++;
+				LootCommand.shadowAssLegsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "shadowAssassinLegging", LootCommand.shadowAssLegs);
 			} else if (message.contains("Shadow Assassin Boots")) {
-				lc.shadowAssBoots++;
-				lc.shadowAssBootsSession++;
-				cf.writeIntConfig("catacombs", "shadowAssassinBoot", lc.shadowAssBoots);
+				LootCommand.shadowAssBoots++;
+				LootCommand.shadowAssBootsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "shadowAssassinBoot", LootCommand.shadowAssBoots);
 			} else if (message.contains("Livid Dagger")) {
-				lc.lividDaggers++;
-				lc.lividDaggersSession++;
-				cf.writeIntConfig("catacombs", "lividDagger", lc.lividDaggers);
+				LootCommand.lividDaggers++;
+				LootCommand.lividDaggersSession++;
+				ConfigHandler.writeIntConfig("catacombs", "lividDagger", LootCommand.lividDaggers);
 			} else if (message.contains("Shadow Fury")) {
-				lc.shadowFurys++;
-				lc.shadowFurysSession++;
-				cf.writeIntConfig("catacombs", "shadowFury", lc.shadowFurys);
+				LootCommand.shadowFurys++;
+				LootCommand.shadowFurysSession++;
+				ConfigHandler.writeIntConfig("catacombs", "shadowFury", LootCommand.shadowFurys);
 			} else if (message.contains("Ancient Rose")) { // F6
-				lc.ancientRoses++;
-				lc.ancientRosesSession++;
-				cf.writeIntConfig("catacombs", "ancientRose", lc.ancientRoses);
+				LootCommand.ancientRoses++;
+				LootCommand.ancientRosesSession++;
+				ConfigHandler.writeIntConfig("catacombs", "ancientRose", LootCommand.ancientRoses);
 			} else if (message.contains("Precursor Eye")) {
-				lc.precursorEyes++;
-				lc.precursorEyesSession++;
-				cf.writeIntConfig("catacombs", "precursorEye", lc.precursorEyes);
+				LootCommand.precursorEyes++;
+				LootCommand.precursorEyesSession++;
+				ConfigHandler.writeIntConfig("catacombs", "precursorEye", LootCommand.precursorEyes);
 			} else if (message.contains("Giant's Sword")) {
-				lc.giantsSwords++;
-				lc.giantsSwordsSession++;
-				cf.writeIntConfig("catacombs", "giantsSword", lc.giantsSwords);
+				LootCommand.giantsSwords++;
+				LootCommand.giantsSwordsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "giantsSword", LootCommand.giantsSwords);
 			} else if (message.contains("Necromancer Lord Helmet")) {
-				lc.necroLordHelms++;
-				lc.necroLordHelmsSession++;
-				cf.writeIntConfig("catacombs", "necroLordHelm", lc.necroLordHelms);
+				LootCommand.necroLordHelms++;
+				LootCommand.necroLordHelmsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "necroLordHelm", LootCommand.necroLordHelms);
 			} else if (message.contains("Necromancer Lord Chestplate")) {
-				lc.necroLordChests++;
-				lc.necroLordChestsSession++;
-				cf.writeIntConfig("catacombs", "necroLordChest", lc.necroLordChests);
+				LootCommand.necroLordChests++;
+				LootCommand.necroLordChestsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "necroLordChest", LootCommand.necroLordChests);
 			} else if (message.contains("Necromancer Lord Leggings")) {
-				lc.necroLordLegs++;
-				lc.necroLordLegsSession++;
-				cf.writeIntConfig("catacombs", "necroLordLegging", lc.necroLordLegs);
+				LootCommand.necroLordLegs++;
+				LootCommand.necroLordLegsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "necroLordLegging", LootCommand.necroLordLegs);
 			} else if (message.contains("Necromancer Lord Boots")) {
-				lc.necroLordBoots++;
-				lc.necroLordBootsSession++;
-				cf.writeIntConfig("catacombs", "necroLordBoot", lc.necroLordBoots);
+				LootCommand.necroLordBoots++;
+				LootCommand.necroLordBootsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "necroLordBoot", LootCommand.necroLordBoots);
 			} else if (message.contains("Necromancer Sword")) {
-				lc.necroSwords++;
-				lc.necroSwordsSession++;
-				cf.writeIntConfig("catacombs", "necroSword", lc.necroSwords);
+				LootCommand.necroSwords++;
+				LootCommand.necroSwordsSession++;
+				ConfigHandler.writeIntConfig("catacombs", "necroSword", LootCommand.necroSwords);
 			}
 		}
 		
@@ -1001,11 +993,11 @@ public class TheMod
 					lastMaddoxTime = System.currentTimeMillis() / 1000;
 				}
 			}
-			if (tc.chatMaddoxToggled) Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(MAIN_COLOUR + "Open chat then click anywhere on-screen to open Maddox"));
+			if (ToggleCommand.chatMaddoxToggled) Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(MAIN_COLOUR + "Open chat then click anywhere on-screen to open Maddox"));
 		}
 		
 		// Spirit Bear alerts
-		if (tc.spiritBearAlerts && message.contains("The Spirit Bear has appeared!")) {
+		if (ToggleCommand.spiritBearAlerts && message.contains("The Spirit Bear has appeared!")) {
 			Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "SPIRIT BEAR", 2);
 		}
     }
@@ -1026,15 +1018,11 @@ public class TheMod
     }
     
     public void renderEverything() {
-    	final ToggleCommand tc = new ToggleCommand();
-    	final MoveCommand moc = new MoveCommand();
-    	final DisplayCommand ds = new DisplayCommand();
-    	
     	if (Minecraft.getMinecraft().currentScreen instanceof EditLocationsGui) return;
     	
     	Minecraft mc = Minecraft.getMinecraft();
     	
-    	if (tc.coordsToggled) {
+    	if (ToggleCommand.coordsToggled) {
     		EntityPlayer player = mc.thePlayer;
     		
         	double xDir = (player.rotationYaw % 360 + 360) % 360;
@@ -1043,10 +1031,10 @@ public class TheMod
         	double yDir = (double) Math.round(player.rotationPitch * 10d) / 10d;
         	
         	String coordText = COORDS_COLOUR + (int) player.posX + " / " + (int) player.posY + " / " + (int) player.posZ + " (" + xDir + " / " + yDir + ")";
-        	new TextRenderer(mc, coordText, moc.coordsXY[0], moc.coordsXY[1], ScaleCommand.coordsScale);
+        	new TextRenderer(mc, coordText, MoveCommand.coordsXY[0], MoveCommand.coordsXY[1], ScaleCommand.coordsScale);
     	}
     	
-    	if (tc.dungeonTimerToggled && Utils.inDungeons) {
+    	if (ToggleCommand.dungeonTimerToggled && Utils.inDungeons) {
     		String dungeonTimerText = EnumChatFormatting.GRAY + "Wither Doors:\n" +
     								  EnumChatFormatting.DARK_RED + "Blood Open:\n" +
     								  EnumChatFormatting.RED + "Watcher Clear:\n" +
@@ -1059,22 +1047,22 @@ public class TheMod
 								   EnumChatFormatting.BLUE + Utils.getTimeBetween(dungeonStartTime, bossClearTime) + "\n" +
 								   EnumChatFormatting.YELLOW + dungeonDeaths + "\n" +
 								   EnumChatFormatting.YELLOW + puzzleFails;
-    		new TextRenderer(mc, dungeonTimerText, moc.dungeonTimerXY[0], moc.dungeonTimerXY[1], ScaleCommand.dungeonTimerScale);
-    		new TextRenderer(mc, dungeonTimers, (int) (moc.dungeonTimerXY[0] + (80 * ScaleCommand.dungeonTimerScale)), moc.dungeonTimerXY[1], ScaleCommand.dungeonTimerScale);
+    		new TextRenderer(mc, dungeonTimerText, MoveCommand.dungeonTimerXY[0], MoveCommand.dungeonTimerXY[1], ScaleCommand.dungeonTimerScale);
+    		new TextRenderer(mc, dungeonTimers, (int) (MoveCommand.dungeonTimerXY[0] + (80 * ScaleCommand.dungeonTimerScale)), MoveCommand.dungeonTimerXY[1], ScaleCommand.dungeonTimerScale);
     	}
     	
-    	if (tc.lividSolverToggled && foundLivid && livid != null) {
-    		new TextRenderer(mc, livid.getName().replace("" + EnumChatFormatting.BOLD, ""), moc.lividHpXY[0], moc.lividHpXY[1], ScaleCommand.lividHpScale);
+    	if (ToggleCommand.lividSolverToggled && foundLivid && livid != null) {
+    		new TextRenderer(mc, livid.getName().replace("" + EnumChatFormatting.BOLD, ""), MoveCommand.lividHpXY[0], MoveCommand.lividHpXY[1], ScaleCommand.lividHpScale);
     	}
     	
-    	if (tc.cakeTimerToggled && Utils.inSkyblock) {
+    	if (ToggleCommand.cakeTimerToggled && Utils.inSkyblock) {
     		double scale = ScaleCommand.cakeTimerScale;
     		double scaleReset = (double) Math.pow(scale, -1);
     		GL11.glScaled(scale, scale, scale);
     		
     		double timeNow = System.currentTimeMillis() / 1000;
     		mc.getTextureManager().bindTexture(CAKE_ICON);
-    		Gui.drawModalRectWithCustomSizedTexture(moc.cakeTimerXY[0], moc.cakeTimerXY[1], 0, 0, 16, 16, 16, 16);
+    		Gui.drawModalRectWithCustomSizedTexture(MoveCommand.cakeTimerXY[0], MoveCommand.cakeTimerXY[1], 0, 0, 16, 16, 16, 16);
     		
     		String cakeText;
     		if (cakeTime - timeNow < 0) {
@@ -1082,13 +1070,12 @@ public class TheMod
     		} else {
     			cakeText = CAKE_COLOUR + Utils.getTimeBetween(timeNow, cakeTime);
     		}
-    		new TextRenderer(mc, cakeText, moc.cakeTimerXY[0] + 20, moc.cakeTimerXY[1] + 5, 1);
+    		new TextRenderer(mc, cakeText, MoveCommand.cakeTimerXY[0] + 20, MoveCommand.cakeTimerXY[1] + 5, 1);
     		
     		GL11.glScaled(scaleReset, scaleReset, scaleReset);
     	}
     	
-    	if (!ds.display.equals("off")) {
-    		final LootCommand lc = new LootCommand();
+    	if (!DisplayCommand.display.equals("off")) {
     		String dropsText = "";
     		String countText = "";
     		String timeBetween = "Never";
@@ -1097,21 +1084,21 @@ public class TheMod
     		double timeNow = System.currentTimeMillis() / 1000;
     		NumberFormat nf = NumberFormat.getIntegerInstance(Locale.US);
     		
-    		if (ds.display.equals("wolf")) {
-    			if (lc.wolfTime == -1) {
+    		if (DisplayCommand.display.equals("wolf")) {
+    			if (LootCommand.wolfTime == -1) {
     				timeBetween = "Never";
     			} else {
-    				timeBetween = Utils.getTimeBetween(lc.wolfTime, timeNow);
+    				timeBetween = Utils.getTimeBetween(LootCommand.wolfTime, timeNow);
     			}
-    			if (lc.wolfBosses == -1) {
+    			if (LootCommand.wolfBosses == -1) {
     				bossesBetween = "Never";
     			} else {
-    				bossesBetween = nf.format(lc.wolfBosses);
+    				bossesBetween = nf.format(LootCommand.wolfBosses);
     			}
-    			if (tc.slayerCountTotal) {
-    				drop20 = nf.format(lc.wolfWheels);
+    			if (ToggleCommand.slayerCountTotal) {
+    				drop20 = nf.format(LootCommand.wolfWheels);
     			} else {
-    				drop20 = nf.format(lc.wolfWheelsDrops) + " times";
+    				drop20 = nf.format(LootCommand.wolfWheelsDrops) + " times";
     			}
     			
     			dropsText = EnumChatFormatting.GOLD + "Svens Killed:\n" +
@@ -1125,32 +1112,32 @@ public class TheMod
 							EnumChatFormatting.DARK_PURPLE + "Overfluxes:\n" +
 							EnumChatFormatting.AQUA + "Time Since RNG:\n" +
 							EnumChatFormatting.AQUA + "Bosses Since RNG:";
-    			countText = EnumChatFormatting.GOLD + nf.format(lc.wolfSvens) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.wolfTeeth) + "\n" +
+    			countText = EnumChatFormatting.GOLD + nf.format(LootCommand.wolfSvens) + "\n" +
+							EnumChatFormatting.GREEN + nf.format(LootCommand.wolfTeeth) + "\n" +
 							EnumChatFormatting.BLUE + drop20 + "\n" +
-							EnumChatFormatting.AQUA + lc.wolfSpirits + "\n" + 
-							EnumChatFormatting.WHITE + lc.wolfBooks + "\n" +
-							EnumChatFormatting.DARK_RED + lc.wolfEggs + "\n" +
-							EnumChatFormatting.GOLD + lc.wolfCoutures + "\n" +
-							EnumChatFormatting.AQUA + lc.wolfBaits + "\n" +
-							EnumChatFormatting.DARK_PURPLE + lc.wolfFluxes + "\n" +
+							EnumChatFormatting.AQUA + LootCommand.wolfSpirits + "\n" + 
+							EnumChatFormatting.WHITE + LootCommand.wolfBooks + "\n" +
+							EnumChatFormatting.DARK_RED + LootCommand.wolfEggs + "\n" +
+							EnumChatFormatting.GOLD + LootCommand.wolfCoutures + "\n" +
+							EnumChatFormatting.AQUA + LootCommand.wolfBaits + "\n" +
+							EnumChatFormatting.DARK_PURPLE + LootCommand.wolfFluxes + "\n" +
 							EnumChatFormatting.AQUA + timeBetween + "\n" +
 							EnumChatFormatting.AQUA + bossesBetween;
-    		} else if (ds.display.equals("wolf_session")) {
-    			if (lc.wolfTimeSession == -1) {
+    		} else if (DisplayCommand.display.equals("wolf_session")) {
+    			if (LootCommand.wolfTimeSession == -1) {
     				timeBetween = "Never";
     			} else {
-    				timeBetween = Utils.getTimeBetween(lc.wolfTimeSession, timeNow);
+    				timeBetween = Utils.getTimeBetween(LootCommand.wolfTimeSession, timeNow);
     			}
-    			if (lc.wolfBossesSession == -1) {
+    			if (LootCommand.wolfBossesSession == -1) {
     				bossesBetween = "Never";
     			} else {
-    				bossesBetween = nf.format(lc.wolfBossesSession);
+    				bossesBetween = nf.format(LootCommand.wolfBossesSession);
     			}
-    			if (tc.slayerCountTotal) {
-    				drop20 = nf.format(lc.wolfWheelsSession);
+    			if (ToggleCommand.slayerCountTotal) {
+    				drop20 = nf.format(LootCommand.wolfWheelsSession);
     			} else {
-    				drop20 = nf.format(lc.wolfWheelsDropsSession) + " times";
+    				drop20 = nf.format(LootCommand.wolfWheelsDropsSession) + " times";
     			}
     			
     			dropsText = EnumChatFormatting.GOLD + "Svens Killed:\n" +
@@ -1164,32 +1151,32 @@ public class TheMod
 							EnumChatFormatting.DARK_PURPLE + "Overfluxes:\n" +
 							EnumChatFormatting.AQUA + "Time Since RNG:\n" +
 							EnumChatFormatting.AQUA + "Bosses Since RNG:";
-    			countText = EnumChatFormatting.GOLD + nf.format(lc.wolfSvensSession) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.wolfTeethSession) + "\n" +
+    			countText = EnumChatFormatting.GOLD + nf.format(LootCommand.wolfSvensSession) + "\n" +
+							EnumChatFormatting.GREEN + nf.format(LootCommand.wolfTeethSession) + "\n" +
 							EnumChatFormatting.BLUE + drop20 + "\n" +
-							EnumChatFormatting.AQUA + lc.wolfSpiritsSession + "\n" + 
-							EnumChatFormatting.WHITE + lc.wolfBooksSession + "\n" +
-							EnumChatFormatting.DARK_RED + lc.wolfEggsSession + "\n" +
-							EnumChatFormatting.GOLD + lc.wolfCouturesSession + "\n" +
-							EnumChatFormatting.AQUA + lc.wolfBaitsSession + "\n" +
-							EnumChatFormatting.DARK_PURPLE + lc.wolfFluxesSession + "\n" +
+							EnumChatFormatting.AQUA + LootCommand.wolfSpiritsSession + "\n" + 
+							EnumChatFormatting.WHITE + LootCommand.wolfBooksSession + "\n" +
+							EnumChatFormatting.DARK_RED + LootCommand.wolfEggsSession + "\n" +
+							EnumChatFormatting.GOLD + LootCommand.wolfCouturesSession + "\n" +
+							EnumChatFormatting.AQUA + LootCommand.wolfBaitsSession + "\n" +
+							EnumChatFormatting.DARK_PURPLE + LootCommand.wolfFluxesSession + "\n" +
 							EnumChatFormatting.AQUA + timeBetween + "\n" +
 						EnumChatFormatting.AQUA + bossesBetween;
-    		} else if (ds.display.equals("spider")) {
-    			if (lc.spiderTime == -1) {
+    		} else if (DisplayCommand.display.equals("spider")) {
+    			if (LootCommand.spiderTime == -1) {
     				timeBetween = "Never";
     			} else {
-    				timeBetween = Utils.getTimeBetween(lc.spiderTime, timeNow);
+    				timeBetween = Utils.getTimeBetween(LootCommand.spiderTime, timeNow);
     			}
-    			if (lc.spiderBosses == -1) {
+    			if (LootCommand.spiderBosses == -1) {
     				bossesBetween = "Never";
     			} else {
-    				bossesBetween = nf.format(lc.spiderBosses);
+    				bossesBetween = nf.format(LootCommand.spiderBosses);
     			}
-    			if (tc.slayerCountTotal) {
-    				drop20 = nf.format(lc.spiderTAP);
+    			if (ToggleCommand.slayerCountTotal) {
+    				drop20 = nf.format(LootCommand.spiderTAP);
     			} else {
-    				drop20 = nf.format(lc.spiderTAPDrops) + " times";
+    				drop20 = nf.format(LootCommand.spiderTAPDrops) + " times";
     			}
     			
     			dropsText = EnumChatFormatting.GOLD + "Tarantulas Killed:\n" +
@@ -1203,32 +1190,32 @@ public class TheMod
 							EnumChatFormatting.GOLD + "Digested Mosquitos:\n" +
 							EnumChatFormatting.AQUA + "Time Since RNG:\n" +
 							EnumChatFormatting.AQUA + "Bosses Since RNG:";
-    			countText = EnumChatFormatting.GOLD + nf.format(lc.spiderTarantulas) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.spiderWebs) + "\n" +
+    			countText = EnumChatFormatting.GOLD + nf.format(LootCommand.spiderTarantulas) + "\n" +
+							EnumChatFormatting.GREEN + nf.format(LootCommand.spiderWebs) + "\n" +
 							EnumChatFormatting.DARK_GREEN + drop20 + "\n" +
-							EnumChatFormatting.DARK_GRAY + lc.spiderBites + "\n" + 
-							EnumChatFormatting.WHITE + lc.spiderBooks + "\n" +
-							EnumChatFormatting.AQUA + lc.spiderCatalysts + "\n" +
-							EnumChatFormatting.DARK_PURPLE + lc.spiderTalismans + "\n" +
-							EnumChatFormatting.LIGHT_PURPLE + lc.spiderSwatters + "\n" +
-							EnumChatFormatting.GOLD + lc.spiderMosquitos + "\n" +
+							EnumChatFormatting.DARK_GRAY + LootCommand.spiderBites + "\n" + 
+							EnumChatFormatting.WHITE + LootCommand.spiderBooks + "\n" +
+							EnumChatFormatting.AQUA + LootCommand.spiderCatalysts + "\n" +
+							EnumChatFormatting.DARK_PURPLE + LootCommand.spiderTalismans + "\n" +
+							EnumChatFormatting.LIGHT_PURPLE + LootCommand.spiderSwatters + "\n" +
+							EnumChatFormatting.GOLD + LootCommand.spiderMosquitos + "\n" +
 							EnumChatFormatting.AQUA + timeBetween + "\n" +
 							EnumChatFormatting.AQUA + bossesBetween;
-    		} else if (ds.display.equals("spider_session")) {
-    			if (lc.spiderTimeSession == -1) {
+    		} else if (DisplayCommand.display.equals("spider_session")) {
+    			if (LootCommand.spiderTimeSession == -1) {
     				timeBetween = "Never";
     			} else {
-    				timeBetween = Utils.getTimeBetween(lc.spiderTimeSession, timeNow);
+    				timeBetween = Utils.getTimeBetween(LootCommand.spiderTimeSession, timeNow);
     			}
-    			if (lc.spiderBossesSession == -1) {
+    			if (LootCommand.spiderBossesSession == -1) {
     				bossesBetween = "Never";
     			} else {
-    				bossesBetween = nf.format(lc.spiderBossesSession);
+    				bossesBetween = nf.format(LootCommand.spiderBossesSession);
     			}
-    			if (tc.slayerCountTotal) {
-    				drop20 = nf.format(lc.spiderTAPSession);
+    			if (ToggleCommand.slayerCountTotal) {
+    				drop20 = nf.format(LootCommand.spiderTAPSession);
     			} else {
-    				drop20 = nf.format(lc.spiderTAPDropsSession) + " times";
+    				drop20 = nf.format(LootCommand.spiderTAPDropsSession) + " times";
     			}
     			
     			dropsText = EnumChatFormatting.GOLD + "Tarantulas Killed:\n" +
@@ -1242,32 +1229,32 @@ public class TheMod
 							EnumChatFormatting.GOLD + "Digested Mosquitos:\n" +
 							EnumChatFormatting.AQUA + "Time Since RNG:\n" +
 							EnumChatFormatting.AQUA + "Bosses Since RNG:";
-    			countText = EnumChatFormatting.GOLD + nf.format(lc.spiderTarantulasSession) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.spiderWebsSession) + "\n" +
+    			countText = EnumChatFormatting.GOLD + nf.format(LootCommand.spiderTarantulasSession) + "\n" +
+							EnumChatFormatting.GREEN + nf.format(LootCommand.spiderWebsSession) + "\n" +
 							EnumChatFormatting.DARK_GREEN + drop20 + "\n" +
-							EnumChatFormatting.DARK_GRAY + lc.spiderBitesSession + "\n" + 
-							EnumChatFormatting.WHITE + lc.spiderBooksSession + "\n" +
-							EnumChatFormatting.AQUA + lc.spiderCatalystsSession + "\n" +
-							EnumChatFormatting.DARK_PURPLE + lc.spiderTalismansSession + "\n" +
-							EnumChatFormatting.LIGHT_PURPLE + lc.spiderSwattersSession + "\n" +
-							EnumChatFormatting.GOLD + lc.spiderMosquitosSession + "\n" +
+							EnumChatFormatting.DARK_GRAY + LootCommand.spiderBitesSession + "\n" + 
+							EnumChatFormatting.WHITE + LootCommand.spiderBooksSession + "\n" +
+							EnumChatFormatting.AQUA + LootCommand.spiderCatalystsSession + "\n" +
+							EnumChatFormatting.DARK_PURPLE + LootCommand.spiderTalismansSession + "\n" +
+							EnumChatFormatting.LIGHT_PURPLE + LootCommand.spiderSwattersSession + "\n" +
+							EnumChatFormatting.GOLD + LootCommand.spiderMosquitosSession + "\n" +
 							EnumChatFormatting.AQUA + timeBetween + "\n" +
 							EnumChatFormatting.AQUA + bossesBetween;
-    		} else if (ds.display.equals("zombie")) {
-    			if (lc.zombieTime == -1) {
+    		} else if (DisplayCommand.display.equals("zombie")) {
+    			if (LootCommand.zombieTime == -1) {
     				timeBetween = "Never";
     			} else {
-    				timeBetween = Utils.getTimeBetween(lc.zombieTime, timeNow);
+    				timeBetween = Utils.getTimeBetween(LootCommand.zombieTime, timeNow);
     			}
-    			if (lc.zombieBosses == -1) {
+    			if (LootCommand.zombieBosses == -1) {
     				bossesBetween = "Never";
     			} else {
-    				bossesBetween = nf.format(lc.zombieBosses);
+    				bossesBetween = nf.format(LootCommand.zombieBosses);
     			}
-    			if (tc.slayerCountTotal) {
-    				drop20 = nf.format(lc.zombieFoulFlesh);
+    			if (ToggleCommand.slayerCountTotal) {
+    				drop20 = nf.format(LootCommand.zombieFoulFlesh);
     			} else {
-    				drop20 = nf.format(lc.zombieFoulFleshDrops) + " times";
+    				drop20 = nf.format(LootCommand.zombieFoulFleshDrops) + " times";
     			}
     			
     			dropsText = EnumChatFormatting.GOLD + "Revs Killed:\n" +
@@ -1282,33 +1269,33 @@ public class TheMod
 							EnumChatFormatting.GOLD + "Scythe Blades:\n" +
 							EnumChatFormatting.AQUA + "Time Since RNG:\n" +
 							EnumChatFormatting.AQUA + "Bosses Since RNG:";
-    			countText = EnumChatFormatting.GOLD + nf.format(lc.zombieRevs) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.zombieRevFlesh) + "\n" +
+    			countText = EnumChatFormatting.GOLD + nf.format(LootCommand.zombieRevs) + "\n" +
+							EnumChatFormatting.GREEN + nf.format(LootCommand.zombieRevFlesh) + "\n" +
 							EnumChatFormatting.BLUE + drop20 + "\n" +
-							EnumChatFormatting.DARK_GREEN + lc.zombiePestilences + "\n" + 
-							EnumChatFormatting.WHITE + lc.zombieBooks + "\n" +
-							EnumChatFormatting.AQUA + lc.zombieUndeadCatas + "\n" +
-							EnumChatFormatting.DARK_PURPLE + lc.zombieBeheadeds + "\n" +
-							EnumChatFormatting.RED + lc.zombieRevCatas + "\n" +
-							EnumChatFormatting.DARK_GREEN + lc.zombieSnakes + "\n" +
-							EnumChatFormatting.GOLD + lc.zombieScythes + "\n" +
+							EnumChatFormatting.DARK_GREEN + LootCommand.zombiePestilences + "\n" + 
+							EnumChatFormatting.WHITE + LootCommand.zombieBooks + "\n" +
+							EnumChatFormatting.AQUA + LootCommand.zombieUndeadCatas + "\n" +
+							EnumChatFormatting.DARK_PURPLE + LootCommand.zombieBeheadeds + "\n" +
+							EnumChatFormatting.RED + LootCommand.zombieRevCatas + "\n" +
+							EnumChatFormatting.DARK_GREEN + LootCommand.zombieSnakes + "\n" +
+							EnumChatFormatting.GOLD + LootCommand.zombieScythes + "\n" +
 							EnumChatFormatting.AQUA + timeBetween + "\n" +
 							EnumChatFormatting.AQUA + bossesBetween;
-    		} else if (ds.display.equals("zombie_session")) {
-    			if (lc.zombieTimeSession == -1) {
+    		} else if (DisplayCommand.display.equals("zombie_session")) {
+    			if (LootCommand.zombieTimeSession == -1) {
     				timeBetween = "Never";
     			} else {
-    				timeBetween = Utils.getTimeBetween(lc.zombieTimeSession, timeNow);
+    				timeBetween = Utils.getTimeBetween(LootCommand.zombieTimeSession, timeNow);
     			}
-    			if (lc.zombieBossesSession == -1) {
+    			if (LootCommand.zombieBossesSession == -1) {
     				bossesBetween = "Never";
     			} else {
-    				bossesBetween = nf.format(lc.zombieBossesSession);
+    				bossesBetween = nf.format(LootCommand.zombieBossesSession);
     			}
-    			if (tc.slayerCountTotal) {
-    				drop20 = nf.format(lc.zombieFoulFleshSession);
+    			if (ToggleCommand.slayerCountTotal) {
+    				drop20 = nf.format(LootCommand.zombieFoulFleshSession);
     			} else {
-    				drop20 = nf.format(lc.zombieFoulFleshDropsSession) + " times";
+    				drop20 = nf.format(LootCommand.zombieFoulFleshDropsSession) + " times";
     			}
     			
     			dropsText = EnumChatFormatting.GOLD + "Revs Killed:\n" +
@@ -1323,28 +1310,28 @@ public class TheMod
 							EnumChatFormatting.GOLD + "Scythe Blades:\n" +
 							EnumChatFormatting.AQUA + "Time Since RNG:\n" +
 							EnumChatFormatting.AQUA + "Bosses Since RNG:";
-    			countText = EnumChatFormatting.GOLD + nf.format(lc.zombieRevsSession) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.zombieRevFleshSession) + "\n" +
+    			countText = EnumChatFormatting.GOLD + nf.format(LootCommand.zombieRevsSession) + "\n" +
+							EnumChatFormatting.GREEN + nf.format(LootCommand.zombieRevFleshSession) + "\n" +
 							EnumChatFormatting.BLUE + drop20 + "\n" +
-							EnumChatFormatting.DARK_GREEN + lc.zombiePestilencesSession + "\n" + 
-							EnumChatFormatting.WHITE + lc.zombieBooksSession + "\n" +
-							EnumChatFormatting.AQUA + lc.zombieUndeadCatasSession + "\n" +
-							EnumChatFormatting.DARK_PURPLE + lc.zombieBeheadedsSession + "\n" +
-							EnumChatFormatting.RED + lc.zombieRevCatasSession + "\n" +
-							EnumChatFormatting.DARK_GREEN + lc.zombieSnakesSession + "\n" +
-							EnumChatFormatting.GOLD + lc.zombieScythes + "\n" +
+							EnumChatFormatting.DARK_GREEN + LootCommand.zombiePestilencesSession + "\n" + 
+							EnumChatFormatting.WHITE + LootCommand.zombieBooksSession + "\n" +
+							EnumChatFormatting.AQUA + LootCommand.zombieUndeadCatasSession + "\n" +
+							EnumChatFormatting.DARK_PURPLE + LootCommand.zombieBeheadedsSession + "\n" +
+							EnumChatFormatting.RED + LootCommand.zombieRevCatasSession + "\n" +
+							EnumChatFormatting.DARK_GREEN + LootCommand.zombieSnakesSession + "\n" +
+							EnumChatFormatting.GOLD + LootCommand.zombieScythes + "\n" +
 							EnumChatFormatting.AQUA + timeBetween + "\n" +
 							EnumChatFormatting.AQUA + bossesBetween;
-    		} else if (ds.display.equals("fishing")) {
-    			if (lc.empTime == -1) {
+    		} else if (DisplayCommand.display.equals("fishing")) {
+    			if (LootCommand.empTime == -1) {
     				timeBetween = "Never";
     			} else {
-    				timeBetween = Utils.getTimeBetween(lc.empTime, timeNow);
+    				timeBetween = Utils.getTimeBetween(LootCommand.empTime, timeNow);
     			}
-    			if (lc.empSCs == -1) {
+    			if (LootCommand.empSCs == -1) {
     				bossesBetween = "Never";
     			} else {
-    				bossesBetween = nf.format(lc.empSCs);
+    				bossesBetween = nf.format(LootCommand.empSCs);
     			}
     			
     			dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
@@ -1357,16 +1344,16 @@ public class TheMod
 							EnumChatFormatting.DARK_AQUA + "Sea Guardians:\n" +
 							EnumChatFormatting.BLUE + "Sea Witches:\n" +
 							EnumChatFormatting.GREEN + "Sea Archers:";
-    			countText = EnumChatFormatting.AQUA + nf.format(lc.seaCreatures) + "\n" +
-							EnumChatFormatting.AQUA + nf.format(lc.fishingMilestone) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.goodCatches) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.greatCatches) + "\n" +
-							EnumChatFormatting.GRAY + nf.format(lc.squids) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.seaWalkers) + "\n" +
-							EnumChatFormatting.DARK_GRAY + nf.format(lc.nightSquids) + "\n" +
-							EnumChatFormatting.DARK_AQUA + nf.format(lc.seaGuardians) + "\n" +
-							EnumChatFormatting.BLUE + nf.format(lc.seaWitches) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.seaArchers);
+    			countText = EnumChatFormatting.AQUA + nf.format(LootCommand.seaCreatures) + "\n" +
+							EnumChatFormatting.AQUA + nf.format(LootCommand.fishingMilestone) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.goodCatches) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.greatCatches) + "\n" +
+							EnumChatFormatting.GRAY + nf.format(LootCommand.squids) + "\n" +
+							EnumChatFormatting.GREEN + nf.format(LootCommand.seaWalkers) + "\n" +
+							EnumChatFormatting.DARK_GRAY + nf.format(LootCommand.nightSquids) + "\n" +
+							EnumChatFormatting.DARK_AQUA + nf.format(LootCommand.seaGuardians) + "\n" +
+							EnumChatFormatting.BLUE + nf.format(LootCommand.seaWitches) + "\n" +
+							EnumChatFormatting.GREEN + nf.format(LootCommand.seaArchers);
     			// Seperated to save vertical space
     			String dropsTextTwo = EnumChatFormatting.GREEN + "Monster of Deeps:\n" +
     								  EnumChatFormatting.YELLOW + "Catfishes:\n" +
@@ -1378,34 +1365,34 @@ public class TheMod
 									  EnumChatFormatting.GOLD + "Sea Emperors:\n" +
 									  EnumChatFormatting.AQUA + "Time Since Emp:\n" +
 									  EnumChatFormatting.AQUA + "Creatures Since Emp:";
-    			String countTextTwo = EnumChatFormatting.GREEN + nf.format(lc.monsterOfTheDeeps) + "\n" +
-    								  EnumChatFormatting.YELLOW + nf.format(lc.catfishes) + "\n" +
-									  EnumChatFormatting.GOLD + nf.format(lc.carrotKings) + "\n" +
-									  EnumChatFormatting.GRAY + nf.format(lc.seaLeeches) + "\n" +
-									  EnumChatFormatting.DARK_PURPLE + nf.format(lc.guardianDefenders) + "\n" +
-									  EnumChatFormatting.DARK_PURPLE + nf.format(lc.deepSeaProtectors) + "\n" +
-									  EnumChatFormatting.GOLD + nf.format(lc.hydras) + "\n" +
-									  EnumChatFormatting.GOLD + nf.format(lc.seaEmperors) + "\n" +
+    			String countTextTwo = EnumChatFormatting.GREEN + nf.format(LootCommand.monsterOfTheDeeps) + "\n" +
+    								  EnumChatFormatting.YELLOW + nf.format(LootCommand.catfishes) + "\n" +
+									  EnumChatFormatting.GOLD + nf.format(LootCommand.carrotKings) + "\n" +
+									  EnumChatFormatting.GRAY + nf.format(LootCommand.seaLeeches) + "\n" +
+									  EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.guardianDefenders) + "\n" +
+									  EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.deepSeaProtectors) + "\n" +
+									  EnumChatFormatting.GOLD + nf.format(LootCommand.hydras) + "\n" +
+									  EnumChatFormatting.GOLD + nf.format(LootCommand.seaEmperors) + "\n" +
 									  EnumChatFormatting.AQUA + timeBetween + "\n" +
 									  EnumChatFormatting.AQUA + bossesBetween;
     			
-    			if (tc.splitFishing) {
-    				new TextRenderer(mc, dropsTextTwo, (int) (moc.displayXY[0] + (160 * ScaleCommand.displayScale)), moc.displayXY[1], ScaleCommand.displayScale);
-        			new TextRenderer(mc, countTextTwo, (int) (moc.displayXY[0] + (270 * ScaleCommand.displayScale)), moc.displayXY[1], ScaleCommand.displayScale);
+    			if (ToggleCommand.splitFishing) {
+    				new TextRenderer(mc, dropsTextTwo, (int) (MoveCommand.displayXY[0] + (160 * ScaleCommand.displayScale)), MoveCommand.displayXY[1], ScaleCommand.displayScale);
+        			new TextRenderer(mc, countTextTwo, (int) (MoveCommand.displayXY[0] + (270 * ScaleCommand.displayScale)), MoveCommand.displayXY[1], ScaleCommand.displayScale);
     			} else {
     				dropsText += "\n" + dropsTextTwo;
     				countText += "\n" + countTextTwo;
     			}
-    		} else if (ds.display.equals("fishing_session")) {
-    			if (lc.empTimeSession == -1) {
+    		} else if (DisplayCommand.display.equals("fishing_session")) {
+    			if (LootCommand.empTimeSession == -1) {
     				timeBetween = "Never";
     			} else {
-    				timeBetween = Utils.getTimeBetween(lc.empTimeSession, timeNow);
+    				timeBetween = Utils.getTimeBetween(LootCommand.empTimeSession, timeNow);
     			}
-    			if (lc.empSCsSession == -1) {
+    			if (LootCommand.empSCsSession == -1) {
     				bossesBetween = "Never";
     			} else {
-    				bossesBetween = nf.format(lc.empSCsSession);
+    				bossesBetween = nf.format(LootCommand.empSCsSession);
     			}
     			
     			dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
@@ -1418,16 +1405,16 @@ public class TheMod
 							EnumChatFormatting.DARK_AQUA + "Sea Guardians:\n" +
 							EnumChatFormatting.BLUE + "Sea Witches:\n" +
 							EnumChatFormatting.GREEN + "Sea Archers:";
-    			countText = EnumChatFormatting.AQUA + nf.format(lc.seaCreaturesSession) + "\n" +
-							EnumChatFormatting.AQUA + nf.format(lc.fishingMilestoneSession) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.goodCatchesSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.greatCatchesSession) + "\n" +
-							EnumChatFormatting.GRAY + nf.format(lc.squidsSession) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.seaWalkersSession) + "\n" +
-							EnumChatFormatting.DARK_GRAY + nf.format(lc.nightSquidsSession) + "\n" +
-							EnumChatFormatting.DARK_AQUA + nf.format(lc.seaGuardiansSession) + "\n" +
-							EnumChatFormatting.BLUE + nf.format(lc.seaWitchesSession) + "\n" +
-							EnumChatFormatting.GREEN + nf.format(lc.seaArchersSession);
+    			countText = EnumChatFormatting.AQUA + nf.format(LootCommand.seaCreaturesSession) + "\n" +
+							EnumChatFormatting.AQUA + nf.format(LootCommand.fishingMilestoneSession) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.goodCatchesSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.greatCatchesSession) + "\n" +
+							EnumChatFormatting.GRAY + nf.format(LootCommand.squidsSession) + "\n" +
+							EnumChatFormatting.GREEN + nf.format(LootCommand.seaWalkersSession) + "\n" +
+							EnumChatFormatting.DARK_GRAY + nf.format(LootCommand.nightSquidsSession) + "\n" +
+							EnumChatFormatting.DARK_AQUA + nf.format(LootCommand.seaGuardiansSession) + "\n" +
+							EnumChatFormatting.BLUE + nf.format(LootCommand.seaWitchesSession) + "\n" +
+							EnumChatFormatting.GREEN + nf.format(LootCommand.seaArchersSession);
     			// Seperated to save vertical space
     			String dropsTextTwo = EnumChatFormatting.GREEN + "Monster of Deeps:\n" +
     								  EnumChatFormatting.YELLOW + "Catfishes:\n" +
@@ -1439,34 +1426,34 @@ public class TheMod
 									  EnumChatFormatting.GOLD + "Sea Emperors:\n" +
 									  EnumChatFormatting.AQUA + "Time Since Emp:\n" +
 									  EnumChatFormatting.AQUA + "Creatures Since Emp:";
-    			String countTextTwo = EnumChatFormatting.GREEN + nf.format(lc.monsterOfTheDeepsSession) + "\n" +
-    								  EnumChatFormatting.YELLOW + nf.format(lc.catfishesSession) + "\n" +
-									  EnumChatFormatting.GOLD + nf.format(lc.carrotKingsSession) + "\n" +
-									  EnumChatFormatting.GRAY + nf.format(lc.seaLeechesSession) + "\n" +
-									  EnumChatFormatting.DARK_PURPLE + nf.format(lc.guardianDefendersSession) + "\n" +
-									  EnumChatFormatting.DARK_PURPLE + nf.format(lc.deepSeaProtectorsSession) + "\n" +
-									  EnumChatFormatting.GOLD + nf.format(lc.hydrasSession) + "\n" +
-									  EnumChatFormatting.GOLD + nf.format(lc.seaEmperorsSession) + "\n" +
+    			String countTextTwo = EnumChatFormatting.GREEN + nf.format(LootCommand.monsterOfTheDeepsSession) + "\n" +
+    								  EnumChatFormatting.YELLOW + nf.format(LootCommand.catfishesSession) + "\n" +
+									  EnumChatFormatting.GOLD + nf.format(LootCommand.carrotKingsSession) + "\n" +
+									  EnumChatFormatting.GRAY + nf.format(LootCommand.seaLeechesSession) + "\n" +
+									  EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.guardianDefendersSession) + "\n" +
+									  EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.deepSeaProtectorsSession) + "\n" +
+									  EnumChatFormatting.GOLD + nf.format(LootCommand.hydrasSession) + "\n" +
+									  EnumChatFormatting.GOLD + nf.format(LootCommand.seaEmperorsSession) + "\n" +
 									  EnumChatFormatting.AQUA + timeBetween + "\n" +
 									  EnumChatFormatting.AQUA + bossesBetween;
     			
-    			if (tc.splitFishing) {
-    				new TextRenderer(mc, dropsTextTwo, (int) (moc.displayXY[0] + (160 * ScaleCommand.displayScale)), moc.displayXY[1], ScaleCommand.displayScale);
-        			new TextRenderer(mc, countTextTwo, (int) (moc.displayXY[0] + (270 * ScaleCommand.displayScale)), moc.displayXY[1], ScaleCommand.displayScale);
+    			if (ToggleCommand.splitFishing) {
+    				new TextRenderer(mc, dropsTextTwo, (int) (MoveCommand.displayXY[0] + (160 * ScaleCommand.displayScale)), MoveCommand.displayXY[1], ScaleCommand.displayScale);
+        			new TextRenderer(mc, countTextTwo, (int) (MoveCommand.displayXY[0] + (270 * ScaleCommand.displayScale)), MoveCommand.displayXY[1], ScaleCommand.displayScale);
     			} else {
     				dropsText += "\n" + dropsTextTwo;
     				countText += "\n" + countTextTwo;
     			}
-    		} else if (ds.display.equals("fishing_winter")) {
-    			if (lc.yetiTime == -1) {
+    		} else if (DisplayCommand.display.equals("fishing_winter")) {
+    			if (LootCommand.yetiTime == -1) {
     				timeBetween = "Never";
     			} else {
-    				timeBetween = Utils.getTimeBetween(lc.yetiTime, timeNow);
+    				timeBetween = Utils.getTimeBetween(LootCommand.yetiTime, timeNow);
     			}
-    			if (lc.yetiSCs == -1) {
+    			if (LootCommand.yetiSCs == -1) {
     				bossesBetween = "Never";
     			} else {
-    				bossesBetween = nf.format(lc.yetiSCs);
+    				bossesBetween = nf.format(LootCommand.yetiSCs);
     			}
     			
     			dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
@@ -1479,26 +1466,26 @@ public class TheMod
 							EnumChatFormatting.GOLD + "Yetis:\n" +
 							EnumChatFormatting.AQUA + "Time Since Yeti:\n" +
 							EnumChatFormatting.AQUA + "Creatures Since Yeti:";
-    			countText = EnumChatFormatting.AQUA + nf.format(lc.seaCreatures) + "\n" +
-							EnumChatFormatting.AQUA + nf.format(lc.fishingMilestone) + "\n" +
-	    					EnumChatFormatting.GOLD + nf.format(lc.goodCatches) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.greatCatches) + "\n" +
-	    					EnumChatFormatting.AQUA + nf.format(lc.frozenSteves) + "\n" +
-							EnumChatFormatting.WHITE + nf.format(lc.frostyTheSnowmans) + "\n" +
-							EnumChatFormatting.DARK_GREEN + nf.format(lc.grinches) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.yetis) + "\n" +
+    			countText = EnumChatFormatting.AQUA + nf.format(LootCommand.seaCreatures) + "\n" +
+							EnumChatFormatting.AQUA + nf.format(LootCommand.fishingMilestone) + "\n" +
+	    					EnumChatFormatting.GOLD + nf.format(LootCommand.goodCatches) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.greatCatches) + "\n" +
+	    					EnumChatFormatting.AQUA + nf.format(LootCommand.frozenSteves) + "\n" +
+							EnumChatFormatting.WHITE + nf.format(LootCommand.frostyTheSnowmans) + "\n" +
+							EnumChatFormatting.DARK_GREEN + nf.format(LootCommand.grinches) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.yetis) + "\n" +
 							EnumChatFormatting.AQUA + timeBetween + "\n" +
 							EnumChatFormatting.AQUA + bossesBetween;
-    		} else if (ds.display.equals("fishing_winter_session")) {
-    			if (lc.yetiTimeSession == -1) {
+    		} else if (DisplayCommand.display.equals("fishing_winter_session")) {
+    			if (LootCommand.yetiTimeSession == -1) {
     				timeBetween = "Never";
     			} else {
-    				timeBetween = Utils.getTimeBetween(lc.yetiTimeSession, timeNow);
+    				timeBetween = Utils.getTimeBetween(LootCommand.yetiTimeSession, timeNow);
     			}
-    			if (lc.yetiSCsSession == -1) {
+    			if (LootCommand.yetiSCsSession == -1) {
     				bossesBetween = "Never";
     			} else {
-    				bossesBetween = nf.format(lc.yetiSCsSession);
+    				bossesBetween = nf.format(LootCommand.yetiSCsSession);
     			}
     			
     			dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
@@ -1511,17 +1498,17 @@ public class TheMod
 							EnumChatFormatting.GOLD + "Yetis:\n" +
 							EnumChatFormatting.AQUA + "Time Since Yeti:\n" +
 							EnumChatFormatting.AQUA + "Creatures Since Yeti:";
-				countText = EnumChatFormatting.AQUA + nf.format(lc.seaCreaturesSession) + "\n" +
-							EnumChatFormatting.AQUA + nf.format(lc.fishingMilestoneSession) + "\n" +
-	    					EnumChatFormatting.GOLD + nf.format(lc.goodCatchesSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.greatCatchesSession) + "\n" +
-	    					EnumChatFormatting.AQUA + nf.format(lc.frozenStevesSession) + "\n" +
-							EnumChatFormatting.WHITE + nf.format(lc.frostyTheSnowmansSession) + "\n" +
-							EnumChatFormatting.DARK_GREEN + nf.format(lc.grinchesSession) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.yetisSession) + "\n" +
+				countText = EnumChatFormatting.AQUA + nf.format(LootCommand.seaCreaturesSession) + "\n" +
+							EnumChatFormatting.AQUA + nf.format(LootCommand.fishingMilestoneSession) + "\n" +
+	    					EnumChatFormatting.GOLD + nf.format(LootCommand.goodCatchesSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.greatCatchesSession) + "\n" +
+	    					EnumChatFormatting.AQUA + nf.format(LootCommand.frozenStevesSession) + "\n" +
+							EnumChatFormatting.WHITE + nf.format(LootCommand.frostyTheSnowmansSession) + "\n" +
+							EnumChatFormatting.DARK_GREEN + nf.format(LootCommand.grinchesSession) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.yetisSession) + "\n" +
 							EnumChatFormatting.AQUA + timeBetween + "\n" +
 							EnumChatFormatting.AQUA + bossesBetween;
-    		} else if (ds.display.equals("fishing_festival")) {
+    		} else if (DisplayCommand.display.equals("fishing_festival")) {
     			dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
     						EnumChatFormatting.AQUA + "Fishing Milestone:\n" +
     						EnumChatFormatting.GOLD + "Good Catches:\n" +
@@ -1530,15 +1517,15 @@ public class TheMod
     						EnumChatFormatting.BLUE + "Blue Sharks:\n" +
     						EnumChatFormatting.GOLD + "Tiger Sharks:\n" +
     						EnumChatFormatting.WHITE + "Great White Sharks:";
-    			countText = EnumChatFormatting.AQUA + nf.format(lc.seaCreatures) + "\n" +
-							EnumChatFormatting.AQUA + nf.format(lc.fishingMilestone) + "\n" +
-	    					EnumChatFormatting.GOLD + nf.format(lc.goodCatches) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.greatCatches) + "\n" +
-	    					EnumChatFormatting.LIGHT_PURPLE + nf.format(lc.nurseSharks) + "\n" +
-							EnumChatFormatting.BLUE + nf.format(lc.blueSharks) + "\n" +
-	    					EnumChatFormatting.GOLD + nf.format(lc.tigerSharks) + "\n" +
-							EnumChatFormatting.WHITE + nf.format(lc.greatWhiteSharks);
-     		} else if (ds.display.equals("fishing_festival_session")) {
+    			countText = EnumChatFormatting.AQUA + nf.format(LootCommand.seaCreatures) + "\n" +
+							EnumChatFormatting.AQUA + nf.format(LootCommand.fishingMilestone) + "\n" +
+	    					EnumChatFormatting.GOLD + nf.format(LootCommand.goodCatches) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.greatCatches) + "\n" +
+	    					EnumChatFormatting.LIGHT_PURPLE + nf.format(LootCommand.nurseSharks) + "\n" +
+							EnumChatFormatting.BLUE + nf.format(LootCommand.blueSharks) + "\n" +
+	    					EnumChatFormatting.GOLD + nf.format(LootCommand.tigerSharks) + "\n" +
+							EnumChatFormatting.WHITE + nf.format(LootCommand.greatWhiteSharks);
+     		} else if (DisplayCommand.display.equals("fishing_festival_session")) {
     			dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
 							EnumChatFormatting.AQUA + "Fishing Milestone:\n" +
 							EnumChatFormatting.GOLD + "Good Catches:\n" +
@@ -1547,15 +1534,15 @@ public class TheMod
 							EnumChatFormatting.BLUE + "Blue Sharks:\n" +
 							EnumChatFormatting.GOLD + "Tiger Sharks:\n" +
 							EnumChatFormatting.WHITE + "Great White Sharks:";
-				countText = EnumChatFormatting.AQUA + nf.format(lc.seaCreaturesSession) + "\n" +
-							EnumChatFormatting.AQUA + nf.format(lc.fishingMilestoneSession) + "\n" +
-	    					EnumChatFormatting.GOLD + nf.format(lc.goodCatchesSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.greatCatchesSession) + "\n" +
-	    					EnumChatFormatting.LIGHT_PURPLE + nf.format(lc.nurseSharksSession) + "\n" +
-							EnumChatFormatting.BLUE + nf.format(lc.blueSharksSession) + "\n" +
-	    					EnumChatFormatting.GOLD + nf.format(lc.tigerSharksSession) + "\n" +
-							EnumChatFormatting.WHITE + nf.format(lc.greatWhiteSharksSession);
-     		} else if (ds.display.equals("fishing_spooky")) {
+				countText = EnumChatFormatting.AQUA + nf.format(LootCommand.seaCreaturesSession) + "\n" +
+							EnumChatFormatting.AQUA + nf.format(LootCommand.fishingMilestoneSession) + "\n" +
+	    					EnumChatFormatting.GOLD + nf.format(LootCommand.goodCatchesSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.greatCatchesSession) + "\n" +
+	    					EnumChatFormatting.LIGHT_PURPLE + nf.format(LootCommand.nurseSharksSession) + "\n" +
+							EnumChatFormatting.BLUE + nf.format(LootCommand.blueSharksSession) + "\n" +
+	    					EnumChatFormatting.GOLD + nf.format(LootCommand.tigerSharksSession) + "\n" +
+							EnumChatFormatting.WHITE + nf.format(LootCommand.greatWhiteSharksSession);
+     		} else if (DisplayCommand.display.equals("fishing_spooky")) {
      			dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
      						EnumChatFormatting.AQUA + "Fishing Milestone:\n" +
      						EnumChatFormatting.GOLD + "Good Catches:\n" +
@@ -1565,16 +1552,16 @@ public class TheMod
      						EnumChatFormatting.DARK_PURPLE + "Werewolves:\n" +
 							EnumChatFormatting.GOLD + "Phantom Fishers:\n" +
      						EnumChatFormatting.GOLD + "Grim Reapers:";
-     			countText = EnumChatFormatting.AQUA + nf.format(lc.seaCreatures) + "\n" +
-							EnumChatFormatting.AQUA + nf.format(lc.fishingMilestone) + "\n" +
-	    					EnumChatFormatting.GOLD + nf.format(lc.goodCatches) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.greatCatches) + "\n" +
-	    					EnumChatFormatting.BLUE + nf.format(lc.scarecrows) + "\n" +
-							EnumChatFormatting.GRAY + nf.format(lc.nightmares) + "\n" +
-	    					EnumChatFormatting.DARK_PURPLE + nf.format(lc.werewolfs) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.phantomFishers) + "\n" +
-	    					EnumChatFormatting.GOLD + nf.format(lc.grimReapers);
-     		} else if (ds.display.equals("fishing_spooky_session")) {
+     			countText = EnumChatFormatting.AQUA + nf.format(LootCommand.seaCreatures) + "\n" +
+							EnumChatFormatting.AQUA + nf.format(LootCommand.fishingMilestone) + "\n" +
+	    					EnumChatFormatting.GOLD + nf.format(LootCommand.goodCatches) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.greatCatches) + "\n" +
+	    					EnumChatFormatting.BLUE + nf.format(LootCommand.scarecrows) + "\n" +
+							EnumChatFormatting.GRAY + nf.format(LootCommand.nightmares) + "\n" +
+	    					EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.werewolfs) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.phantomFishers) + "\n" +
+	    					EnumChatFormatting.GOLD + nf.format(LootCommand.grimReapers);
+     		} else if (DisplayCommand.display.equals("fishing_spooky_session")) {
      			dropsText = EnumChatFormatting.AQUA + "Creatures Caught:\n" +
 	 						EnumChatFormatting.AQUA + "Fishing Milestone:\n" +
 	 						EnumChatFormatting.GOLD + "Good Catches:\n" +
@@ -1584,64 +1571,64 @@ public class TheMod
 	 						EnumChatFormatting.DARK_PURPLE + "Werewolves:\n" +
 							EnumChatFormatting.GOLD + "Phantom Fishers:\n" +
 	 						EnumChatFormatting.GOLD + "Grim Reapers:";
-	 			countText = EnumChatFormatting.AQUA + nf.format(lc.seaCreaturesSession) + "\n" +
-							EnumChatFormatting.AQUA + nf.format(lc.fishingMilestoneSession) + "\n" +
-	    					EnumChatFormatting.GOLD + nf.format(lc.goodCatchesSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.greatCatchesSession) + "\n" +
-	    					EnumChatFormatting.BLUE + nf.format(lc.scarecrowsSession) + "\n" +
-							EnumChatFormatting.GRAY + nf.format(lc.nightmaresSession) + "\n" +
-	    					EnumChatFormatting.DARK_PURPLE + nf.format(lc.werewolfsSession) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.phantomFishersSession) + "\n" +
-	    					EnumChatFormatting.GOLD + nf.format(lc.grimReapersSession);
-     		} else if (ds.display.equals("catacombs_floor_one")) {
+	 			countText = EnumChatFormatting.AQUA + nf.format(LootCommand.seaCreaturesSession) + "\n" +
+							EnumChatFormatting.AQUA + nf.format(LootCommand.fishingMilestoneSession) + "\n" +
+	    					EnumChatFormatting.GOLD + nf.format(LootCommand.goodCatchesSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.greatCatchesSession) + "\n" +
+	    					EnumChatFormatting.BLUE + nf.format(LootCommand.scarecrowsSession) + "\n" +
+							EnumChatFormatting.GRAY + nf.format(LootCommand.nightmaresSession) + "\n" +
+	    					EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.werewolfsSession) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.phantomFishersSession) + "\n" +
+	    					EnumChatFormatting.GOLD + nf.format(LootCommand.grimReapersSession);
+     		} else if (DisplayCommand.display.equals("catacombs_floor_one")) {
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
     						EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
     						EnumChatFormatting.BLUE + "Bonzo's Staffs:\n" +
     						EnumChatFormatting.AQUA + "Coins Spent:\n" +
     						EnumChatFormatting.AQUA + "Time Spent:";
-    			countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulators) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooks) + "\n" +
-							EnumChatFormatting.BLUE + nf.format(lc.bonzoStaffs) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f1CoinsSpent) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f1TimeSpent);
-    		} else if (ds.display.equals("catacombs_floor_one_session")) {
+    			countText = EnumChatFormatting.GOLD + nf.format(LootCommand.recombobulators) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.fumingPotatoBooks) + "\n" +
+							EnumChatFormatting.BLUE + nf.format(LootCommand.bonzoStaffs) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(LootCommand.f1CoinsSpent) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, LootCommand.f1TimeSpent);
+    		} else if (DisplayCommand.display.equals("catacombs_floor_one_session")) {
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
 							EnumChatFormatting.BLUE + "Bonzo's Staffs:\n" +
     						EnumChatFormatting.AQUA + "Coins Spent:\n" +
     						EnumChatFormatting.AQUA + "Time Spent:";
-				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulatorsSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooksSession) + "\n" +
-							EnumChatFormatting.BLUE + nf.format(lc.bonzoStaffsSession) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f1CoinsSpentSession) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f1TimeSpentSession);
-    		} else if (ds.display.equals("catacombs_floor_two")) {
+				countText = EnumChatFormatting.GOLD + nf.format(LootCommand.recombobulatorsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.fumingPotatoBooksSession) + "\n" +
+							EnumChatFormatting.BLUE + nf.format(LootCommand.bonzoStaffsSession) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(LootCommand.f1CoinsSpentSession) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, LootCommand.f1TimeSpentSession);
+    		} else if (DisplayCommand.display.equals("catacombs_floor_two")) {
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
 							EnumChatFormatting.BLUE + "Scarf's Studies:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Adaptive Blades:\n" +
 		    				EnumChatFormatting.AQUA + "Coins Spent:\n" +
 		    				EnumChatFormatting.AQUA + "Time Spent:";
-				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulators) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooks) + "\n" +
-							EnumChatFormatting.BLUE + nf.format(lc.scarfStudies) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveSwords) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f2CoinsSpent) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f2TimeSpent);
-    		} else if (ds.display.equals("catacombs_floor_two_session")) {
+				countText = EnumChatFormatting.GOLD + nf.format(LootCommand.recombobulators) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.fumingPotatoBooks) + "\n" +
+							EnumChatFormatting.BLUE + nf.format(LootCommand.scarfStudies) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.adaptiveSwords) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(LootCommand.f2CoinsSpent) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, LootCommand.f2TimeSpent);
+    		} else if (DisplayCommand.display.equals("catacombs_floor_two_session")) {
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
 							EnumChatFormatting.BLUE + "Scarf's Studies:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Adaptive Blades:\n" +
 		    				EnumChatFormatting.AQUA + "Coins Spent:\n" +
 		    				EnumChatFormatting.AQUA + "Time Spent:";
-				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulatorsSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooksSession) + "\n" +
-							EnumChatFormatting.BLUE + nf.format(lc.scarfStudiesSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveSwordsSession) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f2CoinsSpentSession) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f2TimeSpentSession);
-    		} else if (ds.display.equals("catacombs_floor_three")) {
+				countText = EnumChatFormatting.GOLD + nf.format(LootCommand.recombobulatorsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.fumingPotatoBooksSession) + "\n" +
+							EnumChatFormatting.BLUE + nf.format(LootCommand.scarfStudiesSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.adaptiveSwordsSession) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(LootCommand.f2CoinsSpentSession) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, LootCommand.f2TimeSpentSession);
+    		} else if (DisplayCommand.display.equals("catacombs_floor_three")) {
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Adaptive Helmets:\n" +
@@ -1650,15 +1637,15 @@ public class TheMod
 							EnumChatFormatting.DARK_PURPLE + "Adaptive Boots:\n" +
 		    				EnumChatFormatting.AQUA + "Coins Spent:\n" +
 		    				EnumChatFormatting.AQUA + "Time Spent:";
-				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulators) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooks) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveHelms) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveChests) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveLegs) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveBoots) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f3CoinsSpent) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f3TimeSpent);
-    		} else if (ds.display.equals("catacombs_floor_three_session")) {
+				countText = EnumChatFormatting.GOLD + nf.format(LootCommand.recombobulators) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.fumingPotatoBooks) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.adaptiveHelms) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.adaptiveChests) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.adaptiveLegs) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.adaptiveBoots) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(LootCommand.f3CoinsSpent) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, LootCommand.f3TimeSpent);
+    		} else if (DisplayCommand.display.equals("catacombs_floor_three_session")) {
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Adaptive Helmets:\n" +
@@ -1667,15 +1654,15 @@ public class TheMod
 							EnumChatFormatting.DARK_PURPLE + "Adaptive Boots:\n" +
 		    				EnumChatFormatting.AQUA + "Coins Spent:\n" +
 		    				EnumChatFormatting.AQUA + "Time Spent:";
-				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulatorsSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooksSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveHelmsSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveChestsSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveLegsSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.adaptiveBootsSession) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f3CoinsSpentSession) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f3TimeSpentSession);
-    		} else if (ds.display.equals("catacombs_floor_four")) {
+				countText = EnumChatFormatting.GOLD + nf.format(LootCommand.recombobulatorsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.fumingPotatoBooksSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.adaptiveHelmsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.adaptiveChestsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.adaptiveLegsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.adaptiveBootsSession) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(LootCommand.f3CoinsSpentSession) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, LootCommand.f3TimeSpentSession);
+    		} else if (DisplayCommand.display.equals("catacombs_floor_four")) {
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Spirit Wings:\n" +
@@ -1687,18 +1674,18 @@ public class TheMod
 							EnumChatFormatting.GOLD + "Leg Spirit Pets:\n" +
 		    				EnumChatFormatting.AQUA + "Coins Spent:\n" +
 		    				EnumChatFormatting.AQUA + "Time Spent:";
-				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulators) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooks) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritWings) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritBones) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritBoots) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritSwords) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.spiritBows) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.epicSpiritPets) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.legSpiritPets) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f4CoinsSpent) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f4TimeSpent);
-    		} else if (ds.display.equals("catacombs_floor_four_session")) {
+				countText = EnumChatFormatting.GOLD + nf.format(LootCommand.recombobulators) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.fumingPotatoBooks) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.spiritWings) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.spiritBones) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.spiritBoots) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.spiritSwords) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.spiritBows) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.epicSpiritPets) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.legSpiritPets) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(LootCommand.f4CoinsSpent) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, LootCommand.f4TimeSpent);
+    		} else if (DisplayCommand.display.equals("catacombs_floor_four_session")) {
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Spirit Wings:\n" +
@@ -1710,18 +1697,18 @@ public class TheMod
 							EnumChatFormatting.GOLD + "Leg Spirit Pets:\n" +
 		    				EnumChatFormatting.AQUA + "Coins Spent:\n" +
 		    				EnumChatFormatting.AQUA + "Time Spent:";
-				countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulatorsSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooksSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritWingsSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritBonesSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritBootsSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.spiritSwordsSession) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.spiritBowsSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.epicSpiritPetsSession) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.legSpiritPetsSession) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f4CoinsSpentSession) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f4TimeSpentSession);
-    		} else if (ds.display.equals("catacombs_floor_five")) {
+				countText = EnumChatFormatting.GOLD + nf.format(LootCommand.recombobulatorsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.fumingPotatoBooksSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.spiritWingsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.spiritBonesSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.spiritBootsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.spiritSwordsSession) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.spiritBowsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.epicSpiritPetsSession) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.legSpiritPetsSession) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(LootCommand.f4CoinsSpentSession) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, LootCommand.f4TimeSpentSession);
+    		} else if (DisplayCommand.display.equals("catacombs_floor_five")) {
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
 							EnumChatFormatting.BLUE + "Warped Stones:\n" +
@@ -1734,19 +1721,19 @@ public class TheMod
 							EnumChatFormatting.GOLD + "Shadow Furys:\n" +
 							EnumChatFormatting.AQUA + "Coins Spent:\n" +
 		    				EnumChatFormatting.AQUA + "Time Spent:";
-    			countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulators) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooks) + "\n" +
-							EnumChatFormatting.BLUE + nf.format(lc.warpedStones) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.shadowAssHelms) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.shadowAssChests) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.shadowAssLegs) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.shadowAssBoots) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.lastBreaths) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.lividDaggers) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.shadowFurys) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f5CoinsSpent) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f5TimeSpent);
-    		} else if (ds.display.equals("catacombs_floor_five_session")) {
+    			countText = EnumChatFormatting.GOLD + nf.format(LootCommand.recombobulators) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.fumingPotatoBooks) + "\n" +
+							EnumChatFormatting.BLUE + nf.format(LootCommand.warpedStones) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.shadowAssHelms) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.shadowAssChests) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.shadowAssLegs) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.shadowAssBoots) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.lastBreaths) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.lividDaggers) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.shadowFurys) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(LootCommand.f5CoinsSpent) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, LootCommand.f5TimeSpent);
+    		} else if (DisplayCommand.display.equals("catacombs_floor_five_session")) {
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
 							EnumChatFormatting.BLUE + "Warped Stones:\n" +
@@ -1759,19 +1746,19 @@ public class TheMod
 							EnumChatFormatting.GOLD + "Shadow Furys:\n" +
 							EnumChatFormatting.AQUA + "Coins Spent:\n" +
 		    				EnumChatFormatting.AQUA + "Time Spent:";
-    			countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulatorsSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooksSession) + "\n" +
-							EnumChatFormatting.BLUE + nf.format(lc.warpedStonesSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.shadowAssHelmsSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.shadowAssChestsSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.shadowAssLegsSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.shadowAssBootsSession) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.lastBreathsSession) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.lividDaggersSession) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.shadowFurysSession) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f5CoinsSpentSession) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f5TimeSpentSession);
-    		} else if (ds.display.equals("catacombs_floor_six")) {
+    			countText = EnumChatFormatting.GOLD + nf.format(LootCommand.recombobulatorsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.fumingPotatoBooksSession) + "\n" +
+							EnumChatFormatting.BLUE + nf.format(LootCommand.warpedStonesSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.shadowAssHelmsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.shadowAssChestsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.shadowAssLegsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.shadowAssBootsSession) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.lastBreathsSession) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.lividDaggersSession) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.shadowFurysSession) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(LootCommand.f5CoinsSpentSession) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, LootCommand.f5TimeSpentSession);
+    		} else if (DisplayCommand.display.equals("catacombs_floor_six")) {
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
 							EnumChatFormatting.BLUE + "Ancient Roses:\n" +
@@ -1784,19 +1771,19 @@ public class TheMod
 							EnumChatFormatting.GOLD + "Necro Swords:\n" +
 							EnumChatFormatting.AQUA + "Coins Spent:\n" +
 		    				EnumChatFormatting.AQUA + "Time Spent:";
-    			countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulators) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooks) + "\n" +
-							EnumChatFormatting.BLUE + nf.format(lc.ancientRoses) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.precursorEyes) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.giantsSwords) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.necroLordHelms) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.necroLordChests) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.necroLordLegs) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.necroLordBoots) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.necroSwords) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f6CoinsSpent) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f6TimeSpent);
-    		} else if (ds.display.equals("catacombs_floor_six_session")) {
+    			countText = EnumChatFormatting.GOLD + nf.format(LootCommand.recombobulators) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.fumingPotatoBooks) + "\n" +
+							EnumChatFormatting.BLUE + nf.format(LootCommand.ancientRoses) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.precursorEyes) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.giantsSwords) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.necroLordHelms) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.necroLordChests) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.necroLordLegs) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.necroLordBoots) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.necroSwords) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(LootCommand.f6CoinsSpent) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, LootCommand.f6TimeSpent);
+    		} else if (DisplayCommand.display.equals("catacombs_floor_six_session")) {
     			dropsText = EnumChatFormatting.GOLD + "Recombobulators:\n" +
 							EnumChatFormatting.DARK_PURPLE + "Fuming Potato Books:\n" +
 							EnumChatFormatting.BLUE + "Ancient Roses:\n" +
@@ -1809,34 +1796,32 @@ public class TheMod
 							EnumChatFormatting.GOLD + "Necro Swords:\n" +
 							EnumChatFormatting.AQUA + "Coins Spent:\n" +
 		    				EnumChatFormatting.AQUA + "Time Spent:";
-    			countText = EnumChatFormatting.GOLD + nf.format(lc.recombobulatorsSession) + "\n" +
-							EnumChatFormatting.DARK_PURPLE + nf.format(lc.fumingPotatoBooksSession) + "\n" +
-							EnumChatFormatting.BLUE + nf.format(lc.ancientRosesSession) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.precursorEyesSession) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.giantsSwordsSession) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.necroLordHelmsSession) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.necroLordChestsSession) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.necroLordLegsSession) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.necroLordBootsSession) + "\n" +
-							EnumChatFormatting.GOLD + nf.format(lc.necroSwordsSession) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getMoneySpent(lc.f6CoinsSpentSession) + "\n" +
-							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, lc.f6TimeSpentSession);
+    			countText = EnumChatFormatting.GOLD + nf.format(LootCommand.recombobulatorsSession) + "\n" +
+							EnumChatFormatting.DARK_PURPLE + nf.format(LootCommand.fumingPotatoBooksSession) + "\n" +
+							EnumChatFormatting.BLUE + nf.format(LootCommand.ancientRosesSession) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.precursorEyesSession) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.giantsSwordsSession) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.necroLordHelmsSession) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.necroLordChestsSession) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.necroLordLegsSession) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.necroLordBootsSession) + "\n" +
+							EnumChatFormatting.GOLD + nf.format(LootCommand.necroSwordsSession) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getMoneySpent(LootCommand.f6CoinsSpentSession) + "\n" +
+							EnumChatFormatting.AQUA + Utils.getTimeBetween(0, LootCommand.f6TimeSpentSession);
     		} else {
-    			ConfigHandler cf = new ConfigHandler();
-    			
     			System.out.println("Display was an unknown value, turning off.");
-    			ds.display = "off";
-    			cf.writeStringConfig("misc", "display", "off");
+    			DisplayCommand.display = "off";
+    			ConfigHandler.writeStringConfig("misc", "display", "off");
     		}
-    		new TextRenderer(mc, dropsText, moc.displayXY[0], moc.displayXY[1], ScaleCommand.displayScale);
-    		new TextRenderer(mc, countText, (int) (moc.displayXY[0] + (110 * ScaleCommand.displayScale)), moc.displayXY[1], ScaleCommand.displayScale);
+    		new TextRenderer(mc, dropsText, MoveCommand.displayXY[0], MoveCommand.displayXY[1], ScaleCommand.displayScale);
+    		new TextRenderer(mc, countText, (int) (MoveCommand.displayXY[0] + (110 * ScaleCommand.displayScale)), MoveCommand.displayXY[1], ScaleCommand.displayScale);
     	}
     	
     	if (showTitle) {
     		Utils.drawTitle(titleText);
     	}
     	if (showSkill) {
-    		new TextRenderer(mc, skillText, moc.skill50XY[0], moc.skill50XY[1], ScaleCommand.skill50Scale);
+    		new TextRenderer(mc, skillText, MoveCommand.skill50XY[0], MoveCommand.skill50XY[1], ScaleCommand.skill50Scale);
     	}
     }
     
@@ -1848,16 +1833,12 @@ public class TheMod
     		checkItemsNow = System.currentTimeMillis() / 1000;
     		if (checkItemsNow - itemsChecked < 3) return;
     		
-    		final ScoreboardHandler sc = new ScoreboardHandler();
-    		List<String> scoreboard = sc.getSidebarLines();
+    		List<String> scoreboard = ScoreboardHandler.getSidebarLines();
     		
     		for (String line : scoreboard) {
-    			String cleanedLine = sc.cleanSB(line);
+    			String cleanedLine = ScoreboardHandler.cleanSB(line);
     			// If Hypixel lags and scoreboard doesn't update
     			if (cleanedLine.contains("Boss slain!") || cleanedLine.contains("Slay the boss!")) {
-    				final LootCommand lc = new LootCommand();
-    				final ConfigHandler cf = new ConfigHandler();
-    				
     				int itemTeeth = Utils.getItems("Wolf Tooth");
         			int itemWheels = Utils.getItems("Hamster Wheel");
         			int itemWebs = Utils.getItems("Tarantula Web");
@@ -1868,25 +1849,25 @@ public class TheMod
         			// If no items, are detected, allow check again. Should fix items not being found
         			if (itemTeeth + itemWheels + itemWebs + itemTAP + itemRev + itemFoul > 0) {
         				itemsChecked = System.currentTimeMillis() / 1000;
-            			lc.wolfTeeth += itemTeeth;
-            			lc.wolfWheels += itemWheels;
-            			lc.spiderWebs += itemWebs;
-            			lc.spiderTAP += itemTAP;
-            			lc.zombieRevFlesh += itemRev;
-            			lc.zombieFoulFlesh += itemFoul;
-            			lc.wolfTeethSession += itemTeeth;
-            			lc.wolfWheelsSession += itemWheels;
-            			lc.spiderWebsSession += itemWebs;
-            			lc.spiderTAPSession += itemTAP;
-            			lc.zombieRevFleshSession += itemRev;
-            			lc.zombieFoulFleshSession += itemFoul;
+            			LootCommand.wolfTeeth += itemTeeth;
+            			LootCommand.wolfWheels += itemWheels;
+            			LootCommand.spiderWebs += itemWebs;
+            			LootCommand.spiderTAP += itemTAP;
+            			LootCommand.zombieRevFlesh += itemRev;
+            			LootCommand.zombieFoulFlesh += itemFoul;
+            			LootCommand.wolfTeethSession += itemTeeth;
+            			LootCommand.wolfWheelsSession += itemWheels;
+            			LootCommand.spiderWebsSession += itemWebs;
+            			LootCommand.spiderTAPSession += itemTAP;
+            			LootCommand.zombieRevFleshSession += itemRev;
+            			LootCommand.zombieFoulFleshSession += itemFoul;
             			
-            			cf.writeIntConfig("wolf", "teeth", lc.wolfTeeth);
-            			cf.writeIntConfig("wolf", "wheel", lc.wolfWheels);
-            			cf.writeIntConfig("spider", "web", lc.spiderWebs);
-            			cf.writeIntConfig("spider", "tap", lc.spiderTAP);
-            			cf.writeIntConfig("zombie", "revFlesh", lc.zombieRevFlesh);
-            			cf.writeIntConfig("zombie", "foulFlesh", lc.zombieFoulFlesh);
+            			ConfigHandler.writeIntConfig("wolf", "teeth", LootCommand.wolfTeeth);
+            			ConfigHandler.writeIntConfig("wolf", "wheel", LootCommand.wolfWheels);
+            			ConfigHandler.writeIntConfig("spider", "web", LootCommand.spiderWebs);
+            			ConfigHandler.writeIntConfig("spider", "tap", LootCommand.spiderTAP);
+            			ConfigHandler.writeIntConfig("zombie", "revFlesh", LootCommand.zombieRevFlesh);
+            			ConfigHandler.writeIntConfig("zombie", "foulFlesh", LootCommand.zombieFoulFlesh);
         			}
     			}
     		}
@@ -1896,18 +1877,16 @@ public class TheMod
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     public void onTooltip(ItemTooltipEvent event) {
     	if (!Utils.inSkyblock) return;
-    	final ToggleCommand tc = new ToggleCommand();
-    	
     	if (event.toolTip == null) return;
     	
     	ItemStack item = event.itemStack;
-    	if (tc.goldenToggled) {
+    	if (ToggleCommand.goldenToggled) {
     		for (int i = 0; i < event.toolTip.size(); i++) {
     			event.toolTip.set(i, Utils.returnGoldenEnchants(event.toolTip.get(i)));
     		}
     	}
     	
-    	if (tc.expertiseLoreToggled) {
+    	if (ToggleCommand.expertiseLoreToggled) {
     		if (item.hasTagCompound()) {
     			NBTTagCompound tags = item.getSubCompound("ExtraAttributes", false);
     			if (tags != null) {
@@ -2272,9 +2251,7 @@ public class TheMod
     		Container containerChest = ((GuiChest) event.gui).inventorySlots;
     		if (containerChest instanceof ContainerChest) {
     			// a lot of declarations here, if you get scarred, my bad
-        		LootCommand lc = new LootCommand();
-        		ConfigHandler cf = new ConfigHandler();
-    			GuiChest chest = (GuiChest) event.gui;
+        		GuiChest chest = (GuiChest) event.gui;
     			IInventory inventory = ((ContainerChest) containerChest).getLowerChestInventory();
     			Slot mouseSlot = chest.getSlotUnderMouse();
     			if (mouseSlot == null || mouseSlot.getStack() == null) return;
@@ -2295,29 +2272,29 @@ public class TheMod
     							String sCleaned = ScoreboardHandler.cleanSB(s);
     							if (sCleaned.contains("The Catacombs (")) {
     								if (sCleaned.contains("F1")) {
-    									lc.f1CoinsSpent += coinsSpent;
-    									lc.f1CoinsSpentSession += coinsSpent;
-    									cf.writeDoubleConfig("catacombs", "floorOneCoins", lc.f1CoinsSpent);
+    									LootCommand.f1CoinsSpent += coinsSpent;
+    									LootCommand.f1CoinsSpentSession += coinsSpent;
+    									ConfigHandler.writeDoubleConfig("catacombs", "floorOneCoins", LootCommand.f1CoinsSpent);
     								} else if (sCleaned.contains("F2")) {
-    									lc.f2CoinsSpent += coinsSpent;
-    									lc.f2CoinsSpentSession += coinsSpent;
-    									cf.writeDoubleConfig("catacombs", "floorTwoCoins", lc.f2CoinsSpent);
+    									LootCommand.f2CoinsSpent += coinsSpent;
+    									LootCommand.f2CoinsSpentSession += coinsSpent;
+    									ConfigHandler.writeDoubleConfig("catacombs", "floorTwoCoins", LootCommand.f2CoinsSpent);
     								} else if (sCleaned.contains("F3")) {
-    									lc.f3CoinsSpent += coinsSpent;
-    									lc.f3CoinsSpentSession += coinsSpent;
-    									cf.writeDoubleConfig("catacombs", "floorThreeCoins", lc.f3CoinsSpent);
+    									LootCommand.f3CoinsSpent += coinsSpent;
+    									LootCommand.f3CoinsSpentSession += coinsSpent;
+    									ConfigHandler.writeDoubleConfig("catacombs", "floorThreeCoins", LootCommand.f3CoinsSpent);
     								} else if (sCleaned.contains("F4")) {
-    									lc.f4CoinsSpent += coinsSpent;
-    									lc.f4CoinsSpentSession += coinsSpent;
-    									cf.writeDoubleConfig("catacombs", "floorFourCoins", lc.f4CoinsSpent);
+    									LootCommand.f4CoinsSpent += coinsSpent;
+    									LootCommand.f4CoinsSpentSession += coinsSpent;
+    									ConfigHandler.writeDoubleConfig("catacombs", "floorFourCoins", LootCommand.f4CoinsSpent);
     								} else if (sCleaned.contains("F5")) {
-    									lc.f5CoinsSpent += coinsSpent;
-    									lc.f5CoinsSpentSession += coinsSpent;
-    									cf.writeDoubleConfig("catacombs", "floorFiveCoins", lc.f5CoinsSpent);
+    									LootCommand.f5CoinsSpent += coinsSpent;
+    									LootCommand.f5CoinsSpentSession += coinsSpent;
+    									ConfigHandler.writeDoubleConfig("catacombs", "floorFiveCoins", LootCommand.f5CoinsSpent);
     								} else if (sCleaned.contains("F6")) {
-    									lc.f6CoinsSpent += coinsSpent;
-    									lc.f6CoinsSpentSession += coinsSpent;
-    									cf.writeDoubleConfig("catacombs", "floorSixCoins", lc.f6CoinsSpent);
+    									LootCommand.f6CoinsSpent += coinsSpent;
+    									LootCommand.f6CoinsSpentSession += coinsSpent;
+    									ConfigHandler.writeDoubleConfig("catacombs", "floorSixCoins", LootCommand.f6CoinsSpent);
     								}
     								break;
     							}
@@ -2415,37 +2392,34 @@ public class TheMod
     }
     
     public void increaseSeaCreatures() {
-    	LootCommand lc = new LootCommand();
-    	ConfigHandler cf = new ConfigHandler();
-    	
-    	if (lc.empSCs != -1) {
-    		lc.empSCs++;
+    	if (LootCommand.empSCs != -1) {
+    		LootCommand.empSCs++;
     	}
-    	if (lc.empSCsSession != -1) {
-    		lc.empSCsSession++;
+    	if (LootCommand.empSCsSession != -1) {
+    		LootCommand.empSCsSession++;
     	}
     	// Only increment Yetis when in Jerry's Workshop
     	List<String> scoreboard = ScoreboardHandler.getSidebarLines();
     	for (String s : scoreboard) {
     		String sCleaned = ScoreboardHandler.cleanSB(s);
     		if (sCleaned.contains("Jerry's Workshop") || sCleaned.contains("Jerry Pond")) {
-    			if (lc.yetiSCs != -1) {
-    				lc.yetiSCs++;
+    			if (LootCommand.yetiSCs != -1) {
+    				LootCommand.yetiSCs++;
     			}
-    			if (lc.yetiSCsSession != -1) {
-    				lc.yetiSCsSession++;
+    			if (LootCommand.yetiSCsSession != -1) {
+    				LootCommand.yetiSCsSession++;
     			}
     		}
     	}
     	
-		lc.seaCreatures++;
-		lc.fishingMilestone++;
-		lc.seaCreaturesSession++;
-		lc.fishingMilestoneSession++;
-		cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
-		cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
-    	cf.writeIntConfig("fishing", "empSC", lc.empSCs);
-    	cf.writeIntConfig("fishing", "yetiSC", lc.yetiSCs);
+		LootCommand.seaCreatures++;
+		LootCommand.fishingMilestone++;
+		LootCommand.seaCreaturesSession++;
+		LootCommand.fishingMilestoneSession++;
+		ConfigHandler.writeIntConfig("fishing", "seaCreature", LootCommand.seaCreatures);
+		ConfigHandler.writeIntConfig("fishing", "milestone", LootCommand.fishingMilestone);
+    	ConfigHandler.writeIntConfig("fishing", "empSC", LootCommand.empSCs);
+    	ConfigHandler.writeIntConfig("fishing", "yetiSC", LootCommand.yetiSCs);
     	
     }
     
diff --git a/src/main/java/me/Danker/commands/ArmourCommand.java b/src/main/java/me/Danker/commands/ArmourCommand.java
index 44255e8..a10d75f 100644
--- a/src/main/java/me/Danker/commands/ArmourCommand.java
+++ b/src/main/java/me/Danker/commands/ArmourCommand.java
@@ -32,8 +32,7 @@ public class ArmourCommand extends CommandBase {
 	}
 	
 	@Override
-	public List<String> getCommandAliases()
-    {
+	public List<String> getCommandAliases() {
         return Collections.singletonList("armour");
     }
 
@@ -59,12 +58,10 @@ public class ArmourCommand extends CommandBase {
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 		// MULTI THREAD DRIFTING
 		new Thread(() -> {
-			APIHandler ah = new APIHandler();
-			ConfigHandler cf = new ConfigHandler();
 			EntityPlayer player = (EntityPlayer) arg0;
 			
 			// Check key
-			String key = cf.getString("api", "APIKey");
+			String key = ConfigHandler.getString("api", "APIKey");
 			if (key.equals("")) {
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "API key not set. Use /setkey."));
 			}
@@ -79,16 +76,16 @@ public class ArmourCommand extends CommandBase {
 			} else {
 				username = arg1[0];
 				player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Checking armour of " + TheMod.SECONDARY_COLOUR + username));
-				uuid = ah.getUUID(username);
+				uuid = APIHandler.getUUID(username);
 			}
 			
 			// Find stats of latest profile
-			String latestProfile = ah.getLatestProfileID(uuid, key);
+			String latestProfile = APIHandler.getLatestProfileID(uuid, key);
 			if (latestProfile == null) return;
 
 			String profileURL = "https://api.hypixel.net/skyblock/profile?profile=" + latestProfile + "&key=" + key;
 			System.out.println("Fetching profile...");
-			JsonObject profileResponse = ah.getResponse(profileURL);
+			JsonObject profileResponse = APIHandler.getResponse(profileURL);
 			if (!profileResponse.get("success").getAsBoolean()) {
 				String reason = profileResponse.get("cause").getAsString();
 				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Failed with reason: " + reason));
diff --git a/src/main/java/me/Danker/commands/BankCommand.java b/src/main/java/me/Danker/commands/BankCommand.java
index f832a2d..6e2ddaa 100644
--- a/src/main/java/me/Danker/commands/BankCommand.java
+++ b/src/main/java/me/Danker/commands/BankCommand.java
@@ -53,12 +53,10 @@ public class BankCommand extends CommandBase {
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 		// MULTI THREAD DRIFTING
 		new Thread(() -> {
-			APIHandler ah = new APIHandler();
-			ConfigHandler cf = new ConfigHandler();
 			EntityPlayer player = (EntityPlayer) arg0;
 			
 			// Check key
-			String key = cf.getString("api", "APIKey");
+			String key = ConfigHandler.getString("api", "APIKey");
 			if (key.equals("")) {
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "API key not set. Use /setkey."));
 			}
@@ -73,16 +71,16 @@ public class BankCommand extends CommandBase {
 			} else {
 				username = arg1[0];
 				player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Checking coins of " + TheMod.SECONDARY_COLOUR + username));
-				uuid = ah.getUUID(username);
+				uuid = APIHandler.getUUID(username);
 			}
 			
 			// Find stats of latest profile
-			String latestProfile = ah.getLatestProfileID(uuid, key);
+			String latestProfile = APIHandler.getLatestProfileID(uuid, key);
 			if (latestProfile == null) return;
 			
 			String profileURL = "https://api.hypixel.net/skyblock/profile?profile=" + latestProfile + "&key=" + key;
 			System.out.println("Fetching profile...");
-			JsonObject profileResponse = ah.getResponse(profileURL);
+			JsonObject profileResponse = APIHandler.getResponse(profileURL);
 			if (!profileResponse.get("success").getAsBoolean()) {
 				String reason = profileResponse.get("cause").getAsString();
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Failed with reason: " + reason));
diff --git a/src/main/java/me/Danker/commands/BlockSlayerCommand.java b/src/main/java/me/Danker/commands/BlockSlayerCommand.java
index bc6a32b..96ea530 100644
--- a/src/main/java/me/Danker/commands/BlockSlayerCommand.java
+++ b/src/main/java/me/Danker/commands/BlockSlayerCommand.java
@@ -10,7 +10,6 @@ import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
 
 public class BlockSlayerCommand extends CommandBase {
 	
@@ -45,7 +44,6 @@ public class BlockSlayerCommand extends CommandBase {
 	@Override
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 		final EntityPlayer player = (EntityPlayer)arg0;
-		final ConfigHandler cf = new ConfigHandler();
 		
 		if (arg1.length == 0 || (arg1.length == 1 && !arg1[0].equalsIgnoreCase("off"))) {
 			player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
@@ -61,7 +59,7 @@ public class BlockSlayerCommand extends CommandBase {
 		} else if (arg1[0].equalsIgnoreCase("off")) {
 			onlySlayerName = "";
 			onlySlayerNumber = "";
-			cf.writeStringConfig("toggles", "BlockSlayer", "");
+			ConfigHandler.writeStringConfig("toggles", "BlockSlayer", "");
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Slayer blocking turned off."));
 			return;
 		} else {
@@ -91,7 +89,7 @@ public class BlockSlayerCommand extends CommandBase {
 				return;
 		}
 		
-		cf.writeStringConfig("toggles", "BlockSlayer", onlySlayerName + " " + onlySlayerNumber);
+		ConfigHandler.writeStringConfig("toggles", "BlockSlayer", onlySlayerName + " " + onlySlayerNumber);
 		player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Slayer blocking set to " + TheMod.SECONDARY_COLOUR + onlySlayerName + " " + onlySlayerNumber));
 	}
 
diff --git a/src/main/java/me/Danker/commands/DankerGuiCommand.java b/src/main/java/me/Danker/commands/DankerGuiCommand.java
index ef39d24..3616849 100644
--- a/src/main/java/me/Danker/commands/DankerGuiCommand.java
+++ b/src/main/java/me/Danker/commands/DankerGuiCommand.java
@@ -1,8 +1,6 @@
 package me.Danker.commands;
 
 import me.Danker.TheMod;
-import me.Danker.gui.DankerGui;
-import net.minecraft.client.Minecraft;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
diff --git a/src/main/java/me/Danker/commands/DisplayCommand.java b/src/main/java/me/Danker/commands/DisplayCommand.java
index 6e00fba..2af402e 100644
--- a/src/main/java/me/Danker/commands/DisplayCommand.java
+++ b/src/main/java/me/Danker/commands/DisplayCommand.java
@@ -10,7 +10,6 @@ import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
 
 public class DisplayCommand extends CommandBase {
 	public static String display;
@@ -54,7 +53,6 @@ public class DisplayCommand extends CommandBase {
 			return;
 		}
 		
-		final ConfigHandler cf = new ConfigHandler();
 		boolean showSession = false;
 		
 		if (arg1[arg1.length - 1].equalsIgnoreCase("session")) showSession = true;
@@ -151,7 +149,7 @@ public class DisplayCommand extends CommandBase {
 		} else if (arg1[0].equalsIgnoreCase("auto")) {
 			auto = true;
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Display set to " + TheMod.SECONDARY_COLOUR + "auto" + TheMod.MAIN_COLOUR + "."));
-			cf.writeBooleanConfig("misc", "autoDisplay", true);
+			ConfigHandler.writeBooleanConfig("misc", "autoDisplay", true);
 			return;
 		} else if (arg1[0].equalsIgnoreCase("off")) {
 			display = "off";
@@ -161,8 +159,8 @@ public class DisplayCommand extends CommandBase {
 		}
 		auto = false;
 		player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Display set to " + TheMod.SECONDARY_COLOUR + display + TheMod.MAIN_COLOUR + "."));
-		cf.writeBooleanConfig("misc", "autoDisplay", false);
-		cf.writeStringConfig("misc", "display", display);
+		ConfigHandler.writeBooleanConfig("misc", "autoDisplay", false);
+		ConfigHandler.writeStringConfig("misc", "display", display);
 	}
 
 }
diff --git a/src/main/java/me/Danker/commands/DungeonsCommand.java b/src/main/java/me/Danker/commands/DungeonsCommand.java
index 7a57400..4b8c126 100644
--- a/src/main/java/me/Danker/commands/DungeonsCommand.java
+++ b/src/main/java/me/Danker/commands/DungeonsCommand.java
@@ -45,12 +45,10 @@ public class DungeonsCommand extends CommandBase {
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 		// MULTI THREAD DRIFTING
 		new Thread(() -> {
-			APIHandler ah = new APIHandler();
-			ConfigHandler cf = new ConfigHandler();
 			EntityPlayer player = (EntityPlayer) arg0;
 			
 			// Check key
-			String key = cf.getString("api", "APIKey");
+			String key = ConfigHandler.getString("api", "APIKey");
 			if (key.equals("")) {
 				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "API key not set. Use /setkey."));
 			}
@@ -65,16 +63,16 @@ public class DungeonsCommand extends CommandBase {
 			} else {
 				username = arg1[0];
 				player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Checking dungeon stats of " + TheMod.SECONDARY_COLOUR + username));
-				uuid = ah.getUUID(username);
+				uuid = APIHandler.getUUID(username);
 			}
 			
 			// Find stats of latest profile
-			String latestProfile = ah.getLatestProfileID(uuid, key);
+			String latestProfile = APIHandler.getLatestProfileID(uuid, key);
 			if (latestProfile == null) return;
 			
 			String profileURL = "https://api.hypixel.net/skyblock/profile?profile=" + latestProfile + "&key=" + key;
 			System.out.println("Fetching profile...");
-			JsonObject profileResponse = ah.getResponse(profileURL);
+			JsonObject profileResponse = APIHandler.getResponse(profileURL);
 			if (!profileResponse.get("success").getAsBoolean()) {
 				String reason = profileResponse.get("cause").getAsString();
 				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Failed with reason: " + reason));
diff --git a/src/main/java/me/Danker/commands/GetkeyCommand.java b/src/main/java/me/Danker/commands/GetkeyCommand.java
index 32fa6df..e7dd051 100644
--- a/src/main/java/me/Danker/commands/GetkeyCommand.java
+++ b/src/main/java/me/Danker/commands/GetkeyCommand.java
@@ -12,7 +12,6 @@ import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
 
 public class GetkeyCommand extends CommandBase implements ICommand {
 
@@ -34,16 +33,15 @@ public class GetkeyCommand extends CommandBase implements ICommand {
 	@Override
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 	    EntityPlayer player = (EntityPlayer)arg0;
-	    ConfigHandler cf = new ConfigHandler();
 	    Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
-	    StringSelection stringSelection = new StringSelection(cf.getString("api", "APIKey"));
+	    StringSelection stringSelection = new StringSelection(ConfigHandler.getString("api", "APIKey"));
 	    
-	    if (cf.getString("api", "APIKey").equals("")) {
+	    if (ConfigHandler.getString("api", "APIKey").equals("")) {
 	      player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "API key not set. Set your API key using /setkey."));
 	    }
 	    
 	    clipboard.setContents(stringSelection, null);
-		player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Your set API key is " + TheMod.SECONDARY_COLOUR + cf.getString("api", "APIKey") + "\n" +
+		player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Your set API key is " + TheMod.SECONDARY_COLOUR + ConfigHandler.getString("api", "APIKey") + "\n" +
 													TheMod.MAIN_COLOUR + " Your set API key has been copied to the clipboard."));
 
 	}
diff --git a/src/main/java/me/Danker/commands/GuildOfCommand.java b/src/main/java/me/Danker/commands/GuildOfCommand.java
index 44fb783..881a9c4 100644
--- a/src/main/java/me/Danker/commands/GuildOfCommand.java
+++ b/src/main/java/me/Danker/commands/GuildOfCommand.java
@@ -47,12 +47,10 @@ public class GuildOfCommand extends CommandBase {
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 		// MULTI THREAD DRIFTING
 		new Thread(() -> {
-			APIHandler ah = new APIHandler();
-			ConfigHandler cf = new ConfigHandler();
 			EntityPlayer player = (EntityPlayer) arg0;
 			
 			// Check key
-			String key = cf.getString("api", "APIKey");
+			String key = ConfigHandler.getString("api", "APIKey");
 			if (key.equals("")) {
 				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "API key not set. Use /setkey."));
 			}
@@ -67,13 +65,13 @@ public class GuildOfCommand extends CommandBase {
 			} else {
 				username = arg1[0];
 				player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Checking guild of " + TheMod.SECONDARY_COLOUR + username));
-				uuid = ah.getUUID(username);
+				uuid = APIHandler.getUUID(username);
 			}
 			
 			// Find guild ID
 			System.out.println("Fetching guild...");
 			String guildURL = "https://api.hypixel.net/guild?player=" + uuid + "&key=" + key;
-			JsonObject guildResponse = ah.getResponse(guildURL);
+			JsonObject guildResponse = APIHandler.getResponse(guildURL);
 			if (!guildResponse.get("success").getAsBoolean()) {
 				String reason = guildResponse.get("cause").getAsString();
 				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Failed with reason: " + reason));
@@ -100,7 +98,7 @@ public class GuildOfCommand extends CommandBase {
 						// Get username from UUID
 						String gmUUID = memberObject.get("uuid").getAsString();
 						String gmNameURL = "https://api.mojang.com/user/profiles/" + gmUUID + "/names";
-						JsonArray gmNameResponse = ah.getArrayResponse(gmNameURL);
+						JsonArray gmNameResponse = APIHandler.getArrayResponse(gmNameURL);
 						
 						guildMaster = gmNameResponse.get(gmNameResponse.size() - 1).getAsJsonObject().get("name").getAsString();
 						break;
diff --git a/src/main/java/me/Danker/commands/ImportFishingCommand.java b/src/main/java/me/Danker/commands/ImportFishingCommand.java
index 67e4c61..734a561 100644
--- a/src/main/java/me/Danker/commands/ImportFishingCommand.java
+++ b/src/main/java/me/Danker/commands/ImportFishingCommand.java
@@ -10,7 +10,6 @@ import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
 
 public class ImportFishingCommand extends CommandBase {
 
@@ -33,13 +32,10 @@ public class ImportFishingCommand extends CommandBase {
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 		// MULTI THREAD DRIFTING
 		new Thread(() -> {
-			APIHandler ah = new APIHandler();
-			LootCommand lc = new LootCommand();
-			ConfigHandler cf = new ConfigHandler();
 			EntityPlayer player = (EntityPlayer) arg0;
 			
 			// Check key
-			String key = cf.getString("api", "APIKey");
+			String key = ConfigHandler.getString("api", "APIKey");
 			if (key.equals("")) {
 				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "API key not set. Use /setkey."));
 			}
@@ -50,12 +46,12 @@ public class ImportFishingCommand extends CommandBase {
 			String username = player.getName();
 			String uuid = player.getUniqueID().toString().replaceAll("[\\-]", "");
 			
-			String latestProfile = ah.getLatestProfileID(uuid, key);
+			String latestProfile = APIHandler.getLatestProfileID(uuid, key);
 			if (latestProfile == null) return;
 			
 			String profileURL = "https://api.hypixel.net/skyblock/profile?profile=" + latestProfile + "&key=" + key;
 			System.out.println("Fetching profile...");
-			JsonObject profileResponse = ah.getResponse(profileURL);
+			JsonObject profileResponse = APIHandler.getResponse(profileURL);
 			if (!profileResponse.get("success").getAsBoolean()) {
 				String reason = profileResponse.get("cause").getAsString();
 				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Failed with reason: " + reason));
@@ -65,230 +61,230 @@ public class ImportFishingCommand extends CommandBase {
 			System.out.println("Fetching fishing stats...");
 			JsonObject statsObject = profileResponse.get("profile").getAsJsonObject().get("members").getAsJsonObject().get(uuid).getAsJsonObject().get("stats").getAsJsonObject();
 			
-			lc.greatCatches = 0;
-			lc.goodCatches = 0;
+			LootCommand.greatCatches = 0;
+			LootCommand.goodCatches = 0;
 			if (statsObject.has("items_fished_treasure")) {
 				if (statsObject.has("items_fished_large_treasure")) {
-					lc.greatCatches = statsObject.get("items_fished_large_treasure").getAsInt();
-					lc.goodCatches = statsObject.get("items_fished_treasure").getAsInt() - lc.greatCatches;
+					LootCommand.greatCatches = statsObject.get("items_fished_large_treasure").getAsInt();
+					LootCommand.goodCatches = statsObject.get("items_fished_treasure").getAsInt() - LootCommand.greatCatches;
 				} else {
-					lc.goodCatches = statsObject.get("items_fished_treasure").getAsInt();
+					LootCommand.goodCatches = statsObject.get("items_fished_treasure").getAsInt();
 				}
 			}
 			
-			lc.seaCreatures = 0;
-			lc.squids = 0;
+			LootCommand.seaCreatures = 0;
+			LootCommand.squids = 0;
 			if (statsObject.has("kills_pond_squid")) {
-				lc.squids = statsObject.get("kills_pond_squid").getAsInt();
+				LootCommand.squids = statsObject.get("kills_pond_squid").getAsInt();
 			}
-			lc.seaCreatures += lc.squids;
+			LootCommand.seaCreatures += LootCommand.squids;
 			
-			lc.seaWalkers = 0;
+			LootCommand.seaWalkers = 0;
 			if (statsObject.has("kills_sea_walker")) {
-				lc.seaWalkers = statsObject.get("kills_sea_walker").getAsInt();
+				LootCommand.seaWalkers = statsObject.get("kills_sea_walker").getAsInt();
 			}
-			lc.seaCreatures += lc.seaWalkers;
+			LootCommand.seaCreatures += LootCommand.seaWalkers;
 			
-			lc.nightSquids = 0;
+			LootCommand.nightSquids = 0;
 			if (statsObject.has("kills_night_squid")) {
-				lc.nightSquids = statsObject.get("kills_night_squid").getAsInt();
+				LootCommand.nightSquids = statsObject.get("kills_night_squid").getAsInt();
 			}
-			lc.seaCreatures += lc.nightSquids;
+			LootCommand.seaCreatures += LootCommand.nightSquids;
 			
-			lc.seaGuardians = 0;
+			LootCommand.seaGuardians = 0;
 			if (statsObject.has("kills_sea_guardian")) {
-				lc.seaGuardians = statsObject.get("kills_sea_guardian").getAsInt();
+				LootCommand.seaGuardians = statsObject.get("kills_sea_guardian").getAsInt();
 			}
-			lc.seaCreatures += lc.seaGuardians;
+			LootCommand.seaCreatures += LootCommand.seaGuardians;
 				
-			lc.seaWitches = 0;
+			LootCommand.seaWitches = 0;
 			if (statsObject.has("kills_sea_witch")) {
-				lc.seaWitches = statsObject.get("kills_sea_witch").getAsInt();
+				LootCommand.seaWitches = statsObject.get("kills_sea_witch").getAsInt();
 			}
-			lc.seaCreatures += lc.seaWitches;
+			LootCommand.seaCreatures += LootCommand.seaWitches;
 			
-			lc.seaArchers = 0;
+			LootCommand.seaArchers = 0;
 			if (statsObject.has("kills_sea_archer")) {
-				lc.seaArchers = statsObject.get("kills_sea_archer").getAsInt();
+				LootCommand.seaArchers = statsObject.get("kills_sea_archer").getAsInt();
 			}
-			lc.seaCreatures += lc.seaArchers;
+			LootCommand.seaCreatures += LootCommand.seaArchers;
 			
-			lc.monsterOfTheDeeps = 0;
+			LootCommand.monsterOfTheDeeps = 0;
 			if (statsObject.has("kills_zombie_deep")) {
 				if (statsObject.has("kills_chicken_deep")) {
-					lc.monsterOfTheDeeps = statsObject.get("kills_zombie_deep").getAsInt() + statsObject.get("kills_chicken_deep").getAsInt();
+					LootCommand.monsterOfTheDeeps = statsObject.get("kills_zombie_deep").getAsInt() + statsObject.get("kills_chicken_deep").getAsInt();
 				} else {
-					lc.monsterOfTheDeeps = statsObject.get("kills_zombie_deep").getAsInt();
+					LootCommand.monsterOfTheDeeps = statsObject.get("kills_zombie_deep").getAsInt();
 				}
 			} else if (statsObject.has("kills_chicken_deep")) {
-				lc.monsterOfTheDeeps = statsObject.get("kills_chicken_deep").getAsInt();
+				LootCommand.monsterOfTheDeeps = statsObject.get("kills_chicken_deep").getAsInt();
 			}
-			lc.seaCreatures += lc.monsterOfTheDeeps;
+			LootCommand.seaCreatures += LootCommand.monsterOfTheDeeps;
 			
-			lc.catfishes = 0;
+			LootCommand.catfishes = 0;
 			if (statsObject.has("kills_catfish")) {
-				lc.catfishes = statsObject.get("kills_catfish").getAsInt();
+				LootCommand.catfishes = statsObject.get("kills_catfish").getAsInt();
 			}
-			lc.seaCreatures += lc.catfishes;
+			LootCommand.seaCreatures += LootCommand.catfishes;
 			
-			lc.carrotKings = 0;
+			LootCommand.carrotKings = 0;
 			if (statsObject.has("kills_carrot_king")) {
-				lc.carrotKings = statsObject.get("kills_carrot_king").getAsInt();
+				LootCommand.carrotKings = statsObject.get("kills_carrot_king").getAsInt();
 			}
-			lc.seaCreatures += lc.carrotKings;
+			LootCommand.seaCreatures += LootCommand.carrotKings;
 			
-			lc.seaLeeches = 0;
+			LootCommand.seaLeeches = 0;
 			if (statsObject.has("kills_sea_leech")) {
-				lc.seaLeeches = statsObject.get("kills_sea_leech").getAsInt();
+				LootCommand.seaLeeches = statsObject.get("kills_sea_leech").getAsInt();
 			}
-			lc.seaCreatures += lc.seaLeeches;
+			LootCommand.seaCreatures += LootCommand.seaLeeches;
 			
-			lc.guardianDefenders = 0;
+			LootCommand.guardianDefenders = 0;
 			if (statsObject.has("kills_guardian_defender")) {
-				lc.guardianDefenders = statsObject.get("kills_guardian_defender").getAsInt();
+				LootCommand.guardianDefenders = statsObject.get("kills_guardian_defender").getAsInt();
 			}
-			lc.seaCreatures += lc.guardianDefenders;
+			LootCommand.seaCreatures += LootCommand.guardianDefenders;
 			
-			lc.deepSeaProtectors = 0;
+			LootCommand.deepSeaProtectors = 0;
 			if (statsObject.has("kills_deep_sea_protector")) {
-				lc.deepSeaProtectors = statsObject.get("kills_deep_sea_protector").getAsInt();
+				LootCommand.deepSeaProtectors = statsObject.get("kills_deep_sea_protector").getAsInt();
 			}
-			lc.seaCreatures += lc.deepSeaProtectors;
+			LootCommand.seaCreatures += LootCommand.deepSeaProtectors;
 			
-			lc.hydras = 0;
+			LootCommand.hydras = 0;
 			if (statsObject.has("kills_water_hydra")) {
 				// Hydra splits
-				lc.hydras = statsObject.get("kills_water_hydra").getAsInt() / 2;
+				LootCommand.hydras = statsObject.get("kills_water_hydra").getAsInt() / 2;
 			}
-			lc.seaCreatures += lc.hydras;
+			LootCommand.seaCreatures += LootCommand.hydras;
 			
-			lc.seaEmperors = 0;
+			LootCommand.seaEmperors = 0;
 			if (statsObject.has("kills_skeleton_emperor")) {
 				if (statsObject.has("kills_guardian_emperor")) {
-					lc.seaEmperors = statsObject.get("kills_skeleton_emperor").getAsInt() + statsObject.get("kills_guardian_emperor").getAsInt();
+					LootCommand.seaEmperors = statsObject.get("kills_skeleton_emperor").getAsInt() + statsObject.get("kills_guardian_emperor").getAsInt();
 				} else {
-					lc.seaEmperors = statsObject.get("kills_skeleton_emperor").getAsInt();
+					LootCommand.seaEmperors = statsObject.get("kills_skeleton_emperor").getAsInt();
 				}
 			} else if (statsObject.has("kills_guardian_emperor")) {
-				lc.seaEmperors = statsObject.get("kills_guardian_emperor").getAsInt();
+				LootCommand.seaEmperors = statsObject.get("kills_guardian_emperor").getAsInt();
 			}
-			lc.seaCreatures += lc.seaEmperors;
+			LootCommand.seaCreatures += LootCommand.seaEmperors;
 			
-			lc.fishingMilestone = 0;
+			LootCommand.fishingMilestone = 0;
 			if (statsObject.has("pet_milestone_sea_creatures_killed")) {
-				lc.fishingMilestone = statsObject.get("pet_milestone_sea_creatures_killed").getAsInt();
+				LootCommand.fishingMilestone = statsObject.get("pet_milestone_sea_creatures_killed").getAsInt();
 			}
 			
-			lc.frozenSteves = 0;
+			LootCommand.frozenSteves = 0;
 			if (statsObject.has("kills_frozen_steve")) {
-				lc.frozenSteves = statsObject.get("kills_frozen_steve").getAsInt();
+				LootCommand.frozenSteves = statsObject.get("kills_frozen_steve").getAsInt();
 			}
-			lc.seaCreatures += lc.frozenSteves;
+			LootCommand.seaCreatures += LootCommand.frozenSteves;
 			
-			lc.frostyTheSnowmans = 0;
+			LootCommand.frostyTheSnowmans = 0;
 			if (statsObject.has("kills_frosty_the_snowman")) {
-				lc.frostyTheSnowmans = statsObject.get("kills_frosty_the_snowman").getAsInt();
+				LootCommand.frostyTheSnowmans = statsObject.get("kills_frosty_the_snowman").getAsInt();
 			}
-			lc.seaCreatures += lc.frostyTheSnowmans;
+			LootCommand.seaCreatures += LootCommand.frostyTheSnowmans;
 			
-			lc.grinches = 0;
+			LootCommand.grinches = 0;
 			if (statsObject.has("kills_grinch")) {
-				lc.grinches = statsObject.get("kills_grinch").getAsInt();
+				LootCommand.grinches = statsObject.get("kills_grinch").getAsInt();
 			}
-			lc.seaCreatures += lc.grinches;
+			LootCommand.seaCreatures += LootCommand.grinches;
 			
-			lc.yetis = 0;
+			LootCommand.yetis = 0;
 			if (statsObject.has("kills_yeti")) {
-				lc.yetis = statsObject.get("kills_yeti").getAsInt();
+				LootCommand.yetis = statsObject.get("kills_yeti").getAsInt();
 			}
-			lc.seaCreatures += lc.yetis;
+			LootCommand.seaCreatures += LootCommand.yetis;
 			
-			lc.nurseSharks = 0;
+			LootCommand.nurseSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
-				lc.nurseSharks = statsObject.get("kills_nurse_shark").getAsInt();
+				LootCommand.nurseSharks = statsObject.get("kills_nurse_shark").getAsInt();
 			}
-			lc.seaCreatures += lc.nurseSharks;
+			LootCommand.seaCreatures += LootCommand.nurseSharks;
 			
-			lc.blueSharks = 0;
+			LootCommand.blueSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
-				lc.blueSharks = statsObject.get("kills_blue_shark").getAsInt();
+				LootCommand.blueSharks = statsObject.get("kills_blue_shark").getAsInt();
 			}
-			lc.seaCreatures += lc.blueSharks;
+			LootCommand.seaCreatures += LootCommand.blueSharks;
 			
-			lc.tigerSharks = 0;
+			LootCommand.tigerSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
-				lc.tigerSharks = statsObject.get("kills_tiger_shark").getAsInt();
+				LootCommand.tigerSharks = statsObject.get("kills_tiger_shark").getAsInt();
 			}
-			lc.seaCreatures += lc.tigerSharks;
+			LootCommand.seaCreatures += LootCommand.tigerSharks;
 			
-			lc.greatWhiteSharks = 0;
+			LootCommand.greatWhiteSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
-				lc.greatWhiteSharks = statsObject.get("kills_great_white_shark").getAsInt();
+				LootCommand.greatWhiteSharks = statsObject.get("kills_great_white_shark").getAsInt();
 			}
-			lc.seaCreatures += lc.greatWhiteSharks;
+			LootCommand.seaCreatures += LootCommand.greatWhiteSharks;
 			
-			lc.scarecrows = 0;
+			LootCommand.scarecrows = 0;
 			if (statsObject.has("kills_scarecrow")) {
-				lc.scarecrows = statsObject.get("kills_scarecrow").getAsInt();
+				LootCommand.scarecrows = statsObject.get("kills_scarecrow").getAsInt();
 			}
-			lc.seaCreatures += lc.scarecrows;
+			LootCommand.seaCreatures += LootCommand.scarecrows;
 			
-			lc.nightmares = 0;
+			LootCommand.nightmares = 0;
 			if (statsObject.has("kills_nightmare")) {
-				lc.nightmares = statsObject.get("kills_nightmare").getAsInt();
+				LootCommand.nightmares = statsObject.get("kills_nightmare").getAsInt();
 			}
-			lc.seaCreatures += lc.nightmares;
+			LootCommand.seaCreatures += LootCommand.nightmares;
 			
-			lc.werewolfs = 0;
+			LootCommand.werewolfs = 0;
 			if (statsObject.has("kills_werewolf")) {
-				lc.werewolfs = statsObject.get("kills_werewolf").getAsInt();
+				LootCommand.werewolfs = statsObject.get("kills_werewolf").getAsInt();
 			}
-			lc.seaCreatures += lc.werewolfs;
+			LootCommand.seaCreatures += LootCommand.werewolfs;
 			
-			lc.phantomFishers = 0;
+			LootCommand.phantomFishers = 0;
 			if (statsObject.has("kills_phantom_fisherman")) {
-				lc.phantomFishers = statsObject.get("kills_phantom_fisherman").getAsInt();
+				LootCommand.phantomFishers = statsObject.get("kills_phantom_fisherman").getAsInt();
 			}
-			lc.seaCreatures += lc.phantomFishers;
+			LootCommand.seaCreatures += LootCommand.phantomFishers;
 			
-			lc.grimReapers = 0;
+			LootCommand.grimReapers = 0;
 			if (statsObject.has("kills_grim_reaper")) {
-				lc.grimReapers = statsObject.get("kills_grim_reaper").getAsInt();
+				LootCommand.grimReapers = statsObject.get("kills_grim_reaper").getAsInt();
 			}
-			lc.seaCreatures += lc.grimReapers;
+			LootCommand.seaCreatures += LootCommand.grimReapers;
 			
 			System.out.println("Writing to config...");
-			cf.writeIntConfig("fishing", "goodCatch", lc.goodCatches);
-			cf.writeIntConfig("fishing", "greatCatch", lc.greatCatches);
-			cf.writeIntConfig("fishing", "seaCreature", lc.seaCreatures);
-			cf.writeIntConfig("fishing", "squid", lc.squids);
-			cf.writeIntConfig("fishing", "seaWalker", lc.seaWalkers);
-			cf.writeIntConfig("fishing", "nightSquid", lc.nightSquids);
-			cf.writeIntConfig("fishing", "seaGuardian", lc.seaGuardians);
-			cf.writeIntConfig("fishing", "seaWitch", lc.seaWitches);
-			cf.writeIntConfig("fishing", "seaArcher", lc.seaArchers);
-			cf.writeIntConfig("fishing", "monsterOfDeep", lc.monsterOfTheDeeps);
-			cf.writeIntConfig("fishing", "catfish", lc.catfishes);
-			cf.writeIntConfig("fishing", "carrotKing", lc.carrotKings);
-			cf.writeIntConfig("fishing", "seaLeech", lc.seaLeeches);
-			cf.writeIntConfig("fishing", "guardianDefender", lc.guardianDefenders);
-			cf.writeIntConfig("fishing", "deepSeaProtector", lc.deepSeaProtectors);
-			cf.writeIntConfig("fishing", "hydra", lc.hydras);
-			cf.writeIntConfig("fishing", "seaEmperor", lc.seaEmperors);
-			cf.writeIntConfig("fishing", "milestone", lc.fishingMilestone);
-			cf.writeIntConfig("fishing", "frozenSteve", lc.frozenSteves);
-			cf.writeIntConfig("fishing", "snowman", lc.frostyTheSnowmans);
-			cf.writeIntConfig("fishing", "grinch", lc.grinches);
-			cf.writeIntConfig("fishing", "yeti", lc.yetis);
-			cf.writeIntConfig("fishing", "nurseShark", lc.nurseSharks);
-			cf.writeIntConfig("fishing", "blueShark", lc.blueSharks);
-			cf.writeIntConfig("fishing", "tigerShark", lc.tigerSharks);
-			cf.writeIntConfig("fishing", "greatWhiteShark", lc.greatWhiteSharks);
-			cf.writeIntConfig("fishing", "scarecrow", lc.scarecrows);
-			cf.writeIntConfig("fishing", "nightmare", lc.nightmares);
-			cf.writeIntConfig("fishing", "werewolf", lc.werewolfs);
-			cf.writeIntConfig("fishing", "phantomFisher", lc.phantomFishers);
-			cf.writeIntConfig("fishing", "grimReaper", lc.grimReapers);
+			ConfigHandler.writeIntConfig("fishing", "goodCatch", LootCommand.goodCatches);
+			ConfigHandler.writeIntConfig("fishing", "greatCatch", LootCommand.greatCatches);
+			ConfigHandler.writeIntConfig("fishing", "seaCreature", LootCommand.seaCreatures);
+			ConfigHandler.writeIntConfig("fishing", "squid", LootCommand.squids);
+			ConfigHandler.writeIntConfig("fishing", "seaWalker", LootCommand.seaWalkers);
+			ConfigHandler.writeIntConfig("fishing", "nightSquid", LootCommand.nightSquids);
+			ConfigHandler.writeIntConfig("fishing", "seaGuardian", LootCommand.seaGuardians);
+			ConfigHandler.writeIntConfig("fishing", "seaWitch", LootCommand.seaWitches);
+			ConfigHandler.writeIntConfig("fishing", "seaArcher", LootCommand.seaArchers);
+			ConfigHandler.writeIntConfig("fishing", "monsterOfDeep", LootCommand.monsterOfTheDeeps);
+			ConfigHandler.writeIntConfig("fishing", "catfish", LootCommand.catfishes);
+			ConfigHandler.writeIntConfig("fishing", "carrotKing", LootCommand.carrotKings);
+			ConfigHandler.writeIntConfig("fishing", "seaLeech", LootCommand.seaLeeches);
+			ConfigHandler.writeIntConfig("fishing", "guardianDefender", LootCommand.guardianDefenders);
+			ConfigHandler.writeIntConfig("fishing", "deepSeaProtector", LootCommand.deepSeaProtectors);
+			ConfigHandler.writeIntConfig("fishing", "hydra", LootCommand.hydras);
+			ConfigHandler.writeIntConfig("fishing", "seaEmperor", LootCommand.seaEmperors);
+			ConfigHandler.writeIntConfig("fishing", "milestone", LootCommand.fishingMilestone);
+			ConfigHandler.writeIntConfig("fishing", "frozenSteve", LootCommand.frozenSteves);
+			ConfigHandler.writeIntConfig("fishing", "snowman", LootCommand.frostyTheSnowmans);
+			ConfigHandler.writeIntConfig("fishing", "grinch", LootCommand.grinches);
+			ConfigHandler.writeIntConfig("fishing", "yeti", LootCommand.yetis);
+			ConfigHandler.writeIntConfig("fishing", "nurseShark", LootCommand.nurseSharks);
+			ConfigHandler.writeIntConfig("fishing", "blueShark", LootCommand.blueSharks);
+			ConfigHandler.writeIntConfig("fishing", "tigerShark", LootCommand.tigerSharks);
+			ConfigHandler.writeIntConfig("fishing", "greatWhiteShark", LootCommand.greatWhiteSharks);
+			ConfigHandler.writeIntConfig("fishing", "scarecrow", LootCommand.scarecrows);
+			ConfigHandler.writeIntConfig("fishing", "nightmare", LootCommand.nightmares);
+			ConfigHandler.writeIntConfig("fishing", "werewolf", LootCommand.werewolfs);
+			ConfigHandler.writeIntConfig("fishing", "phantomFisher", LootCommand.phantomFishers);
+			ConfigHandler.writeIntConfig("fishing", "grimReaper", LootCommand.grimReapers);
 			
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Fishing stats imported."));
 		}).start();
diff --git a/src/main/java/me/Danker/commands/LobbySkillsCommand.java b/src/main/java/me/Danker/commands/LobbySkillsCommand.java
index 696a855..679898d 100644
--- a/src/main/java/me/Danker/commands/LobbySkillsCommand.java
+++ b/src/main/java/me/Danker/commands/LobbySkillsCommand.java
@@ -46,13 +46,10 @@ public class LobbySkillsCommand extends CommandBase {
 	@Override
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 		EntityPlayer playerSP = (EntityPlayer) arg0;
-		ConfigHandler cf = new ConfigHandler();
-		APIHandler ah = new APIHandler();
-		boolean someErrored = false;
 		Map<String, Double> unsortedSAList = new HashMap<String, Double>();
 		ArrayList<Double> lobbySkills = new ArrayList<Double>();
 		// Check key
-		String key = cf.getString("api", "APIKey");
+		String key = ConfigHandler.getString("api", "APIKey");
 		if (key.equals("")) {
 			playerSP.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "API key not set. Use /setkey."));
 			return;
@@ -72,7 +69,7 @@ public class LobbySkillsCommand extends CommandBase {
 					long biggestLastSave = 0;
 					int profileIndex = -1;
 					Thread.sleep(600);
-					JsonObject profileResponse = ah.getResponse("https://api.hypixel.net/skyblock/profiles?uuid=" + UUID + "&key=" + key);
+					JsonObject profileResponse = APIHandler.getResponse("https://api.hypixel.net/skyblock/profiles?uuid=" + UUID + "&key=" + key);
 					if (!profileResponse.get("success").getAsBoolean()) {
 						String reason = profileResponse.get("cause").getAsString();
 						System.out.println("User " + player.getGameProfile().getName() + " failed with reason: " + reason);
@@ -138,7 +135,7 @@ public class LobbySkillsCommand extends CommandBase {
 					} else {
 						Thread.sleep(600); // Sleep for another request
 						System.out.println("Fetching skills from achievement API");
-						JsonObject playerObject = ah.getResponse("https://api.hypixel.net/player?uuid=" + UUID + "&key=" + key);
+						JsonObject playerObject = APIHandler.getResponse("https://api.hypixel.net/player?uuid=" + UUID + "&key=" + key);
 						
 						if (!playerObject.get("success").getAsBoolean()) {
 							String reason = profileResponse.get("cause").getAsString();
diff --git a/src/main/java/me/Danker/commands/MoveCommand.java b/src/main/java/me/Danker/commands/MoveCommand.java
index a3f5e3b..0581d8c 100644
--- a/src/main/java/me/Danker/commands/MoveCommand.java
+++ b/src/main/java/me/Danker/commands/MoveCommand.java
@@ -10,7 +10,6 @@ import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
 
 public class MoveCommand extends CommandBase {
 
@@ -47,7 +46,6 @@ public class MoveCommand extends CommandBase {
 	@Override
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 		final EntityPlayer player = (EntityPlayer)arg0;
-		final ConfigHandler cf = new ConfigHandler();
 		
 		if (arg1.length < 2) {
 			player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
@@ -57,38 +55,38 @@ public class MoveCommand extends CommandBase {
 		if (arg1[0].equalsIgnoreCase("coords")) {
 			coordsXY[0] = Integer.parseInt(arg1[1]);
 			coordsXY[1] = Integer.parseInt(arg1[2]);
-			cf.writeIntConfig("locations", "coordsX", coordsXY[0]);
-			cf.writeIntConfig("locations", "coordsY", coordsXY[1]);
+			ConfigHandler.writeIntConfig("locations", "coordsX", coordsXY[0]);
+			ConfigHandler.writeIntConfig("locations", "coordsY", coordsXY[1]);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Coords have been moved to " + TheMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
 		} else if (arg1[0].equalsIgnoreCase("display")) {
 			displayXY[0] = Integer.parseInt(arg1[1]);
 			displayXY[1] = Integer.parseInt(arg1[2]);
-			cf.writeIntConfig("locations", "displayX", displayXY[0]);
-			cf.writeIntConfig("locations", "displayY", displayXY[1]);
+			ConfigHandler.writeIntConfig("locations", "displayX", displayXY[0]);
+			ConfigHandler.writeIntConfig("locations", "displayY", displayXY[1]);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Tracker display has been moved to " + TheMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
 		} else if (arg1[0].equalsIgnoreCase("dungeontimer")) {
 			dungeonTimerXY[0] = Integer.parseInt(arg1[1]);
 			dungeonTimerXY[1] = Integer.parseInt(arg1[2]);
-			cf.writeIntConfig("locations", "dungeonTimerX", dungeonTimerXY[0]);
-			cf.writeIntConfig("locations", "dungeonTimerY", dungeonTimerXY[1]);
+			ConfigHandler.writeIntConfig("locations", "dungeonTimerX", dungeonTimerXY[0]);
+			ConfigHandler.writeIntConfig("locations", "dungeonTimerY", dungeonTimerXY[1]);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Dungeon timer has been moved to " + TheMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
 		} else if (arg1[0].equalsIgnoreCase("skill50")) {
 			skill50XY[0] = Integer.parseInt(arg1[1]);
 			skill50XY[1] = Integer.parseInt(arg1[2]);
-			cf.writeIntConfig("locations", "skill50X", skill50XY[0]);
-			cf.writeIntConfig("locations", "skill50Y", skill50XY[1]);
+			ConfigHandler.writeIntConfig("locations", "skill50X", skill50XY[0]);
+			ConfigHandler.writeIntConfig("locations", "skill50Y", skill50XY[1]);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Skill 50 display has been moved to " + TheMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
 		} else if (arg1[0].equalsIgnoreCase("lividhp")) { 
 			lividHpXY[0] = Integer.parseInt(arg1[1]);
 			lividHpXY[1] = Integer.parseInt(arg1[2]);
-			cf.writeIntConfig("locations", "lividHpX", lividHpXY[0]);
-			cf.writeIntConfig("locations", "lividHpY", lividHpXY[1]);
+			ConfigHandler.writeIntConfig("locations", "lividHpX", lividHpXY[0]);
+			ConfigHandler.writeIntConfig("locations", "lividHpY", lividHpXY[1]);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Livid HP has been moved to " + TheMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
 		} else if (arg1[0].equalsIgnoreCase("caketimer")) { 
 			cakeTimerXY[0] = Integer.parseInt(arg1[1]);
 			cakeTimerXY[1] = Integer.parseInt(arg1[2]);
-			cf.writeIntConfig("locations", "cakeTimerX", cakeTimerXY[0]);
-			cf.writeIntConfig("locations", "cakeTimerY", cakeTimerXY[1]);
+			ConfigHandler.writeIntConfig("locations", "cakeTimerX", cakeTimerXY[0]);
+			ConfigHandler.writeIntConfig("locations", "cakeTimerY", cakeTimerXY[1]);
 		} else {
 			player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
 		}
diff --git a/src/main/java/me/Danker/commands/PetsCommand.java b/src/main/java/me/Danker/commands/PetsCommand.java
index 031d087..8e41814 100644
--- a/src/main/java/me/Danker/commands/PetsCommand.java
+++ b/src/main/java/me/Danker/commands/PetsCommand.java
@@ -79,12 +79,10 @@ public class PetsCommand extends CommandBase {
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 		// MULTI THREAD DRIFTING
 		new Thread(() -> {
-			APIHandler ah = new APIHandler();
-			ConfigHandler cf = new ConfigHandler();
 			EntityPlayer player = (EntityPlayer) arg0;
 			
 			// Check key
-			String key = cf.getString("api", "APIKey");
+			String key = ConfigHandler.getString("api", "APIKey");
 			if (key.equals("")) {
 				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "API key not set. Use /setkey."));
 			}
@@ -99,16 +97,16 @@ public class PetsCommand extends CommandBase {
 			} else {
 				username = arg1[0];
 				player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Checking pets of " + TheMod.SECONDARY_COLOUR + username));
-				uuid = ah.getUUID(username);
+				uuid = APIHandler.getUUID(username);
 			}
 			
 			// Find stats of latest profile
-			String latestProfile = ah.getLatestProfileID(uuid, key);
+			String latestProfile = APIHandler.getLatestProfileID(uuid, key);
 			if (latestProfile == null) return;
 			
 			String profileURL = "https://api.hypixel.net/skyblock/profile?profile=" + latestProfile + "&key=" + key;
 			System.out.println("Fetching profile...");
-			JsonObject profileResponse = ah.getResponse(profileURL);
+			JsonObject profileResponse = APIHandler.getResponse(profileURL);
 			if (!profileResponse.get("success").getAsBoolean()) {
 				String reason = profileResponse.get("cause").getAsString();
 				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Failed with reason: " + reason));
diff --git a/src/main/java/me/Danker/commands/ReloadConfigCommand.java b/src/main/java/me/Danker/commands/ReloadConfigCommand.java
index 113bbc4..c4ad036 100644
--- a/src/main/java/me/Danker/commands/ReloadConfigCommand.java
+++ b/src/main/java/me/Danker/commands/ReloadConfigCommand.java
@@ -7,7 +7,6 @@ import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
 
 public class ReloadConfigCommand extends CommandBase {
 
@@ -29,8 +28,7 @@ public class ReloadConfigCommand extends CommandBase {
 	@Override
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 		final EntityPlayer player = (EntityPlayer)arg0;
-		final ConfigHandler cf = new ConfigHandler();
-		cf.reloadConfig();
+		ConfigHandler.reloadConfig();
 		player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Reloaded config."));
 	}
 
diff --git a/src/main/java/me/Danker/commands/ResetLootCommand.java b/src/main/java/me/Danker/commands/ResetLootCommand.java
index 0c33866..f99b5ae 100644
--- a/src/main/java/me/Danker/commands/ResetLootCommand.java
+++ b/src/main/java/me/Danker/commands/ResetLootCommand.java
@@ -90,154 +90,142 @@ public class ResetLootCommand extends CommandBase {
 		}
 	}
 	
-	static void resetZombie() {
-		LootCommand lc = new LootCommand();
-		ConfigHandler cf = new ConfigHandler();
-		
-		lc.zombieRevsSession = 0;
-		lc.zombieRevFleshSession = 0;
-		lc.zombieFoulFleshSession = 0;
-		lc.zombieFoulFleshDropsSession = 0;
-		lc.zombiePestilencesSession = 0;
-		lc.zombieUndeadCatasSession = 0;
-		lc.zombieBooksSession = 0;
-		lc.zombieBeheadedsSession = 0;
-		lc.zombieRevCatasSession = 0;
-		lc.zombieSnakesSession = 0;
-		lc.zombieScythesSession = 0;
-		lc.zombieTimeSession = -1;
-		lc.zombieBossesSession = -1;
-		cf.deleteCategory("zombie");
-		cf.reloadConfig();
+	static void resetZombie() {		
+		LootCommand.zombieRevsSession = 0;
+		LootCommand.zombieRevFleshSession = 0;
+		LootCommand.zombieFoulFleshSession = 0;
+		LootCommand.zombieFoulFleshDropsSession = 0;
+		LootCommand.zombiePestilencesSession = 0;
+		LootCommand.zombieUndeadCatasSession = 0;
+		LootCommand.zombieBooksSession = 0;
+		LootCommand.zombieBeheadedsSession = 0;
+		LootCommand.zombieRevCatasSession = 0;
+		LootCommand.zombieSnakesSession = 0;
+		LootCommand.zombieScythesSession = 0;
+		LootCommand.zombieTimeSession = -1;
+		LootCommand.zombieBossesSession = -1;
+		ConfigHandler.deleteCategory("zombie");
+		ConfigHandler.reloadConfig();
 	}
 	
 	static void resetSpider() {
-		LootCommand lc = new LootCommand();
-		ConfigHandler cf = new ConfigHandler();
-		
-		lc.spiderTarantulasSession = 0;
-		lc.spiderWebsSession = 0;
-		lc.spiderTAPSession = 0;
-		lc.spiderTAPDropsSession = 0;
-		lc.spiderBitesSession = 0;
-		lc.spiderCatalystsSession = 0;
-		lc.spiderBooksSession = 0;
-		lc.spiderSwattersSession = 0;
-		lc.spiderTalismansSession = 0;
-		lc.spiderMosquitosSession = 0;
-		lc.spiderTimeSession = -1;
-		lc.spiderBossesSession = -1;
-		cf.deleteCategory("spider");
-		cf.reloadConfig();
+		LootCommand.spiderTarantulasSession = 0;
+		LootCommand.spiderWebsSession = 0;
+		LootCommand.spiderTAPSession = 0;
+		LootCommand.spiderTAPDropsSession = 0;
+		LootCommand.spiderBitesSession = 0;
+		LootCommand.spiderCatalystsSession = 0;
+		LootCommand.spiderBooksSession = 0;
+		LootCommand.spiderSwattersSession = 0;
+		LootCommand.spiderTalismansSession = 0;
+		LootCommand.spiderMosquitosSession = 0;
+		LootCommand.spiderTimeSession = -1;
+		LootCommand.spiderBossesSession = -1;
+		ConfigHandler.deleteCategory("spider");
+		ConfigHandler.reloadConfig();
 	}
 	
 	static void resetWolf() {
-		LootCommand lc = new LootCommand();
-		ConfigHandler cf = new ConfigHandler();
-		lc.wolfSvensSession = 0;
-		lc.wolfTeethSession = 0;
-		lc.wolfWheelsSession = 0;
-		lc.wolfWheelsDropsSession = 0;
-		lc.wolfSpiritsSession = 0;
-		lc.wolfBooksSession = 0;
-		lc.wolfEggsSession = 0;
-		lc.wolfCouturesSession = 0;
-		lc.wolfBaitsSession = 0;
-		lc.wolfFluxesSession = 0;
-		lc.wolfTimeSession = -1;
-		lc.wolfBossesSession = -1;
-		cf.deleteCategory("wolf");
-		cf.reloadConfig();
+		LootCommand.wolfSvensSession = 0;
+		LootCommand.wolfTeethSession = 0;
+		LootCommand.wolfWheelsSession = 0;
+		LootCommand.wolfWheelsDropsSession = 0;
+		LootCommand.wolfSpiritsSession = 0;
+		LootCommand.wolfBooksSession = 0;
+		LootCommand.wolfEggsSession = 0;
+		LootCommand.wolfCouturesSession = 0;
+		LootCommand.wolfBaitsSession = 0;
+		LootCommand.wolfFluxesSession = 0;
+		LootCommand.wolfTimeSession = -1;
+		LootCommand.wolfBossesSession = -1;
+		ConfigHandler.deleteCategory("wolf");
+		ConfigHandler.reloadConfig();
 	}
 	
 	static void resetFishing() {
-		LootCommand lc = new LootCommand();
-		ConfigHandler cf = new ConfigHandler();
-		lc.seaCreaturesSession = 0;
-		lc.goodCatchesSession = 0;
-		lc.greatCatchesSession = 0;
-		lc.squidsSession = 0;
-		lc.seaWalkersSession = 0;
-		lc.nightSquidsSession = 0;
-		lc.seaGuardiansSession = 0;
-		lc.seaWitchesSession = 0;
-		lc.seaArchersSession = 0;
-		lc.monsterOfTheDeepsSession = 0;
-		lc.catfishesSession = 0;
-		lc.carrotKingsSession = 0;
-		lc.seaLeechesSession = 0;
-		lc.guardianDefendersSession = 0;
-		lc.deepSeaProtectorsSession = 0;
-		lc.hydrasSession = 0;
-		lc.seaEmperorsSession = 0;
-		lc.empTimeSession = -1;
-		lc.empSCsSession = -1;
-		lc.fishingMilestoneSession = 0;
-		lc.frozenStevesSession = 0;
-		lc.frostyTheSnowmansSession = 0;
-		lc.grinchesSession = 0;
-		lc.yetisSession = 0;
-		lc.yetiTimeSession = -1;
-		lc.yetiSCsSession = -1;
-		lc.nurseSharksSession = 0;
-		lc.blueSharksSession = 0;
-		lc.tigerSharksSession = 0;
-		lc.greatWhiteSharksSession = 0;
-		lc.scarecrowsSession = 0;
-		lc.nightmaresSession = 0;
-		lc.werewolfsSession = 0;
-		lc.phantomFishersSession = 0;
-		lc.grimReapersSession = 0;
-		cf.deleteCategory("fishing");
-		cf.reloadConfig();
+		LootCommand.seaCreaturesSession = 0;
+		LootCommand.goodCatchesSession = 0;
+		LootCommand.greatCatchesSession = 0;
+		LootCommand.squidsSession = 0;
+		LootCommand.seaWalkersSession = 0;
+		LootCommand.nightSquidsSession = 0;
+		LootCommand.seaGuardiansSession = 0;
+		LootCommand.seaWitchesSession = 0;
+		LootCommand.seaArchersSession = 0;
+		LootCommand.monsterOfTheDeepsSession = 0;
+		LootCommand.catfishesSession = 0;
+		LootCommand.carrotKingsSession = 0;
+		LootCommand.seaLeechesSession = 0;
+		LootCommand.guardianDefendersSession = 0;
+		LootCommand.deepSeaProtectorsSession = 0;
+		LootCommand.hydrasSession = 0;
+		LootCommand.seaEmperorsSession = 0;
+		LootCommand.empTimeSession = -1;
+		LootCommand.empSCsSession = -1;
+		LootCommand.fishingMilestoneSession = 0;
+		LootCommand.frozenStevesSession = 0;
+		LootCommand.frostyTheSnowmansSession = 0;
+		LootCommand.grinchesSession = 0;
+		LootCommand.yetisSession = 0;
+		LootCommand.yetiTimeSession = -1;
+		LootCommand.yetiSCsSession = -1;
+		LootCommand.nurseSharksSession = 0;
+		LootCommand.blueSharksSession = 0;
+		LootCommand.tigerSharksSession = 0;
+		LootCommand.greatWhiteSharksSession = 0;
+		LootCommand.scarecrowsSession = 0;
+		LootCommand.nightmaresSession = 0;
+		LootCommand.werewolfsSession = 0;
+		LootCommand.phantomFishersSession = 0;
+		LootCommand.grimReapersSession = 0;
+		ConfigHandler.deleteCategory("fishing");
+		ConfigHandler.reloadConfig();
 	}
 	
 	static void resetCatacombs() {
-		LootCommand lc = new LootCommand();
-		ConfigHandler cf = new ConfigHandler();
-		lc.recombobulatorsSession = 0;
-		lc.fumingPotatoBooksSession = 0;
-		lc.bonzoStaffsSession = 0;
-		lc.f1CoinsSpentSession = 0;
-		lc.f1TimeSpentSession = 0;
-		lc.scarfStudiesSession = 0;
-		lc.f2CoinsSpentSession = 0;
-		lc.f2TimeSpentSession = 0;
-		lc.adaptiveHelmsSession = 0;
-		lc.adaptiveChestsSession = 0;
-		lc.adaptiveLegsSession = 0;
-		lc.adaptiveBootsSession = 0;
-		lc.adaptiveSwordsSession = 0;
-		lc.f3CoinsSpentSession = 0;
-		lc.f3TimeSpentSession = 0;
-		lc.spiritWingsSession = 0;
-		lc.spiritBonesSession = 0;
-		lc.spiritBootsSession = 0;
-		lc.spiritSwordsSession = 0;
-		lc.epicSpiritPetsSession = 0;
-		lc.f4CoinsSpentSession = 0;
-		lc.f4TimeSpentSession = 0;
-		lc.warpedStonesSession = 0;
-		lc.shadowAssHelmsSession = 0;
-		lc.shadowAssChestsSession = 0;
-		lc.shadowAssLegsSession = 0;
-		lc.shadowAssBootsSession = 0;
-		lc.lividDaggersSession = 0;
-		lc.shadowFurysSession = 0;
-		lc.f5CoinsSpentSession = 0;
-		lc.f5TimeSpentSession = 0;
-		lc.ancientRosesSession = 0;
-		lc.precursorEyesSession = 0;
-		lc.giantsSwordsSession = 0;
-		lc.necroLordHelmsSession = 0;
-		lc.necroLordChestsSession = 0;
-		lc.necroLordLegsSession = 0;
-		lc.necroLordBootsSession = 0;
-		lc.necroSwordsSession = 0;
-		lc.f6CoinsSpentSession = 0;
-		lc.f6TimeSpentSession = 0;
-		cf.deleteCategory("catacombs");
-		cf.reloadConfig();
+		LootCommand.recombobulatorsSession = 0;
+		LootCommand.fumingPotatoBooksSession = 0;
+		LootCommand.bonzoStaffsSession = 0;
+		LootCommand.f1CoinsSpentSession = 0;
+		LootCommand.f1TimeSpentSession = 0;
+		LootCommand.scarfStudiesSession = 0;
+		LootCommand.f2CoinsSpentSession = 0;
+		LootCommand.f2TimeSpentSession = 0;
+		LootCommand.adaptiveHelmsSession = 0;
+		LootCommand.adaptiveChestsSession = 0;
+		LootCommand.adaptiveLegsSession = 0;
+		LootCommand.adaptiveBootsSession = 0;
+		LootCommand.adaptiveSwordsSession = 0;
+		LootCommand.f3CoinsSpentSession = 0;
+		LootCommand.f3TimeSpentSession = 0;
+		LootCommand.spiritWingsSession = 0;
+		LootCommand.spiritBonesSession = 0;
+		LootCommand.spiritBootsSession = 0;
+		LootCommand.spiritSwordsSession = 0;
+		LootCommand.epicSpiritPetsSession = 0;
+		LootCommand.f4CoinsSpentSession = 0;
+		LootCommand.f4TimeSpentSession = 0;
+		LootCommand.warpedStonesSession = 0;
+		LootCommand.shadowAssHelmsSession = 0;
+		LootCommand.shadowAssChestsSession = 0;
+		LootCommand.shadowAssLegsSession = 0;
+		LootCommand.shadowAssBootsSession = 0;
+		LootCommand.lividDaggersSession = 0;
+		LootCommand.shadowFurysSession = 0;
+		LootCommand.f5CoinsSpentSession = 0;
+		LootCommand.f5TimeSpentSession = 0;
+		LootCommand.ancientRosesSession = 0;
+		LootCommand.precursorEyesSession = 0;
+		LootCommand.giantsSwordsSession = 0;
+		LootCommand.necroLordHelmsSession = 0;
+		LootCommand.necroLordChestsSession = 0;
+		LootCommand.necroLordLegsSession = 0;
+		LootCommand.necroLordBootsSession = 0;
+		LootCommand.necroSwordsSession = 0;
+		LootCommand.f6CoinsSpentSession = 0;
+		LootCommand.f6TimeSpentSession = 0;
+		ConfigHandler.deleteCategory("catacombs");
+		ConfigHandler.reloadConfig();
 	}
 
 }
diff --git a/src/main/java/me/Danker/commands/ScaleCommand.java b/src/main/java/me/Danker/commands/ScaleCommand.java
index fa4c51d..1527e40 100644
--- a/src/main/java/me/Danker/commands/ScaleCommand.java
+++ b/src/main/java/me/Danker/commands/ScaleCommand.java
@@ -10,7 +10,6 @@ import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
 
 public class ScaleCommand extends CommandBase {
 
diff --git a/src/main/java/me/Danker/commands/SetkeyCommand.java b/src/main/java/me/Danker/commands/SetkeyCommand.java
index 9ad1abe..f2e58e5 100644
--- a/src/main/java/me/Danker/commands/SetkeyCommand.java
+++ b/src/main/java/me/Danker/commands/SetkeyCommand.java
@@ -8,7 +8,6 @@ import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
 
 public class SetkeyCommand extends CommandBase implements ICommand {
 
@@ -36,8 +35,7 @@ public class SetkeyCommand extends CommandBase implements ICommand {
 			return;
 		}
 		
-		final ConfigHandler cf = new ConfigHandler();
-		cf.writeStringConfig("api", "APIKey", arg1[0]);
+		ConfigHandler.writeStringConfig("api", "APIKey", arg1[0]);
 		player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Set API key to " + TheMod.SECONDARY_COLOUR + arg1[0]));
 	}
 
diff --git a/src/main/java/me/Danker/commands/SkillsCommand.java b/src/main/java/me/Danker/commands/SkillsCommand.java
index 12bfd93..71905fc 100644
--- a/src/main/java/me/Danker/commands/SkillsCommand.java
+++ b/src/main/java/me/Danker/commands/SkillsCommand.java
@@ -45,12 +45,10 @@ public class SkillsCommand extends CommandBase {
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 		// MULTI THREAD DRIFTING
 		new Thread(() -> {
-			APIHandler ah = new APIHandler();
-			ConfigHandler cf = new ConfigHandler();
 			EntityPlayer player = (EntityPlayer) arg0;
 			
 			// Check key
-			String key = cf.getString("api", "APIKey");
+			String key = ConfigHandler.getString("api", "APIKey");
 			if (key.equals("")) {
 				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "API key not set. Use /setkey."));
 			}
@@ -65,16 +63,16 @@ public class SkillsCommand extends CommandBase {
 			} else {
 				username = arg1[0];
 				player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Checking skills of " + TheMod.SECONDARY_COLOUR + username));
-				uuid = ah.getUUID(username);
+				uuid = APIHandler.getUUID(username);
 			}
 			
 			// Find stats of latest profile
-			String latestProfile = ah.getLatestProfileID(uuid, key);
+			String latestProfile = APIHandler.getLatestProfileID(uuid, key);
 			if (latestProfile == null) return;
 			
 			String profileURL = "https://api.hypixel.net/skyblock/profile?profile=" + latestProfile + "&key=" + key;
 			System.out.println("Fetching profile...");
-			JsonObject profileResponse = ah.getResponse(profileURL);
+			JsonObject profileResponse = APIHandler.getResponse(profileURL);
 			if (!profileResponse.get("success").getAsBoolean()) {
 				String reason = profileResponse.get("cause").getAsString();
 				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Failed with reason: " + reason));
@@ -131,7 +129,7 @@ public class SkillsCommand extends CommandBase {
 				
 				String playerURL = "https://api.hypixel.net/player?uuid=" + uuid + "&key=" + key;
 				System.out.println("Fetching skills from achievement API");
-				JsonObject playerObject = ah.getResponse(playerURL);
+				JsonObject playerObject = APIHandler.getResponse(playerURL);
 				
 				if (!playerObject.get("success").getAsBoolean()) {
 					String reason = profileResponse.get("cause").getAsString();
diff --git a/src/main/java/me/Danker/commands/SkyblockPlayersCommand.java b/src/main/java/me/Danker/commands/SkyblockPlayersCommand.java
index 24c3152..aca61ee 100644
--- a/src/main/java/me/Danker/commands/SkyblockPlayersCommand.java
+++ b/src/main/java/me/Danker/commands/SkyblockPlayersCommand.java
@@ -44,19 +44,17 @@ public class SkyblockPlayersCommand extends CommandBase {
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 		// MULTI THREAD DRIFTING
 		new Thread(() -> {
-			APIHandler ah = new APIHandler();
-			ConfigHandler cf = new ConfigHandler();
 			EntityPlayer player = (EntityPlayer) arg0;
 			
 			// Check key
-			String key = cf.getString("api", "APIKey");
+			String key = ConfigHandler.getString("api", "APIKey");
 			if (key.equals("")) {
 				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "API key not set. Use /setkey."));
 			}
 			
 			String playersURL = "https://api.hypixel.net/gameCounts?key=" + key;
 			System.out.println("Fetching player count...");
-			JsonObject playersResponse = ah.getResponse(playersURL);
+			JsonObject playersResponse = APIHandler.getResponse(playersURL);
 			if (!playersResponse.get("success").getAsBoolean()) {
 				String reason = playersResponse.get("cause").getAsString();
 				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Failed with reason: " + reason));
diff --git a/src/main/java/me/Danker/commands/SlayerCommand.java b/src/main/java/me/Danker/commands/SlayerCommand.java
index 3ac6a46..07119bb 100644
--- a/src/main/java/me/Danker/commands/SlayerCommand.java
+++ b/src/main/java/me/Danker/commands/SlayerCommand.java
@@ -47,12 +47,10 @@ public class SlayerCommand extends CommandBase {
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 		// MULTI THREAD DRIFTING
 		new Thread(() -> {
-			APIHandler ah = new APIHandler();
-			ConfigHandler cf = new ConfigHandler();
 			EntityPlayer player = (EntityPlayer) arg0;
 			
 			// Check key
-			String key = cf.getString("api", "APIKey");
+			String key = ConfigHandler.getString("api", "APIKey");
 			if (key.equals("")) {
 				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "API key not set. Use /setkey."));
 			}
@@ -67,16 +65,16 @@ public class SlayerCommand extends CommandBase {
 			} else {
 				username = arg1[0];
 				player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Checking slayer of " + TheMod.SECONDARY_COLOUR + username));
-				uuid = ah.getUUID(username);
+				uuid = APIHandler.getUUID(username);
 			}
 			
 			// Find stats of latest profile
-			String latestProfile = ah.getLatestProfileID(uuid, key);
+			String latestProfile = APIHandler.getLatestProfileID(uuid, key);
 			if (latestProfile == null) return;
 			
 			String profileURL = "https://api.hypixel.net/skyblock/profile?profile=" + latestProfile + "&key=" + key;
 			System.out.println("Fetching profile...");
-			JsonObject profileResponse = ah.getResponse(profileURL);
+			JsonObject profileResponse = APIHandler.getResponse(profileURL);
 			if (!profileResponse.get("success").getAsBoolean()) {
 				String reason = profileResponse.get("cause").getAsString();
 				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Failed with reason: " + reason));
diff --git a/src/main/java/me/Danker/commands/ToggleCommand.java b/src/main/java/me/Danker/commands/ToggleCommand.java
index 563c403..93cce26 100644
--- a/src/main/java/me/Danker/commands/ToggleCommand.java
+++ b/src/main/java/me/Danker/commands/ToggleCommand.java
@@ -11,7 +11,6 @@ import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
 
 public class ToggleCommand extends CommandBase implements ICommand {
 	public static boolean gpartyToggled;
@@ -76,7 +75,6 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	@Override
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 		final EntityPlayer player = (EntityPlayer)arg0;
-		final ConfigHandler cf = new ConfigHandler();
 		
 		if (arg1.length == 0) {
 			player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
@@ -85,107 +83,107 @@ public class ToggleCommand extends CommandBase implements ICommand {
 		
 		if (arg1[0].equalsIgnoreCase("gparty")) {
 			gpartyToggled = !gpartyToggled;
-			cf.writeBooleanConfig("toggles", "GParty", gpartyToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "GParty", gpartyToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Guild party notifications has been set to " + TheMod.SECONDARY_COLOUR + gpartyToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("coords")) {
 			coordsToggled = !coordsToggled;
-			cf.writeBooleanConfig("toggles", "Coords", coordsToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "Coords", coordsToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Coord/Angle display has been set to " + TheMod.SECONDARY_COLOUR + coordsToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("golden")) { 
 			goldenToggled = !goldenToggled;
-			cf.writeBooleanConfig("toggles", "Golden", goldenToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "Golden", goldenToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Golden T6 enchants has been set to " + TheMod.SECONDARY_COLOUR + goldenToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("slayercount")) {
 			slayerCountTotal = !slayerCountTotal;
-			cf.writeBooleanConfig("toggles", "SlayerCount", slayerCountTotal);
+			ConfigHandler.writeBooleanConfig("toggles", "SlayerCount", slayerCountTotal);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Counting total 20% slayer drops has been set to " + TheMod.SECONDARY_COLOUR + slayerCountTotal + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("rngesusalerts")) {
 			rngesusAlerts = !rngesusAlerts;
-			cf.writeBooleanConfig("toggles", "RNGesusAlerts", rngesusAlerts);
+			ConfigHandler.writeBooleanConfig("toggles", "RNGesusAlerts", rngesusAlerts);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Slayer RNGesus alerts has been set to " + TheMod.SECONDARY_COLOUR + rngesusAlerts + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("splitfishing")) {
 			splitFishing = !splitFishing;
-			cf.writeBooleanConfig("toggles", "SplitFishing", splitFishing);
+			ConfigHandler.writeBooleanConfig("toggles", "SplitFishing", splitFishing);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Split fishing display has been set to " + TheMod.SECONDARY_COLOUR + splitFishing + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("chatmaddox")) {
 			chatMaddoxToggled = !chatMaddoxToggled;
-			cf.writeBooleanConfig("toggles", "ChatMaddox", chatMaddoxToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "ChatMaddox", chatMaddoxToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Click screen to open Maddox menu has been set to " + TheMod.SECONDARY_COLOUR + chatMaddoxToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("spiritbearalerts")) { 
 			spiritBearAlerts = !spiritBearAlerts;
-			cf.writeBooleanConfig("toggles", "SpiritBearAlerts", spiritBearAlerts);
+			ConfigHandler.writeBooleanConfig("toggles", "SpiritBearAlerts", spiritBearAlerts);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Spirit Bear alerts have been set to " + TheMod.SECONDARY_COLOUR + spiritBearAlerts + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("aotd")) {
 			aotdToggled = !aotdToggled;
-			cf.writeBooleanConfig("toggles", "AOTD", aotdToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "AOTD", aotdToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Block AOTD ability been set to " + TheMod.SECONDARY_COLOUR + aotdToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("lividdagger")) {
 			lividDaggerToggled = !lividDaggerToggled;
-			cf.writeBooleanConfig("toggles", "LividDagger", lividDaggerToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "LividDagger", lividDaggerToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Block Livid Dagger ability been set to " + TheMod.SECONDARY_COLOUR + lividDaggerToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("sceptremessages")) {
 			sceptreMessages = !sceptreMessages;
-			cf.writeBooleanConfig("toggles", "SceptreMessages", sceptreMessages);
+			ConfigHandler.writeBooleanConfig("toggles", "SceptreMessages", sceptreMessages);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Spirit Sceptre messages have been set to " + TheMod.SECONDARY_COLOUR + sceptreMessages + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("petcolors") || arg1[0].equalsIgnoreCase("petcolours")) {
 			petColoursToggled = !petColoursToggled;
-			cf.writeBooleanConfig("toggles", "PetColors", petColoursToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "PetColors", petColoursToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Pet colours have been set to " + TheMod.SECONDARY_COLOUR + petColoursToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("dungeontimer")) {
 			dungeonTimerToggled = !dungeonTimerToggled;
-			cf.writeBooleanConfig("toggles", "DungeonTimer", dungeonTimerToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "DungeonTimer", dungeonTimerToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Dungeon timer has been set to " + TheMod.SECONDARY_COLOUR + dungeonTimerToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("golemalerts")) {
 			golemAlertToggled = !golemAlertToggled;
-			cf.writeBooleanConfig("toggles", "GolemAlerts", golemAlertToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "GolemAlerts", golemAlertToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Golem spawn alerts has been set to " + TheMod.SECONDARY_COLOUR + golemAlertToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("expertiselore")) {
 			expertiseLoreToggled = !expertiseLoreToggled;
-			cf.writeBooleanConfig("toggles", "ExpertiseLore", expertiseLoreToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "ExpertiseLore", expertiseLoreToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Expertise in lore has been set to " + TheMod.SECONDARY_COLOUR + expertiseLoreToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("skill50display")) {
 			skill50DisplayToggled = !skill50DisplayToggled;
-			cf.writeBooleanConfig("toggles", "Skill50Display", skill50DisplayToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "Skill50Display", skill50DisplayToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Skill 50 display has been set to " + TheMod.SECONDARY_COLOUR + skill50DisplayToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("outlinetext")) {
 			outlineTextToggled = !outlineTextToggled;
-			cf.writeBooleanConfig("toggles", "OutlineText", outlineTextToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "OutlineText", outlineTextToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Outline displayed text has been set to " + TheMod.SECONDARY_COLOUR + outlineTextToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("midasstaffmessages")) {
 			midasStaffMessages = !midasStaffMessages;
-			cf.writeBooleanConfig("toggles", "MidasStaffMessages", midasStaffMessages);
+			ConfigHandler.writeBooleanConfig("toggles", "MidasStaffMessages", midasStaffMessages);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Midas Staff messages have been set to " + TheMod.SECONDARY_COLOUR + midasStaffMessages + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("healmessages")) {
 			healMessages = !healMessages;
-			cf.writeBooleanConfig("toggles", "HealMessages", healMessages);
+			ConfigHandler.writeBooleanConfig("toggles", "HealMessages", healMessages);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Heal messages have been set to " + TheMod.SECONDARY_COLOUR + healMessages + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("caketimer")) { 
 			cakeTimerToggled = !cakeTimerToggled;
-			cf.writeBooleanConfig("toggles", "CakeTimer", cakeTimerToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "CakeTimer", cakeTimerToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Cake timer has been set to " + TheMod.SECONDARY_COLOUR + cakeTimerToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("lividsolver")) {
 			lividSolverToggled = !lividSolverToggled;
-			cf.writeBooleanConfig("toggles", "LividSolver", lividSolverToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "LividSolver", lividSolverToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Livid solver has been set to " + TheMod.SECONDARY_COLOUR + lividSolverToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("threemanpuzzle")) { 
 			threeManToggled = !threeManToggled;
-			cf.writeBooleanConfig("toggles", "ThreeManPuzzle", threeManToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "ThreeManPuzzle", threeManToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Three man puzzle solver has been set to " + TheMod.SECONDARY_COLOUR + threeManToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("oruopuzzle")) { 
 			oruoToggled = !oruoToggled;
-			cf.writeBooleanConfig("toggles", "OruoPuzzle", oruoToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "OruoPuzzle", oruoToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Oruo trivia solver has been set to " + TheMod.SECONDARY_COLOUR + oruoToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("blazepuzzle")) { 
 			blazeToggled = !blazeToggled;
-			cf.writeBooleanConfig("toggles", "BlazePuzzle", blazeToggled);
+			ConfigHandler.writeBooleanConfig("toggles", "BlazePuzzle", blazeToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Blaze puzzle solver has been set to " + TheMod.SECONDARY_COLOUR + blazeToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("creeperpuzzle")) {
 			creeperToggled = !creeperToggled;
-			cf.writeBooleanConfig("creeperpuzzle", "CreeperPuzzle", creeperToggled);
+			ConfigHandler.writeBooleanConfig("creeperpuzzle", "CreeperPuzzle", creeperToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Creeper puzzle solver has been set to " + TheMod.SECONDARY_COLOUR + creeperToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("waterpuzzle")) {
 			waterToggled = !waterToggled;
-			cf.writeBooleanConfig("waterpuzzle", "WaterPuzzle", waterToggled);
+			ConfigHandler.writeBooleanConfig("waterpuzzle", "WaterPuzzle", waterToggled);
 			player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Water puzzle solver has been set to " + TheMod.SECONDARY_COLOUR + waterToggled + TheMod.MAIN_COLOUR + "."));
 		} else if (arg1[0].equalsIgnoreCase("list")) {
 			player.addChatMessage(new ChatComponentText(TheMod.TYPE_COLOUR + "Guild party notifications: " + TheMod.VALUE_COLOUR + gpartyToggled + "\n" +
diff --git a/src/main/java/me/Danker/gui/DankerGui.java b/src/main/java/me/Danker/gui/DankerGui.java
index 8667461..73db9f0 100644
--- a/src/main/java/me/Danker/gui/DankerGui.java
+++ b/src/main/java/me/Danker/gui/DankerGui.java
@@ -12,7 +12,6 @@ import me.Danker.handlers.TextRenderer;
 import me.Danker.utils.Utils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiConfirmOpenLink;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.ScaledResolution;
 
diff --git a/src/main/java/me/Danker/gui/EditLocationsGui.java b/src/main/java/me/Danker/gui/EditLocationsGui.java
index d8034e6..7e67c1e 100644
--- a/src/main/java/me/Danker/gui/EditLocationsGui.java
+++ b/src/main/java/me/Danker/gui/EditLocationsGui.java
@@ -34,9 +34,6 @@ public class EditLocationsGui extends GuiScreen {
 	@Override
 	public void initGui() {
 		super.initGui();
-		// Ease of typing
-		MoveCommand moc = new MoveCommand();
-		ScaleCommand sc = new ScaleCommand();
 		
 		String displayText = EnumChatFormatting.GOLD + "Svens Killed:\n" +
 							 EnumChatFormatting.GREEN + "Wolf Teeth:\n" +
@@ -74,12 +71,12 @@ public class EditLocationsGui extends GuiScreen {
 							      EnumChatFormatting.YELLOW + 2 + "\n" +
 							      EnumChatFormatting.YELLOW + 1;
 		
-		display = new LocationButton(0, moc.displayXY[0], moc.displayXY[1], 145 * sc.displayScale, 102 * sc.displayScale, sc.displayScale, displayText, displayNums, 110);
-		dungeonTimer = new LocationButton(0, moc.dungeonTimerXY[0], moc.dungeonTimerXY[1], 113 * sc.dungeonTimerScale, 57 * sc.dungeonTimerScale, sc.dungeonTimerScale, dungeonTimerText, dungeonTimerNums, 80);
-		coords = new LocationButton(0, moc.coordsXY[0], moc.coordsXY[1], 141 * sc.coordsScale, 12 * sc.coordsScale, sc.coordsScale, TheMod.COORDS_COLOUR + "74 / 14 / -26 (141.1 / 6.7)", null, null);
-		skill50 = new LocationButton(0, moc.skill50XY[0], moc.skill50XY[1], 233 * sc.skill50Scale, 12 * sc.skill50Scale, sc.skill50Scale, TheMod.SKILL_50_COLOUR + "+3.5 Farming (28,882,117.7/55,172,425) 52.34%", null, null);
-		lividHP = new LocationButton(0, moc.lividHpXY[0], moc.lividHpXY[1], 85 * sc.lividHpScale, 12 * sc.lividHpScale, sc.lividHpScale, EnumChatFormatting.WHITE + "﴾ Livid " + EnumChatFormatting.YELLOW + "6.9M" + EnumChatFormatting.RED + "❤ " + EnumChatFormatting.WHITE + "﴿", null, null);
-		cakeTimer = new LocationButton(0, moc.cakeTimerXY[0], moc.cakeTimerXY[1] + 5, 85 * sc.cakeTimerScale, 18 * sc.cakeTimerScale, sc.cakeTimerScale, TheMod.CAKE_COLOUR + "     11h16m", null, null);
+		display = new LocationButton(0, MoveCommand.displayXY[0], MoveCommand.displayXY[1], 145 * ScaleCommand.displayScale, 102 * ScaleCommand.displayScale, ScaleCommand.displayScale, displayText, displayNums, 110);
+		dungeonTimer = new LocationButton(0, MoveCommand.dungeonTimerXY[0], MoveCommand.dungeonTimerXY[1], 113 * ScaleCommand.dungeonTimerScale, 57 * ScaleCommand.dungeonTimerScale, ScaleCommand.dungeonTimerScale, dungeonTimerText, dungeonTimerNums, 80);
+		coords = new LocationButton(0, MoveCommand.coordsXY[0], MoveCommand.coordsXY[1], 141 * ScaleCommand.coordsScale, 12 * ScaleCommand.coordsScale, ScaleCommand.coordsScale, TheMod.COORDS_COLOUR + "74 / 14 / -26 (141.1 / 6.7)", null, null);
+		skill50 = new LocationButton(0, MoveCommand.skill50XY[0], MoveCommand.skill50XY[1], 233 * ScaleCommand.skill50Scale, 12 * ScaleCommand.skill50Scale, ScaleCommand.skill50Scale, TheMod.SKILL_50_COLOUR + "+3.5 Farming (28,882,117.7/55,172,425) 52.34%", null, null);
+		lividHP = new LocationButton(0, MoveCommand.lividHpXY[0], MoveCommand.lividHpXY[1], 85 * ScaleCommand.lividHpScale, 12 * ScaleCommand.lividHpScale, ScaleCommand.lividHpScale, EnumChatFormatting.WHITE + "﴾ Livid " + EnumChatFormatting.YELLOW + "6.9M" + EnumChatFormatting.RED + "❤ " + EnumChatFormatting.WHITE + "﴿", null, null);
+		cakeTimer = new LocationButton(0, MoveCommand.cakeTimerXY[0], MoveCommand.cakeTimerXY[1] + 5, 85 * ScaleCommand.cakeTimerScale, 18 * ScaleCommand.cakeTimerScale, ScaleCommand.cakeTimerScale, TheMod.CAKE_COLOUR + "     11h16m", null, null);
 		
 		this.buttonList.add(coords);
 		this.buttonList.add(dungeonTimer);
diff --git a/src/main/java/me/Danker/handlers/APIHandler.java b/src/main/java/me/Danker/handlers/APIHandler.java
index 6d1df32..c96aa50 100644
--- a/src/main/java/me/Danker/handlers/APIHandler.java
+++ b/src/main/java/me/Danker/handlers/APIHandler.java
@@ -18,7 +18,6 @@ import me.Danker.TheMod;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
 
 public class APIHandler {
 	public static JsonObject getResponse(String urlString) {
diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index 5a59308..08a78c4 100644
--- a/src/main/java/me/Danker/handlers/ConfigHandler.java
+++ b/src/main/java/me/Danker/handlers/ConfigHandler.java
@@ -374,203 +374,198 @@ public class ConfigHandler {
 		if (!hasKey("colors", "coordsDisplay")) writeStringConfig("colors", "coordsDisplay", "" + EnumChatFormatting.WHITE);
 		if (!hasKey("colors", "cakeDisplay")) writeStringConfig("colors", "cakeDisplay", "" + EnumChatFormatting.GOLD);
 		
-		final ToggleCommand tf = new ToggleCommand();
-		tf.gpartyToggled = getBoolean("toggles", "GParty");
-		tf.coordsToggled = getBoolean("toggles", "Coords");
-		tf.goldenToggled = getBoolean("toggles", "Golden");
-		tf.slayerCountTotal = getBoolean("toggles", "SlayerCount");
-		tf.rngesusAlerts = getBoolean("toggles", "RNGesusAlerts");
-		tf.splitFishing = getBoolean("toggles", "SplitFishing");
-		tf.chatMaddoxToggled = getBoolean("toggles", "ChatMaddox");
-		tf.spiritBearAlerts = getBoolean("toggles", "SpiritBearAlerts");
-		tf.aotdToggled = getBoolean("toggles", "AOTD");
-		tf.lividDaggerToggled = getBoolean("toggles", "LividDagger");
-		tf.sceptreMessages = getBoolean("toggles", "SceptreMessages");
-		tf.petColoursToggled = getBoolean("toggles", "PetColors");
-		tf.dungeonTimerToggled = getBoolean("toggles", "DungeonTimer");
-		tf.golemAlertToggled = getBoolean("toggles", "GolemAlerts");
-		tf.expertiseLoreToggled = getBoolean("toggles", "ExpertiseLore");
-		tf.skill50DisplayToggled = getBoolean("toggles", "Skill50Display");
-		tf.outlineTextToggled = getBoolean("toggles", "OutlineText");
-		tf.midasStaffMessages = getBoolean("toggles", "MidasStaffMessages");
-		tf.healMessages = getBoolean("toggles", "HealMessages");
-		tf.cakeTimerToggled = getBoolean("toggles", "CakeTimer");
-		tf.lividSolverToggled = getBoolean("toggles", "LividSolver");
+		ToggleCommand.gpartyToggled = getBoolean("toggles", "GParty");
+		ToggleCommand.coordsToggled = getBoolean("toggles", "Coords");
+		ToggleCommand.goldenToggled = getBoolean("toggles", "Golden");
+		ToggleCommand.slayerCountTotal = getBoolean("toggles", "SlayerCount");
+		ToggleCommand.rngesusAlerts = getBoolean("toggles", "RNGesusAlerts");
+		ToggleCommand.splitFishing = getBoolean("toggles", "SplitFishing");
+		ToggleCommand.chatMaddoxToggled = getBoolean("toggles", "ChatMaddox");
+		ToggleCommand.spiritBearAlerts = getBoolean("toggles", "SpiritBearAlerts");
+		ToggleCommand.aotdToggled = getBoolean("toggles", "AOTD");
+		ToggleCommand.lividDaggerToggled = getBoolean("toggles", "LividDagger");
+		ToggleCommand.sceptreMessages = getBoolean("toggles", "SceptreMessages");
+		ToggleCommand.petColoursToggled = getBoolean("toggles", "PetColors");
+		ToggleCommand.dungeonTimerToggled = getBoolean("toggles", "DungeonTimer");
+		ToggleCommand.golemAlertToggled = getBoolean("toggles", "GolemAlerts");
+		ToggleCommand.expertiseLoreToggled = getBoolean("toggles", "ExpertiseLore");
+		ToggleCommand.skill50DisplayToggled = getBoolean("toggles", "Skill50Display");
+		ToggleCommand.outlineTextToggled = getBoolean("toggles", "OutlineText");
+		ToggleCommand.midasStaffMessages = getBoolean("toggles", "MidasStaffMessages");
+		ToggleCommand.healMessages = getBoolean("toggles", "HealMessages");
+		ToggleCommand.cakeTimerToggled = getBoolean("toggles", "CakeTimer");
+		ToggleCommand.lividSolverToggled = getBoolean("toggles", "LividSolver");
 		// Puzzle Solvers
-		tf.threeManToggled = getBoolean("toggles", "ThreeManPuzzle");
-		tf.oruoToggled = getBoolean("toggles", "OruoPuzzle");
-		tf.blazeToggled = getBoolean("toggles", "BlazePuzzle");
-		tf.creeperToggled = getBoolean("toggles", "CreeperPuzzle");
-		tf.waterToggled = getBoolean("toggles", "WaterPuzzle");
+		ToggleCommand.threeManToggled = getBoolean("toggles", "ThreeManPuzzle");
+		ToggleCommand.oruoToggled = getBoolean("toggles", "OruoPuzzle");
+		ToggleCommand.blazeToggled = getBoolean("toggles", "BlazePuzzle");
+		ToggleCommand.creeperToggled = getBoolean("toggles", "CreeperPuzzle");
+		ToggleCommand.waterToggled = getBoolean("toggles", "WaterPuzzle");
 		
-		final BlockSlayerCommand bs = new BlockSlayerCommand();
 		String onlySlayer = getString("toggles", "BlockSlayer");
 		if (!onlySlayer.equals("")) {
-			bs.onlySlayerName = onlySlayer.substring(0, onlySlayer.lastIndexOf(" "));
-			bs.onlySlayerNumber = onlySlayer.substring(onlySlayer.lastIndexOf(" ") + 1, onlySlayer.length());
+			BlockSlayerCommand.onlySlayerName = onlySlayer.substring(0, onlySlayer.lastIndexOf(" "));
+			BlockSlayerCommand.onlySlayerNumber = onlySlayer.substring(onlySlayer.lastIndexOf(" ") + 1, onlySlayer.length());
 		}
 		
-		final LootCommand lc = new LootCommand();
 		// Wolf
-		lc.wolfSvens = getInt("wolf", "svens");
-		lc.wolfTeeth = getInt("wolf", "teeth");
-		lc.wolfWheels = getInt("wolf", "wheel");
-		lc.wolfWheelsDrops = getInt("wolf", "wheelDrops");
-		lc.wolfSpirits = getInt("wolf", "spirit");
-		lc.wolfBooks = getInt("wolf", "book");
-		lc.wolfEggs = getInt("wolf", "egg");
-		lc.wolfCoutures = getInt("wolf", "couture");
-		lc.wolfBaits = getInt("wolf", "bait");
-		lc.wolfFluxes = getInt("wolf", "flux");
-		lc.wolfTime = getDouble("wolf", "timeRNG");
-		lc.wolfBosses = getInt("wolf", "bossRNG");
+		LootCommand.wolfSvens = getInt("wolf", "svens");
+		LootCommand.wolfTeeth = getInt("wolf", "teeth");
+		LootCommand.wolfWheels = getInt("wolf", "wheel");
+		LootCommand.wolfWheelsDrops = getInt("wolf", "wheelDrops");
+		LootCommand.wolfSpirits = getInt("wolf", "spirit");
+		LootCommand.wolfBooks = getInt("wolf", "book");
+		LootCommand.wolfEggs = getInt("wolf", "egg");
+		LootCommand.wolfCoutures = getInt("wolf", "couture");
+		LootCommand.wolfBaits = getInt("wolf", "bait");
+		LootCommand.wolfFluxes = getInt("wolf", "flux");
+		LootCommand.wolfTime = getDouble("wolf", "timeRNG");
+		LootCommand.wolfBosses = getInt("wolf", "bossRNG");
 		// Spider
-		lc.spiderTarantulas = getInt("spider", "tarantulas");
-		lc.spiderWebs = getInt("spider", "web");
-		lc.spiderTAP = getInt("spider", "tap");
-		lc.spiderTAPDrops = getInt("spider", "tapDrops");
-		lc.spiderBites = getInt("spider", "bite");
-		lc.spiderCatalysts = getInt("spider", "catalyst");
-		lc.spiderBooks = getInt("spider", "book");
-		lc.spiderSwatters = getInt("spider", "swatter");
-		lc.spiderTalismans = getInt("spider", "talisman");
-		lc.spiderMosquitos = getInt("spider", "mosquito");
-		lc.spiderTime = getDouble("spider", "timeRNG");
-		lc.spiderBosses = getInt("spider", "bossRNG");
+		LootCommand.spiderTarantulas = getInt("spider", "tarantulas");
+		LootCommand.spiderWebs = getInt("spider", "web");
+		LootCommand.spiderTAP = getInt("spider", "tap");
+		LootCommand.spiderTAPDrops = getInt("spider", "tapDrops");
+		LootCommand.spiderBites = getInt("spider", "bite");
+		LootCommand.spiderCatalysts = getInt("spider", "catalyst");
+		LootCommand.spiderBooks = getInt("spider", "book");
+		LootCommand.spiderSwatters = getInt("spider", "swatter");
+		LootCommand.spiderTalismans = getInt("spider", "talisman");
+		LootCommand.spiderMosquitos = getInt("spider", "mosquito");
+		LootCommand.spiderTime = getDouble("spider", "timeRNG");
+		LootCommand.spiderBosses = getInt("spider", "bossRNG");
 		// Zombie
-		lc.zombieRevs = getInt("zombie", "revs");
-		lc.zombieRevFlesh = getInt("zombie", "revFlesh");
-		lc.zombieFoulFlesh = getInt("zombie", "foulFlesh");
-		lc.zombieFoulFleshDrops = getInt("zombie", "foulFleshDrops");
-		lc.zombiePestilences = getInt("zombie", "pestilence");
-		lc.zombieUndeadCatas = getInt("zombie", "undeadCatalyst");
-		lc.zombieBooks = getInt("zombie", "book");
-		lc.zombieBeheadeds = getInt("zombie", "beheaded");
-		lc.zombieRevCatas = getInt("zombie", "revCatalyst");
-		lc.zombieSnakes = getInt("zombie", "snake");
-		lc.zombieScythes = getInt("zombie", "scythe");
-		lc.zombieTime = getDouble("zombie", "timeRNG");
-		lc.zombieBosses = getInt("zombie", "bossRNG");
+		LootCommand.zombieRevs = getInt("zombie", "revs");
+		LootCommand.zombieRevFlesh = getInt("zombie", "revFlesh");
+		LootCommand.zombieFoulFlesh = getInt("zombie", "foulFlesh");
+		LootCommand.zombieFoulFleshDrops = getInt("zombie", "foulFleshDrops");
+		LootCommand.zombiePestilences = getInt("zombie", "pestilence");
+		LootCommand.zombieUndeadCatas = getInt("zombie", "undeadCatalyst");
+		LootCommand.zombieBooks = getInt("zombie", "book");
+		LootCommand.zombieBeheadeds = getInt("zombie", "beheaded");
+		LootCommand.zombieRevCatas = getInt("zombie", "revCatalyst");
+		LootCommand.zombieSnakes = getInt("zombie", "snake");
+		LootCommand.zombieScythes = getInt("zombie", "scythe");
+		LootCommand.zombieTime = getDouble("zombie", "timeRNG");
+		LootCommand.zombieBosses = getInt("zombie", "bossRNG");
 		
 		// Fishing
-		lc.seaCreatures = getInt("fishing", "seaCreature");
-		lc.goodCatches = getInt("fishing", "goodCatch");
-		lc.greatCatches = getInt("fishing", "greatCatch");
-		lc.squids = getInt("fishing", "squid");
-		lc.seaWalkers = getInt("fishing", "seaWalker");
-		lc.nightSquids = getInt("fishing", "nightSquid");
-		lc.seaGuardians = getInt("fishing", "seaGuardian");
-		lc.seaWitches = getInt("fishing", "seaWitch");
-		lc.seaArchers = getInt("fishing", "seaArcher");
-		lc.monsterOfTheDeeps = getInt("fishing", "monsterOfDeep");
-		lc.catfishes = getInt("fishing", "catfish");
-		lc.carrotKings = getInt("fishing", "carrotKing");
-		lc.seaLeeches = getInt("fishing", "seaLeech");
-		lc.guardianDefenders = getInt("fishing", "guardianDefender");
-		lc.deepSeaProtectors = getInt("fishing", "deepSeaProtector");
-		lc.hydras = getInt("fishing", "hydra");
-		lc.seaEmperors = getInt("fishing", "seaEmperor");
-		lc.empTime = getDouble("fishing", "empTime");
-		lc.empSCs = getInt("fishing", "empSC");
-		lc.fishingMilestone = getInt("fishing", "milestone");
+		LootCommand.seaCreatures = getInt("fishing", "seaCreature");
+		LootCommand.goodCatches = getInt("fishing", "goodCatch");
+		LootCommand.greatCatches = getInt("fishing", "greatCatch");
+		LootCommand.squids = getInt("fishing", "squid");
+		LootCommand.seaWalkers = getInt("fishing", "seaWalker");
+		LootCommand.nightSquids = getInt("fishing", "nightSquid");
+		LootCommand.seaGuardians = getInt("fishing", "seaGuardian");
+		LootCommand.seaWitches = getInt("fishing", "seaWitch");
+		LootCommand.seaArchers = getInt("fishing", "seaArcher");
+		LootCommand.monsterOfTheDeeps = getInt("fishing", "monsterOfDeep");
+		LootCommand.catfishes = getInt("fishing", "catfish");
+		LootCommand.carrotKings = getInt("fishing", "carrotKing");
+		LootCommand.seaLeeches = getInt("fishing", "seaLeech");
+		LootCommand.guardianDefenders = getInt("fishing", "guardianDefender");
+		LootCommand.deepSeaProtectors = getInt("fishing", "deepSeaProtector");
+		LootCommand.hydras = getInt("fishing", "hydra");
+		LootCommand.seaEmperors = getInt("fishing", "seaEmperor");
+		LootCommand.empTime = getDouble("fishing", "empTime");
+		LootCommand.empSCs = getInt("fishing", "empSC");
+		LootCommand.fishingMilestone = getInt("fishing", "milestone");
 		// Fishing Winter
-		lc.frozenSteves = getInt("fishing", "frozenSteve");
-		lc.frostyTheSnowmans = getInt("fishing", "snowman");
-		lc.grinches = getInt("fishing", "grinch");
-		lc.yetis = getInt("fishing", "yeti");
-		lc.yetiTime = getDouble("fishing", "yetiTime");
-		lc.yetiSCs = getInt("fishing", "yetiSC");
+		LootCommand.frozenSteves = getInt("fishing", "frozenSteve");
+		LootCommand.frostyTheSnowmans = getInt("fishing", "snowman");
+		LootCommand.grinches = getInt("fishing", "grinch");
+		LootCommand.yetis = getInt("fishing", "yeti");
+		LootCommand.yetiTime = getDouble("fishing", "yetiTime");
+		LootCommand.yetiSCs = getInt("fishing", "yetiSC");
 		// Fishing Festival
-		lc.nurseSharks = getInt("fishing", "nurseShark");
-		lc.blueSharks = getInt("fishing", "blueShark");
-		lc.tigerSharks = getInt("fishing", "tigerShark");
-		lc.greatWhiteSharks = getInt("fishing", "greatWhiteShark");
+		LootCommand.nurseSharks = getInt("fishing", "nurseShark");
+		LootCommand.blueSharks = getInt("fishing", "blueShark");
+		LootCommand.tigerSharks = getInt("fishing", "tigerShark");
+		LootCommand.greatWhiteSharks = getInt("fishing", "greatWhiteShark");
 		// Spooky Fishing
-		lc.scarecrows = getInt("fishing", "scarecrow");
-		lc.nightmares = getInt("fishing", "nightmare");
-		lc.werewolfs = getInt("fishing", "nightmare");
-		lc.phantomFishers = getInt("fishing", "phantomFisher");
-		lc.grimReapers = getInt("fishing", "grimReaper");
+		LootCommand.scarecrows = getInt("fishing", "scarecrow");
+		LootCommand.nightmares = getInt("fishing", "nightmare");
+		LootCommand.werewolfs = getInt("fishing", "nightmare");
+		LootCommand.phantomFishers = getInt("fishing", "phantomFisher");
+		LootCommand.grimReapers = getInt("fishing", "grimReaper");
 		
 		// Dungeons
-		lc.recombobulators =  getInt("catacombs", "recombobulator");
-		lc.fumingPotatoBooks = getInt("catacombs", "fumingBooks");
+		LootCommand.recombobulators =  getInt("catacombs", "recombobulator");
+		LootCommand.fumingPotatoBooks = getInt("catacombs", "fumingBooks");
 		// F1
-		lc.bonzoStaffs = getInt("catacombs", "bonzoStaff");
-		lc.f1CoinsSpent = getDouble("catacombs", "floorOneCoins");
-		lc.f1TimeSpent = getDouble("catacombs", "floorOneTime");
+		LootCommand.bonzoStaffs = getInt("catacombs", "bonzoStaff");
+		LootCommand.f1CoinsSpent = getDouble("catacombs", "floorOneCoins");
+		LootCommand.f1TimeSpent = getDouble("catacombs", "floorOneTime");
 		// F2
-		lc.scarfStudies = getInt("catacombs", "scarfStudies");
-		lc.f2CoinsSpent = getDouble("catacombs", "floorTwoCoins");
-		lc.f2TimeSpent = getDouble("catacombs", "floorTwoTime");
+		LootCommand.scarfStudies = getInt("catacombs", "scarfStudies");
+		LootCommand.f2CoinsSpent = getDouble("catacombs", "floorTwoCoins");
+		LootCommand.f2TimeSpent = getDouble("catacombs", "floorTwoTime");
 		// F3
-		lc.adaptiveHelms = getInt("catacombs", "adaptiveHelm");
-		lc.adaptiveChests = getInt("catacombs", "adaptiveChest");
-		lc.adaptiveLegs = getInt("catacombs", "adaptiveLegging");
-		lc.adaptiveBoots = getInt("catacombs", "adaptiveBoot");
-		lc.adaptiveSwords = getInt("catacombs", "adaptiveSword");
-		lc.f3CoinsSpent = getDouble("catacombs", "floorThreeCoins");
-		lc.f3TimeSpent = getDouble("catacombs", "floorThreeTime");
+		LootCommand.adaptiveHelms = getInt("catacombs", "adaptiveHelm");
+		LootCommand.adaptiveChests = getInt("catacombs", "adaptiveChest");
+		LootCommand.adaptiveLegs = getInt("catacombs", "adaptiveLegging");
+		LootCommand.adaptiveBoots = getInt("catacombs", "adaptiveBoot");
+		LootCommand.adaptiveSwords = getInt("catacombs", "adaptiveSword");
+		LootCommand.f3CoinsSpent = getDouble("catacombs", "floorThreeCoins");
+		LootCommand.f3TimeSpent = getDouble("catacombs", "floorThreeTime");
 		// F4
-		lc.spiritWings = getInt("catacombs", "spiritWing");
-		lc.spiritBones = getInt("catacombs", "spiritBone");
-		lc.spiritBoots = getInt("catacombs", "spiritBoot");
-		lc.spiritSwords = getInt("catacombs", "spiritSword");
-		lc.spiritBows = getInt("catacombs", "spiritBow");
-		lc.epicSpiritPets = getInt("catacombs", "spiritPetEpic");
-		lc.legSpiritPets = getInt("catacombs", "spiritPetLeg");
-		lc.f4CoinsSpent = getDouble("catacombs", "floorFourCoins");
-		lc.f4TimeSpent = getDouble("catacombs", "floorFourTime");
+		LootCommand.spiritWings = getInt("catacombs", "spiritWing");
+		LootCommand.spiritBones = getInt("catacombs", "spiritBone");
+		LootCommand.spiritBoots = getInt("catacombs", "spiritBoot");
+		LootCommand.spiritSwords = getInt("catacombs", "spiritSword");
+		LootCommand.spiritBows = getInt("catacombs", "spiritBow");
+		LootCommand.epicSpiritPets = getInt("catacombs", "spiritPetEpic");
+		LootCommand.legSpiritPets = getInt("catacombs", "spiritPetLeg");
+		LootCommand.f4CoinsSpent = getDouble("catacombs", "floorFourCoins");
+		LootCommand.f4TimeSpent = getDouble("catacombs", "floorFourTime");
 		// F5
-		lc.warpedStones = getInt("catacombs", "warpedStone");
-		lc.shadowAssHelms = getInt("catacombs", "shadowAssassinHelm");
-		lc.shadowAssChests = getInt("catacombs", "shadowAssassinChest");
-		lc.shadowAssLegs = getInt("catacombs", "shadowAssassinLegging");
-		lc.shadowAssBoots = getInt("catacombs", "shadowAssassinBoot");
-		lc.lastBreaths = getInt("catacombs", "lastBreath");
-		lc.lividDaggers = getInt("catacombs", "lividDagger");
-		lc.shadowFurys = getInt("catacombs", "shadowFury");
-		lc.f5CoinsSpent = getDouble("catacombs", "floorFiveCoins");
-		lc.f5TimeSpent = getDouble("catacombs", "floorFiveTime");
+		LootCommand.warpedStones = getInt("catacombs", "warpedStone");
+		LootCommand.shadowAssHelms = getInt("catacombs", "shadowAssassinHelm");
+		LootCommand.shadowAssChests = getInt("catacombs", "shadowAssassinChest");
+		LootCommand.shadowAssLegs = getInt("catacombs", "shadowAssassinLegging");
+		LootCommand.shadowAssBoots = getInt("catacombs", "shadowAssassinBoot");
+		LootCommand.lastBreaths = getInt("catacombs", "lastBreath");
+		LootCommand.lividDaggers = getInt("catacombs", "lividDagger");
+		LootCommand.shadowFurys = getInt("catacombs", "shadowFury");
+		LootCommand.f5CoinsSpent = getDouble("catacombs", "floorFiveCoins");
+		LootCommand.f5TimeSpent = getDouble("catacombs", "floorFiveTime");
 		// F6
-		lc.ancientRoses = getInt("catacombs", "ancientRose");
-		lc.precursorEyes = getInt("catacombs", "precursorEye");
-		lc.giantsSwords = getInt("catacombs", "giantsSword");
-		lc.necroLordHelms = getInt("catacombs", "necroLordHelm");
-		lc.necroLordChests = getInt("catacombs", "necroLordChest");
-		lc.necroLordLegs = getInt("catacombs", "necroLordLegging");
-		lc.necroLordBoots = getInt("catacombs", "necroLordBoot");
-		lc.necroSwords = getInt("catacombs", "necroSword");
-		lc.f6CoinsSpent = getDouble("catacombs", "floorSixCoins");
-		lc.f6TimeSpent = getDouble("catacombs", "floorSixTime");
+		LootCommand.ancientRoses = getInt("catacombs", "ancientRose");
+		LootCommand.precursorEyes = getInt("catacombs", "precursorEye");
+		LootCommand.giantsSwords = getInt("catacombs", "giantsSword");
+		LootCommand.necroLordHelms = getInt("catacombs", "necroLordHelm");
+		LootCommand.necroLordChests = getInt("catacombs", "necroLordChest");
+		LootCommand.necroLordLegs = getInt("catacombs", "necroLordLegging");
+		LootCommand.necroLordBoots = getInt("catacombs", "necroLordBoot");
+		LootCommand.necroSwords = getInt("catacombs", "necroSword");
+		LootCommand.f6CoinsSpent = getDouble("catacombs", "floorSixCoins");
+		LootCommand.f6TimeSpent = getDouble("catacombs", "floorSixTime");
 		
-		final DisplayCommand ds = new DisplayCommand();
-		ds.display = getString("misc", "display");
-		ds.auto = getBoolean("misc", "autoDisplay");
+		// Misc
+		DisplayCommand.display = getString("misc", "display");
+		DisplayCommand.auto = getBoolean("misc", "autoDisplay");
 		TheMod.SKILL_TIME = getInt("misc", "skill50Time") * 20;
 		TheMod.cakeTime = getDouble("misc", "cakeTime");
 		
-		final MoveCommand moc = new MoveCommand();
-		moc.coordsXY[0] = getInt("locations", "coordsX");
-		moc.coordsXY[1] = getInt("locations", "coordsY");
-		moc.displayXY[0] = getInt("locations", "displayX");
-		moc.displayXY[1] = getInt("locations", "displayY");
-		moc.dungeonTimerXY[0] = getInt("locations", "dungeonTimerX");
-		moc.dungeonTimerXY[1] = getInt("locations", "dungeonTimerY");
-		moc.skill50XY[0] = getInt("locations", "skill50X");
-		moc.skill50XY[1] = getInt("locations", "skill50Y");
-		moc.lividHpXY[0] = getInt("locations", "lividHpX");
-		moc.lividHpXY[1] = getInt("locations", "lividHpY");
-		moc.cakeTimerXY[0] = getInt("locations", "cakeTimerX");
-		moc.cakeTimerXY[1] = getInt("locations", "cakeTimerY");
+		MoveCommand.coordsXY[0] = getInt("locations", "coordsX");
+		MoveCommand.coordsXY[1] = getInt("locations", "coordsY");
+		MoveCommand.displayXY[0] = getInt("locations", "displayX");
+		MoveCommand.displayXY[1] = getInt("locations", "displayY");
+		MoveCommand.dungeonTimerXY[0] = getInt("locations", "dungeonTimerX");
+		MoveCommand.dungeonTimerXY[1] = getInt("locations", "dungeonTimerY");
+		MoveCommand.skill50XY[0] = getInt("locations", "skill50X");
+		MoveCommand.skill50XY[1] = getInt("locations", "skill50Y");
+		MoveCommand.lividHpXY[0] = getInt("locations", "lividHpX");
+		MoveCommand.lividHpXY[1] = getInt("locations", "lividHpY");
+		MoveCommand.cakeTimerXY[0] = getInt("locations", "cakeTimerX");
+		MoveCommand.cakeTimerXY[1] = getInt("locations", "cakeTimerY");
 		
-		final ScaleCommand sc = new ScaleCommand();
-		sc.coordsScale = getDouble("scales", "coordsScale");
-		sc.displayScale = getDouble("scales", "displayScale");
-		sc.dungeonTimerScale = getDouble("scales", "dungeonTimerScale");
-		sc.skill50Scale = getDouble("scales", "skill50Scale");
-		sc.lividHpScale = getDouble("scales", "lividHpScale");
-		sc.cakeTimerScale = getDouble("scales", "cakeTimerScale");
+		ScaleCommand.coordsScale = getDouble("scales", "coordsScale");
+		ScaleCommand.displayScale = getDouble("scales", "displayScale");
+		ScaleCommand.dungeonTimerScale = getDouble("scales", "dungeonTimerScale");
+		ScaleCommand.skill50Scale = getDouble("scales", "skill50Scale");
+		ScaleCommand.lividHpScale = getDouble("scales", "lividHpScale");
+		ScaleCommand.cakeTimerScale = getDouble("scales", "cakeTimerScale");
 		
 		TheMod.MAIN_COLOUR = getString("colors", "main");
 		TheMod.SECONDARY_COLOUR = getString("colors", "secondary");