Move features into their own files

8 files changed, 640 insertions, 955 deletions

diff --git a/src/main/java/me/Danker/commands/BlockSlayerCommand.java b/src/main/java/me/Danker/commands/BlockSlayerCommand.java
index 606b930..c0beb42 100644
--- a/src/main/java/me/Danker/commands/BlockSlayerCommand.java
+++ b/src/main/java/me/Danker/commands/BlockSlayerCommand.java
@@ -1,6 +1,7 @@
 package me.Danker.commands;
 
 import me.Danker.DankersSkyblockMod;
+import me.Danker.features.BlockWrongSlayer;
 import me.Danker.handlers.ConfigHandler;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
@@ -12,9 +13,6 @@ import net.minecraft.util.ChatComponentText;
 import java.util.List;
 
 public class BlockSlayerCommand extends CommandBase {
-	
-	public static String onlySlayerName = "";
-	public static String onlySlayerNumber = "";
 
 	@Override
 	public String getCommandName() {
@@ -52,17 +50,17 @@ public class BlockSlayerCommand extends CommandBase {
 		
 		switch (arg1[0].toLowerCase()) {
 			case "zombie":
-				onlySlayerName = "Revenant Horror";
+				BlockWrongSlayer.onlySlayerName = "Revenant Horror";
 				break;
 			case "spider":
-				onlySlayerName = "Tarantula Broodfather";
+				BlockWrongSlayer.onlySlayerName = "Tarantula Broodfather";
 				break;
 			case "wolf":
-				onlySlayerName = "Sven Packmaster";
+				BlockWrongSlayer.onlySlayerName = "Sven Packmaster";
 				break;
 			case "off":
-				onlySlayerName = "";
-				onlySlayerNumber = "";
+				BlockWrongSlayer.onlySlayerName = "";
+				BlockWrongSlayer.onlySlayerNumber = "";
 				ConfigHandler.writeStringConfig("toggles", "BlockSlayer", "");
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Slayer blocking turned off."));
 				return;
@@ -75,26 +73,26 @@ public class BlockSlayerCommand extends CommandBase {
 		// Just manually set to roman numeral, I don't wanna put a whole converter in here
 		switch (slayerNumber) {
 			case 1:
-				onlySlayerNumber = "I";
+				BlockWrongSlayer.onlySlayerNumber = "I";
 				break;
 			case 2:
-				onlySlayerNumber = "II";
+				BlockWrongSlayer.onlySlayerNumber = "II";
 				break;
 			case 3:
-				onlySlayerNumber = "III";
+				BlockWrongSlayer.onlySlayerNumber = "III";
 				break;
 			case 4:
-				onlySlayerNumber = "IV";
+				BlockWrongSlayer.onlySlayerNumber = "IV";
 				break;
 			default:
-				onlySlayerName = "";
-				onlySlayerNumber = "";
+				BlockWrongSlayer.onlySlayerName = "";
+				BlockWrongSlayer.onlySlayerNumber = "";
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
 				return;
 		}
 		
-		ConfigHandler.writeStringConfig("toggles", "BlockSlayer", onlySlayerName + " " + onlySlayerNumber);
-		player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Slayer blocking set to " + DankersSkyblockMod.SECONDARY_COLOUR + onlySlayerName + " " + onlySlayerNumber));
+		ConfigHandler.writeStringConfig("toggles", "BlockSlayer", BlockWrongSlayer.onlySlayerName + " " + BlockWrongSlayer.onlySlayerNumber);
+		player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Slayer blocking set to " + DankersSkyblockMod.SECONDARY_COLOUR + BlockWrongSlayer.onlySlayerName + " " + BlockWrongSlayer.onlySlayerNumber));
 	}
 
 }
diff --git a/src/main/java/me/Danker/commands/DankerGuiCommand.java b/src/main/java/me/Danker/commands/DankerGuiCommand.java
index a6b200f..deddc01 100644
--- a/src/main/java/me/Danker/commands/DankerGuiCommand.java
+++ b/src/main/java/me/Danker/commands/DankerGuiCommand.java
@@ -1,6 +1,7 @@
 package me.Danker.commands;
 
 import me.Danker.DankersSkyblockMod;
+import me.Danker.features.SkillTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.ResourcePackRepository;
 import net.minecraft.command.CommandBase;
@@ -93,7 +94,7 @@ public class DankerGuiCommand extends CommandBase {
 			debug.append("# Other Settings\n");
 			debug.append("[Current Display][").append(DisplayCommand.display).append("]\n");
 			debug.append("[Auto Display][").append(DisplayCommand.auto).append("]\n");
-			debug.append("[Skill Tracker Visible][").append(DankersSkyblockMod.showSkillTracker).append("]\n");
+			debug.append("[Skill Tracker Visible][").append(SkillTracker.showSkillTracker).append("]\n");
 			debug.append("# Resource Packs\n");
 			if (Minecraft.getMinecraft().getResourcePackRepository().getRepositoryEntries().size() == 0) {
 				debug.append("<None>\n");
diff --git a/src/main/java/me/Danker/commands/ImportFishingCommand.java b/src/main/java/me/Danker/commands/ImportFishingCommand.java
index e508ecb..c3007a0 100644
--- a/src/main/java/me/Danker/commands/ImportFishingCommand.java
+++ b/src/main/java/me/Danker/commands/ImportFishingCommand.java
@@ -2,6 +2,7 @@ package me.Danker.commands;
 
 import com.google.gson.JsonObject;
 import me.Danker.DankersSkyblockMod;
+import me.Danker.features.loot.LootTracker;
 import me.Danker.handlers.APIHandler;
 import me.Danker.handlers.ConfigHandler;
 import net.minecraft.command.CommandBase;
@@ -59,230 +60,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();
 			
-			LootCommand.greatCatches = 0;
-			LootCommand.goodCatches = 0;
+			LootTracker.greatCatches = 0;
+			LootTracker.goodCatches = 0;
 			if (statsObject.has("items_fished_treasure")) {
 				if (statsObject.has("items_fished_large_treasure")) {
-					LootCommand.greatCatches = statsObject.get("items_fished_large_treasure").getAsInt();
-					LootCommand.goodCatches = statsObject.get("items_fished_treasure").getAsInt() - LootCommand.greatCatches;
+					LootTracker.greatCatches = statsObject.get("items_fished_large_treasure").getAsInt();
+					LootTracker.goodCatches = statsObject.get("items_fished_treasure").getAsInt() - LootTracker.greatCatches;
 				} else {
-					LootCommand.goodCatches = statsObject.get("items_fished_treasure").getAsInt();
+					LootTracker.goodCatches = statsObject.get("items_fished_treasure").getAsInt();
 				}
 			}
 			
-			LootCommand.seaCreatures = 0;
-			LootCommand.squids = 0;
+			LootTracker.seaCreatures = 0;
+			LootTracker.squids = 0;
 			if (statsObject.has("kills_pond_squid")) {
-				LootCommand.squids = statsObject.get("kills_pond_squid").getAsInt();
+				LootTracker.squids = statsObject.get("kills_pond_squid").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.squids;
+			LootTracker.seaCreatures += LootTracker.squids;
 			
-			LootCommand.seaWalkers = 0;
+			LootTracker.seaWalkers = 0;
 			if (statsObject.has("kills_sea_walker")) {
-				LootCommand.seaWalkers = statsObject.get("kills_sea_walker").getAsInt();
+				LootTracker.seaWalkers = statsObject.get("kills_sea_walker").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.seaWalkers;
+			LootTracker.seaCreatures += LootTracker.seaWalkers;
 			
-			LootCommand.nightSquids = 0;
+			LootTracker.nightSquids = 0;
 			if (statsObject.has("kills_night_squid")) {
-				LootCommand.nightSquids = statsObject.get("kills_night_squid").getAsInt();
+				LootTracker.nightSquids = statsObject.get("kills_night_squid").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.nightSquids;
+			LootTracker.seaCreatures += LootTracker.nightSquids;
 			
-			LootCommand.seaGuardians = 0;
+			LootTracker.seaGuardians = 0;
 			if (statsObject.has("kills_sea_guardian")) {
-				LootCommand.seaGuardians = statsObject.get("kills_sea_guardian").getAsInt();
+				LootTracker.seaGuardians = statsObject.get("kills_sea_guardian").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.seaGuardians;
+			LootTracker.seaCreatures += LootTracker.seaGuardians;
 				
-			LootCommand.seaWitches = 0;
+			LootTracker.seaWitches = 0;
 			if (statsObject.has("kills_sea_witch")) {
-				LootCommand.seaWitches = statsObject.get("kills_sea_witch").getAsInt();
+				LootTracker.seaWitches = statsObject.get("kills_sea_witch").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.seaWitches;
+			LootTracker.seaCreatures += LootTracker.seaWitches;
 			
-			LootCommand.seaArchers = 0;
+			LootTracker.seaArchers = 0;
 			if (statsObject.has("kills_sea_archer")) {
-				LootCommand.seaArchers = statsObject.get("kills_sea_archer").getAsInt();
+				LootTracker.seaArchers = statsObject.get("kills_sea_archer").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.seaArchers;
+			LootTracker.seaCreatures += LootTracker.seaArchers;
 			
-			LootCommand.monsterOfTheDeeps = 0;
+			LootTracker.monsterOfTheDeeps = 0;
 			if (statsObject.has("kills_zombie_deep")) {
 				if (statsObject.has("kills_chicken_deep")) {
-					LootCommand.monsterOfTheDeeps = statsObject.get("kills_zombie_deep").getAsInt() + statsObject.get("kills_chicken_deep").getAsInt();
+					LootTracker.monsterOfTheDeeps = statsObject.get("kills_zombie_deep").getAsInt() + statsObject.get("kills_chicken_deep").getAsInt();
 				} else {
-					LootCommand.monsterOfTheDeeps = statsObject.get("kills_zombie_deep").getAsInt();
+					LootTracker.monsterOfTheDeeps = statsObject.get("kills_zombie_deep").getAsInt();
 				}
 			} else if (statsObject.has("kills_chicken_deep")) {
-				LootCommand.monsterOfTheDeeps = statsObject.get("kills_chicken_deep").getAsInt();
+				LootTracker.monsterOfTheDeeps = statsObject.get("kills_chicken_deep").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.monsterOfTheDeeps;
+			LootTracker.seaCreatures += LootTracker.monsterOfTheDeeps;
 			
-			LootCommand.catfishes = 0;
+			LootTracker.catfishes = 0;
 			if (statsObject.has("kills_catfish")) {
-				LootCommand.catfishes = statsObject.get("kills_catfish").getAsInt();
+				LootTracker.catfishes = statsObject.get("kills_catfish").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.catfishes;
+			LootTracker.seaCreatures += LootTracker.catfishes;
 			
-			LootCommand.carrotKings = 0;
+			LootTracker.carrotKings = 0;
 			if (statsObject.has("kills_carrot_king")) {
-				LootCommand.carrotKings = statsObject.get("kills_carrot_king").getAsInt();
+				LootTracker.carrotKings = statsObject.get("kills_carrot_king").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.carrotKings;
+			LootTracker.seaCreatures += LootTracker.carrotKings;
 			
-			LootCommand.seaLeeches = 0;
+			LootTracker.seaLeeches = 0;
 			if (statsObject.has("kills_sea_leech")) {
-				LootCommand.seaLeeches = statsObject.get("kills_sea_leech").getAsInt();
+				LootTracker.seaLeeches = statsObject.get("kills_sea_leech").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.seaLeeches;
+			LootTracker.seaCreatures += LootTracker.seaLeeches;
 			
-			LootCommand.guardianDefenders = 0;
+			LootTracker.guardianDefenders = 0;
 			if (statsObject.has("kills_guardian_defender")) {
-				LootCommand.guardianDefenders = statsObject.get("kills_guardian_defender").getAsInt();
+				LootTracker.guardianDefenders = statsObject.get("kills_guardian_defender").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.guardianDefenders;
+			LootTracker.seaCreatures += LootTracker.guardianDefenders;
 			
-			LootCommand.deepSeaProtectors = 0;
+			LootTracker.deepSeaProtectors = 0;
 			if (statsObject.has("kills_deep_sea_protector")) {
-				LootCommand.deepSeaProtectors = statsObject.get("kills_deep_sea_protector").getAsInt();
+				LootTracker.deepSeaProtectors = statsObject.get("kills_deep_sea_protector").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.deepSeaProtectors;
+			LootTracker.seaCreatures += LootTracker.deepSeaProtectors;
 			
-			LootCommand.hydras = 0;
+			LootTracker.hydras = 0;
 			if (statsObject.has("kills_water_hydra")) {
 				// Hydra splits
-				LootCommand.hydras = statsObject.get("kills_water_hydra").getAsInt() / 2;
+				LootTracker.hydras = statsObject.get("kills_water_hydra").getAsInt() / 2;
 			}
-			LootCommand.seaCreatures += LootCommand.hydras;
+			LootTracker.seaCreatures += LootTracker.hydras;
 			
-			LootCommand.seaEmperors = 0;
+			LootTracker.seaEmperors = 0;
 			if (statsObject.has("kills_skeleton_emperor")) {
 				if (statsObject.has("kills_guardian_emperor")) {
-					LootCommand.seaEmperors = statsObject.get("kills_skeleton_emperor").getAsInt() + statsObject.get("kills_guardian_emperor").getAsInt();
+					LootTracker.seaEmperors = statsObject.get("kills_skeleton_emperor").getAsInt() + statsObject.get("kills_guardian_emperor").getAsInt();
 				} else {
-					LootCommand.seaEmperors = statsObject.get("kills_skeleton_emperor").getAsInt();
+					LootTracker.seaEmperors = statsObject.get("kills_skeleton_emperor").getAsInt();
 				}
 			} else if (statsObject.has("kills_guardian_emperor")) {
-				LootCommand.seaEmperors = statsObject.get("kills_guardian_emperor").getAsInt();
+				LootTracker.seaEmperors = statsObject.get("kills_guardian_emperor").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.seaEmperors;
+			LootTracker.seaCreatures += LootTracker.seaEmperors;
 			
-			LootCommand.fishingMilestone = 0;
+			LootTracker.fishingMilestone = 0;
 			if (statsObject.has("pet_milestone_sea_creatures_killed")) {
-				LootCommand.fishingMilestone = statsObject.get("pet_milestone_sea_creatures_killed").getAsInt();
+				LootTracker.fishingMilestone = statsObject.get("pet_milestone_sea_creatures_killed").getAsInt();
 			}
 			
-			LootCommand.frozenSteves = 0;
+			LootTracker.frozenSteves = 0;
 			if (statsObject.has("kills_frozen_steve")) {
-				LootCommand.frozenSteves = statsObject.get("kills_frozen_steve").getAsInt();
+				LootTracker.frozenSteves = statsObject.get("kills_frozen_steve").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.frozenSteves;
+			LootTracker.seaCreatures += LootTracker.frozenSteves;
 			
-			LootCommand.frostyTheSnowmans = 0;
+			LootTracker.frostyTheSnowmans = 0;
 			if (statsObject.has("kills_frosty_the_snowman")) {
-				LootCommand.frostyTheSnowmans = statsObject.get("kills_frosty_the_snowman").getAsInt();
+				LootTracker.frostyTheSnowmans = statsObject.get("kills_frosty_the_snowman").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.frostyTheSnowmans;
+			LootTracker.seaCreatures += LootTracker.frostyTheSnowmans;
 			
-			LootCommand.grinches = 0;
+			LootTracker.grinches = 0;
 			if (statsObject.has("kills_grinch")) {
-				LootCommand.grinches = statsObject.get("kills_grinch").getAsInt();
+				LootTracker.grinches = statsObject.get("kills_grinch").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.grinches;
+			LootTracker.seaCreatures += LootTracker.grinches;
 			
-			LootCommand.yetis = 0;
+			LootTracker.yetis = 0;
 			if (statsObject.has("kills_yeti")) {
-				LootCommand.yetis = statsObject.get("kills_yeti").getAsInt();
+				LootTracker.yetis = statsObject.get("kills_yeti").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.yetis;
+			LootTracker.seaCreatures += LootTracker.yetis;
 			
-			LootCommand.nurseSharks = 0;
+			LootTracker.nurseSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
-				LootCommand.nurseSharks = statsObject.get("kills_nurse_shark").getAsInt();
+				LootTracker.nurseSharks = statsObject.get("kills_nurse_shark").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.nurseSharks;
+			LootTracker.seaCreatures += LootTracker.nurseSharks;
 			
-			LootCommand.blueSharks = 0;
+			LootTracker.blueSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
-				LootCommand.blueSharks = statsObject.get("kills_blue_shark").getAsInt();
+				LootTracker.blueSharks = statsObject.get("kills_blue_shark").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.blueSharks;
+			LootTracker.seaCreatures += LootTracker.blueSharks;
 			
-			LootCommand.tigerSharks = 0;
+			LootTracker.tigerSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
-				LootCommand.tigerSharks = statsObject.get("kills_tiger_shark").getAsInt();
+				LootTracker.tigerSharks = statsObject.get("kills_tiger_shark").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.tigerSharks;
+			LootTracker.seaCreatures += LootTracker.tigerSharks;
 			
-			LootCommand.greatWhiteSharks = 0;
+			LootTracker.greatWhiteSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
-				LootCommand.greatWhiteSharks = statsObject.get("kills_great_white_shark").getAsInt();
+				LootTracker.greatWhiteSharks = statsObject.get("kills_great_white_shark").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.greatWhiteSharks;
+			LootTracker.seaCreatures += LootTracker.greatWhiteSharks;
 			
-			LootCommand.scarecrows = 0;
+			LootTracker.scarecrows = 0;
 			if (statsObject.has("kills_scarecrow")) {
-				LootCommand.scarecrows = statsObject.get("kills_scarecrow").getAsInt();
+				LootTracker.scarecrows = statsObject.get("kills_scarecrow").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.scarecrows;
+			LootTracker.seaCreatures += LootTracker.scarecrows;
 			
-			LootCommand.nightmares = 0;
+			LootTracker.nightmares = 0;
 			if (statsObject.has("kills_nightmare")) {
-				LootCommand.nightmares = statsObject.get("kills_nightmare").getAsInt();
+				LootTracker.nightmares = statsObject.get("kills_nightmare").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.nightmares;
+			LootTracker.seaCreatures += LootTracker.nightmares;
 			
-			LootCommand.werewolfs = 0;
+			LootTracker.werewolfs = 0;
 			if (statsObject.has("kills_werewolf")) {
-				LootCommand.werewolfs = statsObject.get("kills_werewolf").getAsInt();
+				LootTracker.werewolfs = statsObject.get("kills_werewolf").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.werewolfs;
+			LootTracker.seaCreatures += LootTracker.werewolfs;
 			
-			LootCommand.phantomFishers = 0;
+			LootTracker.phantomFishers = 0;
 			if (statsObject.has("kills_phantom_fisherman")) {
-				LootCommand.phantomFishers = statsObject.get("kills_phantom_fisherman").getAsInt();
+				LootTracker.phantomFishers = statsObject.get("kills_phantom_fisherman").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.phantomFishers;
+			LootTracker.seaCreatures += LootTracker.phantomFishers;
 			
-			LootCommand.grimReapers = 0;
+			LootTracker.grimReapers = 0;
 			if (statsObject.has("kills_grim_reaper")) {
-				LootCommand.grimReapers = statsObject.get("kills_grim_reaper").getAsInt();
+				LootTracker.grimReapers = statsObject.get("kills_grim_reaper").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.grimReapers;
+			LootTracker.seaCreatures += LootTracker.grimReapers;
 			
 			System.out.println("Writing to config...");
-			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);
+			ConfigHandler.writeIntConfig("fishing", "goodCatch", LootTracker.goodCatches);
+			ConfigHandler.writeIntConfig("fishing", "greatCatch", LootTracker.greatCatches);
+			ConfigHandler.writeIntConfig("fishing", "seaCreature", LootTracker.seaCreatures);
+			ConfigHandler.writeIntConfig("fishing", "squid", LootTracker.squids);
+			ConfigHandler.writeIntConfig("fishing", "seaWalker", LootTracker.seaWalkers);
+			ConfigHandler.writeIntConfig("fishing", "nightSquid", LootTracker.nightSquids);
+			ConfigHandler.writeIntConfig("fishing", "seaGuardian", LootTracker.seaGuardians);
+			ConfigHandler.writeIntConfig("fishing", "seaWitch", LootTracker.seaWitches);
+			ConfigHandler.writeIntConfig("fishing", "seaArcher", LootTracker.seaArchers);
+			ConfigHandler.writeIntConfig("fishing", "monsterOfDeep", LootTracker.monsterOfTheDeeps);
+			ConfigHandler.writeIntConfig("fishing", "catfish", LootTracker.catfishes);
+			ConfigHandler.writeIntConfig("fishing", "carrotKing", LootTracker.carrotKings);
+			ConfigHandler.writeIntConfig("fishing", "seaLeech", LootTracker.seaLeeches);
+			ConfigHandler.writeIntConfig("fishing", "guardianDefender", LootTracker.guardianDefenders);
+			ConfigHandler.writeIntConfig("fishing", "deepSeaProtector", LootTracker.deepSeaProtectors);
+			ConfigHandler.writeIntConfig("fishing", "hydra", LootTracker.hydras);
+			ConfigHandler.writeIntConfig("fishing", "seaEmperor", LootTracker.seaEmperors);
+			ConfigHandler.writeIntConfig("fishing", "milestone", LootTracker.fishingMilestone);
+			ConfigHandler.writeIntConfig("fishing", "frozenSteve", LootTracker.frozenSteves);
+			ConfigHandler.writeIntConfig("fishing", "snowman", LootTracker.frostyTheSnowmans);
+			ConfigHandler.writeIntConfig("fishing", "grinch", LootTracker.grinches);
+			ConfigHandler.writeIntConfig("fishing", "yeti", LootTracker.yetis);
+			ConfigHandler.writeIntConfig("fishing", "nurseShark", LootTracker.nurseSharks);
+			ConfigHandler.writeIntConfig("fishing", "blueShark", LootTracker.blueSharks);
+			ConfigHandler.writeIntConfig("fishing", "tigerShark", LootTracker.tigerSharks);
+			ConfigHandler.writeIntConfig("fishing", "greatWhiteShark", LootTracker.greatWhiteSharks);
+			ConfigHandler.writeIntConfig("fishing", "scarecrow", LootTracker.scarecrows);
+			ConfigHandler.writeIntConfig("fishing", "nightmare", LootTracker.nightmares);
+			ConfigHandler.writeIntConfig("fishing", "werewolf", LootTracker.werewolfs);
+			ConfigHandler.writeIntConfig("fishing", "phantomFisher", LootTracker.phantomFishers);
+			ConfigHandler.writeIntConfig("fishing", "grimReaper", LootTracker.grimReapers);
 			
 			player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Fishing stats imported."));
 		}).start();
diff --git a/src/main/java/me/Danker/commands/LootCommand.java b/src/main/java/me/Danker/commands/LootCommand.java
index 0f38ada..3dba27d 100644
--- a/src/main/java/me/Danker/commands/LootCommand.java
+++ b/src/main/java/me/Danker/commands/LootCommand.java
@@ -1,6 +1,7 @@
 package me.Danker.commands;
 
 import me.Danker.DankersSkyblockMod;
+import me.Danker.features.loot.LootTracker;
 import me.Danker.utils.Utils;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
@@ -15,325 +16,7 @@ import java.util.List;
 import java.util.Locale;
 
 public class LootCommand extends CommandBase {
-	// Wolf
-	public static int wolfSvens;
-	public static int wolfTeeth;
-	public static int wolfWheels;
-	public static int wolfWheelsDrops;
-	public static int wolfSpirits;
-	public static int wolfBooks;
-	public static int wolfEggs;
-	public static int wolfCoutures;
-	public static int wolfBaits;
-	public static int wolfFluxes;
-	public static double wolfTime;
-	public static int wolfBosses;
-	// Spider
-	public static int spiderTarantulas;
-	public static int spiderWebs;
-	public static int spiderTAP;
-	public static int spiderTAPDrops;
-	public static int spiderBites;
-	public static int spiderCatalysts;
-	public static int spiderBooks;
-	public static int spiderSwatters;
-	public static int spiderTalismans;
-	public static int spiderMosquitos;
-	public static double spiderTime;
-	public static int spiderBosses;
-	// Zombie
-	public static int zombieRevs;
-	public static int zombieRevFlesh;
-	public static int zombieFoulFlesh;
-	public static int zombieFoulFleshDrops;
-	public static int zombiePestilences;
-	public static int zombieUndeadCatas;
-	public static int zombieBooks;
-	public static int zombieBeheadeds;
-	public static int zombieRevCatas;
-	public static int zombieSnakes;
-	public static int zombieScythes;
-	public static double zombieTime;
-	public static int zombieBosses;
-	
-	// Fishing
-	public static int seaCreatures;
-	public static int goodCatches;
-	public static int greatCatches;
-	public static int squids;
-	public static int seaWalkers;
-	public static int nightSquids;
-	public static int seaGuardians;
-	public static int seaWitches;
-	public static int seaArchers;
-	public static int monsterOfTheDeeps;
-	public static int catfishes;
-	public static int carrotKings;
-	public static int seaLeeches;
-	public static int guardianDefenders;
-	public static int deepSeaProtectors;
-	public static int hydras;
-	public static int seaEmperors;
-	public static double empTime;
-	public static int empSCs;
-	public static int fishingMilestone;
-	// Fishing Winter
-	public static int frozenSteves;
-	public static int frostyTheSnowmans;
-	public static int grinches;
-	public static int yetis;
-	public static double yetiTime;
-	public static int yetiSCs;
-	// Fishing Festival
-	public static int nurseSharks;
-	public static int blueSharks;
-	public static int tigerSharks;
-	public static int greatWhiteSharks;
-	// Spooky Fishing
-	public static int scarecrows;
-	public static int nightmares;
-	public static int werewolfs;
-	public static int phantomFishers;
-	public static int grimReapers;
-	
-	// Mythological
-	public static double mythCoins;
-	public static int griffinFeathers;
-	public static int crownOfGreeds;
-	public static int washedUpSouvenirs;
-	public static int minosHunters;
-	public static int siameseLynxes;
-	public static int minotaurs;
-	public static int gaiaConstructs;
-	public static int minosChampions;
-	public static int minosInquisitors;
-	
-	// Catacombs Dungeons
-	public static int recombobulators;
-	public static int fumingPotatoBooks;
-	// F1
-	public static int bonzoStaffs;
-	public static double f1CoinsSpent;
-	public static double f1TimeSpent;
-	// F2
-	public static int scarfStudies;
-	public static int adaptiveSwords;
-	public static double f2CoinsSpent;
-	public static double f2TimeSpent;
-	// F3
-	public static int adaptiveHelms;
-	public static int adaptiveChests;
-	public static int adaptiveLegs;
-	public static int adaptiveBoots;
-	public static double f3CoinsSpent;
-	public static double f3TimeSpent;
-	// F4
-	public static int spiritWings;
-	public static int spiritBones;
-	public static int spiritBoots;
-	public static int spiritSwords;
-	public static int spiritBows;
-	public static int epicSpiritPets;
-	public static int legSpiritPets;
-	public static double f4CoinsSpent;
-	public static double f4TimeSpent;
-	// F5
-	public static int warpedStones;
-	public static int shadowAssHelms;
-	public static int shadowAssChests;
-	public static int shadowAssLegs;
-	public static int shadowAssBoots;
-	public static int lastBreaths;
-	public static int lividDaggers;
-	public static int shadowFurys;
-	public static double f5CoinsSpent;
-	public static double f5TimeSpent;
-	// F6
-	public static int ancientRoses;
-	public static int precursorEyes;
-	public static int giantsSwords;
-	public static int necroLordHelms;
-	public static int necroLordChests;
-	public static int necroLordLegs;
-	public static int necroLordBoots;
-	public static int necroSwords;
-	public static double f6CoinsSpent;
-	public static double f6TimeSpent;
-	// F7
-	public static int witherBloods;
-	public static int witherCloaks;
-	public static int implosions;
-	public static int witherShields;
-	public static int shadowWarps;
-	public static int necronsHandles;
-	public static int autoRecombs;
-	public static int witherHelms;
-	public static int witherChests;
-	public static int witherLegs;
-	public static int witherBoots;
-	public static double f7CoinsSpent;
-	public static double f7TimeSpent;
-	
-	// Single sessions (No config saves)
-	// Wolf
-	public static int wolfSvensSession = 0;
-	public static int wolfTeethSession = 0;
-	public static int wolfWheelsSession = 0;
-	public static int wolfWheelsDropsSession = 0;
-	public static int wolfSpiritsSession = 0;
-	public static int wolfBooksSession = 0;
-	public static int wolfEggsSession = 0;
-	public static int wolfCouturesSession = 0;
-	public static int wolfBaitsSession = 0;
-	public static int wolfFluxesSession = 0;
-	public static double wolfTimeSession = -1;
-	public static int wolfBossesSession = -1;
-	// Spider
-	public static int spiderTarantulasSession = 0;
-	public static int spiderWebsSession = 0;
-	public static int spiderTAPSession = 0;
-	public static int spiderTAPDropsSession = 0;
-	public static int spiderBitesSession = 0;
-	public static int spiderCatalystsSession = 0;
-	public static int spiderBooksSession = 0;
-	public static int spiderSwattersSession = 0;
-	public static int spiderTalismansSession = 0;
-	public static int spiderMosquitosSession = 0;
-	public static double spiderTimeSession = -1;
-	public static int spiderBossesSession = -1;
-	// Zombie
-	public static int zombieRevsSession = 0;
-	public static int zombieRevFleshSession = 0;
-	public static int zombieFoulFleshSession = 0;
-	public static int zombieFoulFleshDropsSession = 0;
-	public static int zombiePestilencesSession = 0;
-	public static int zombieUndeadCatasSession = 0;
-	public static int zombieBooksSession = 0;
-	public static int zombieBeheadedsSession = 0;
-	public static int zombieRevCatasSession = 0;
-	public static int zombieSnakesSession = 0;
-	public static int zombieScythesSession = 0;
-	public static double zombieTimeSession = -1;
-	public static int zombieBossesSession = -1;
 
-	// Fishing
-	public static int seaCreaturesSession = 0;
-	public static int goodCatchesSession = 0;
-	public static int greatCatchesSession = 0;
-	public static int squidsSession = 0;
-	public static int seaWalkersSession = 0;
-	public static int nightSquidsSession = 0;
-	public static int seaGuardiansSession = 0;
-	public static int seaWitchesSession = 0;
-	public static int seaArchersSession = 0;
-	public static int monsterOfTheDeepsSession = 0;
-	public static int catfishesSession = 0;
-	public static int carrotKingsSession = 0;
-	public static int seaLeechesSession = 0;
-	public static int guardianDefendersSession = 0;
-	public static int deepSeaProtectorsSession = 0;
-	public static int hydrasSession = 0;
-	public static int seaEmperorsSession = 0;
-	public static double empTimeSession = -1;
-	public static int empSCsSession = -1;
-	public static int fishingMilestoneSession = 0;
-	// Fishing Winter
-	public static int frozenStevesSession = 0;
-	public static int frostyTheSnowmansSession = 0;
-	public static int grinchesSession = 0;
-	public static int yetisSession = 0;
-	public static double yetiTimeSession = -1;
-	public static int yetiSCsSession = -1;
-	// Fishing Festival
-	public static int nurseSharksSession = 0;
-	public static int blueSharksSession = 0;
-	public static int tigerSharksSession = 0;
-	public static int greatWhiteSharksSession = 0;
-	// Spooky Fishing
-	public static int scarecrowsSession = 0;
-	public static int nightmaresSession = 0;
-	public static int werewolfsSession = 0;
-	public static int phantomFishersSession = 0;
-	public static int grimReapersSession = 0;
-	
-	// Mythological
-	public static double mythCoinsSession = 0;
-	public static int griffinFeathersSession = 0;
-	public static int crownOfGreedsSession = 0;
-	public static int washedUpSouvenirsSession = 0;
-	public static int minosHuntersSession = 0;
-	public static int siameseLynxesSession = 0;
-	public static int minotaursSession = 0;
-	public static int gaiaConstructsSession = 0;
-	public static int minosChampionsSession = 0;
-	public static int minosInquisitorsSession = 0;
-	
-	// Catacombs Dungeons
-	public static int recombobulatorsSession = 0;
-	public static int fumingPotatoBooksSession = 0;
-	// F1
-	public static int bonzoStaffsSession = 0;
-	public static double f1CoinsSpentSession = 0;
-	public static double f1TimeSpentSession = 0;
-	// F2
-	public static int scarfStudiesSession = 0;
-	public static int adaptiveSwordsSession = 0;
-	public static double f2CoinsSpentSession = 0;
-	public static double f2TimeSpentSession = 0;
-	// F3
-	public static int adaptiveHelmsSession = 0;
-	public static int adaptiveChestsSession = 0;
-	public static int adaptiveLegsSession = 0;
-	public static int adaptiveBootsSession = 0;
-	public static double f3CoinsSpentSession = 0;
-	public static double f3TimeSpentSession = 0;
-	// F4
-	public static int spiritWingsSession = 0;
-	public static int spiritBonesSession = 0;
-	public static int spiritBootsSession = 0;
-	public static int spiritSwordsSession = 0;
-	public static int spiritBowsSession = 0;
-	public static int epicSpiritPetsSession = 0;
-	public static int legSpiritPetsSession = 0;
-	public static double f4CoinsSpentSession = 0;
-	public static double f4TimeSpentSession = 0;
-	// F5
-	public static int warpedStonesSession = 0;
-	public static int shadowAssHelmsSession = 0;
-	public static int shadowAssChestsSession = 0;
-	public static int shadowAssLegsSession = 0;
-	public static int shadowAssBootsSession = 0;
-	public static int lastBreathsSession = 0;
-	public static int lividDaggersSession = 0;
-	public static int shadowFurysSession = 0;
-	public static double f5CoinsSpentSession = 0;
-	public static double f5TimeSpentSession = 0;
-	// F6
-	public static int ancientRosesSession = 0;
-	public static int precursorEyesSession = 0;
-	public static int giantsSwordsSession = 0;
-	public static int necroLordHelmsSession = 0;
-	public static int necroLordChestsSession = 0;
-	public static int necroLordLegsSession = 0;
-	public static int necroLordBootsSession = 0;
-	public static int necroSwordsSession = 0;
-	public static double f6CoinsSpentSession = 0;
-	public static double f6TimeSpentSession = 0;
-	// F7
-	public static int witherBloodsSession = 0;
-	public static int witherCloaksSession = 0;
-	public static int implosionsSession = 0;
-	public static int witherShieldsSession = 0;
-	public static int shadowWarpsSession = 0;
-	public static int necronsHandlesSession = 0;
-	public static int autoRecombsSession = 0;
-	public static int witherHelmsSession = 0;
-	public static int witherChestsSession = 0;
-	public static int witherLegsSession = 0;
-	public static int witherBootsSession = 0;
-	public static double f7CoinsSpentSession = 0;
-	public static double f7TimeSpentSession = 0;
-	
 	@Override
 	public String getCommandName() {
 		return "loot";
@@ -371,213 +54,213 @@ public class LootCommand extends CommandBase {
 			player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
 			return;
 		}
-		
+
 		double timeNow = System.currentTimeMillis() / 1000;
 		String timeBetween;
 		String bossesBetween;
 		String drop20;
 		NumberFormat nf = NumberFormat.getIntegerInstance(Locale.US);
 		boolean showSession = false;
-		
+
 		if (arg1[arg1.length - 1].equalsIgnoreCase("session")) showSession = true;
 
 		switch (arg1[0].toLowerCase()) {
 			case "wolf":
 				if (showSession) {
-					if (wolfTimeSession == -1) {
+					if (LootTracker.wolfTimeSession == -1) {
 						timeBetween = "Never";
 					} else {
-						timeBetween = Utils.getTimeBetween(wolfTimeSession, timeNow);
+						timeBetween = Utils.getTimeBetween(LootTracker.wolfTimeSession, timeNow);
 					}
-					if (wolfBossesSession == -1) {
+					if (LootTracker.wolfBossesSession == -1) {
 						bossesBetween = "Never";
 					} else {
-						bossesBetween = nf.format(wolfBossesSession);
+						bossesBetween = nf.format(LootTracker.wolfBossesSession);
 					}
 					if (ToggleCommand.slayerCountTotal) {
-						drop20 = nf.format(wolfWheelsSession);
+						drop20 = nf.format(LootTracker.wolfWheelsSession);
 					} else {
-						drop20 = nf.format(wolfWheelsDropsSession) + " times";
+						drop20 = nf.format(LootTracker.wolfWheelsDropsSession) + " times";
 					}
-					
+
 					player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																EnumChatFormatting.DARK_AQUA + EnumChatFormatting.BOLD + "  Sven Loot Summary (Current Session):\n" +
-																EnumChatFormatting.GOLD + "    Svens Killed: " + nf.format(wolfSvensSession) + "\n" +
-																EnumChatFormatting.GREEN + "    Wolf Teeth: " + nf.format(wolfTeethSession) + "\n" +
+																EnumChatFormatting.GOLD + "    Svens Killed: " + nf.format(LootTracker.wolfSvensSession) + "\n" +
+																EnumChatFormatting.GREEN + "    Wolf Teeth: " + nf.format(LootTracker.wolfTeethSession) + "\n" +
 																EnumChatFormatting.BLUE + "    Hamster Wheels: " + drop20 + "\n" +
-																EnumChatFormatting.AQUA + "    Spirit Runes: " + wolfSpiritsSession + "\n" + 
-																EnumChatFormatting.WHITE + "    Critical VI Books: " + wolfBooksSession + "\n" +
-																EnumChatFormatting.DARK_RED + "    Red Claw Eggs: " + wolfEggsSession + "\n" +
-																EnumChatFormatting.GOLD + "    Couture Runes: " + wolfCouturesSession + "\n" +
-																EnumChatFormatting.AQUA + "    Grizzly Baits: " + wolfBaitsSession + "\n" +
-																EnumChatFormatting.DARK_PURPLE + "    Overfluxes: " + wolfFluxesSession + "\n" +
+																EnumChatFormatting.AQUA + "    Spirit Runes: " + LootTracker.wolfSpiritsSession + "\n" +
+																EnumChatFormatting.WHITE + "    Critical VI Books: " + LootTracker.wolfBooksSession + "\n" +
+																EnumChatFormatting.DARK_RED + "    Red Claw Eggs: " + LootTracker.wolfEggsSession + "\n" +
+																EnumChatFormatting.GOLD + "    Couture Runes: " + LootTracker.wolfCouturesSession + "\n" +
+																EnumChatFormatting.AQUA + "    Grizzly Baits: " + LootTracker.wolfBaitsSession + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Overfluxes: " + LootTracker.wolfFluxesSession + "\n" +
 																EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
 																EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
 																EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + " -------------------"));
 					return;
 				}
-				
-				if (wolfTime == -1) {
+
+				if (LootTracker.wolfTime == -1) {
 					timeBetween = "Never";
 				} else {
-					timeBetween = Utils.getTimeBetween(wolfTime, timeNow);
+					timeBetween = Utils.getTimeBetween(LootTracker.wolfTime, timeNow);
 				}
-				if (wolfBosses == -1) {
+				if (LootTracker.wolfBosses == -1) {
 					bossesBetween = "Never";
 				} else {
-					bossesBetween = nf.format(wolfBosses);
+					bossesBetween = nf.format(LootTracker.wolfBosses);
 				}
 				if (ToggleCommand.slayerCountTotal) {
-					drop20 = nf.format(wolfWheels);
+					drop20 = nf.format(LootTracker.wolfWheels);
 				} else {
-					drop20 = nf.format(wolfWheelsDrops) + " times";
+					drop20 = nf.format(LootTracker.wolfWheelsDrops) + " times";
 				}
-				
+
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 															EnumChatFormatting.DARK_AQUA + EnumChatFormatting.BOLD + "  Sven Loot Summary:\n" +
-															EnumChatFormatting.GOLD + "    Svens Killed: " + nf.format(wolfSvens) + "\n" +
-															EnumChatFormatting.GREEN + "    Wolf Teeth: " + nf.format(wolfTeeth) + "\n" +
+															EnumChatFormatting.GOLD + "    Svens Killed: " + nf.format(LootTracker.wolfSvens) + "\n" +
+															EnumChatFormatting.GREEN + "    Wolf Teeth: " + nf.format(LootTracker.wolfTeeth) + "\n" +
 															EnumChatFormatting.BLUE + "    Hamster Wheels: " + drop20 + "\n" +
-															EnumChatFormatting.AQUA + "    Spirit Runes: " + wolfSpirits + "\n" + 
-															EnumChatFormatting.WHITE + "    Critical VI Books: " + wolfBooks + "\n" +
-															EnumChatFormatting.DARK_RED + "    Red Claw Eggs: " + wolfEggs + "\n" +
-															EnumChatFormatting.GOLD + "    Couture Runes: " + wolfCoutures + "\n" +
-															EnumChatFormatting.AQUA + "    Grizzly Baits: " + wolfBaits + "\n" +
-															EnumChatFormatting.DARK_PURPLE + "    Overfluxes: " + wolfFluxes + "\n" +
+															EnumChatFormatting.AQUA + "    Spirit Runes: " + LootTracker.wolfSpirits + "\n" +
+															EnumChatFormatting.WHITE + "    Critical VI Books: " + LootTracker.wolfBooks + "\n" +
+															EnumChatFormatting.DARK_RED + "    Red Claw Eggs: " + LootTracker.wolfEggs + "\n" +
+															EnumChatFormatting.GOLD + "    Couture Runes: " + LootTracker.wolfCoutures + "\n" +
+															EnumChatFormatting.AQUA + "    Grizzly Baits: " + LootTracker.wolfBaits + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Overfluxes: " + LootTracker.wolfFluxes + "\n" +
 															EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
 															EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
 															EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + " -------------------"));
 				break;
 			case "spider":
 				if (showSession) {
-					if (spiderTimeSession == -1) {
+					if (LootTracker.spiderTimeSession == -1) {
 						timeBetween = "Never";
 					} else {
-						timeBetween = Utils.getTimeBetween(spiderTimeSession, timeNow);
+						timeBetween = Utils.getTimeBetween(LootTracker.spiderTimeSession, timeNow);
 					}
-					if (spiderBossesSession == -1) {
+					if (LootTracker.spiderBossesSession == -1) {
 						bossesBetween = "Never";
 					} else {
-						bossesBetween = nf.format(spiderBossesSession);
+						bossesBetween = nf.format(LootTracker.spiderBossesSession);
 					}
 					if (ToggleCommand.slayerCountTotal) {
-						drop20 = nf.format(spiderTAPSession);
+						drop20 = nf.format(LootTracker.spiderTAPSession);
 					} else {
-						drop20 = nf.format(spiderTAPDropsSession) + " times";
+						drop20 = nf.format(LootTracker.spiderTAPDropsSession) + " times";
 					}
-					
+
 					player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + "  Spider Loot Summary (Current Session):\n" +
-																EnumChatFormatting.GOLD + "    Tarantulas Killed: " + nf.format(spiderTarantulasSession) + "\n" +
-																EnumChatFormatting.GREEN + "    Tarantula Webs: " + nf.format(spiderWebsSession) + "\n" +
+																EnumChatFormatting.GOLD + "    Tarantulas Killed: " + nf.format(LootTracker.spiderTarantulasSession) + "\n" +
+																EnumChatFormatting.GREEN + "    Tarantula Webs: " + nf.format(LootTracker.spiderWebsSession) + "\n" +
 																EnumChatFormatting.DARK_GREEN + "    Arrow Poison: " + drop20 + "\n" +
-																EnumChatFormatting.DARK_GRAY + "    Bite Runes: " + spiderBitesSession + "\n" + 
-																EnumChatFormatting.WHITE + "    Bane VI Books: " + spiderBooksSession + "\n" +
-																EnumChatFormatting.AQUA + "    Spider Catalysts: " + spiderCatalystsSession + "\n" +
-																EnumChatFormatting.DARK_PURPLE + "    Tarantula Talismans: " + spiderTalismansSession + "\n" +
-																EnumChatFormatting.LIGHT_PURPLE + "    Fly Swatters: " + spiderSwattersSession + "\n" +
-																EnumChatFormatting.GOLD + "    Digested Mosquitos: " + spiderMosquitosSession + "\n" +
+																EnumChatFormatting.DARK_GRAY + "    Bite Runes: " + LootTracker.spiderBitesSession + "\n" +
+																EnumChatFormatting.WHITE + "    Bane VI Books: " + LootTracker.spiderBooksSession + "\n" +
+																EnumChatFormatting.AQUA + "    Spider Catalysts: " + LootTracker.spiderCatalystsSession + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Tarantula Talismans: " + LootTracker.spiderTalismansSession + "\n" +
+																EnumChatFormatting.LIGHT_PURPLE + "    Fly Swatters: " + LootTracker.spiderSwattersSession + "\n" +
+																EnumChatFormatting.GOLD + "    Digested Mosquitos: " + LootTracker.spiderMosquitosSession + "\n" +
 																EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
 																EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
 																EnumChatFormatting.RED + EnumChatFormatting.BOLD + " -------------------"));
 					return;
 				}
-				
-				if (spiderTime == -1) {
+
+				if (LootTracker.spiderTime == -1) {
 					timeBetween = "Never";
 				} else {
-					timeBetween = Utils.getTimeBetween(spiderTime, timeNow);
+					timeBetween = Utils.getTimeBetween(LootTracker.spiderTime, timeNow);
 				}
-				if (spiderBosses == -1) {
+				if (LootTracker.spiderBosses == -1) {
 					bossesBetween = "Never";
 				} else {
-					bossesBetween = nf.format(spiderBosses);
+					bossesBetween = nf.format(LootTracker.spiderBosses);
 				}
 				if (ToggleCommand.slayerCountTotal) {
-					drop20 = nf.format(spiderTAP);
+					drop20 = nf.format(LootTracker.spiderTAP);
 				} else {
-					drop20 = nf.format(spiderTAPDrops) + " times";
+					drop20 = nf.format(LootTracker.spiderTAPDrops) + " times";
 				}
-				
+
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 															EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + "  Spider Loot Summary:\n" +
-															EnumChatFormatting.GOLD + "    Tarantulas Killed: " + nf.format(spiderTarantulas) + "\n" +
-															EnumChatFormatting.GREEN + "    Tarantula Webs: " + nf.format(spiderWebs) + "\n" +
+															EnumChatFormatting.GOLD + "    Tarantulas Killed: " + nf.format(LootTracker.spiderTarantulas) + "\n" +
+															EnumChatFormatting.GREEN + "    Tarantula Webs: " + nf.format(LootTracker.spiderWebs) + "\n" +
 															EnumChatFormatting.DARK_GREEN + "    Arrow Poison: " + drop20 + "\n" +
-															EnumChatFormatting.DARK_GRAY + "    Bite Runes: " + spiderBites + "\n" + 
-															EnumChatFormatting.WHITE + "    Bane VI Books: " + spiderBooks + "\n" +
-															EnumChatFormatting.AQUA + "    Spider Catalysts: " + spiderCatalysts + "\n" +
-															EnumChatFormatting.DARK_PURPLE + "    Tarantula Talismans: " + spiderTalismans + "\n" +
-															EnumChatFormatting.LIGHT_PURPLE + "    Fly Swatters: " + spiderSwatters + "\n" +
-															EnumChatFormatting.GOLD + "    Digested Mosquitos: " + spiderMosquitos + "\n" +
+															EnumChatFormatting.DARK_GRAY + "    Bite Runes: " + LootTracker.spiderBites + "\n" +
+															EnumChatFormatting.WHITE + "    Bane VI Books: " + LootTracker.spiderBooks + "\n" +
+															EnumChatFormatting.AQUA + "    Spider Catalysts: " + LootTracker.spiderCatalysts + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Tarantula Talismans: " + LootTracker.spiderTalismans + "\n" +
+															EnumChatFormatting.LIGHT_PURPLE + "    Fly Swatters: " + LootTracker.spiderSwatters + "\n" +
+															EnumChatFormatting.GOLD + "    Digested Mosquitos: " + LootTracker.spiderMosquitos + "\n" +
 															EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
 															EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
 															EnumChatFormatting.RED + EnumChatFormatting.BOLD + " -------------------"));
 				break;
 			case "zombie":
 				if (showSession) {
-					if (zombieTimeSession == -1) {
+					if (LootTracker.zombieTimeSession == -1) {
 						timeBetween = "Never";
 					} else {
-						timeBetween = Utils.getTimeBetween(zombieTimeSession, timeNow);
+						timeBetween = Utils.getTimeBetween(LootTracker.zombieTimeSession, timeNow);
 					}
-					if (zombieBossesSession == -1) {
+					if (LootTracker.zombieBossesSession == -1) {
 						bossesBetween = "Never";
 					} else {
-						bossesBetween = nf.format(zombieBossesSession);
+						bossesBetween = nf.format(LootTracker.zombieBossesSession);
 					}
 					if (ToggleCommand.slayerCountTotal) {
-						drop20 = nf.format(zombieFoulFleshSession);
+						drop20 = nf.format(LootTracker.zombieFoulFleshSession);
 					} else {
-						drop20 = nf.format(zombieFoulFleshDropsSession) + " times";
+						drop20 = nf.format(LootTracker.zombieFoulFleshDropsSession) + " times";
 					}
-					
+
 					player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																EnumChatFormatting.DARK_GREEN + EnumChatFormatting.BOLD + "  Zombie Loot Summary (Current Session):\n" +
-																EnumChatFormatting.GOLD + "    Revs Killed: " + nf.format(zombieRevsSession) + "\n" +
-																EnumChatFormatting.GREEN + "    Revenant Flesh: " + nf.format(zombieRevFleshSession) + "\n" +
+																EnumChatFormatting.GOLD + "    Revs Killed: " + nf.format(LootTracker.zombieRevsSession) + "\n" +
+																EnumChatFormatting.GREEN + "    Revenant Flesh: " + nf.format(LootTracker.zombieRevFleshSession) + "\n" +
 																EnumChatFormatting.BLUE + "    Foul Flesh: " + drop20 + "\n" +
-																EnumChatFormatting.DARK_GREEN + "    Pestilence Runes: " + zombiePestilencesSession + "\n" + 
-																EnumChatFormatting.WHITE + "    Smite VI Books: " + zombieBooksSession + "\n" +
-																EnumChatFormatting.AQUA + "    Undead Catalysts: " + zombieUndeadCatasSession + "\n" +
-																EnumChatFormatting.DARK_PURPLE + "    Beheaded Horrors: " + zombieBeheadedsSession + "\n" +
-																EnumChatFormatting.RED + "    Revenant Catalysts: " + zombieRevCatasSession + "\n" +
-																EnumChatFormatting.DARK_GREEN + "    Snake Runes: " + zombieSnakesSession + "\n" +
-																EnumChatFormatting.GOLD + "    Scythe Blades: " + zombieScythesSession + "\n" +
+																EnumChatFormatting.DARK_GREEN + "    Pestilence Runes: " +LootTracker.zombiePestilencesSession + "\n" +
+																EnumChatFormatting.WHITE + "    Smite VI Books: " + LootTracker.zombieBooksSession + "\n" +
+																EnumChatFormatting.AQUA + "    Undead Catalysts: " + LootTracker.zombieUndeadCatasSession + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Beheaded Horrors: " + LootTracker.zombieBeheadedsSession + "\n" +
+																EnumChatFormatting.RED + "    Revenant Catalysts: " + LootTracker.zombieRevCatasSession + "\n" +
+																EnumChatFormatting.DARK_GREEN + "    Snake Runes: " + LootTracker.zombieSnakesSession + "\n" +
+																EnumChatFormatting.GOLD + "    Scythe Blades: " + LootTracker.zombieScythesSession + "\n" +
 																EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
 																EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
 																EnumChatFormatting.GREEN + EnumChatFormatting.BOLD + " -------------------"));
 					return;
 				}
-				
-				if (zombieTime == -1) {
+
+				if (LootTracker.zombieTime == -1) {
 					timeBetween = "Never";
 				} else {
-					timeBetween = Utils.getTimeBetween(zombieTime, timeNow);
+					timeBetween = Utils.getTimeBetween(LootTracker.zombieTime, timeNow);
 				}
-				if (zombieBosses == -1) {
+				if (LootTracker.zombieBosses == -1) {
 					bossesBetween = "Never";
 				} else {
-					bossesBetween = nf.format(zombieBosses);
+					bossesBetween = nf.format(LootTracker.zombieBosses);
 				}
 				if (ToggleCommand.slayerCountTotal) {
-					drop20 = nf.format(zombieFoulFlesh);
+					drop20 = nf.format(LootTracker.zombieFoulFlesh);
 				} else {
-					drop20 = nf.format(zombieFoulFleshDrops) + " times";
+					drop20 = nf.format(LootTracker.zombieFoulFleshDrops) + " times";
 				}
-				
+
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 															EnumChatFormatting.DARK_GREEN + EnumChatFormatting.BOLD + "  Zombie Loot Summary:\n" +
-															EnumChatFormatting.GOLD + "    Revs Killed: " + nf.format(zombieRevs) + "\n" +
-															EnumChatFormatting.GREEN + "    Revenant Flesh: " + nf.format(zombieRevFlesh) + "\n" +
+															EnumChatFormatting.GOLD + "    Revs Killed: " + nf.format(LootTracker.zombieRevs) + "\n" +
+															EnumChatFormatting.GREEN + "    Revenant Flesh: " + nf.format(LootTracker.zombieRevFlesh) + "\n" +
 															EnumChatFormatting.BLUE + "    Foul Flesh: " + drop20 + "\n" +
-															EnumChatFormatting.DARK_GREEN + "    Pestilence Runes: " + zombiePestilences + "\n" + 
-															EnumChatFormatting.WHITE + "    Smite VI Books: " + zombieBooks + "\n" +
-															EnumChatFormatting.AQUA + "    Undead Catalysts: " + zombieUndeadCatas + "\n" +
-															EnumChatFormatting.DARK_PURPLE + "    Beheaded Horrors: " + zombieBeheadeds + "\n" +
-															EnumChatFormatting.RED + "    Revenant Catalysts: " + zombieRevCatas + "\n" +
-															EnumChatFormatting.DARK_GREEN + "    Snake Runes: " + zombieSnakes + "\n" +
-															EnumChatFormatting.GOLD + "    Scythe Blades: " + zombieScythes + "\n" +
+															EnumChatFormatting.DARK_GREEN + "    Pestilence Runes: " + LootTracker.zombiePestilences + "\n" +
+															EnumChatFormatting.WHITE + "    Smite VI Books: " + LootTracker.zombieBooks + "\n" +
+															EnumChatFormatting.AQUA + "    Undead Catalysts: " + LootTracker.zombieUndeadCatas + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Beheaded Horrors: " + LootTracker.zombieBeheadeds + "\n" +
+															EnumChatFormatting.RED + "    Revenant Catalysts: " + LootTracker.zombieRevCatas + "\n" +
+															EnumChatFormatting.DARK_GREEN + "    Snake Runes: " + LootTracker.zombieSnakes + "\n" +
+															EnumChatFormatting.GOLD + "    Scythe Blades: " + LootTracker.zombieScythes + "\n" +
 															EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
 															EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
 															EnumChatFormatting.GREEN + EnumChatFormatting.BOLD + " -------------------"));
@@ -586,46 +269,46 @@ public class LootCommand extends CommandBase {
 				if (arg1.length > 1) {
 					if (arg1[1].equalsIgnoreCase("winter")) {
 						if (showSession) {
-							if (yetiTimeSession == -1) {
+							if (LootTracker.yetiTimeSession == -1) {
 								timeBetween = "Never";
 							} else {
-								timeBetween = Utils.getTimeBetween(yetiTimeSession, timeNow);
+								timeBetween = Utils.getTimeBetween(LootTracker.yetiTimeSession, timeNow);
 							}
-							if (yetiSCsSession == -1) {
+							if (LootTracker.yetiSCsSession == -1) {
 								bossesBetween = "Never";
 							} else {
-								bossesBetween = nf.format(yetiSCsSession);
+								bossesBetween = nf.format(LootTracker.yetiSCsSession);
 							}
-							
+
 							player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																		EnumChatFormatting.WHITE + EnumChatFormatting.BOLD + "  Winter Fishing Summary (Current Session):\n" +
-																		EnumChatFormatting.AQUA + "    Frozen Steves: " + nf.format(frozenStevesSession) + "\n" +
-																		EnumChatFormatting.WHITE + "    Snowmans: " + nf.format(frostyTheSnowmansSession) + "\n" +
-																		EnumChatFormatting.DARK_GREEN + "    Grinches: " + nf.format(grinchesSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Yetis: " + nf.format(yetisSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Frozen Steves: " + nf.format(LootTracker.frozenStevesSession) + "\n" +
+																		EnumChatFormatting.WHITE + "    Snowmans: " + nf.format(LootTracker.frostyTheSnowmansSession) + "\n" +
+																		EnumChatFormatting.DARK_GREEN + "    Grinches: " + nf.format(LootTracker.grinchesSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Yetis: " + nf.format(LootTracker.yetisSession) + "\n" +
 																		EnumChatFormatting.AQUA + "    Time Since Yeti: " + timeBetween + "\n" +
 																		EnumChatFormatting.AQUA + "    Creatures Since Yeti: " + bossesBetween + "\n" +
 																		EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + " -------------------"));
 							return;
 						}
-						
-						if (yetiTime == -1) {
+
+						if (LootTracker.yetiTime == -1) {
 							timeBetween = "Never";
 						} else {
-							timeBetween = Utils.getTimeBetween(yetiTime, timeNow);
+							timeBetween = Utils.getTimeBetween(LootTracker.yetiTime, timeNow);
 						}
-						if (yetiSCs == -1) {
+						if (LootTracker.yetiSCs == -1) {
 							bossesBetween = "Never";
 						} else {
-							bossesBetween = nf.format(yetiSCs);
+							bossesBetween = nf.format(LootTracker.yetiSCs);
 						}
-						
+
 						player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																	EnumChatFormatting.WHITE + EnumChatFormatting.BOLD + "  Winter Fishing Summary:\n" +
-																	EnumChatFormatting.AQUA + "    Frozen Steves: " + nf.format(frozenSteves) + "\n" +
-																	EnumChatFormatting.WHITE + "    Snowmans: " + nf.format(frostyTheSnowmans) + "\n" +
-																	EnumChatFormatting.DARK_GREEN + "    Grinches: " + nf.format(grinches) + "\n" +
-																	EnumChatFormatting.GOLD + "    Yetis: " + nf.format(yetis) + "\n" +
+																	EnumChatFormatting.AQUA + "    Frozen Steves: " + nf.format(LootTracker.frozenSteves) + "\n" +
+																	EnumChatFormatting.WHITE + "    Snowmans: " + nf.format(LootTracker.frostyTheSnowmans) + "\n" +
+																	EnumChatFormatting.DARK_GREEN + "    Grinches: " + nf.format(LootTracker.grinches) + "\n" +
+																	EnumChatFormatting.GOLD + "    Yetis: " + nf.format(LootTracker.yetis) + "\n" +
 																	EnumChatFormatting.AQUA + "    Time Since Yeti: " + timeBetween + "\n" +
 																	EnumChatFormatting.AQUA + "    Creatures Since Yeti: " + bossesBetween + "\n" +
 																	EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + " -------------------"));
@@ -634,146 +317,146 @@ public class LootCommand extends CommandBase {
 						if (showSession) {
 							player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																		EnumChatFormatting.DARK_BLUE + EnumChatFormatting.BOLD + " Fishing Festival Summary (Current Session):\n" +
-																		EnumChatFormatting.LIGHT_PURPLE + "    Nurse Sharks: " + nf.format(nurseSharksSession) + "\n" +
-																		EnumChatFormatting.BLUE + "    Blue Sharks: " + nf.format(blueSharksSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Tiger Sharks: " + nf.format(tigerSharksSession) + "\n" +
-																		EnumChatFormatting.WHITE + "    Great White Sharks: " + nf.format(greatWhiteSharksSession) + "\n" +
+																		EnumChatFormatting.LIGHT_PURPLE + "    Nurse Sharks: " + nf.format(LootTracker.nurseSharksSession) + "\n" +
+																		EnumChatFormatting.BLUE + "    Blue Sharks: " + nf.format(LootTracker.blueSharksSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Tiger Sharks: " + nf.format(LootTracker.tigerSharksSession) + "\n" +
+																		EnumChatFormatting.WHITE + "    Great White Sharks: " + nf.format(LootTracker.greatWhiteSharksSession) + "\n" +
 																		EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + " -------------------"));
 							return;
 						}
-						
+
 						player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																	EnumChatFormatting.DARK_BLUE + EnumChatFormatting.BOLD + " Fishing Festival Summary:\n" +
-																	EnumChatFormatting.LIGHT_PURPLE + "    Nurse Sharks: " + nf.format(nurseSharks) + "\n" +
-																	EnumChatFormatting.BLUE + "    Blue Sharks: " + nf.format(blueSharks) + "\n" +
-																	EnumChatFormatting.GOLD + "    Tiger Sharks: " + nf.format(tigerSharks) + "\n" +
-																	EnumChatFormatting.WHITE + "    Great White Sharks: " + nf.format(greatWhiteSharks) + "\n" +
+																	EnumChatFormatting.LIGHT_PURPLE + "    Nurse Sharks: " + nf.format(LootTracker.nurseSharks) + "\n" +
+																	EnumChatFormatting.BLUE + "    Blue Sharks: " + nf.format(LootTracker.blueSharks) + "\n" +
+																	EnumChatFormatting.GOLD + "    Tiger Sharks: " + nf.format(LootTracker.tigerSharks) + "\n" +
+																	EnumChatFormatting.WHITE + "    Great White Sharks: " + nf.format(LootTracker.greatWhiteSharks) + "\n" +
 																	EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + " -------------------"));
 					} else if (arg1[1].equalsIgnoreCase("spooky")) {
 						if (showSession) {
 							player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																		EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + " Spooky Fishing Summary (Current Session):\n" +
-																		EnumChatFormatting.BLUE + "    Scarecrows: " + nf.format(scarecrowsSession) + "\n" +
-																		EnumChatFormatting.GRAY + "    Nightmares: " + nf.format(nightmaresSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Werewolves: " + nf.format(werewolfsSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Phantom Fishers: " + nf.format(phantomFishersSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Grim Reapers: " + nf.format(grimReapersSession) + "\n" +
+																		EnumChatFormatting.BLUE + "    Scarecrows: " + nf.format(LootTracker.scarecrowsSession) + "\n" +
+																		EnumChatFormatting.GRAY + "    Nightmares: " + nf.format(LootTracker.nightmaresSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Werewolves: " + nf.format(LootTracker.werewolfsSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Phantom Fishers: " + nf.format(LootTracker.phantomFishersSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Grim Reapers: " + nf.format(LootTracker.grimReapersSession) + "\n" +
 																		EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------"));
 							return;
 						}
-						
+
 						player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																	EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + " Spooky Fishing Summary:\n" +
-																	EnumChatFormatting.BLUE + "    Scarecrows: " + nf.format(scarecrows) + "\n" +
-																	EnumChatFormatting.GRAY + "    Nightmares: " + nf.format(nightmares) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Werewolves: " + nf.format(werewolfs) + "\n" +
-																	EnumChatFormatting.GOLD + "    Phantom Fishers: " + nf.format(phantomFishers) + "\n" +
-																	EnumChatFormatting.GOLD + "    Grim Reapers: " + nf.format(grimReapers) + "\n" +
+																	EnumChatFormatting.BLUE + "    Scarecrows: " + nf.format(LootTracker.scarecrows) + "\n" +
+																	EnumChatFormatting.GRAY + "    Nightmares: " + nf.format(LootTracker.nightmares) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Werewolves: " + nf.format(LootTracker.werewolfs) + "\n" +
+																	EnumChatFormatting.GOLD + "    Phantom Fishers: " + nf.format(LootTracker.phantomFishers) + "\n" +
+																	EnumChatFormatting.GOLD + "    Grim Reapers: " + nf.format(LootTracker.grimReapers) + "\n" +
 																	EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------"));
 					}
 				}
-				
+
 				if (showSession) {
-					if (empTimeSession == -1) {
+					if (LootTracker.empTimeSession == -1) {
 						timeBetween = "Never";
 					} else {
-						timeBetween = Utils.getTimeBetween(empTimeSession, timeNow);
+						timeBetween = Utils.getTimeBetween(LootTracker.empTimeSession, timeNow);
 					}
-					if (empSCsSession == -1) {
+					if (LootTracker.empSCsSession == -1) {
 						bossesBetween = "Never";
 					} else {
-						bossesBetween = nf.format(empSCsSession);
+						bossesBetween = nf.format(LootTracker.empSCsSession);
 					}
-					
+
 					player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + "  Fishing Summary (Current Session):\n" +
-																EnumChatFormatting.AQUA + "    Sea Creatures Caught: " + nf.format(seaCreaturesSession) + "\n" +
-																EnumChatFormatting.GOLD + "    Good Catches: " + nf.format(goodCatchesSession) + "\n" +
-																EnumChatFormatting.DARK_PURPLE + "    Great Catches: " + nf.format(greatCatchesSession) + "\n\n" +
-																EnumChatFormatting.GRAY + "    Squids: " + nf.format(squidsSession) + "\n" +
-																EnumChatFormatting.GREEN + "    Sea Walkers: " + nf.format(seaWalkersSession) + "\n" +
-																EnumChatFormatting.DARK_GRAY + "    Night Squids: " + nf.format(nightSquidsSession) + "\n" +
-																EnumChatFormatting.DARK_AQUA + "    Sea Guardians: " + nf.format(seaGuardiansSession) + "\n" +
-																EnumChatFormatting.BLUE + "    Sea Witches: " + nf.format(seaWitchesSession) + "\n" +
-																EnumChatFormatting.GREEN + "    Sea Archers: " + nf.format(seaArchersSession) + "\n" +
-																EnumChatFormatting.GREEN + "    Monster of the Deeps: " + nf.format(monsterOfTheDeepsSession) + "\n" +
-																EnumChatFormatting.YELLOW + "    Catfishes: " + nf.format(catfishesSession) + "\n" +
-																EnumChatFormatting.GOLD + "    Carrot Kings: " + nf.format(carrotKingsSession) + "\n" +
-																EnumChatFormatting.GRAY + "    Sea Leeches: " + nf.format(seaLeechesSession) + "\n" +
-																EnumChatFormatting.DARK_PURPLE + "    Guardian Defenders: " + nf.format(guardianDefendersSession) + "\n" +
-																EnumChatFormatting.DARK_PURPLE + "    Deep Sea Protectors: " + nf.format(deepSeaProtectorsSession) + "\n" +
-																EnumChatFormatting.GOLD + "    Hydras: " + nf.format(hydrasSession) + "\n" +
-																EnumChatFormatting.GOLD + "    Sea Emperors: " + nf.format(seaEmperorsSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Sea Creatures Caught: " + nf.format(LootTracker.seaCreaturesSession) + "\n" +
+																EnumChatFormatting.GOLD + "    Good Catches: " + nf.format(LootTracker.goodCatchesSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Great Catches: " + nf.format(LootTracker.greatCatchesSession) + "\n\n" +
+																EnumChatFormatting.GRAY + "    Squids: " + nf.format(LootTracker.squidsSession) + "\n" +
+																EnumChatFormatting.GREEN + "    Sea Walkers: " + nf.format(LootTracker.seaWalkersSession) + "\n" +
+																EnumChatFormatting.DARK_GRAY + "    Night Squids: " + nf.format(LootTracker.nightSquidsSession) + "\n" +
+																EnumChatFormatting.DARK_AQUA + "    Sea Guardians: " + nf.format(LootTracker.seaGuardiansSession) + "\n" +
+																EnumChatFormatting.BLUE + "    Sea Witches: " + nf.format(LootTracker.seaWitchesSession) + "\n" +
+																EnumChatFormatting.GREEN + "    Sea Archers: " + nf.format(LootTracker.seaArchersSession) + "\n" +
+																EnumChatFormatting.GREEN + "    Monster of the Deeps: " + nf.format(LootTracker.monsterOfTheDeepsSession) + "\n" +
+																EnumChatFormatting.YELLOW + "    Catfishes: " + nf.format(LootTracker.catfishesSession) + "\n" +
+																EnumChatFormatting.GOLD + "    Carrot Kings: " + nf.format(LootTracker.carrotKingsSession) + "\n" +
+																EnumChatFormatting.GRAY + "    Sea Leeches: " + nf.format(LootTracker.seaLeechesSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Guardian Defenders: " + nf.format(LootTracker.guardianDefendersSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Deep Sea Protectors: " + nf.format(LootTracker.deepSeaProtectorsSession) + "\n" +
+																EnumChatFormatting.GOLD + "    Hydras: " + nf.format(LootTracker.hydrasSession) + "\n" +
+																EnumChatFormatting.GOLD + "    Sea Emperors: " + nf.format(LootTracker.seaEmperorsSession) + "\n" +
 																EnumChatFormatting.AQUA + "    Time Since Sea Emperor: " + timeBetween + "\n" +
 																EnumChatFormatting.AQUA + "    Sea Creatures Since Sea Emperor: " + bossesBetween + "\n" +
 																EnumChatFormatting.DARK_AQUA + EnumChatFormatting.BOLD + " -------------------"));
 					return;
 				}
-				
-				if (empTime == -1) {
+
+				if (LootTracker.empTime == -1) {
 					timeBetween = "Never";
 				} else {
-					timeBetween = Utils.getTimeBetween(empTime, timeNow);
+					timeBetween = Utils.getTimeBetween(LootTracker.empTime, timeNow);
 				}
-				if (empSCs == -1) {
+				if (LootTracker.empSCs == -1) {
 					bossesBetween = "Never";
 				} else {
-					bossesBetween = nf.format(empSCs);
+					bossesBetween = nf.format(LootTracker.empSCs);
 				}
-				
+
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 															EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + "  Fishing Summary:\n" +
-															EnumChatFormatting.AQUA + "    Sea Creatures Caught: " + nf.format(seaCreatures) + "\n" +
-															EnumChatFormatting.GOLD + "    Good Catches: " + nf.format(goodCatches) + "\n" +
-															EnumChatFormatting.DARK_PURPLE + "    Great Catches: " + nf.format(greatCatches) + "\n\n" +
-															EnumChatFormatting.GRAY + "    Squids: " + nf.format(squids) + "\n" +
-															EnumChatFormatting.GREEN + "    Sea Walkers: " + nf.format(seaWalkers) + "\n" +
-															EnumChatFormatting.DARK_GRAY + "    Night Squids: " + nf.format(nightSquids) + "\n" +
-															EnumChatFormatting.DARK_AQUA + "    Sea Guardians: " + nf.format(seaGuardians) + "\n" +
-															EnumChatFormatting.BLUE + "    Sea Witches: " + nf.format(seaWitches) + "\n" +
-															EnumChatFormatting.GREEN + "    Sea Archers: " + nf.format(seaArchers) + "\n" +
-															EnumChatFormatting.GREEN + "    Monster of the Deeps: " + nf.format(monsterOfTheDeeps) + "\n" +
-															EnumChatFormatting.YELLOW + "    Catfishes: " + nf.format(catfishes) + "\n" +
-															EnumChatFormatting.GOLD + "    Carrot Kings: " + nf.format(carrotKings) + "\n" +
-															EnumChatFormatting.GRAY + "    Sea Leeches: " + nf.format(seaLeeches) + "\n" +
-															EnumChatFormatting.DARK_PURPLE + "    Guardian Defenders: " + nf.format(guardianDefenders) + "\n" +
-															EnumChatFormatting.DARK_PURPLE + "    Deep Sea Protectors: " + nf.format(deepSeaProtectors) + "\n" +
-															EnumChatFormatting.GOLD + "    Hydras: " + nf.format(hydras) + "\n" +
-															EnumChatFormatting.GOLD + "    Sea Emperors: " + nf.format(seaEmperors) + "\n" +
+															EnumChatFormatting.AQUA + "    Sea Creatures Caught: " + nf.format(LootTracker.seaCreatures) + "\n" +
+															EnumChatFormatting.GOLD + "    Good Catches: " + nf.format(LootTracker.goodCatches) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Great Catches: " + nf.format(LootTracker.greatCatches) + "\n\n" +
+															EnumChatFormatting.GRAY + "    Squids: " + nf.format(LootTracker.squids) + "\n" +
+															EnumChatFormatting.GREEN + "    Sea Walkers: " + nf.format(LootTracker.seaWalkers) + "\n" +
+															EnumChatFormatting.DARK_GRAY + "    Night Squids: " + nf.format(LootTracker.nightSquids) + "\n" +
+															EnumChatFormatting.DARK_AQUA + "    Sea Guardians: " + nf.format(LootTracker.seaGuardians) + "\n" +
+															EnumChatFormatting.BLUE + "    Sea Witches: " + nf.format(LootTracker.seaWitches) + "\n" +
+															EnumChatFormatting.GREEN + "    Sea Archers: " + nf.format(LootTracker.seaArchers) + "\n" +
+															EnumChatFormatting.GREEN + "    Monster of the Deeps: " + nf.format(LootTracker.monsterOfTheDeeps) + "\n" +
+															EnumChatFormatting.YELLOW + "    Catfishes: " + nf.format(LootTracker.catfishes) + "\n" +
+															EnumChatFormatting.GOLD + "    Carrot Kings: " + nf.format(LootTracker.carrotKings) + "\n" +
+															EnumChatFormatting.GRAY + "    Sea Leeches: " + nf.format(LootTracker.seaLeeches) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Guardian Defenders: " + nf.format(LootTracker.guardianDefenders) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Deep Sea Protectors: " + nf.format(LootTracker.deepSeaProtectors) + "\n" +
+															EnumChatFormatting.GOLD + "    Hydras: " + nf.format(LootTracker.hydras) + "\n" +
+															EnumChatFormatting.GOLD + "    Sea Emperors: " + nf.format(LootTracker.seaEmperors) + "\n" +
 															EnumChatFormatting.AQUA + "    Time Since Sea Emperor: " + timeBetween + "\n" +
 															EnumChatFormatting.AQUA + "    Sea Creatures Since Sea Emperor: " + bossesBetween + "\n" +
 															EnumChatFormatting.DARK_AQUA + EnumChatFormatting.BOLD + " -------------------"));
-	
+
 				break;
 			case "mythological":
 				if (showSession) {
 					player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																EnumChatFormatting.YELLOW + EnumChatFormatting.BOLD + "  Mythological Event Summary (Current Session):\n" +
-																EnumChatFormatting.YELLOW + "    Coins: " + Utils.getMoneySpent(mythCoinsSession) + "\n" +
-																EnumChatFormatting.WHITE + "    Griffin Feathers: " + nf.format(griffinFeathersSession) + "\n" +
-																EnumChatFormatting.GOLD + "    Crown of Greeds: " + nf.format(crownOfGreedsSession) + "\n" +
-																EnumChatFormatting.AQUA + "    Washed-up Souvenirs: " + nf.format(washedUpSouvenirsSession) + "\n" +
-																EnumChatFormatting.RED + "    Minos Hunters: " + nf.format(minosHuntersSession) + "\n" +
-																EnumChatFormatting.GRAY + "   Siamese Lynxes: " + nf.format(siameseLynxesSession) + "\n" +
-																EnumChatFormatting.RED + "   Minotaurs: " + nf.format(minotaursSession) + "\n" +
-																EnumChatFormatting.WHITE + "   Gaia Constructs: " + nf.format(gaiaConstructsSession) + "\n" +
-																EnumChatFormatting.DARK_PURPLE + "    Minos Champions: " + nf.format(minosChampionsSession) + "\n" +
-																EnumChatFormatting.GOLD + "    Minos Inquisitors: " + nf.format(minosInquisitorsSession) + "\n" +
+																EnumChatFormatting.YELLOW + "    Coins: " + Utils.getMoneySpent(LootTracker.mythCoinsSession) + "\n" +
+																EnumChatFormatting.WHITE + "    Griffin Feathers: " + nf.format(LootTracker.griffinFeathersSession) + "\n" +
+																EnumChatFormatting.GOLD + "    Crown of Greeds: " + nf.format(LootTracker.crownOfGreedsSession) + "\n" +
+																EnumChatFormatting.AQUA + "    Washed-up Souvenirs: " + nf.format(LootTracker.washedUpSouvenirsSession) + "\n" +
+																EnumChatFormatting.RED + "    Minos Hunters: " + nf.format(LootTracker.minosHuntersSession) + "\n" +
+																EnumChatFormatting.GRAY + "   Siamese Lynxes: " + nf.format(LootTracker.siameseLynxesSession) + "\n" +
+																EnumChatFormatting.RED + "   Minotaurs: " + nf.format(LootTracker.minotaursSession) + "\n" +
+																EnumChatFormatting.WHITE + "   Gaia Constructs: " + nf.format(LootTracker.gaiaConstructsSession) + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Minos Champions: " + nf.format(LootTracker.minosChampionsSession) + "\n" +
+																EnumChatFormatting.GOLD + "    Minos Inquisitors: " + nf.format(LootTracker.minosInquisitorsSession) + "\n" +
 																EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + "-------------------"));
 					return;
 				}
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 															EnumChatFormatting.YELLOW + EnumChatFormatting.BOLD + "  Mythological Event Summary:\n" +
-															EnumChatFormatting.YELLOW + "    Coins: " + Utils.getMoneySpent(mythCoins) + "\n" +
-															EnumChatFormatting.WHITE + "    Griffin Feathers: " + nf.format(griffinFeathers) + "\n" +
-															EnumChatFormatting.GOLD + "    Crown of Greeds: " + nf.format(crownOfGreeds) + "\n" +
-															EnumChatFormatting.AQUA + "    Washed-up Souvenirs: " + nf.format(washedUpSouvenirs) + "\n" +
-															EnumChatFormatting.RED + "    Minos Hunters: " + nf.format(minosHunters) + "\n" +
-															EnumChatFormatting.GRAY + "   Siamese Lynxes: " + nf.format(siameseLynxes) + "\n" +
-															EnumChatFormatting.RED + "   Minotaurs: " + nf.format(minotaurs) + "\n" +
-															EnumChatFormatting.WHITE + "   Gaia Constructs: " + nf.format(gaiaConstructs) + "\n" +
-															EnumChatFormatting.DARK_PURPLE + "    Minos Champions: " + nf.format(minosChampions) + "\n" +
-															EnumChatFormatting.GOLD + "    Minos Inquisitors: " + nf.format(minosInquisitors) + "\n" +
+															EnumChatFormatting.YELLOW + "    Coins: " + Utils.getMoneySpent(LootTracker.mythCoins) + "\n" +
+															EnumChatFormatting.WHITE + "    Griffin Feathers: " + nf.format(LootTracker.griffinFeathers) + "\n" +
+															EnumChatFormatting.GOLD + "    Crown of Greeds: " + nf.format(LootTracker.crownOfGreeds) + "\n" +
+															EnumChatFormatting.AQUA + "    Washed-up Souvenirs: " + nf.format(LootTracker.washedUpSouvenirs) + "\n" +
+															EnumChatFormatting.RED + "    Minos Hunters: " + nf.format(LootTracker.minosHunters) + "\n" +
+															EnumChatFormatting.GRAY + "   Siamese Lynxes: " + nf.format(LootTracker.siameseLynxes) + "\n" +
+															EnumChatFormatting.RED + "   Minotaurs: " + nf.format(LootTracker.minotaurs) + "\n" +
+															EnumChatFormatting.WHITE + "   Gaia Constructs: " + nf.format(LootTracker.gaiaConstructs) + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Minos Champions: " + nf.format(LootTracker.minosChampions) + "\n" +
+															EnumChatFormatting.GOLD + "    Minos Inquisitors: " + nf.format(LootTracker.minosInquisitors) + "\n" +
 															EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + "-------------------"));
 				break;
 			case "catacombs":
@@ -787,21 +470,21 @@ public class LootCommand extends CommandBase {
 						if (showSession) {
 							player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																		EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F1 Summary (Current Session):\n" +
-																		EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulatorsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooksSession) + "\n" +
-																		EnumChatFormatting.BLUE + "    Bonzo's Staffs: " + nf.format(bonzoStaffsSession) + "\n" +
-																		EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f1CoinsSpentSession) + "\n" +
-																		EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f1TimeSpentSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(LootTracker.recombobulatorsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(LootTracker.fumingPotatoBooksSession) + "\n" +
+																		EnumChatFormatting.BLUE + "    Bonzo's Staffs: " + nf.format(LootTracker.bonzoStaffsSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(LootTracker.f1CoinsSpentSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, LootTracker.f1TimeSpentSession) + "\n" +
 																		EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 							return;
 						}
 						player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																	EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F1 Summary:\n" +
-																	EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulators) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooks) + "\n" +
-																	EnumChatFormatting.BLUE + "    Bonzo's Staffs: " + nf.format(bonzoStaffs) + "\n" +
-																	EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f1CoinsSpent) + "\n" +
-																	EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f1TimeSpent) + "\n" +
+																	EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(LootTracker.recombobulators) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(LootTracker.fumingPotatoBooks) + "\n" +
+																	EnumChatFormatting.BLUE + "    Bonzo's Staffs: " + nf.format(LootTracker.bonzoStaffs) + "\n" +
+																	EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(LootTracker.f1CoinsSpent) + "\n" +
+																	EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, LootTracker.f1TimeSpent) + "\n" +
 																	EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 						break;
 					case "f2":
@@ -809,23 +492,23 @@ public class LootCommand extends CommandBase {
 						if (showSession) {
 							player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																		EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F2 Summary (Current Session):\n" +
-																		EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulatorsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooksSession) + "\n" +
-																		EnumChatFormatting.BLUE + "    Scarf's Studies: " + nf.format(scarfStudiesSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Adaptive Blades: " + nf.format(adaptiveSwordsSession) + "\n" +
-																		EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f2CoinsSpentSession) + "\n" +
-																		EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f2TimeSpentSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(LootTracker.recombobulatorsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(LootTracker.fumingPotatoBooksSession) + "\n" +
+																		EnumChatFormatting.BLUE + "    Scarf's Studies: " + nf.format(LootTracker.scarfStudiesSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Adaptive Blades: " + nf.format(LootTracker.adaptiveSwordsSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(LootTracker.f2CoinsSpentSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, LootTracker.f2TimeSpentSession) + "\n" +
 																		EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 							return;
 						}
 						player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																	EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F2 Summary:\n" +
-																	EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulators) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooks) + "\n" +
-																	EnumChatFormatting.BLUE + "    Scarf's Studies: " + nf.format(scarfStudies) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Adaptive Blades: " + nf.format(adaptiveSwords) + "\n" +
-																	EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f2CoinsSpent) + "\n" +
-																	EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f2TimeSpent) + "\n" +
+																	EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(LootTracker.recombobulators) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(LootTracker.fumingPotatoBooks) + "\n" +
+																	EnumChatFormatting.BLUE + "    Scarf's Studies: " + nf.format(LootTracker.scarfStudies) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Adaptive Blades: " + nf.format(LootTracker.adaptiveSwords) + "\n" +
+																	EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(LootTracker.f2CoinsSpent) + "\n" +
+																	EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, LootTracker.f2TimeSpent) + "\n" +
 																	EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 						break;
 					case "f3":
@@ -833,27 +516,27 @@ public class LootCommand extends CommandBase {
 						if (showSession) {
 							player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																		EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F3 Summary (Current Session):\n" +
-																		EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulatorsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooksSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Adaptive Helmets: " + nf.format(adaptiveHelmsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Adaptive Chestplates: " + nf.format(adaptiveChestsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Adaptive Leggings: " + nf.format(adaptiveLegsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Adaptive Boots: " + nf.format(adaptiveBootsSession) + "\n" +
-																		EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f3CoinsSpentSession) + "\n" +
-																		EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f3TimeSpentSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(LootTracker.recombobulatorsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(LootTracker.fumingPotatoBooksSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Adaptive Helmets: " + nf.format(LootTracker.adaptiveHelmsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Adaptive Chestplates: " + nf.format(LootTracker.adaptiveChestsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Adaptive Leggings: " + nf.format(LootTracker.adaptiveLegsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Adaptive Boots: " + nf.format(LootTracker.adaptiveBootsSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(LootTracker.f3CoinsSpentSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, LootTracker.f3TimeSpentSession) + "\n" +
 																		EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 							return;
 						}
 						player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																	EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F3 Summary:\n" +
-																	EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulators) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooks) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Adaptive Helmets: " + nf.format(adaptiveHelms) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Adaptive Chestplates: " + nf.format(adaptiveChests) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Adaptive Leggings: " + nf.format(adaptiveLegs) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Adaptive Boots: " + nf.format(adaptiveBoots) + "\n" +
-																	EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f3CoinsSpent) + "\n" +
-																	EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f3TimeSpent) + "\n" +
+																	EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(LootTracker.recombobulators) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(LootTracker.fumingPotatoBooks) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Adaptive Helmets: " + nf.format(LootTracker.adaptiveHelms) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Adaptive Chestplates: " + nf.format(LootTracker.adaptiveChests) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Adaptive Leggings: " + nf.format(LootTracker.adaptiveLegs) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Adaptive Boots: " + nf.format(LootTracker.adaptiveBoots) + "\n" +
+																	EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(LootTracker.f3CoinsSpent) + "\n" +
+																	EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, LootTracker.f3TimeSpent) + "\n" +
 																	EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 						break;
 					case "f4":
@@ -861,33 +544,33 @@ public class LootCommand extends CommandBase {
 						if (showSession) {
 							player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																		EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F4 Summary (Current Session):\n" +
-																		EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulatorsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooksSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Spirit Wings: " + nf.format(spiritWingsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Spirit Bones: " + nf.format(spiritBonesSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Spirit Boots: " + nf.format(spiritBootsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Spirit Swords: " + nf.format(spiritSwordsSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Spirit Bows: " + nf.format(spiritBowsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Epic Spirit Pets: " + nf.format(epicSpiritPetsSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Leg Spirit Pets: " + nf.format(legSpiritPetsSession) + "\n" +
-																		EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f4CoinsSpentSession) + "\n" +
-																		EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f4TimeSpentSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(LootTracker.recombobulatorsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(LootTracker.fumingPotatoBooksSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Spirit Wings: " + nf.format(LootTracker.spiritWingsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Spirit Bones: " + nf.format(LootTracker.spiritBonesSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Spirit Boots: " + nf.format(LootTracker.spiritBootsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Spirit Swords: " + nf.format(LootTracker.spiritSwordsSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Spirit Bows: " + nf.format(LootTracker.spiritBowsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Epic Spirit Pets: " + nf.format(LootTracker.epicSpiritPetsSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Leg Spirit Pets: " + nf.format(LootTracker.legSpiritPetsSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(LootTracker.f4CoinsSpentSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, LootTracker.f4TimeSpentSession) + "\n" +
 																		EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 							return;
 						}
 						player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																	EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F4 Summary:\n" +
-																	EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulators) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooks) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Spirit Wings: " + nf.format(spiritWings) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Spirit Bones: " + nf.format(spiritBones) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Spirit Boots: " + nf.format(spiritBoots) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Spirit Swords: " + nf.format(spiritSwords) + "\n" +
-																	EnumChatFormatting.GOLD + "    Spirit Bows: " + nf.format(spiritBows) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Epic Spirit Pets: " + nf.format(epicSpiritPets) + "\n" +
-																	EnumChatFormatting.GOLD + "    Leg Spirit Pets: " + nf.format(legSpiritPets) + "\n" +
-																	EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f4CoinsSpent) + "\n" +
-																	EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f4TimeSpent) + "\n" +
+																	EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(LootTracker.recombobulators) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(LootTracker.fumingPotatoBooks) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Spirit Wings: " + nf.format(LootTracker.spiritWings) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Spirit Bones: " + nf.format(LootTracker.spiritBones) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Spirit Boots: " + nf.format(LootTracker.spiritBoots) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Spirit Swords: " + nf.format(LootTracker.spiritSwords) + "\n" +
+																	EnumChatFormatting.GOLD + "    Spirit Bows: " + nf.format(LootTracker.spiritBows) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Epic Spirit Pets: " + nf.format(LootTracker.epicSpiritPets) + "\n" +
+																	EnumChatFormatting.GOLD + "    Leg Spirit Pets: " + nf.format(LootTracker.legSpiritPets) + "\n" +
+																	EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(LootTracker.f4CoinsSpent) + "\n" +
+																	EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, LootTracker.f4TimeSpent) + "\n" +
 																	EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 						break;
 					case "f5":
@@ -895,35 +578,35 @@ public class LootCommand extends CommandBase {
 						if (showSession) {
 							player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																		EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F5 Summary (Current Session):\n" +
-																		EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulatorsSession) + "\n" +
-																		EnumChatFormatting.BLUE + "    Warped Stones: " + nf.format(warpedStonesSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooksSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Shadow Assassin Helmets: " + nf.format(shadowAssHelmsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Shadow Assassin Chests: " + nf.format(shadowAssChestsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Shadow Assassin Legs: " + nf.format(shadowAssLegsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Shadow Assassin Boots: " + nf.format(shadowAssBootsSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Last Breaths: " + nf.format(lastBreathsSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Livid Daggers: " + nf.format(lividDaggersSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Shadow Furys: " + nf.format(shadowFurysSession) + "\n" +
-																		EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f5CoinsSpentSession) + "\n" +
-																		EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f5TimeSpentSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(LootTracker.recombobulatorsSession) + "\n" +
+																		EnumChatFormatting.BLUE + "    Warped Stones: " + nf.format(LootTracker.warpedStonesSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(LootTracker.fumingPotatoBooksSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Shadow Assassin Helmets: " + nf.format(LootTracker.shadowAssHelmsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Shadow Assassin Chests: " + nf.format(LootTracker.shadowAssChestsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Shadow Assassin Legs: " + nf.format(LootTracker.shadowAssLegsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Shadow Assassin Boots: " + nf.format(LootTracker.shadowAssBootsSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Last Breaths: " + nf.format(LootTracker.lastBreathsSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Livid Daggers: " + nf.format(LootTracker.lividDaggersSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Shadow Furys: " + nf.format(LootTracker.shadowFurysSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(LootTracker.f5CoinsSpentSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, LootTracker.f5TimeSpentSession) + "\n" +
 																		EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 							return;
 						}
 						player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																	EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F5 Summary:\n" +
-																	EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulators) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooks) + "\n" +
-																	EnumChatFormatting.BLUE + "    Warped Stones: " + nf.format(warpedStones) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Shadow Assassin Helmets: " + nf.format(shadowAssHelms) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Shadow Assassin Chests: " + nf.format(shadowAssChests) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Shadow Assassin Legs: " + nf.format(shadowAssLegs) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Shadow Assassin Boots: " + nf.format(shadowAssBoots) + "\n" +
-																	EnumChatFormatting.GOLD + "    Last Breaths: " + nf.format(lastBreaths) + "\n" +
-																	EnumChatFormatting.GOLD + "    Livid Daggers: " + nf.format(lividDaggers) + "\n" +
-																	EnumChatFormatting.GOLD + "    Shadow Furys: " + nf.format(shadowFurys) + "\n" +
-																	EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f5CoinsSpent) + "\n" +
-																	EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f5TimeSpent) + "\n" +
+																	EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(LootTracker.recombobulators) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(LootTracker.fumingPotatoBooks) + "\n" +
+																	EnumChatFormatting.BLUE + "    Warped Stones: " + nf.format(LootTracker.warpedStones) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Shadow Assassin Helmets: " + nf.format(LootTracker.shadowAssHelms) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Shadow Assassin Chests: " + nf.format(LootTracker.shadowAssChests) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Shadow Assassin Legs: " + nf.format(LootTracker.shadowAssLegs) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Shadow Assassin Boots: " + nf.format(LootTracker.shadowAssBoots) + "\n" +
+																	EnumChatFormatting.GOLD + "    Last Breaths: " + nf.format(LootTracker.lastBreaths) + "\n" +
+																	EnumChatFormatting.GOLD + "    Livid Daggers: " + nf.format(LootTracker.lividDaggers) + "\n" +
+																	EnumChatFormatting.GOLD + "    Shadow Furys: " + nf.format(LootTracker.shadowFurys) + "\n" +
+																	EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(LootTracker.f5CoinsSpent) + "\n" +
+																	EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, LootTracker.f5TimeSpent) + "\n" +
 																	EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 						break;
 					case "f6":
@@ -931,35 +614,35 @@ public class LootCommand extends CommandBase {
 						if (showSession) {
 							player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																		EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F6 Summary (Current Session):\n" +
-																		EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulatorsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooksSession) + "\n" +
-																		EnumChatFormatting.BLUE + "    Ancient Roses: " + nf.format(ancientRosesSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Precursor Eyes: " + nf.format(precursorEyesSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Giant's Swords: " + nf.format(giantsSwordsSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Necro Lord Helmets: " + nf.format(necroLordHelmsSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Necro Lord Chestplates: " + nf.format(necroLordChestsSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Necro Lord Leggings: " + nf.format(necroLordLegsSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Necro Lord Boots: " + nf.format(necroLordBootsSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Necro Swords: " + nf.format(necroSwordsSession) + "\n" +
-																		EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f6CoinsSpentSession) + "\n" +
-																		EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f6TimeSpentSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(LootTracker.recombobulatorsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(LootTracker.fumingPotatoBooksSession) + "\n" +
+																		EnumChatFormatting.BLUE + "    Ancient Roses: " + nf.format(LootTracker.ancientRosesSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Precursor Eyes: " + nf.format(LootTracker.precursorEyesSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Giant's Swords: " + nf.format(LootTracker.giantsSwordsSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Necro Lord Helmets: " + nf.format(LootTracker.necroLordHelmsSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Necro Lord Chestplates: " + nf.format(LootTracker.necroLordChestsSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Necro Lord Leggings: " + nf.format(LootTracker.necroLordLegsSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Necro Lord Boots: " + nf.format(LootTracker.necroLordBootsSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Necro Swords: " + nf.format(LootTracker.necroSwordsSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(LootTracker.f6CoinsSpentSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, LootTracker.f6TimeSpentSession) + "\n" +
 																		EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 							return;
 						}
 						player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																	EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F6 Summary:\n" +
-																	EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulators) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooks) + "\n" +
-																	EnumChatFormatting.BLUE + "    Ancient Roses: " + nf.format(ancientRoses) + "\n" +
-																	EnumChatFormatting.GOLD + "    Precursor Eyes: " + nf.format(precursorEyes) + "\n" +
-																	EnumChatFormatting.GOLD + "    Giant's Swords: " + nf.format(giantsSwords) + "\n" +
-																	EnumChatFormatting.GOLD + "    Necro Lord Helmets: " + nf.format(necroLordHelms) + "\n" +
-																	EnumChatFormatting.GOLD + "    Necro Lord Chestplates: " + nf.format(necroLordChests) + "\n" +
-																	EnumChatFormatting.GOLD + "    Necro Lord Leggings: " + nf.format(necroLordLegs) + "\n" +
-																	EnumChatFormatting.GOLD + "    Necro Lord Boots: " + nf.format(necroLordBoots) + "\n" +
-																	EnumChatFormatting.GOLD + "    Necro Swords: " + nf.format(necroSwords) + "\n" +
-																	EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f6CoinsSpent) + "\n" +
-																	EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f6TimeSpent) + "\n" +
+																	EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(LootTracker.recombobulators) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(LootTracker.fumingPotatoBooks) + "\n" +
+																	EnumChatFormatting.BLUE + "    Ancient Roses: " + nf.format(LootTracker.ancientRoses) + "\n" +
+																	EnumChatFormatting.GOLD + "    Precursor Eyes: " + nf.format(LootTracker.precursorEyes) + "\n" +
+																	EnumChatFormatting.GOLD + "    Giant's Swords: " + nf.format(LootTracker.giantsSwords) + "\n" +
+																	EnumChatFormatting.GOLD + "    Necro Lord Helmets: " + nf.format(LootTracker.necroLordHelms) + "\n" +
+																	EnumChatFormatting.GOLD + "    Necro Lord Chestplates: " + nf.format(LootTracker.necroLordChests) + "\n" +
+																	EnumChatFormatting.GOLD + "    Necro Lord Leggings: " + nf.format(LootTracker.necroLordLegs) + "\n" +
+																	EnumChatFormatting.GOLD + "    Necro Lord Boots: " + nf.format(LootTracker.necroLordBoots) + "\n" +
+																	EnumChatFormatting.GOLD + "    Necro Swords: " + nf.format(LootTracker.necroSwords) + "\n" +
+																	EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(LootTracker.f6CoinsSpent) + "\n" +
+																	EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, LootTracker.f6TimeSpent) + "\n" +
 																	EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 						break;
 					case "f7":
@@ -967,41 +650,41 @@ public class LootCommand extends CommandBase {
 						if (showSession) {
 							player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																		EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F7 Summary (Current Session):\n" +
-																		EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulatorsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooksSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Wither Bloods: " + nf.format(witherBloodsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Wither Cloaks: " + nf.format(witherCloaksSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Implosions: " + nf.format(implosionsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Wither Shields: " + nf.format(witherShieldsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Shadow Warps: " + nf.format(shadowWarpsSession) + "\n" +
-																		EnumChatFormatting.DARK_PURPLE + "    Necron's Handles: " + nf.format(necronsHandlesSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Auto Recombobulator: " + nf.format(autoRecombsSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Wither Helmets: " + nf.format(witherHelmsSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Wither Chesplates: " + nf.format(witherChestsSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Wither Leggings: " + nf.format(witherLegsSession) + "\n" +
-																		EnumChatFormatting.GOLD + "    Wither Boots: " + nf.format(witherBootsSession) + "\n" +
-																		EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f7CoinsSpentSession) + "\n" +
-																		EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f7TimeSpentSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(LootTracker.recombobulatorsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(LootTracker.fumingPotatoBooksSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Wither Bloods: " + nf.format(LootTracker.witherBloodsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Wither Cloaks: " + nf.format(LootTracker.witherCloaksSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Implosions: " + nf.format(LootTracker.implosionsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Wither Shields: " + nf.format(LootTracker.witherShieldsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Shadow Warps: " + nf.format(LootTracker.shadowWarpsSession) + "\n" +
+																		EnumChatFormatting.DARK_PURPLE + "    Necron's Handles: " + nf.format(LootTracker.necronsHandlesSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Auto Recombobulator: " + nf.format(LootTracker.autoRecombsSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Wither Helmets: " + nf.format(LootTracker.witherHelmsSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Wither Chesplates: " + nf.format(LootTracker.witherChestsSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Wither Leggings: " + nf.format(LootTracker.witherLegsSession) + "\n" +
+																		EnumChatFormatting.GOLD + "    Wither Boots: " + nf.format(LootTracker.witherBootsSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(LootTracker.f7CoinsSpentSession) + "\n" +
+																		EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, LootTracker.f7TimeSpentSession) + "\n" +
 																		EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 							return;
 						}
 						player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																	EnumChatFormatting.RED + EnumChatFormatting.BOLD + "  Catacombs F7 Summary:\n" +
-																	EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(recombobulators) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(fumingPotatoBooks) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Wither Bloods: " + nf.format(witherBloods) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Wither Cloaks: " + nf.format(witherCloaks) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Implosions: " + nf.format(implosions) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Wither Shields: " + nf.format(witherShields) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Shadow Warps: " + nf.format(shadowWarps) + "\n" +
-																	EnumChatFormatting.DARK_PURPLE + "    Necron's Handles: " + nf.format(necronsHandles) + "\n" +
-																	EnumChatFormatting.GOLD + "    Auto Recombobulator: " + nf.format(autoRecombs) + "\n" +
-																	EnumChatFormatting.GOLD + "    Wither Helmets: " + nf.format(witherHelms) + "\n" +
-																	EnumChatFormatting.GOLD + "    Wither Chesplates: " + nf.format(witherChests) + "\n" +
-																	EnumChatFormatting.GOLD + "    Wither Leggings: " + nf.format(witherLegs) + "\n" +
-																	EnumChatFormatting.GOLD + "    Wither Boots: " + nf.format(witherBoots) + "\n" +
-																	EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(f7CoinsSpent) + "\n" +
-																	EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, f7TimeSpent) + "\n" +
+																	EnumChatFormatting.GOLD + "    Recombobulator 3000s: " + nf.format(LootTracker.recombobulators) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Fuming Potato Books: " + nf.format(LootTracker.fumingPotatoBooks) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Wither Bloods: " + nf.format(LootTracker.witherBloods) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Wither Cloaks: " + nf.format(LootTracker.witherCloaks) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Implosions: " + nf.format(LootTracker.implosions) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Wither Shields: " + nf.format(LootTracker.witherShields) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Shadow Warps: " + nf.format(LootTracker.shadowWarps) + "\n" +
+																	EnumChatFormatting.DARK_PURPLE + "    Necron's Handles: " + nf.format(LootTracker.necronsHandles) + "\n" +
+																	EnumChatFormatting.GOLD + "    Auto Recombobulator: " + nf.format(LootTracker.autoRecombs) + "\n" +
+																	EnumChatFormatting.GOLD + "    Wither Helmets: " + nf.format(LootTracker.witherHelms) + "\n" +
+																	EnumChatFormatting.GOLD + "    Wither Chesplates: " + nf.format(LootTracker.witherChests) + "\n" +
+																	EnumChatFormatting.GOLD + "    Wither Leggings: " + nf.format(LootTracker.witherLegs) + "\n" +
+																	EnumChatFormatting.GOLD + "    Wither Boots: " + nf.format(LootTracker.witherBoots) + "\n" +
+																	EnumChatFormatting.AQUA + "    Coins Spent: " + Utils.getMoneySpent(LootTracker.f7CoinsSpent) + "\n" +
+																	EnumChatFormatting.AQUA + "    Time Spent: " + Utils.getTimeBetween(0, LootTracker.f7TimeSpent) + "\n" +
 																	EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + " -------------------"));
 						break;
 					default:
diff --git a/src/main/java/me/Danker/commands/PetsCommand.java b/src/main/java/me/Danker/commands/PetsCommand.java
index a7824e4..fa2d24c 100644
--- a/src/main/java/me/Danker/commands/PetsCommand.java
+++ b/src/main/java/me/Danker/commands/PetsCommand.java
@@ -16,7 +16,6 @@ import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 
 public class PetsCommand extends CommandBase {
diff --git a/src/main/java/me/Danker/commands/RepartyCommand.java b/src/main/java/me/Danker/commands/RepartyCommand.java
index 623ebf7..26a19c6 100644
--- a/src/main/java/me/Danker/commands/RepartyCommand.java
+++ b/src/main/java/me/Danker/commands/RepartyCommand.java
@@ -8,10 +8,11 @@ import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
-import net.minecraft.util.*;
 import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 
diff --git a/src/main/java/me/Danker/commands/ResetLootCommand.java b/src/main/java/me/Danker/commands/ResetLootCommand.java
index 9b4ecfa..00df1b9 100644
--- a/src/main/java/me/Danker/commands/ResetLootCommand.java
+++ b/src/main/java/me/Danker/commands/ResetLootCommand.java
@@ -1,6 +1,7 @@
 package me.Danker.commands;
 
 import me.Danker.DankersSkyblockMod;
+import me.Danker.features.loot.LootTracker;
 import me.Danker.handlers.ConfigHandler;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
@@ -113,167 +114,167 @@ public class ResetLootCommand extends CommandBase {
 	}
 	
 	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;
+		LootTracker.zombieRevsSession = 0;
+		LootTracker.zombieRevFleshSession = 0;
+		LootTracker.zombieFoulFleshSession = 0;
+		LootTracker.zombieFoulFleshDropsSession = 0;
+		LootTracker.zombiePestilencesSession = 0;
+		LootTracker.zombieUndeadCatasSession = 0;
+		LootTracker.zombieBooksSession = 0;
+		LootTracker.zombieBeheadedsSession = 0;
+		LootTracker.zombieRevCatasSession = 0;
+		LootTracker.zombieSnakesSession = 0;
+		LootTracker.zombieScythesSession = 0;
+		LootTracker.zombieTimeSession = -1;
+		LootTracker.zombieBossesSession = -1;
 		ConfigHandler.deleteCategory("zombie");
 		ConfigHandler.reloadConfig();
 	}
 	
 	static void resetSpider() {
-		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;
+		LootTracker.spiderTarantulasSession = 0;
+		LootTracker.spiderWebsSession = 0;
+		LootTracker.spiderTAPSession = 0;
+		LootTracker.spiderTAPDropsSession = 0;
+		LootTracker.spiderBitesSession = 0;
+		LootTracker.spiderCatalystsSession = 0;
+		LootTracker.spiderBooksSession = 0;
+		LootTracker.spiderSwattersSession = 0;
+		LootTracker.spiderTalismansSession = 0;
+		LootTracker.spiderMosquitosSession = 0;
+		LootTracker.spiderTimeSession = -1;
+		LootTracker.spiderBossesSession = -1;
 		ConfigHandler.deleteCategory("spider");
 		ConfigHandler.reloadConfig();
 	}
 	
 	static void resetWolf() {
-		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;
+		LootTracker.wolfSvensSession = 0;
+		LootTracker.wolfTeethSession = 0;
+		LootTracker.wolfWheelsSession = 0;
+		LootTracker.wolfWheelsDropsSession = 0;
+		LootTracker.wolfSpiritsSession = 0;
+		LootTracker.wolfBooksSession = 0;
+		LootTracker.wolfEggsSession = 0;
+		LootTracker.wolfCouturesSession = 0;
+		LootTracker.wolfBaitsSession = 0;
+		LootTracker.wolfFluxesSession = 0;
+		LootTracker.wolfTimeSession = -1;
+		LootTracker.wolfBossesSession = -1;
 		ConfigHandler.deleteCategory("wolf");
 		ConfigHandler.reloadConfig();
 	}
 	
 	static void resetFishing() {
-		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;
+		LootTracker.seaCreaturesSession = 0;
+		LootTracker.goodCatchesSession = 0;
+		LootTracker.greatCatchesSession = 0;
+		LootTracker.squidsSession = 0;
+		LootTracker.seaWalkersSession = 0;
+		LootTracker.nightSquidsSession = 0;
+		LootTracker.seaGuardiansSession = 0;
+		LootTracker.seaWitchesSession = 0;
+		LootTracker.seaArchersSession = 0;
+		LootTracker.monsterOfTheDeepsSession = 0;
+		LootTracker.catfishesSession = 0;
+		LootTracker.carrotKingsSession = 0;
+		LootTracker.seaLeechesSession = 0;
+		LootTracker.guardianDefendersSession = 0;
+		LootTracker.deepSeaProtectorsSession = 0;
+		LootTracker.hydrasSession = 0;
+		LootTracker.seaEmperorsSession = 0;
+		LootTracker.empTimeSession = -1;
+		LootTracker.empSCsSession = -1;
+		LootTracker.fishingMilestoneSession = 0;
+		LootTracker.frozenStevesSession = 0;
+		LootTracker.frostyTheSnowmansSession = 0;
+		LootTracker.grinchesSession = 0;
+		LootTracker.yetisSession = 0;
+		LootTracker.yetiTimeSession = -1;
+		LootTracker.yetiSCsSession = -1;
+		LootTracker.nurseSharksSession = 0;
+		LootTracker.blueSharksSession = 0;
+		LootTracker.tigerSharksSession = 0;
+		LootTracker.greatWhiteSharksSession = 0;
+		LootTracker.scarecrowsSession = 0;
+		LootTracker.nightmaresSession = 0;
+		LootTracker.werewolfsSession = 0;
+		LootTracker.phantomFishersSession = 0;
+		LootTracker.grimReapersSession = 0;
 		ConfigHandler.deleteCategory("fishing");
 		ConfigHandler.reloadConfig();
 	}
 	
 	static void resetMythological() {
-		LootCommand.mythCoinsSession = 0;
-		LootCommand.griffinFeathersSession = 0;
-		LootCommand.crownOfGreedsSession = 0;
-		LootCommand.washedUpSouvenirsSession = 0;
-		LootCommand.minosHuntersSession = 0;
-		LootCommand.siameseLynxesSession = 0;
-		LootCommand.minotaursSession = 0;
-		LootCommand.gaiaConstructsSession = 0;
-		LootCommand.minosChampionsSession = 0;
-		LootCommand.minosInquisitorsSession = 0;
+		LootTracker.mythCoinsSession = 0;
+		LootTracker.griffinFeathersSession = 0;
+		LootTracker.crownOfGreedsSession = 0;
+		LootTracker.washedUpSouvenirsSession = 0;
+		LootTracker.minosHuntersSession = 0;
+		LootTracker.siameseLynxesSession = 0;
+		LootTracker.minotaursSession = 0;
+		LootTracker.gaiaConstructsSession = 0;
+		LootTracker.minosChampionsSession = 0;
+		LootTracker.minosInquisitorsSession = 0;
 		ConfigHandler.deleteCategory("mythological");
 		ConfigHandler.reloadConfig();
 	}
 	
 	static void resetCatacombs() {
-		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;
-		LootCommand.witherBloodsSession = 0;
-		LootCommand.witherCloaksSession = 0;
-		LootCommand.implosionsSession = 0;
-		LootCommand.witherShieldsSession = 0;
-		LootCommand.shadowWarpsSession = 0;
-		LootCommand.necronsHandlesSession = 0;
-		LootCommand.autoRecombsSession = 0;
-		LootCommand.witherHelmsSession = 0;
-		LootCommand.witherChestsSession = 0;
-		LootCommand.witherLegsSession = 0;
-		LootCommand.witherBootsSession = 0;
-		LootCommand.f7CoinsSpentSession = 0;
-		LootCommand.f7TimeSpentSession = 0;
+		LootTracker.recombobulatorsSession = 0;
+		LootTracker.fumingPotatoBooksSession = 0;
+		LootTracker.bonzoStaffsSession = 0;
+		LootTracker.f1CoinsSpentSession = 0;
+		LootTracker.f1TimeSpentSession = 0;
+		LootTracker.scarfStudiesSession = 0;
+		LootTracker.f2CoinsSpentSession = 0;
+		LootTracker.f2TimeSpentSession = 0;
+		LootTracker.adaptiveHelmsSession = 0;
+		LootTracker.adaptiveChestsSession = 0;
+		LootTracker.adaptiveLegsSession = 0;
+		LootTracker.adaptiveBootsSession = 0;
+		LootTracker.adaptiveSwordsSession = 0;
+		LootTracker.f3CoinsSpentSession = 0;
+		LootTracker.f3TimeSpentSession = 0;
+		LootTracker.spiritWingsSession = 0;
+		LootTracker.spiritBonesSession = 0;
+		LootTracker.spiritBootsSession = 0;
+		LootTracker.spiritSwordsSession = 0;
+		LootTracker.epicSpiritPetsSession = 0;
+		LootTracker.f4CoinsSpentSession = 0;
+		LootTracker.f4TimeSpentSession = 0;
+		LootTracker.warpedStonesSession = 0;
+		LootTracker.shadowAssHelmsSession = 0;
+		LootTracker.shadowAssChestsSession = 0;
+		LootTracker.shadowAssLegsSession = 0;
+		LootTracker.shadowAssBootsSession = 0;
+		LootTracker.lividDaggersSession = 0;
+		LootTracker.shadowFurysSession = 0;
+		LootTracker.f5CoinsSpentSession = 0;
+		LootTracker.f5TimeSpentSession = 0;
+		LootTracker.ancientRosesSession = 0;
+		LootTracker.precursorEyesSession = 0;
+		LootTracker.giantsSwordsSession = 0;
+		LootTracker.necroLordHelmsSession = 0;
+		LootTracker.necroLordChestsSession = 0;
+		LootTracker.necroLordLegsSession = 0;
+		LootTracker.necroLordBootsSession = 0;
+		LootTracker.necroSwordsSession = 0;
+		LootTracker.f6CoinsSpentSession = 0;
+		LootTracker.f6TimeSpentSession = 0;
+		LootTracker.witherBloodsSession = 0;
+		LootTracker.witherCloaksSession = 0;
+		LootTracker.implosionsSession = 0;
+		LootTracker.witherShieldsSession = 0;
+		LootTracker.shadowWarpsSession = 0;
+		LootTracker.necronsHandlesSession = 0;
+		LootTracker.autoRecombsSession = 0;
+		LootTracker.witherHelmsSession = 0;
+		LootTracker.witherChestsSession = 0;
+		LootTracker.witherLegsSession = 0;
+		LootTracker.witherBootsSession = 0;
+		LootTracker.f7CoinsSpentSession = 0;
+		LootTracker.f7TimeSpentSession = 0;
 		ConfigHandler.deleteCategory("catacombs");
 		ConfigHandler.reloadConfig();
 	}
diff --git a/src/main/java/me/Danker/commands/SkillTrackerCommand.java b/src/main/java/me/Danker/commands/SkillTrackerCommand.java
index 03753aa..75cd2cc 100644
--- a/src/main/java/me/Danker/commands/SkillTrackerCommand.java
+++ b/src/main/java/me/Danker/commands/SkillTrackerCommand.java
@@ -1,6 +1,7 @@
 package me.Danker.commands;
 
 import me.Danker.DankersSkyblockMod;
+import me.Danker.features.SkillTracker;
 import me.Danker.handlers.ConfigHandler;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
@@ -55,39 +56,39 @@ public class SkillTrackerCommand extends CommandBase {
 				switch (arg1[0].toLowerCase()) {
 					case "start":
 					case "resume":
-						if (DankersSkyblockMod.skillStopwatch.isStarted() && DankersSkyblockMod.skillStopwatch.isSuspended()) {
-							DankersSkyblockMod.skillStopwatch.resume();
-						} else if (!DankersSkyblockMod.skillStopwatch.isStarted()) {
-							DankersSkyblockMod.skillStopwatch.start();
+						if (SkillTracker.skillStopwatch.isStarted() && SkillTracker.skillStopwatch.isSuspended()) {
+							SkillTracker.skillStopwatch.resume();
+						} else if (!SkillTracker.skillStopwatch.isStarted()) {
+							SkillTracker.skillStopwatch.start();
 						}
 						player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Skill tracker started."));
 						break;
 					case "pause":
 					case "stop":
-						if (DankersSkyblockMod.skillStopwatch.isStarted() && !DankersSkyblockMod.skillStopwatch.isSuspended()) {
-							DankersSkyblockMod.skillStopwatch.suspend();
+						if (SkillTracker.skillStopwatch.isStarted() && !SkillTracker.skillStopwatch.isSuspended()) {
+							SkillTracker.skillStopwatch.suspend();
 						} else {
 							player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Skill tracker paused."));
 						}
 						break;
 					case "reset":
-						DankersSkyblockMod.skillStopwatch = new StopWatch();
-						DankersSkyblockMod.farmingXPGained = 0;
-						DankersSkyblockMod.miningXPGained = 0;
-						DankersSkyblockMod.combatXPGained = 0;
-						DankersSkyblockMod.foragingXPGained = 0;
-						DankersSkyblockMod.fishingXPGained = 0;
-						DankersSkyblockMod.enchantingXPGained = 0;
-						DankersSkyblockMod.alchemyXPGained = 0;
+						SkillTracker.skillStopwatch = new StopWatch();
+						SkillTracker.farmingXPGained = 0;
+						SkillTracker.miningXPGained = 0;
+						SkillTracker.combatXPGained = 0;
+						SkillTracker.foragingXPGained = 0;
+						SkillTracker.fishingXPGained = 0;
+						SkillTracker.enchantingXPGained = 0;
+						SkillTracker.alchemyXPGained = 0;
 						player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Skill tracker reset."));
 						break;
 					case "hide":
-						DankersSkyblockMod.showSkillTracker = false;
+						SkillTracker.showSkillTracker = false;
 						ConfigHandler.writeBooleanConfig("misc", "showSkillTracker", false);
 						player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Skill tracker hidden."));
 						break;
 					case "show":
-						DankersSkyblockMod.showSkillTracker = true;
+						SkillTracker.showSkillTracker = true;
 						ConfigHandler.writeBooleanConfig("misc", "showSkillTracker", true);
 						player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Skill tracker shown."));
 						break;