Add a new child skill: Ranching

2026-02-18 09:43:00 +01:00 · 2013-07-08 10:55:41 +02:00
651 changed files with 14166 additions and 29108 deletions
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -7,156 +7,7 @@ Key:
  ! Change
  - Removal

-Version 1.4.09-dev
- + Added new child skill; Salvage
- + Added new feature to Herbalism. Instantly-regrown crops are protected from being broken for 1 second
- + Added option to config.yml to show the /mcstats scoreboard automatically after logging in
- + Added option to config.yml for Alchemy. Skills.Alchemy.Prevent_Hopper_Transfer_Bottles
- + Added support for `MATERIAL|data` format in treasures.yml
- + Added API to experience events to get XP gain reason
- + Added API to check if an entity is bleeding
- = Fixed bug where the Updater was running on the main thread.
- = Fixed bug when players would use /ptp without being in a party
- = Fixed bug where player didn't have a mcMMOPlayer object in AsyncPlayerChatEvent
- = Fixed bug where dodge would check the wrong player skill level
- = Fixed bug which causes /party teleport to stop working
- = Fixed bug where SaveTimerTask would produce an IndexOutOfBoundsException
- ! Changed player data saving. Save tasks are now asynchronous
- ! Vanished players no longer get hit by AoE effects
- ! Changed Alchemy config option 'Prevent_Hopper_Transfer' renamed to 'Prevent_Hopper_Transfer_Ingredients'
- - Removed salvage ability from Repair, salvage has it's own (child) skill now
-
-Version 1.4.08
- + Added a new skill; Alchemy. Special thanks to EasyMFnE for creating this!
- + Added SecondaryAbilityType enum, and new SecondaryAbilityWeightedActivationCheckEvent, fired when a secondary ability checkes its activation chances
- + Added the possibility to gain experience when using Fishing "Shake"
- + Added config options to disable various sound effects
- + Smelting now works with custom ores - add smelting XP value to blocks.yml, or it will default to 1/10th of normal XP.
- + Added automatic cleanup of backups folder.
- + Added bypass permission for finding Fishing traps
- + Added level threshold settings to hardcore modes. When a players skill level is below this threshold, they will not lose any stats
- + Added party alliances, two parties can now team up. Allies share party chat and cannot harm each other.
- + Added new experience bonus perk 'mcmmo.perks.xp.10percentboost.<skillname>' multiplies incoming XP by 1.1
- + Added new experience bonus perk 'mcmmo.perks.xp.customboost.<skillname>' multiplies incoming XP by the boost amount defined in the experience config
- + Added Ender Dragon, Wither, and Witch to combat experience multipliers - they do not give XP by default
- + Added support for multiple mod config files, naming can be done as either armor.<modname>.yml or <modname>.armor.yml
- + Added config options to configure the items used in "Call of the Wild"
- + Added config option to configure the database command cooldown
- = Fixed bug where healthbars wouldn't display if skills were disabled
- = Fixed bug with "Call of the Wild" entities despawning
- = Fixed bug with updating (very) old user data.
- = Fixed bug with checking maximum durability of mod items.
- = Fixed exploit involving Call of The Wild.
- = Fixed bug where LeafBlower permissions were ignored
- = Fixed bug with toggle commands not properly displaying the success message.
- = Fixed IllegalArgumentException caused by an empty Fishing treasure category
- = Fixed bug with Salvage not reading the config value for the anvil material.
- = Fixed exploit where you could receive smelting XP for improper items
- = Fixed bug where the Unbreaking enchantment was ignored when using "Super Breaker" or "Giga Drill Breaker"
- = Fixed bug which prevented players from gaining Acrobatics XP when the setting 'Prevent_XP_After_Teleport' was set to false
- = Fixed bug where cooldown donor perks were reducing more than expected
- = Fixed bug where disabling hardcore mode for specific skills didn't work
- = Fixed bug which caused the backup cleanup to delete old backups while it should have kept those
- = Fixed bug where party chat broke if the display name contained special characters
- = Fixed bug where `/addlevels all` and `/skillreset all` didn't work
- = Fixed bug which made it possible to gain XP by taming the same horse multiple times, if a player "untamed" that horse
- = Fixed bug where some horses summoned with "Call of the Wild" were unable to jump
- = Fixed bug where the /ptp request expiration time was checked wrongly - preventing players from using the command
- = Fixed bug where Hylian Luck was broken
- = Fixed bug where Snow would never drop treasures
- = Fixed issues with commands giving away vanished players.
- = Fixed bug where the Repair lucky perk would increase the Arcane Forging downgrade chance, instead of decreasing it
- ! Changed party system. Parties now have XP and Levels. Party features such as party teleport and party chat have to be unlocked before they can be used by the party members
- ! Changed appearance of party member list. Gold = party leader, White = online, Gray = offline, Italic = not nearby
- ! Updated localization files
- ! Changed the appearance of /mcmmo commands
- ! Changed AxesCritical to CriticalHit in config file
- ! Changed several secondary ability permissions(deprecated versions still exist)
- ! Changed /ptp config setting, Commands.ptp.Confirm_Required is now Commands.ptp.Accept.Required
- ! Changed config validation for UnlockLevels, they can now also be 0
- ! Changed config validation for Rank_Levels, successive Ranks can now be less than or equal to each other
- ! Changed default amount of XP gained from mining Quartz Ore. From 250 to 100 XP.
- ! Changed Acrobatics config setting, Skills.Acrobatics.Prevent_XP_After_Teleport is now Skills.Acrobatics.XP_After_Teleport_Cooldown
- - Removed /stats alias for /mcstats
-
-Version 1.4.07
- + Added XP boost to Acrobatics when wearing Boots of Feather Falling
- + Added SQL Database can now recover from a dropped connection without losing data. (Thanks Riking!)
- + Added more tiers to Fishing, Repair and Smelting!
- + Added Carrot on a Stick and Flint & Steel to repair.vanilla.yml
- + Added horses to the "Shake" ability
- + Added ability to summon horses via "Call of the Wild" using apples
- + Added XP gain to Taming for horses
- + Added new permission nodes to allow more control over Taming and "Call of the Wild"
- + Added new experience.yml config file! Moved all experience related settings from config.yml to experience.yml
- + Added support for EXPONENTIAL formula curves to experience.yml
- + Added new /mcconvert command to convert players levels and experience from one formula curve to another.
- + Added snow to Excavation blocks
- + Added new experience curve option. Cumulative curve, calculates experience needed for next level using power level.
- + Added extra settings to config.yml for "Call of the Wild" (Taming)
- + Added a 5 second cooldown after teleporting before Acrobatics XP can be earned. Plus a config option to disable
- + Added new API methods to ExperienceAPI to get a players rank on the leaderboards
- + Added new McMMOPlayerDeathPenaltyEvent, fired when a player dies and would lose levels
- + Added new McMMOPlayerLevelChangeEvent, fired when a players level changes
- + Added new McMMOPlayerLevelDownEvent, fired when a player loses levels
- + Added ability to give custom names to items in treasures.yml - use the key "Custom_Name" to set, expects a string.
- + Added ability to give lore to items in treasures.yml - use the key "Lore" to set, expects a list of strings.
- + Added Quartz and Name Tags to the default Excavation treasures
- + Added a warning message if the server is running NoCheatPlus without CompatNoCheatPlus
- + Added cooldown to commands with heavy database access to prevent denial of service
- + Added /mcscoreboard keep, to keep the scoreboard up forever
- + Added Rainbow Mode to scoreboards
- + Added new /mccooldowns command to show all ability cooldowns
- + Commands may now both print text and display a scoreboard
- + Killing a custom entity will automatically add it to the custom entity config file with default values.
- = Fixed bug which allowed players to bypass fishing's exploit prevention
- = Fixed bug where FakeEntityDamageByEntityEvent wasn't being fired
- = Fixed bug with "Skull Splitter" not finding the locale string
- = Fixed issue where locale strings could cause the scoreboard header to be longer than 16 characters.
- = Fixed a bug with "Beast Lore" when the entity had no owner but was tamed.
- = Fixed a bug where AbilityDeactivateEvent would throw an error if the player logged out before his ability ran out.
- = Fixed a bug where LevelUpEvent would be called for an offline player.
- = Fixed a bug where teleport location was never reset if warmup was set to 0 for "Chimaera Wing".
- = Fixed a bug where the "Dodge" DamageModifier wasn't being read from advanced.yml
- = Fixed a bug where squid were not awarding XP.
- = Fixed a bug where Combat XP was granted within 5 seconds for respawned players
- = Fixed a bug where wrong feedback messages were being send when using a command on an offline player
- = Fixed a bug where players were able to gain Herbalism XP in mine carts, even though Prevent_AFK_Leveling was enabled
- = Fixed a bug where players would get hit by fireworks if they leveled up while in a boat
- ! Changed Fishing "Treasure Hunter" and "Magic Hunter" drop percentages
- ! Changed format of mod config files. (blocks.yml, tools.yml, armor.yml and entities.yml) **YOU WILL NEED TO UPDATE YOUR FILE TO THE NEW FORMAT**
- ! Changed format of treasures.yml. **YOU WILL NEED TO UPDATE YOUR FILE TO THE NEW FORMAT**
- ! Changed format of repair.vanilla.yml. **YOU WILL NEED TO UPDATE YOUR FILE TO THE NEW FORMAT**
- ! Changed default XP multiplier for repairing shears
- ! Changed "Shake" drops for Witches. They no longer drop water bottles, since they no longer drop them in Vanilla.
- ! Changed fishing exploit prevention, by default it will no longer send global sounds, effects and messages.
- ! Changed Hardcore modes, they will also subtract experience
- ! Changed various values to double in advanced.yml for the sake of consistency.
- ! Nerfed Fishing "Master Angler" (removed skill level based bonus) and also made the modifiers configurable
- ! Nerfed Archery damage to eliminate constant one-hit kills.
- ! Changed the way Repair hands out XP, also added config options to control Repair XP
- ! Changed Swords "Counter Attack" ability from passive to active. Blocking is required to activate.
- ! Hardcore modes can now be toggled for each skill individually
- ! Vampirism can now be enabled without having Skill Death Penalty enabled
- ! Admin and Party chat prefixes are now customizable
- ! Changed the color of party leader names in Party chat
- ! Improved "Tree Feller" algorithm (Thanks Riking!)
- ! Improved AFK Acrobatics prevention mechanism
- ! Improved profile saving
- ! Improved partial name matcher
- ! Improved update checker
- ! Updated localization files
- ! Party item share category states are now saved when the server shuts down.
- ! When using "Super Breaker" or "Giga Driller" abilities extra tool durability is used (again)
- ! Mob healthbars are automatically disabled when the plugin "HealthBar" is found
- ! Massively improved scoreboard handling
- ! Reworked scoreboard configuration (config.yml) - **you will need to update**
- - The /mmoupdate command has been removed. It is replaced by /mcconvert database
- - Removed Abilities.Tools.Durability_Loss_Enabled, set Abilities.Tools.Durability_Loss to 0 to disable instead.
- - Removed Skills.Fishing.Shake_UnlockLevel from advanced.yml, now using Skills.Fishing.Rank_Levels.Rank_1 instead.
- - Removed SpoutPlugin support
-
-Version 1.4.06
+Version 1.4.06-dev
 + Added "Ice Fishing" ability to Fishing
 + Added global scoreboards to track skill rankings (display using /mctop)
 + Added per-player scoreboard displays for the /inspect, /mcrank, /mcstats, and /<skillname> commands
--- a/README.md
+++ b/README.md
@@ -2,10 +2,12 @@
 ## The RPG lovers mod

 ### Dev builds
-Our latest development builds are available ~~[here](http://ci.mcmmo.info)~~. Unfortunately, the mcMMO site is down; a temporary dev build location is hosted [here](http://ci.ecocitycraft.com/job/mcMMO/).
+Our latest development builds are available [here](http://ci.mcmmo.info).

 ### Brief Description
-The goal of mcMMO is to take core Minecraft game mechanics and expand them into add an extensive and quality RPG experience. Everything in mcMMO has been carefully thought out and is constantly being improved upon. Currently, mcMMO adds fourteen unique skills to train and level in. Each of these skills is highly customizable through our configuration files, allowing server admins to tweak mcMMO to best suit the needs of his or her server. Know that the mcMMO team is dedicated to providing an ever-evolving experience, and that we carefully read all feedback and bug reports in order to evaluate and balance the mechanics of mcMMO in every update.
+mcMMO takes core Minecraft game mechanics and expands them to add an extensive RPG experience, the goal of the project has always been a quality RPG experience. Everything in mcMMO is carefully thought out and is constantly improving. mcMMO adds eleven skills to train in and level in, while also offering a high level of customization for server admins. There are countless features, including custom sounds, graphical elements, and more added when running mcMMO in conjunction with Spout. I carefully read feedback and evaluate the mechanics of mcMMO in every update to provide an ever-evolving experience.
+
+If you want an original RPG experience like no other mod out there, mcMMO is for you.

 ## About the Team

@@ -29,23 +31,17 @@ mcMMO is currently developed by a team of individuals from all over the world.
 (https://github.com/TfT-02)
 [![t00thpick1](http://www.gravatar.com/avatar/ee23c7794a0c40120c3474287c7bce06.png)]
 (https://github.com/t00thpick1)
-[![riking](https://1.gravatar.com/avatar/aca9f37e569ac3a63929920035a91ba4.png)]
-(https://github.com/riking)
-
-### Special thanks
-[![EasyMFnE](https://www.gravatar.com/avatar/99c9a1fa3bbf957791ceac7b45daadb0.png)]
-(https://github.com/EasyMFnE)  
-Added the Alchemy skill

 ## Compiling

-mcMMO uses Maven 3 to manage dependencies, packaging, and shading of necessary classes; Maven 3 is required to compile mcMMO.
+mcMMO uses Maven 3 to manage dependancies, packaging, and shading of necessary classes; Maven 3 is required to compile mcMMO.

-The typical command used to build mcMMO is: `mvn clean package install`
+The typical command used to build mcMMO is: mvn clean package install

 Required Libraries:
+* Spout API
 * JUnit
-* EMetrics
+* Metrics
 * Bukkit

 http://dev.bukkit.org/server-mods/mcmmo for more up to date information.
--- a/extras/mods/LOTR.armor.yml
+++ b/extras/mods/LOTR.armor.yml
@@ -1,439 +0,0 @@
-# Lord of the Rings mod config by Dragyn
-# Built against version [1.6.4] The Lord of the Rings Mod Public Beta 11.1
-#
-#
-#  Settings for Boots
-###
-Boots:
-    # Bronze
-    X12015:
-        Repairable: true
-        Repair_Material: X12004
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Orc
-    X12035:
-        Repairable: true
-        Repair_Material: X12036
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Gondorian
-    X12060:
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Mithril
-    X12064:
-        Repairable: true
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Elven
-    X12088:
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Warg
-    X12098:
-        Repairable: true
-        Repair_Material: X12094
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Dwarven
-    X12129:
-        Repairable: true
-        Repair_Material: X12112
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Galven
-    X12134:
-        Repairable: true
-        Repair_Material: X12130
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Uruk
-    X12161:
-        Repairable: true
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Wood Elf
-    X12176:
-        Repairable: true
-        Repair_Material: LEATHER
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Ancient
-    X12180:
-        Repairable: true
-        Repair_Material: X12179
-        Repair_Material_Data_Value: 3
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Rohirric
-    X12187:
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Rangers
-    X12206:
-        Repairable: true
-        Repair_Material: LEATHER
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Dunlending
-    X12210:
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Morgul
-    X12222:
-        Repairable: true
-        Repair_Material: X12217
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-#
-#  Settings for Chestplates
-###
-Chestplates:
-    # Bronze
-    X12013:
-        Repairable: true
-        Repair_Material: X12004
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Orc
-    X12033:
-        Repairable: true
-        Repair_Material: X12036
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Gondorian
-    X12058:
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Mithril
-    X12062:
-        Repairable: true
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Elven
-    X12086:
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Warg
-    X12096:
-        Repairable: true
-        Repair_Material: X12094
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Dwarven
-    X12127:
-        Repairable: true
-        Repair_Material: X12112
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Galven
-    X12132:
-        Repairable: true
-        Repair_Material: X12130
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Uruk
-    X12159:
-        Repairable: true
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Wood Elf
-    X12174:
-        Repairable: true
-        Repair_Material: LEATHER
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Ancient
-    X12178:
-        Repairable: true
-        Repair_Material: X12179
-        Repair_Material_Data_Value: 3
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Rohirric
-    X12185:
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Rangers
-    X12204:
-        Repairable: true
-        Repair_Material: LEATHER
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Dunlending
-    X12208:
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Morgul
-    X12220:
-        Repairable: true
-        Repair_Material: X12217
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-#
-#  Settings for Helmets
-###
-Helmets:
-    # Bronze
-    X12012:
-        Repairable: true
-        Repair_Material: X12004
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Orc
-    X12032:
-        Repairable: true
-        Repair_Material: X12036
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Gondorian
-    X12057:
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Mithril
-    X12061:
-        Repairable: true
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Elven
-    X12085:
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Warg
-    X12095:
-        Repairable: true
-        Repair_Material: X12094
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Dwarven
-    X12126:
-        Repairable: true
-        Repair_Material: X12112
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Galven
-    X12131:
-        Repairable: true
-        Repair_Material: X12130
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Uruk
-    X12158:
-        Repairable: true
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Wood Elf
-    X12173:
-        Repairable: true
-        Repair_Material: LEATHER
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Ancient
-    X12177:
-        Repairable: true
-        Repair_Material: X12179
-        Repair_Material_Data_Value: 3
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Rohirric
-    X12184:
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Rangers
-    X12203:
-        Repairable: true
-        Repair_Material: LEATHER
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Dunlending
-    X12207:
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Morgul
-    X12219:
-        Repairable: true
-        Repair_Material: X12217
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-#
-#  Settings for Leggings
-###
-Leggings:
-    # Bronze
-    X12014:
-        Repairable: true
-        Repair_Material: X12004
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Orc
-    X12034:
-        Repairable: true
-        Repair_Material: X12036
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Gondorian
-    X12059:
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Mithril
-    X12063:
-        Repairable: true
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Elven
-    X12087:
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Warg
-    X12097:
-        Repairable: true
-        Repair_Material: X12094
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Dwarven
-    X12128:
-        Repairable: true
-        Repair_Material: X12112
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Galven
-    X12133:
-        Repairable: true
-        Repair_Material: X12130
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Uruk
-    X12160:
-        Repairable: true
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Wood Elf
-    X12175:
-        Repairable: true
-        Repair_Material: LEATHER
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Ancient
-    X12179:
-        Repairable: true
-        Repair_Material: X12179
-        Repair_Material_Data_Value: 3
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Rohirric
-    X12186:
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Rangers
-    X12205:
-        Repairable: true
-        Repair_Material: LEATHER
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Dunlending
-    X12209:
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Morgul
-    X12221:
-        Repairable: true
-        Repair_Material: X12217
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
--- a/extras/mods/LOTR.blocks.yml
+++ b/extras/mods/LOTR.blocks.yml
@@ -1,211 +0,0 @@
-# Lord of the Rings mod config by Skuli (Updated by Dragyn)
-# Built against version [1.6.4] The Lord of the Rings Mod Public Beta 11.1
-#
-#  Settings for Custom Excavation Blocks
-###
-Excavation:
-    Block_1|0:
-        XP_Gain: 99
-        Double_Drops_Enabled: true
-    Block_2|0:
-        XP_Gain: 99
-        Double_Drops_Enabled: true
-
-#
-#  Settings for Custom Herbalism Blocks
-###
-Herbalism:
-
-# Shireheather
-    X1813:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-
-# Simbelmyne
-    X1805:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-
-# Asphodel
-    X1895:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-
-# Bluebell
-    X1867:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-
-# Clover
-    X1873:
-        XP_Gain: 10
-        Double_Drops_Enabled: false
-
-# Dead Marsh Plant
-    X1886:
-        XP_Gain: 10
-        Double_Drops_Enabled: false
-
-# DwarfWort
-    X1902:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-
-# Elanor
-    X1833:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-
-# Lettuce Crop
-    X1830:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-
-# Morgul Shroom
-    X1870:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-
-# Niphredil
-    X1834:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-
-# Pipeweed Crop
-    X1823:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-
-# Pipeweed Plant
-    X1822:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-
-#
-#  Settings for Custom Mining Blocks
-###
-Mining:
-
-# Mithril
-    X1803:
-        XP_Gain: 2000
-        Double_Drops_Enabled: false
-        Is_Ore: true
-# Naurite
-    X1818:
-        XP_Gain: 150
-        Double_Drops_Enabled: false
-        Is_Ore: false
-#Glowstone Ore
-    X1859:
-        XP_Gain: 30
-        Double_Drops_Enabled: false
-        Is_Ore: false
-# Remains
-    X1885:
-        XP_Gain: 1800
-        Double_Drops_Enabled: false
-        Is_Ore: false
-# Gulduril
-    X1887:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Ore: false
-
-# Quendite
-    X1846:
-        XP_Gain: 150
-        Double_Drops_Enabled: false
-        Is_Ore: false
-
-# MorgulIron
-    X1819:
-        XP_Gain: 25
-        Double_Drops_Enabled: true
-        Is_Ore: false
-
-# Rohan Rock
-    X180|2:
-        XP_Gain: 30
-        Double_Drops_Enabled: false
-        Is_Ore: false
-
-
-#Gondor Stone
-    X180|1:
-        XP_Gain: 30
-        Double_Drops_Enabled: false
-        Is_Ore: false
-
-# Mordor Stone
-    X180|0:
-        XP_Gain: 30
-        Double_Drops_Enabled: false
-        Is_Ore: false
-
-#
-#  Settings for Custom Woodcutting Blocks
-###
-Woodcutting:
-# Shire Pine
-    X1806|0:
-        XP_Gain: 90
-        Double_Drops_Enabled: true
-        Is_Log: true
-
-# Mallorn
-    X1806|1:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true
-
-# Apple
-    X1860|0:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true
-
-#  Pear
-    X1860|1:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true
-
-# Cherry
-    X1860|2:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true
-
-# Mirkwood
-    X1806|2:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true
-
-# Charred
-    X1806|3:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true
-
-# Lebethron
-    X1896|0:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true
-
-# Beech
-    X1896|1:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true
-
-
-#
-#  Settings for Custom Ability Blocks
-#  (These blocks don't trigger abilities)
-###
-Ability_Blocks:
-    Block_1|0:
-    Block_2|0:
--- a/extras/mods/LOTR.tools.yml
+++ b/extras/mods/LOTR.tools.yml
@@ -1,700 +0,0 @@
-# Lord of the Rings mod config by Skuli (Updated by Dragyn)
-# Built against version [1.6.4] The Lord of the Rings Mod Public Beta 11.1
-
-Axes:
-    #DwarvenThrowingAxe
-    X12146:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12112
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 451
-    #UrukWarhammer
-    X12156:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 391
-    #Gondorian Warhammer
-    X12140:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: false
-        Repair_Material: X12112
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 281
-    #UrukBattleaxe
-    X12155:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 391
-    #MithrilBattleaxe
-    X12138:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 2479
-    #MithrilWarhamer
-    X12139:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 2479
-    #OrcWarhammer
-    X12125:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12036
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 261
-    #Dwarven Warhammer
-    X12120:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12112
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 451
-    #DwarvenZbattleaxe
-    X12119:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12112
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 451
-    #BronzeAxe
-    X12009:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12004
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 197
-    #MithrilAxe
-    X12050:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 2479
-    #MallornAxe
-    X12075:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X1801
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 121
-    #Elven Axe
-    X12080:
-        XP_Modifer: 2
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: false
-        Repair_Material: X12112
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 313
-    #DwarvenAxe
-    X12115:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12112
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 450
-    #OrcAxe
-    X12123:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12036
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 261
-    #UrukAxe
-    X12150:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 391
-Bows:    
-    #ElvenBow
-    X12093:
-        XP_Modifer: 2
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: false
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 9
-        Durability: 485
-    #mallornbow
-    X12084:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X1801
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 417
-    #orcBow
-    X12099:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12036
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 441
-    #UrukCrossbow
-    X12163:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 471
-    #MithrilCrossbow
-    X12171:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 1761
-    #IronCrossbow
-    X12170:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 9
-        Durability: 357
-    #BowofMirkwood
-    X12177:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: false
-        Repair_Material: X1806
-        Repair_Material_Data_Value: 2
-        Repair_Material_Quantity: 3
-        Durability: 417
-Hoes:    
-    #BronzeHoe
-    X12011:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12004
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 197
-    #MithrilHoe
-    X12052:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 2479
-    #MallornHoe
-    X12077:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X1801
-        Repair_Material_Data_Value: 1
-        Repair_Material_Quantity: 2
-        Durability: 121
-    #CopperHoe
-    X26511:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X26507
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 180
-    #ElvenHoe
-    X12082:
-        XP_Modifer: 2
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: false
-        Repair_Material: X12082
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 313
-    #DwarvenHoe
-    X12117:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X26507
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 180
-Pickaxes:    
-    #MEBronzePickaxe
-    X12008:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12004
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 197
-    #MithrilPixkaxe
-    X12049:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 2479
-    #MallornPickaxe
-    X12074:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X1801
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 121
-    #ElvenPickaxe
-    X12079:
-        XP_Modifer: 2
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: false
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 313
-    #DwarvenPickaxe
-    X12114:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12112
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 451
-    #UrukPickaxe
-    X12149:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 391
-    #OrcPickaxe
-    X12122:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12036
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 261
-Shovels:    
-    #BronzeShovel
-    X12007:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12004
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 1
-        Durability: 197
-    #MithrilShovel
-    X12048:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 1
-        Durability: 2479
-    #MallornShovel
-    X12073:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X1801
-        Repair_Material_Data_Value: 1
-        Repair_Material_Quantity: 1
-        Durability: 121
-    #ElvenShovel
-    X12078:
-        XP_Modifer: 2
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: false
-        Repair_Material: X12082
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 1
-        Durability: 313
-    #DwarvenShovel
-    X12113:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12112
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 1
-        Durability: 451
-    #UrukShovel
-    X12148:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 1
-        Durability: 391
-    #OrcShovel
-    X12121:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12036
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 1
-        Durability: 261
-
-Swords:    
-    #Uruk Dagger
-    X12153:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 313
-    #Poisoned urukd agger
-    X12154:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 313
-    #Uruk Spear
-    X12157:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 391
-    #Rohirric Sword
-    X12181:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: false
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 251
-    #Rohirric Dagger
-    X12182:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: false
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 201
-    #Rohirric Spear
-    X12183:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: false
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 251
-    #Dunlending Spear
-    X12212:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: false
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 251
-    #Uruk Scimitar
-    X12151:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12147
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 391
-    #Mithril Dagger
-    X12137:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 1983
-    #Iron Dagger
-    X12136:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 201
-    #Dwarven Dagger
-    X12118:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12112
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 361
-    #Dwarven Sword
-    X12116:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12112
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 451
-    #Elven Sword
-    X12081:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: false
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 313
-    #Elven Spear
-    X12083:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: false
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 313
-    #Anduril
-    X12070:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 4
-        Repairable: false
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 313
-    #Mallorn Sword
-    X12076:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X1801
-        Repair_Material_Data_Value: 1
-        Repair_Material_Quantity: 2
-        Durability: 121
-    #Mithril Spear
-    X12069:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 4
-        Repairable: true
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 2479
-    #Iron Spear
-    X12068:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: IRON_INGOT
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 1
-        Durability: 251
-    #Orc Spear
-    X12066:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12036
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 1
-        Durability: 261
-    #Bronze Spear
-    X12067:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12004
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 1
-        Durability: 197
-    #Gondor Spear
-    X12065:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: false
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 1
-        Durability: 281
-    #Gondor Sword
-    X12056:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: false
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 1
-        Durability: 281
-    #Orc Scimitar
-    X12031:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12036
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 261
-    #Steel Sword
-    X26862:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X26857
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 751
-    #Bronze Sword
-    X12010:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X12004
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 1
-        Durability: 197
-    #Mithril Sword
-    X12051:
-        XP_Modifer: 1
-        Ability_Enabled: true
-        Tier: 4
-        Repairable: true
-        Repair_Material: X12006
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 2479    
--- a/extras/mods/extrabiomesxl.blocks.yml
+++ b/extras/mods/extrabiomesxl.blocks.yml
@@ -1,182 +0,0 @@
-# Config created by Dragyn
-# Created For ExtrabiomesXL-universal-1.6.4-3.14.5
-
-#
-#  Settings for Custom Excavation Blocks
-###
-Excavation:
-    # Quicksand
-    X2214|0:
-        XP_Gain: 40
-        Double_Drops_Enabled: true
-
-
-#
-#  Settings for Custom Herbalism Blocks
-###
-Herbalism:
-    # Cattails
-    X2201|0:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-    # Hydrangea
-    X2202|1:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-    # Buttercups
-    X2202|2:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-    # Lavender
-    X2202|3:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-    # Tiny Cactus
-    X2202|4:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-    # Toadstool
-    X2202|6:
-        XP_Gain: 150
-        Double_Drops_Enabled: true        
-    # Calla Lillies
-    X2202|7:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-#
-#  Settings for Custom Mining Blocks
-###
-Mining:
-    X254|0:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-
-    X254|1:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-
-#
-#  Settings for Custom Woodcutting Blocks
-###
-Woodcutting:
-    # Fir 
-    X2208|0:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Acacia 
-    X2208|1:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Cypress 
-    X2208|2:
-        XP_Gain: 90
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Japanese Maple
-    X2208|3:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Redwood Quarter
-    X2209|0:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X2211|0:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X2212|0:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X2213|0:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Fir Quarters
-    X2209|1:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X2211|1:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X2212|1:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X2213|1:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true        
-    # Oak Quarters
-    X2209|2:
-        XP_Gain: 70
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X2211|2:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X2212|2:
-        XP_Gain: 70
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X2213|2:
-        XP_Gain: 70
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Acacia 
-    X2209|1:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Cypress 
-    X2209|2:
-        XP_Gain: 90
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Bald Cypress Quarter
-    X2225|0:
-        XP_Gain: 90
-        Double_Drops_Enabled: true
-        Is_Log: true    
-    # Bald Cypress Elbow
-    X2227|0:
-        XP_Gain: 90
-        Double_Drops_Enabled: true
-        Is_Log: true     
-    # Bald Cypress Log
-    X2231|2:
-        XP_Gain: 90
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Rainbow Eucalyptus
-    X2228|0:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true           
-    X2229|0:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true  
-    X2231|0:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true     
-    # Autumn Log
-    X2231|1:
-        XP_Gain: 90
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Sakura Log
-    X2238|0:
-        XP_Gain: 90
-        Double_Drops_Enabled: true
-        Is_Log: true         
--- a/extras/mods/galacticraft.armor.yml
+++ b/extras/mods/galacticraft.armor.yml
@@ -1,71 +0,0 @@
-# Config created by Dragyn
-# Created For Galacticraft-1.6.4-2.0.7.904 and Galacticraft-Planets-1.6.4-2.0.7.904
-#
-#  Settings for Boots
-###
-Boots:
-    # Heavy Duty
-    X10149:
-        Repairable: true
-        Repair_Material: X10150
-        Repair_Material_Data_Value: 9
-        Repair_Material_Quantity: 2
-        Durability: 500
-    X10171:
-        Repairable: true
-        Repair_Material: X10161
-        Repair_Material_Data_Value: 2
-        Repair_Material_Quantity: 2
-        Durability: 999
-#
-#  Settings for Chestplates
-###
-Chestplates:
-    # Heavy Duty
-    X10147:
-        Repairable: true
-        Repair_Material: X10150
-        Repair_Material_Data_Value: 9
-        Repair_Material_Quantity: 2
-        Durability: 500
-    X10169:
-        Repairable: true
-        Repair_Material: X10161
-        Repair_Material_Data_Value: 2
-        Repair_Material_Quantity: 2
-        Durability: 999
-#
-#  Settings for Helmets
-###
-Helmets:
-    # Heavy Duty
-        X10146:
-        Repairable: true
-        Repair_Material: X10150
-        Repair_Material_Data_Value: 9
-        Repair_Material_Quantity: 2
-        Durability: 500
-    X10168:
-        Repairable: true
-        Repair_Material: X10161
-        Repair_Material_Data_Value: 2
-        Repair_Material_Quantity: 2
-        Durability: 999
-#
-#  Settings for Leggings
-###
-Leggings:
-    # Heavy Duty
-    X10148:
-        Repairable: true
-        Repair_Material: X10150
-        Repair_Material_Data_Value: 9
-        Repair_Material_Quantity: 2
-        Durability: 500
-    X10170:
-        Repairable: true
-        Repair_Material: X10161
-        Repair_Material_Data_Value: 2
-        Repair_Material_Quantity: 2
-        Durability: 999
-        
--- a/extras/mods/galacticraft.blocks.yml
+++ b/extras/mods/galacticraft.blocks.yml
@@ -1,98 +0,0 @@
-# Config created by Dragyn
-# Created For Galacticraft-1.6.4-2.0.7.904 and Galacticraft-Planets-1.6.4-2.0.7.904
-#
-#  Settings for Custom Excavation Blocks
-###
-Excavation:
-    # Dirt
-    X3347|3:
-        XP_Gain: 40
-        Double_Drops_Enabled: true
-    Block_2|0:
-        XP_Gain: 99
-        Double_Drops_Enabled: true
-
-#
-#  Settings for Custom Mining Blocks
-###
-Mining:
-    # Copper Ore
-    X3347|0:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    X3372|5:
-        XP_Gain: 450
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    X3390|0:
-        XP_Gain: 550
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Tin Ore
-    X3347|1:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    X3372|6:
-        XP_Gain: 450
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    X3390|1:
-        XP_Gain: 550
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Aluminum Ore
-    X3372|7:
-        XP_Gain: 450
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Silicon Ore
-    X3372|8:
-        XP_Gain: 450
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Cheese Ore
-    X3347|2:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true   
-    # Iron Ore
-    X3390|3:
-        XP_Gain: 550
-        Double_Drops_Enabled: true
-        Is_Ore: true        
-    # Desh Ore
-    X3390|2:
-        XP_Gain: 600
-        Double_Drops_Enabled: true
-        Is_Ore: true                    
-    # Moon Stone
-    X3347|4:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false    
-    # Moon Turf
-    X3347|5:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false    
-    # Mars Cobblestone
-    X3390|4:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false     
-    # Mars Rock/Stone
-    X3390|5:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false 
-    X3390|6:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false 
-    X3390|9:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false 
-
--- a/extras/mods/galacticraft.tools.yml
+++ b/extras/mods/galacticraft.tools.yml
@@ -1,123 +0,0 @@
-# Config created by Dragyn
-# Created For Galacticraft-1.6.4-2.0.7.904 and Galacticraft-Planets-1.6.4-2.0.7.904
-#
-#  Settings for Axes
-###
-Axes:
-    # Heavy Duty
-    X10145:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X10150
-        Repair_Material_Data_Value: 9
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Desh
-    X10167:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: 10161
-        Repair_Material_Data_Value: 2
-        Repair_Material_Quantity: 2
-        Durability: 1000
-
-#
-#  Settings for Hoes
-###
-Hoes:
-    # Heavy Duty
-    X10144:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X10150
-        Repair_Material_Data_Value: 9
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Desh
-    X10166:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: 10161
-        Repair_Material_Data_Value: 2
-        Repair_Material_Quantity: 2
-        Durability: 1000
-#
-#  Settings for Pickaxes
-###
-Pickaxes:
-    # Heavy Duty
-    X10142:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X10150
-        Repair_Material_Data_Value: 9
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Desh
-    X10164:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: 10161
-        Repair_Material_Data_Value: 2
-        Repair_Material_Quantity: 2
-        Durability: 1000
-#
-#  Settings for Shovels
-###
-Shovels:
-    # Heavy Duty
-    X10143:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X10150
-        Repair_Material_Data_Value: 9
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Desh
-    X10165:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: 10161
-        Repair_Material_Data_Value: 2
-        Repair_Material_Quantity: 2
-        Durability: 1000
-#
-#  Settings for Swords
-###
-Swords:
-    # Heavy Duty
-    X10141:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 4
-        Repairable: true
-        Repair_Material: X10150
-        Repair_Material_Data_Value: 9
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Desh
-    X10163:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: 10161
-        Repair_Material_Data_Value: 2
-        Repair_Material_Quantity: 2
-        Durability: 1000
--- a/extras/mods/metallurgy3.armor.yml
+++ b/extras/mods/metallurgy3.armor.yml
--- a/extras/mods/metallurgy3.blocks.yml
+++ b/extras/mods/metallurgy3.blocks.yml
@@ -1,185 +0,0 @@
-# Config created by Dragyn
-# Created For Metallurgy-1.6.4-3.3.1 
-#
-#
-#  Settings for Custom Mining Blocks
-###
-Mining:
-    # Copper
-    X900|0:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Tin
-    X900|1:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Zinc
-    X902|0:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Silver
-    X902|1:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Platinum
-    X902|3:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true
-
-    # NETHER ORES
-    # Ignatius
-    X903|0:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Shadow Iron
-    X903|1:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Lemurite
-    X903|2:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: true                
-    # Midasium
-    X903|3:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Vyroxeres
-    X903|4:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Ceruclase
-    X903|5:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Alduorite
-    X903|6:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Kalendrite
-    X903|7:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Vulcanite
-    X903|8:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Sanguinite
-    X903|9:
-        XP_Gain: 450
-        Double_Drops_Enabled: true
-        Is_Ore: true
-
-    # Manganese
-    X900|2:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Eximite
-    X900|5:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Meutoite
-    X900|6:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Sulfur
-    X905|7:
-        XP_Gain: 150
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Phosphorite
-    X905|8:
-        XP_Gain: 150
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Saltpeter
-    X905|9:
-        XP_Gain: 150
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Magnesium
-    X905|10:
-        XP_Gain: 150
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Bitumen
-    X905|11:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Potash
-    X905|12:
-        XP_Gain: 150
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Prometheum
-    X906|0:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true        
-    # Deep Iron
-    X906|1:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true 
-    # Infuscolium
-    X906|2:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true 
-    # Oureclase
-    X906|4:
-        XP_Gain: 650
-        Double_Drops_Enabled: true
-        Is_Ore: true 
-    # Astral Silver
-    X906|5:
-        XP_Gain: 650
-        Double_Drops_Enabled: true
-        Is_Ore: true 
-    # Carmot
-    X906|6:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Mithril
-    X906|7:
-        XP_Gain: 750
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Rubracium
-    X906|8:
-        XP_Gain: 800
-        Double_Drops_Enabled: true
-        Is_Ore: true         
-    # Orichalcum
-    X906|11:
-        XP_Gain: 900
-        Double_Drops_Enabled: true
-        Is_Ore: true         
-    # Adamantine
-    X906|13:
-        XP_Gain: 1000
-        Double_Drops_Enabled: true
-        Is_Ore: true         
-    # Atlarus
-    X906|14:
-        XP_Gain: 1000
-        Double_Drops_Enabled: true
-        Is_Ore: true   
--- a/extras/mods/metallurgy3.tools.yml
+++ b/extras/mods/metallurgy3.tools.yml
--- a/extras/mods/railcraft.armor.yml
+++ b/extras/mods/railcraft.armor.yml
@@ -1,44 +0,0 @@
-# Config created by Dragyn
-# Created For Railcraft_1.6.2-8.1.0.0 
-#
-#
-#  Settings for Boots
-###
-Boots:
-    X7758:
-        Repairable: true
-        Repair_Material: X7796
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500       
-#
-#  Settings for Chestplates
-###
-Chestplates:
-    X7761:
-        Repairable: true
-        Repair_Material: X7796
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500        
-#
-#  Settings for Helmets
-###
-Helmets:
-    X7759:
-        Repairable: true
-        Repair_Material: X7796
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500       
-#
-#  Settings for Leggings
-###
-Leggings:
-    X7760:
-        Repairable: true
-        Repair_Material: X7796
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-        
--- a/extras/mods/railcraft.blocks.yml
+++ b/extras/mods/railcraft.blocks.yml
@@ -1,103 +0,0 @@
-# Config created by Dragyn
-# Created For Railcraft_1.6.2-8.1.0.0 
-#
-#
-#  Settings for Custom Mining Blocks
-###
-Mining:
-    # Abyssal Stone
-    X457|6:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Quarried Stone
-    X457|7:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Sulfur
-    X458|0:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Saltpeter
-    X458|1:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Dark Diamond
-    X458|2:
-        XP_Gain: 750
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Dark Emerald
-    X458|3:
-        XP_Gain: 1000
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Dark Lapis
-    X458|4:
-        XP_Gain: 400
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Firestone
-    X458|5:
-        XP_Gain: 450
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Infernal Stone
-    X467|2:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X467|5:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Blood Stained Stone
-    X468|2:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X468|5:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Sandy Stone
-    X469|2:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X469|5:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Quarried Stone
-    X471|2:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X471|5:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Frost Bound Stone
-    X472|2:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X472|5:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Nether Stone
-    X475|2:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X475|5:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-              
-              
--- a/extras/mods/railcraft.tools.yml
+++ b/extras/mods/railcraft.tools.yml
@@ -1,76 +0,0 @@
-# Config created by Dragyn
-# Created For Railcraft_1.6.2-8.1.0.0 
-#
-#
-#  Settings for Axes
-###
-Axes:
-    # Steel
-    X7819:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X7796
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-
-
-#
-#  Settings for Hoes
-###
-Hoes:
-    # Steel
-    X7820:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X7796
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-
-#
-#  Settings for Pickaxes
-###
-Pickaxes:
-    # Steel
-    X7821:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X7796
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-#
-#  Settings for Shovels
-###
-Shovels:
-    # Steel
-    X7823:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X7796
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-#
-#  Settings for Swords
-###
-Swords:
-    # Steel
-    X7824:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X7796
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
--- a/extras/mods/simcraft.blocks.yml
+++ b/extras/mods/simcraft.blocks.yml
@@ -1,543 +0,0 @@
-# Config created by Dragyn
-# Created For SimCraft 1.6.4 
-#
-#
-#  Settings for Custom Herbalism Blocks
-###
-Herbalism:
-    X705|0:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X705|1:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X705|2:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X705|3:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X705|4:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X705|5:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X705|6:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X705|7:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X705|8:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X705|9:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X705|10:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X705|11:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X705|12:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X705|13:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X705|14:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X705|15:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X706|0:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X706|1:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X706|2:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X706|3:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X706|4:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X706|5:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X706|6:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X706|7:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X706|8:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X706|9:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X706|10:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X706|11:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X706|12:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X706|13:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X706|14:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X706|15:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X707|0:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X707|1:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X707|2:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X707|3:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X707|4:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X707|5:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X707|6:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X707|7:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X707|8:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X707|9:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X707|10:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X707|11:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X707|12:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X707|13:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X707|14:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-    X707|15:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-#
-#  Settings for Custom Mining Blocks
-###
-Mining:
-    X700|0:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X700|1:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X700|2:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X700|3:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X700|4:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X700|5:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X700|6:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X700|7:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X700|8:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X700|9:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X700|10:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X700|11:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X700|12:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X700|13:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X700|14:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X700|15:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X701|0:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X701|1:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X701|2:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X701|3:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X701|4:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X701|5:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X701|6:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X701|7:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X701|8:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X701|9:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X701|10:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X701|11:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X701|12:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X701|13:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X701|14:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X701|15:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X702|0:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X702|1:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X702|2:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X702|3:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X702|4:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X702|5:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X702|6:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X702|7:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X702|8:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X702|9:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X702|10:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X702|11:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X702|12:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X702|13:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X702|14:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X702|15:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X703|0:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X703|1:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X703|2:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X703|3:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X703|4:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X703|5:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X703|6:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X703|7:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X703|8:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X703|9:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X703|10:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X703|11:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X703|12:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X703|13:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X703|14:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X703|15:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X704|0:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X704|1:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X704|2:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X704|3:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X704|4:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X704|5:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X704|6:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X704|7:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X704|8:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X704|9:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X704|10:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X704|11:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X704|12:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X704|13:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X704|14:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X704|15:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-#
-#  Settings for Custom Woodcutting Blocks
-###
-Woodcutting:
-    X708|0:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X708|1:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X708|2:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X708|3:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X708|4:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X708|5:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X708|6:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X708|7:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X708|8:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X708|9:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X708|10:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X708|11:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X1095|0:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X1095|1:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X1095|2:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    X1095|3:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
--- a/extras/mods/simcraft.tools.yml
+++ b/extras/mods/simcraft.tools.yml
@@ -1,61 +0,0 @@
-# Config created by Dragyn
-# Created For Railcraft_1.6.2-8.1.0.0 
-#
-#
-#  Settings for Axes
-###
-Axes:
-    # Steel
-    X15787:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X15260
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-
-
-#
-#  Settings for Pickaxes
-###
-Pickaxes:
-    # Steel
-    X15788:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X15260
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-#
-#  Settings for Shovels
-###
-Shovels:
-    # Steel
-    X15789:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X15260
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-#
-#  Settings for Swords
-###
-Swords:
-    # Steel
-    X15786:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X15260
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
--- a/extras/mods/twilightforest.armor.yml
+++ b/extras/mods/twilightforest.armor.yml
@@ -1,134 +0,0 @@
-# Config created by Dragyn
-# Created For twilightforest-1.20.3 
-#
-#
-#  Settings for Boots
-###
-Boots:  
-    # Ironwood
-    X27978:
-        Repairable: true
-        Repair_Material: X27974
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Fiery
-    X27995:
-        Repairable: true
-        Repair_Material: X27991
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Stealeaf
-    X28002:
-        Repairable: true
-        Repair_Material: X27998
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Knightmetal
-    X28037:
-        Repairable: true
-        Repair_Material: X28032
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-        
-#
-#  Settings for Chestplates
-###
-Chestplates:
-    # Ironwood
-    X27976:
-        Repairable: true
-        Repair_Material: X27974
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Fiery
-    X27993:
-        Repairable: true
-        Repair_Material: X27991
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Stealeaf
-    X28000:
-        Repairable: true
-        Repair_Material: X27998
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Knightmetal
-    X28035:
-        Repairable: true
-        Repair_Material: X28032
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-
-#
-#  Settings for Helmets
-###
-Helmets:
-    # Ironwood
-    X27975:
-        Repairable: true
-        Repair_Material: X27974
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Fiery
-    X27992:
-        Repairable: true
-        Repair_Material: X27991
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Stealeaf
-    X27999:
-        Repairable: true
-        Repair_Material: X27998
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Knightmetal
-    X28034:
-        Repairable: true
-        Repair_Material: X28032
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-
-#
-#  Settings for Leggings
-###
-Leggings:
-    # Ironwood
-    X27977:
-        Repairable: true
-        Repair_Material: X27974
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Fiery
-    X27994:
-        Repairable: true
-        Repair_Material: X27991
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Stealeaf
-    X28001:
-        Repairable: true
-        Repair_Material: X27998
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Knightmetal
-    X28036:
-        Repairable: true
-        Repair_Material: X28032
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
--- a/extras/mods/twilightforest.blocks.yml
+++ b/extras/mods/twilightforest.blocks.yml
@@ -1,117 +0,0 @@
-# Config created by Dragyn
-# Created For twilightforest-1.20.3 
-#
-#
-#  Settings for Custom Herbalism Blocks
-###
-Herbalism:
-    # Mushgloom
-    X2169|9:
-        XP_Gain: 150
-        Double_Drops_Enabled: true
-    # Torchberry Plant
-    X2169|13:
-        XP_Gain: 20
-        Double_Drops_Enabled: true
-    # Mayapple
-    X2169|4:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-    # Fiddlehead
-    X2169|8:
-        XP_Gain: 35
-        Double_Drops_Enabled: true
-
-
-#
-#  Settings for Custom Mining Blocks
-###
-Mining:
-    # Mazestone
-    X2165|0:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2165|1:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2165|2:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2165|3:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2165|4:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2165|5:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2165|6:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2165|7:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: false
-        
-#
-#  Settings for Custom Woodcutting Blocks
-###
-Woodcutting:
-    # Twilight Oak
-    X2163|0:
-        XP_Gain: 70
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Canopy
-    X2163|1:
-        XP_Gain: 80
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Mangrove
-    X2163|2:
-        XP_Gain: 90
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Darkwood
-    X2163|3:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Roots
-    X2170|0:
-        XP_Gain: 10
-        Double_Drops_Enabled: true
-        Is_Log: false
-    X2170|1:
-        XP_Gain: 10
-        Double_Drops_Enabled: true
-        Is_Log: false
-    # Timewood
-    X2176|0:
-        XP_Gain: 1000
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Transwood
-    X2176|1:
-        XP_Gain: 1000
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Minewood
-    X2176|2:
-        XP_Gain: 1000
-        Double_Drops_Enabled: true
-        Is_Log: true
-    # Sortingwood
-    X2176|3:
-        XP_Gain: 1000
-        Double_Drops_Enabled: true
-        Is_Log: true
-                 
--- a/extras/mods/twilightforest.tools.yml
+++ b/extras/mods/twilightforest.tools.yml
@@ -1,186 +0,0 @@
-# Config created by Dragyn
-# Created For twilightforest-1.20.3 
-#
-#
-#  Settings for Axes
-###
-Axes:
-    # Ironwood
-    X27982:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X27974
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Steeleaf
-    X31989:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X27998
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Knightmetal
-    X28040:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X28032
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Minotaur
-    X31984:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X264
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-
-
-#
-#  Settings for Hoes
-###
-Hoes:
-    # Ironwood
-    X27983:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X27974
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Steeleaf
-    X31988:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X27998
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-
-#
-#  Settings for Pickaxes
-###
-Pickaxes:
-    # Ironwood
-    X27981:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X27974
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Fiery
-    X27997:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X27991
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Steeleaf
-    X28005:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X27998
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Knightmetal
-    X28039:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X28032
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-#
-#  Settings for Shovels
-###
-Shovels:
-    # Ironwood
-    X27980:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X27974
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Steeleaf
-    X28004:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X27998
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-#
-#  Settings for Swords
-###
-Swords:
-    # Ironwood
-    X27979:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X27974
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Fiery
-    X27996:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X27991
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Steeleaf
-    X28003:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X27998
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Knightmetal
-    X28038:
-        XP_Modifer: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X28032
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 500
--- a/extras/mods/underground_biomes.blocks.yml
+++ b/extras/mods/underground_biomes.blocks.yml
@@ -1,171 +0,0 @@
-# Config created by Dragyn
-# Created For UndergroundBiomes 1.6.x - 0.4.2c 
-#
-#
-#  Settings for Custom Mining Blocks
-###
-Mining:
-    X2000|0:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2000|1:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2000|2:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2000|3:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2000|4:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2000|5:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2000|6:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2000|7:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-#        
-    X2001|0:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2001|1:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2001|2:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2001|3:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2001|4:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2001|5:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2001|6:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2001|7:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false        
-#        
-    X2009|0:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2009|1:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2009|2:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2009|3:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2009|4:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2009|5:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2009|6:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2009|7:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false   
-#
-    X2010|0:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2010|1:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2010|2:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2010|3:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2010|4:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2010|5:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2010|6:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2010|7:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false   
-#    
-    X2011|0:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2011|1:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2011|2:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2011|3:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2011|4:
-        XP_Gain: 50
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2011|5:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2011|6:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    X2011|7:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false                   
--- a/extras/repair.chain.yml
+++ b/extras/repair.chain.yml
@@ -1,11 +1,11 @@
 #
-#  Repair configuration
-#  Last updated on ${project.version}-b${BUILD_NUMBER}
-#
 # Any file named repair.*.yml in the mcmmmo folder will be loaded as a repair config
 # All repair configs have a main section titled "Repairables"
-# Afterwards, all sub-items are considered a Repairable to be loaded. The names of each subitem should be the exact material name.
-# The bare minimum of a Repairable is that it have a RepairMaterial and a MaximumDurability
+# Afterwards, all sub-items are considered a Repairable to be loaded
+# The bare minimum of a Repairable is that it have an ItemId, a RepairMaterialId, and a MaximumDurability
+#
+# ItemId: This is the id of the item to be repairable.
+## This is required to be set.
 #
 # ItemType: This is the type of item to be repaired, this is only important to permissions.
 ## Valid values are ARMOR, TOOL, and OTHER.
@@ -15,7 +15,7 @@
 ## Valid values are STRING, LEATHER, WOOD, STONE, IRON, GOLD, DIAMOND, and OTHER
 ## This defaults to OTHER.
 #
-# RepairMaterial: This is the material name of the item used to repair this repairable.
+# RepairMaterialId: This is the id of the item used to repair this repairable.
 ## This is required to be set.
 #
 # RepairMaterialMetadata: This is the metadata of the item used to repair this repairable.
@@ -26,7 +26,7 @@
 ## This is required to be set.
 #
 # MinimumLevel: This is the minimum repair level needed to repair this item.
-## Valid values are => 0
+## Valid values are > 0
 ## This defaults to 0
 #
 # MinimumQuantity: This is the minimum number of items needed to repair this item ignoring all other repair bonuses.
@@ -42,19 +42,32 @@
 #
 ###
 Repairables:
-    #
-    # Chainmail repairables
-    ###
-    # Armor
-    CHAINMAIL_HELMET:
-        RepairMaterial: FIRE
+    ChainHelmet:
+        ItemId: 302
+        ItemType: ARMOR
+        RepairMaterialId: 51
+        MaximumDurability: 165
+        MinimumQuantity: 5
        XpMultiplier: 2
-    CHAINMAIL_CHESTPLATE:
-        RepairMaterial: FIRE
+    ChainChest:
+        ItemId: 303
+        ItemType: ARMOR
+        RepairMaterialId: 51
+        MaximumDurability: 240
+        MinimumQuantity: 8
        XpMultiplier: 2
-    CHAINMAIL_LEGGINGS:
-        RepairMaterial: FIRE
+    ChainLegs:
+        ItemId: 304
+        ItemType: ARMOR
+        RepairMaterialId: 51
+        MaximumDurability: 225
+        MinimumQuantity: 7
        XpMultiplier: 2
-    CHAINMAIL_BOOTS:
-        RepairMaterial: FIRE
+    ChainBoots:
+        ItemId: 305
+        ItemType: ARMOR
+        RepairMaterialId: 51
+        RepairMaterialMetadata: -1
+        MaximumDurability: 195
+        MinimumQuantity: 4
        XpMultiplier: 2
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.gmail.nossr50.mcMMO</groupId>
    <artifactId>mcMMO</artifactId>
-    <version>1.4.09-SNAPSHOT</version>
+    <version>1.4.06-dev6</version>
    <name>mcMMO</name>
    <url>https://github.com/mcMMO-Dev/mcMMO</url>
    <issueManagement>
@@ -22,6 +22,38 @@
                    <include>.jenkins</include>
                </includes>
            </resource>
+            <resource>
+                <targetPath>resources</targetPath>
+                <filtering>false</filtering>
+                <directory>${basedir}/src/main/resources/xpbar/</directory>
+                <includes>
+                    <include>xpbar*.png</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>resources</targetPath>
+                <filtering>false</filtering>
+                <directory>${basedir}/src/main/resources/healthbar/</directory>
+                <includes>
+                    <include>health*.png</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>resources</targetPath>
+                <filtering>false</filtering>
+                <directory>${basedir}/src/main/resources/skillicon/</directory>
+                <includes>
+                    <include>*.png</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>resources</targetPath>
+                <filtering>false</filtering>
+                <directory>${basedir}/src/main/resources/sound/</directory>
+                <includes>
+                    <include>*.wav</include>
+                </includes>
+            </resource>
            <resource>
                <targetPath>com/gmail/nossr50/locale</targetPath>
                <filtering>true</filtering>
@@ -30,14 +62,6 @@
                    <include>locale*.properties</include>
                </includes>
            </resource>
-            <resource>
-                <targetPath>mods</targetPath>
-                <filtering>true</filtering>
-                <directory>${basedir}/src/main/resources/mods</directory>
-                <includes>
-                    <include>*.yml</include>
-                </includes>
-            </resource>
        </resources>
        <plugins>
            <plugin>
@@ -109,8 +133,8 @@
            <url>http://repo.bukkit.org/content/groups/public/</url>
        </repository>
        <repository>
-            <id>md_5-releases</id>
-            <url>http://repo.md-5.net/content/repositories/releases/</url>
+            <id>spout-repo</id>
+            <url>http://nexus.spout.org/content/groups/public/</url>
        </repository>
        <repository>
            <id>Plugin MetricsExtension</id>
@@ -121,7 +145,14 @@
        <dependency>
            <groupId>org.bukkit</groupId>
            <artifactId>bukkit</artifactId>
-            <version>1.6.4-R2.0</version>
+            <version>1.5.2-R1.0</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.getspout</groupId>
+            <artifactId>spoutplugin</artifactId>
+            <version>LATEST</version>
            <type>jar</type>
            <scope>compile</scope>
        </dependency>
@@ -139,19 +170,15 @@
    </dependencies>
    <distributionManagement>
        <repository>
-            <id>md_5-releases</id>
-            <url>http://repo.md-5.net/content/repositories/releases/</url>
+            <id>mcmmo-repo</id>
+            <url>file:///var/lib/jenkins/repo</url>
        </repository>
-        <snapshotRepository>
-            <id>md_5-snapshots</id>
-            <url>http://repo.md-5.net/content/repositories/snapshots/</url>
-        </snapshotRepository>
    </distributionManagement>
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>
    <ciManagement>
-        <system>Jenkins</system>
-        <url>http://ci.ecocitycraft.com/job/mcMMO</url>
+    	<system>Jenkins</system>
+    	<url>ci.mcmmo.org</url>
    </ciManagement>
 </project>
--- a/src/main/java/com/gmail/nossr50/api/AbilityAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/AbilityAPI.java
@@ -1,11 +1,9 @@
 package com.gmail.nossr50.api;

-import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
-import com.gmail.nossr50.runnables.skills.BleedTimerTask;
 import com.gmail.nossr50.util.player.UserManager;

 public final class AbilityAPI {
@@ -52,38 +50,34 @@ public final class AbilityAPI {
    }

    public static void resetCooldowns(Player player) {
-        UserManager.getPlayer(player).resetCooldowns();
+        UserManager.getPlayer(player).getProfile().resetCooldowns();
    }

    public static void setBerserkCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(AbilityType.BERSERK, cooldown);
+        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.BERSERK, cooldown);
    }

    public static void setGigaDrillBreakerCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(AbilityType.GIGA_DRILL_BREAKER, cooldown);
+        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.GIGA_DRILL_BREAKER, cooldown);
    }

    public static void setGreenTerraCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(AbilityType.GREEN_TERRA, cooldown);
+        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.GREEN_TERRA, cooldown);
    }

    public static void setSerratedStrikesCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SERRATED_STRIKES, cooldown);
+        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.SERRATED_STRIKES, cooldown);
    }

    public static void setSkullSplitterCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SKULL_SPLITTER, cooldown);
+        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.SKULL_SPLITTER, cooldown);
    }

    public static void setSuperBreakerCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SUPER_BREAKER, cooldown);
+        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.SUPER_BREAKER, cooldown);
    }

    public static void setTreeFellerCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(AbilityType.TREE_FELLER, cooldown);
-    }
-
-    public static boolean isBleeding(LivingEntity entity) {
-        return BleedTimerTask.isBleeding(entity);
+        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.TREE_FELLER, cooldown);
    }
 }
--- a/src/main/java/com/gmail/nossr50/api/ChatAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/ChatAPI.java
@@ -5,8 +5,8 @@ import org.bukkit.plugin.Plugin;

 import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.chat.ChatManagerFactory;
+import com.gmail.nossr50.chat.ChatMode;
 import com.gmail.nossr50.chat.PartyChatManager;
-import com.gmail.nossr50.datatypes.chat.ChatMode;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.player.UserManager;

@@ -76,7 +76,7 @@ public final class ChatAPI {
     * @return true if the player is using party chat, false otherwise
     */
    public static boolean isUsingPartyChat(Player player) {
-        return UserManager.getPlayer(player).isChatEnabled(ChatMode.PARTY);
+        return UserManager.getPlayer(player).getPartyChatMode();
    }

    /**
@@ -86,7 +86,7 @@ public final class ChatAPI {
     * @return true if the player is using party chat, false otherwise
     */
    public static boolean isUsingPartyChat(String playerName) {
-        return UserManager.getPlayer(playerName).isChatEnabled(ChatMode.PARTY);
+        return UserManager.getPlayer(playerName).getPartyChatMode();
    }

    /**
@@ -96,7 +96,7 @@ public final class ChatAPI {
     * @return true if the player is using admin chat, false otherwise
     */
    public static boolean isUsingAdminChat(Player player) {
-        return UserManager.getPlayer(player).isChatEnabled(ChatMode.ADMIN);
+        return UserManager.getPlayer(player).getAdminChatMode();
    }

    /**
@@ -106,7 +106,7 @@ public final class ChatAPI {
     * @return true if the player is using admin chat, false otherwise
     */
    public static boolean isUsingAdminChat(String playerName) {
-        return UserManager.getPlayer(playerName).isChatEnabled(ChatMode.ADMIN);
+        return UserManager.getPlayer(playerName).getAdminChatMode();
    }

    /**
@@ -115,7 +115,7 @@ public final class ChatAPI {
     * @param player The player to toggle party chat on.
     */
    public static void togglePartyChat(Player player) {
-        UserManager.getPlayer(player).toggleChat(ChatMode.PARTY);
+        UserManager.getPlayer(player).togglePartyChat();
    }

    /**
@@ -124,7 +124,7 @@ public final class ChatAPI {
     * @param playerName The name of the player to toggle party chat on.
     */
    public static void togglePartyChat(String playerName) {
-        UserManager.getPlayer(playerName).toggleChat(ChatMode.PARTY);
+        UserManager.getPlayer(playerName).togglePartyChat();
    }

    /**
@@ -133,7 +133,7 @@ public final class ChatAPI {
     * @param player The player to toggle admin chat on.
     */
    public static void toggleAdminChat(Player player) {
-        UserManager.getPlayer(player).toggleChat(ChatMode.ADMIN);
+        UserManager.getPlayer(player).toggleAdminChat();
    }

    /**
@@ -142,7 +142,7 @@ public final class ChatAPI {
     * @param playerName The name of the player to toggle party chat on.
     */
    public static void toggleAdminChat(String playerName) {
-        UserManager.getPlayer(playerName).toggleChat(ChatMode.ADMIN);
+        UserManager.getPlayer(playerName).toggleAdminChat();
    }

    private static ChatManager getPartyChatManager(Plugin plugin, String party) {
--- a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java
@@ -7,12 +7,9 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.api.exceptions.InvalidPlayerException;
 import com.gmail.nossr50.api.exceptions.InvalidSkillException;
-import com.gmail.nossr50.api.exceptions.InvalidXPGainReasonException;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.skills.child.FamilyTree;
 import com.gmail.nossr50.util.player.UserManager;

@@ -45,50 +42,24 @@ public final class ExperienceAPI {
    public static boolean isNonChildSkill(String skillType) {
        SkillType skill = SkillType.getSkill(skillType);

-        return skill != null && !skill.isChildSkill();
+        if (skill == null) return false;
+
+        return !skill.isChildSkill();
    }

-    @Deprecated
+    /**
+     * Adds raw XP to the player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     */
    public static void addRawXP(Player player, String skillType, int XP) {
-        addRawXP(player, skillType, (float) XP);
-    }
-
-    /**
-     * Adds raw XP to the player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     */
-    @Deprecated
-    public static void addRawXP(Player player, String skillType, float XP) {
-        addRawXP(player, skillType, XP, "UNKNOWN");
-    }
-
-    /**
-     * Adds raw XP to the player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     * @param xpGainReason The reason to gain XP
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
-     */
-    public static void addRawXP(Player player, String skillType, float XP, String xpGainReason) {
-        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
-    }
-
-    @Deprecated
-    public static void addRawXPOffline(String playerName, String skillType, int XP) {
-        addRawXPOffline(playerName, skillType, (float) XP);
+        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), XP);
    }

    /**
@@ -103,8 +74,8 @@ public final class ExperienceAPI {
     * @throws InvalidSkillException if the given skill is not valid
     * @throws InvalidPlayerException if the given player does not exist in the database
     */
-    public static void addRawXPOffline(String playerName, String skillType, float XP) {
-        addOfflineXP(playerName, getSkillType(skillType), (int) Math.floor(XP));
+    public static void addRawXPOffline(String playerName, String skillType, int XP) {
+        addOfflineXP(playerName, getSkillType(skillType), XP);
    }

    /**
@@ -118,26 +89,8 @@ public final class ExperienceAPI {
     *
     * @throws InvalidSkillException if the given skill is not valid
     */
-    @Deprecated
    public static void addMultipliedXP(Player player, String skillType, int XP) {
-        addMultipliedXP(player, skillType, XP, "UNKNOWN");
-    }
-
-    /**
-     * Adds XP to the player, calculates for XP Rate only.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     * @param xpGainReason The reason to gain XP
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
-     */
-    public static void addMultipliedXP(Player player, String skillType, int XP, String xpGainReason) {
-        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason));
+        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
    }

    /**
@@ -153,7 +106,7 @@ public final class ExperienceAPI {
     * @throws InvalidPlayerException if the given player does not exist in the database
     */
    public static void addMultipliedXPOffline(String playerName, String skillType, int XP) {
-        addOfflineXP(playerName, getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
+        addOfflineXP(playerName, getSkillType(skillType), (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
    }

    /**
@@ -167,28 +120,10 @@ public final class ExperienceAPI {
     *
     * @throws InvalidSkillException if the given skill is not valid
     */
-    @Deprecated
    public static void addModifiedXP(Player player, String skillType, int XP) {
-        addModifiedXP(player, skillType, XP, "UNKNOWN");
-    }
-
-    /**
-     * Adds XP to the player, calculates for XP Rate and skill modifier.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     * @param xpGainReason The reason to gain XP
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
-     */
-    public static void addModifiedXP(Player player, String skillType, int XP, String xpGainReason) {
        SkillType skill = getSkillType(skillType);

-        UserManager.getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason));
+        UserManager.getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * Config.getInstance().getExperienceGainsGlobalMultiplier()));
    }

    /**
@@ -206,7 +141,7 @@ public final class ExperienceAPI {
    public static void addModifiedXPOffline(String playerName, String skillType, int XP) {
        SkillType skill = getSkillType(skillType);

-        addOfflineXP(playerName, skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
+        addOfflineXP(playerName, skill, (int) (XP / skill.getXpModifier() * Config.getInstance().getExperienceGainsGlobalMultiplier()));
    }

    /**
@@ -221,27 +156,8 @@ public final class ExperienceAPI {
     *
     * @throws InvalidSkillException if the given skill is not valid
     */
-    @Deprecated
    public static void addXP(Player player, String skillType, int XP) {
-        addXP(player, skillType, XP, "UNKNOWN");
-    }
-
-    /**
-     * Adds XP to the player, calculates for XP Rate, skill modifiers, perks, child skills,
-     * and party sharing.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     * @param xpGainReason The reason to gain XP
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
-     */
-    public static void addXP(Player player, String skillType, int XP, String xpGainReason) {
-        UserManager.getPlayer(player).beginXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
+        UserManager.getPlayer(player).beginXpGain(getSkillType(skillType), XP);
    }

    /**
@@ -257,7 +173,7 @@ public final class ExperienceAPI {
     * @throws UnsupportedOperationException if the given skill is a child skill
     */
    public static int getXP(Player player, String skillType) {
-        return UserManager.getPlayer(player).getSkillXpLevel(getNonChildSkillType(skillType));
+        return UserManager.getPlayer(player).getProfile().getSkillXpLevel(getNonChildSkillType(skillType));
    }

    /**
@@ -290,7 +206,7 @@ public final class ExperienceAPI {
     * @throws UnsupportedOperationException if the given skill is a child skill
     */
    public static float getXPRaw(Player player, String skillType) {
-        return UserManager.getPlayer(player).getSkillXpLevelRaw(getNonChildSkillType(skillType));
+        return UserManager.getPlayer(player).getProfile().getSkillXpLevelRaw(getNonChildSkillType(skillType));
    }

    /**
@@ -323,7 +239,7 @@ public final class ExperienceAPI {
     * @throws UnsupportedOperationException if the given skill is a child skill
     */
    public static int getXPToNextLevel(Player player, String skillType) {
-        return UserManager.getPlayer(player).getXpToLevel(getNonChildSkillType(skillType));
+        return UserManager.getPlayer(player).getProfile().getXpToLevel(getNonChildSkillType(skillType));
    }

    /**
@@ -396,7 +312,7 @@ public final class ExperienceAPI {
     * @throws InvalidSkillException if the given skill is not valid
     */
    public static void addLevel(Player player, String skillType, int levels) {
-        UserManager.getPlayer(player).addLevels(getSkillType(skillType), levels);
+        UserManager.getPlayer(player).getProfile().addLevels(getSkillType(skillType), levels);
    }

    /**
@@ -422,12 +338,12 @@ public final class ExperienceAPI {
                profile.addLevels(parentSkill, (levels / parentSkills.size()));
            }

-            profile.scheduleAsyncSave();
+            profile.save();
            return;
        }

        profile.addLevels(skill, levels);
-        profile.scheduleAsyncSave();
+        profile.save();
    }

    /**
@@ -442,7 +358,7 @@ public final class ExperienceAPI {
     * @throws InvalidSkillException if the given skill is not valid
     */
    public static int getLevel(Player player, String skillType) {
-        return UserManager.getPlayer(player).getSkillLevel(getSkillType(skillType));
+        return UserManager.getPlayer(player).getProfile().getSkillLevel(getSkillType(skillType));
    }

    /**
@@ -487,7 +403,7 @@ public final class ExperienceAPI {
        int powerLevel = 0;
        PlayerProfile profile = getOfflineProfile(playerName);

-        for (SkillType type : SkillType.NON_CHILD_SKILLS) {
+        for (SkillType type : SkillType.nonChildSkills()) {
            powerLevel += profile.getSkillLevel(type);
        }

@@ -519,40 +435,6 @@ public final class ExperienceAPI {
        return Config.getInstance().getPowerLevelCap();
    }

-    /**
-     * Get the position on the leaderboard of a player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param playerName The name of the player to check
-     * @param skillType The skill to check
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @throws UnsupportedOperationException if the given skill is a child skill
-     *
-     * @return the position on the leaderboard
-     */
-    public static int getPlayerRankSkill(String playerName, String skillType) {
-        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get(getNonChildSkillType(skillType));
-    }
-
-
-    /**
-     * Get the position on the power level leaderboard of a player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param playerName The name of the player to check
-     *
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     *
-     * @return the position on the power level leaderboard
-     */
-    public static int getPlayerRankOverall(String playerName) {
-        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get(null);
-    }
-
    /**
     * Sets the level of a player in a specific skill type.
     * </br>
@@ -565,7 +447,7 @@ public final class ExperienceAPI {
     * @throws InvalidSkillException if the given skill is not valid
     */
    public static void setLevel(Player player, String skillType, int skillLevel) {
-        UserManager.getPlayer(player).modifySkill(getSkillType(skillType), skillLevel);
+        UserManager.getPlayer(player).getProfile().modifySkill(getSkillType(skillType), skillLevel);
    }

    /**
@@ -597,7 +479,7 @@ public final class ExperienceAPI {
     * @throws UnsupportedOperationException if the given skill is a child skill
     */
    public static void setXP(Player player, String skillType, int newValue) {
-        UserManager.getPlayer(player).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
+        UserManager.getPlayer(player).getProfile().setSkillXpLevel(getNonChildSkillType(skillType), newValue);
    }

    /**
@@ -630,7 +512,7 @@ public final class ExperienceAPI {
     * @throws UnsupportedOperationException if the given skill is a child skill
     */
    public static void removeXP(Player player, String skillType, int xp) {
-        UserManager.getPlayer(player).removeXp(getNonChildSkillType(skillType), xp);
+        UserManager.getPlayer(player).getProfile().removeXp(getNonChildSkillType(skillType), xp);
    }

    /**
@@ -655,8 +537,19 @@ public final class ExperienceAPI {
    private static void addOfflineXP(String playerName, SkillType skill, int XP) {
        PlayerProfile profile = getOfflineProfile(playerName);

-        profile.addXp(skill, XP);
-        profile.scheduleAsyncSave();
+        if (skill.isChildSkill()) {
+            Set<SkillType> parentSkills = FamilyTree.getParents(skill);
+
+            for (SkillType parentSkill : parentSkills) {
+                profile.setSkillXpLevel(parentSkill, profile.getSkillLevel(parentSkill) + (XP / parentSkills.size()));
+            }
+
+            profile.save();
+            return;
+        }
+
+        profile.setSkillXpLevel(skill, profile.getSkillXpLevel(skill) + XP);
+        profile.save();
    }

    private static PlayerProfile getOfflineProfile(String playerName) {
@@ -688,14 +581,4 @@ public final class ExperienceAPI {

        return skill;
    }
-
-    private static XPGainReason getXPGainReason(String reason) throws InvalidXPGainReasonException {
-        XPGainReason xpGainReason = XPGainReason.getXPGainReason(reason);
-
-        if (xpGainReason == null) {
-            throw new InvalidXPGainReasonException();
-        }
-
-        return xpGainReason;
-    }
 }
--- a/src/main/java/com/gmail/nossr50/api/PartyAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/PartyAPI.java
@@ -77,12 +77,13 @@ public final class PartyAPI {
     */
    public static void addToParty(Player player, String partyName) {
        Party party = PartyManager.getParty(partyName);
+        String playerName = player.getName();

        if (party == null) {
-            party = new Party(player.getName(), partyName);
+            party = new Party(playerName, partyName);
        }

-        PartyManager.addToParty(UserManager.getPlayer(player), party);
+        PartyManager.addToParty(playerName, UserManager.getPlayer(player), party);
    }

    /**
@@ -93,7 +94,7 @@ public final class PartyAPI {
     * @param player The player to remove
     */
    public static void removeFromParty(Player player) {
-        PartyManager.removeFromParty(UserManager.getPlayer(player));
+        PartyManager.removeFromParty(player, UserManager.getPlayer(player).getParty());
    }

    /**
@@ -174,17 +175,4 @@ public final class PartyAPI {
    public static List<Player> getOnlineMembers(Player player) {
        return PartyManager.getOnlineMembers(player);
    }
-
-    public static boolean hasAlly(String partyName) {
-        return getAllyName(partyName) != null;
-    }
-
-    public static String getAllyName(String partyName) {
-        Party ally = PartyManager.getParty(partyName).getAlly();
-        if (ally != null) {
-            return ally.getName();
-        }
-
-        return null;
-    }
 }
--- a/src/main/java/com/gmail/nossr50/api/SpoutHudAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/SpoutHudAPI.java
@@ -0,0 +1,29 @@
+package com.gmail.nossr50.api;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.spout.SpoutConfig;
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class SpoutHudAPI {
+    private SpoutHudAPI() {}
+
+    /**
+     * Disable the mcMMO XP bar for a player.
+     * </br>
+     * This function is designed for API usage.
+     */
+    public static void disableXpBar(Player player) {
+        UserManager.getPlayer(player).getProfile().setHudType(HudType.DISABLED);
+    }
+
+    /**
+     * Disable the mcMMO XP bar for the server.
+     * </br>
+     * This function is designed for API usage.
+     */
+    public static void disableXpBar() {
+        SpoutConfig.getInstance().setXPBarEnabled(false);
+    }
+}
--- a/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java
@@ -0,0 +1,53 @@
+package com.gmail.nossr50.api;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.inventory.ItemStack;
+
+import com.gmail.nossr50.datatypes.skills.ToolType;
+
+public final class SpoutToolsAPI {
+    public static final List<ItemStack> spoutSwords   = new ArrayList<ItemStack>();
+    public static final List<ItemStack> spoutAxes     = new ArrayList<ItemStack>();
+    public static final List<ItemStack> spoutPickaxes = new ArrayList<ItemStack>();
+    public static final List<ItemStack> spoutHoes     = new ArrayList<ItemStack>();
+    public static final List<ItemStack> spoutShovels  = new ArrayList<ItemStack>();
+
+    private SpoutToolsAPI() {}
+
+    /**
+     * Add a custom Spout tool to mcMMO for XP gain & ability use.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param spoutTool The tool to add
+     * @param type The type of tool to add
+     */
+    public static void addCustomTool(ItemStack spoutTool, ToolType type) {
+        switch (type) {
+            case AXE:
+                spoutAxes.add(spoutTool);
+                break;
+
+            case HOE:
+                spoutHoes.add(spoutTool);
+                break;
+
+            case PICKAXE:
+                spoutPickaxes.add(spoutTool);
+                break;
+
+            case SHOVEL:
+                spoutShovels.add(spoutTool);
+                break;
+
+            case SWORD:
+                spoutSwords.add(spoutTool);
+                break;
+
+            default:
+                break;
+        }
+    }
+}
--- a/src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java
+++ b/src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java
@@ -1,9 +0,0 @@
-package com.gmail.nossr50.api.exceptions;
-
-public class InvalidXPGainReasonException extends RuntimeException {
-    private static final long serialVersionUID = 4427052841957931157L;
-
-    public InvalidXPGainReasonException() {
-        super("That is not a valid XPGainReason.");
-    }
-}
--- a/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java
+++ b/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java
@@ -7,7 +7,7 @@ import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;

 public class AdminChatManager extends ChatManager {
    protected AdminChatManager(Plugin plugin) {
-        super(plugin, Config.getInstance().getAdminDisplayNames(), Config.getInstance().getAdminChatPrefix());
+        super(plugin, Config.getInstance().getAdminDisplayNames(), "Commands.AdminChat.Prefix");
    }

    @Override
--- a/src/main/java/com/gmail/nossr50/chat/ChatManager.java
+++ b/src/main/java/com/gmail/nossr50/chat/ChatManager.java
@@ -11,7 +11,6 @@ public abstract class ChatManager {
    protected boolean useDisplayNames;
    protected String chatPrefix;

-    protected String senderName;
    protected String displayName;
    protected String message;

@@ -28,9 +27,8 @@ public abstract class ChatManager {
            return;
        }

-        senderName = event.getSender();
-        displayName = useDisplayNames ? event.getDisplayName() : senderName;
-        message = LocaleLoader.formatString(chatPrefix, displayName) + " " + event.getMessage();
+        displayName = useDisplayNames ? event.getDisplayName() : event.getSender();
+        message = LocaleLoader.getString(chatPrefix, displayName) + event.getMessage();

        sendMessage();
    }
--- a/src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java
+++ b/src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java
@@ -4,8 +4,6 @@ import java.util.HashMap;

 import org.bukkit.plugin.Plugin;

-import com.gmail.nossr50.datatypes.chat.ChatMode;
-
 public class ChatManagerFactory {
    private static final HashMap<Plugin, AdminChatManager> adminChatManagers = new HashMap<Plugin, AdminChatManager>();
    private static final HashMap<Plugin, PartyChatManager> partyChatManagers = new HashMap<Plugin, PartyChatManager>();
--- a/src/main/java/com/gmail/nossr50/chat/ChatMode.java
+++ b/src/main/java/com/gmail/nossr50/chat/ChatMode.java
@@ -0,0 +1,70 @@
+package com.gmail.nossr50.chat;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+public enum ChatMode {
+    ADMIN(LocaleLoader.getString("Commands.AdminChat.On"), LocaleLoader.getString("Commands.AdminChat.Off")),
+    PARTY(LocaleLoader.getString("Commands.Party.Chat.On"), LocaleLoader.getString("Commands.Party.Chat.Off"));
+
+    private String enabledMessage;
+    private String disabledMessage;
+
+    private ChatMode(String enabledMessage, String disabledMessage) {
+        this.enabledMessage  = enabledMessage;
+        this.disabledMessage = disabledMessage;
+    }
+
+    public boolean isEnabled(McMMOPlayer mcMMOPlayer) {
+        switch (this) {
+            case ADMIN:
+                return mcMMOPlayer.getAdminChatMode();
+
+            case PARTY:
+                return mcMMOPlayer.getPartyChatMode();
+
+            default:
+                return false;
+        }
+    }
+
+    public void disable(McMMOPlayer mcMMOPlayer) {
+        switch (this) {
+            case ADMIN:
+                mcMMOPlayer.setAdminChat(false);
+                return;
+
+            case PARTY:
+                mcMMOPlayer.setPartyChat(false);
+                return;
+
+            default:
+                return;
+        }
+    }
+
+    public void enable(McMMOPlayer mcMMOPlayer) {
+        switch (this) {
+            case ADMIN:
+                mcMMOPlayer.setAdminChat(true);
+                mcMMOPlayer.setPartyChat(false);
+                return;
+
+            case PARTY:
+                mcMMOPlayer.setPartyChat(true);
+                mcMMOPlayer.setAdminChat(false);
+                return;
+
+            default:
+                return;
+        }
+    }
+
+    public String getEnabledMessage() {
+        return enabledMessage;
+    }
+
+    public String getDisabledMessage() {
+        return disabledMessage;
+    }
+}
--- a/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java
+++ b/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java
@@ -1,22 +1,17 @@
 package com.gmail.nossr50.chat;

-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;

 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
-import com.gmail.nossr50.locale.LocaleLoader;

 public class PartyChatManager extends ChatManager {
    private Party party;

    protected PartyChatManager(Plugin plugin) {
-        super(plugin, Config.getInstance().getPartyDisplayNames(), Config.getInstance().getPartyChatPrefix());
+        super(plugin, Config.getInstance().getPartyDisplayNames(), "Commands.Party.Chat.Prefix");
    }

    public void setParty(Party party) {
@@ -30,21 +25,10 @@ public class PartyChatManager extends ChatManager {

    @Override
    protected void sendMessage() {
-        if (Config.getInstance().getPartyChatColorLeaderName() && senderName.equalsIgnoreCase(party.getLeader())) {
-            message = message.replaceFirst(Pattern.quote(displayName), ChatColor.GOLD + Matcher.quoteReplacement(displayName) + ChatColor.RESET);
-        }
-
        for (Player member : party.getOnlineMembers()) {
            member.sendMessage(message);
        }

-        if (party.getAlly() != null) {
-            for (Player member : party.getAlly().getOnlineMembers()) {
-                String allyPrefix = LocaleLoader.formatString(Config.getInstance().getPartyChatPrefixAlly());
-                member.sendMessage(allyPrefix + message);
-            }
-        }
-
        plugin.getLogger().info("[P]<" + party.getName() + ">" + message);
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java
@@ -2,17 +2,18 @@ package com.gmail.nossr50.commands;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;

 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-
 import com.google.common.collect.ImmutableList;

 public class KrakenCommand implements TabExecutor {
@@ -29,7 +30,7 @@ public class KrakenCommand implements TabExecutor {
                    return true;
                }

-                UserManager.getPlayer(sender.getName()).getFishingManager().unleashTheKraken();
+                UserManager.getPlayer((Player) sender).getFishingManager().unleashTheKraken();
                return true;

            case 1:
@@ -38,10 +39,9 @@ public class KrakenCommand implements TabExecutor {
                    return true;
                }

-                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0]);

-                if (!CommandUtils.checkPlayerExistence(sender, playerName, mcMMOPlayer)) {
+                if (!CommandUtils.checkPlayerExistence(sender, args[0], mcMMOPlayer)) {
                    return true;
                }

@@ -57,7 +57,7 @@ public class KrakenCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayers().keySet();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            default:
                return ImmutableList.of();
--- a/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java
@@ -2,7 +2,6 @@ package com.gmail.nossr50.commands;

 import org.bukkit.command.CommandSender;

-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;

@@ -18,13 +17,13 @@ public class McabilityCommand extends ToggleCommand {
    }

    @Override
-    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
-        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Ability." + (mcMMOPlayer.getAbilityUse() ? "Off" : "On")));
+    protected void applyCommandAction() {
+        player.sendMessage(LocaleLoader.getString("Commands.Ability." + (mcMMOPlayer.getAbilityUse() ? "Off" : "On")));
        mcMMOPlayer.toggleAbilityUse();
    }

    @Override
-    protected void sendSuccessMessage(CommandSender sender, String playerName) {
-        sender.sendMessage(LocaleLoader.getString("Commands.Ability.Toggle", playerName));
+    protected void sendSuccessMessage(CommandSender sender) {
+        sender.sendMessage("Ability use has been toggled for " + player.getName()); // TODO: Localize
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java
@@ -1,93 +0,0 @@
-package com.gmail.nossr50.commands;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.util.StringUtil;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.database.ConvertDatabaseCommand;
-import com.gmail.nossr50.commands.experience.ConvertExperienceCommand;
-import com.gmail.nossr50.database.DatabaseManagerFactory;
-import com.gmail.nossr50.datatypes.database.DatabaseType;
-import com.gmail.nossr50.datatypes.experience.FormulaType;
-
-import com.google.common.collect.ImmutableList;
-
-public class McconvertCommand implements TabExecutor {
-    private static final List<String> FORMULA_TYPES;
-    private static final List<String> DATABASE_TYPES;
-    private static final List<String> SUBCOMMANDS = ImmutableList.of("database", "experience");
-
-    private CommandExecutor databaseConvertCommand = new ConvertDatabaseCommand();
-    private CommandExecutor experienceConvertCommand = new ConvertExperienceCommand();
-
-    static {
-        ArrayList<String> formulaTypes = new ArrayList<String>();
-        ArrayList<String> databaseTypes = new ArrayList<String>();
-
-        for (FormulaType type : FormulaType.values()) {
-            formulaTypes.add(type.toString());
-        }
-
-        for (DatabaseType type : DatabaseType.values()) {
-            databaseTypes.add(type.toString());
-        }
-
-        // Custom stuff
-        databaseTypes.remove(DatabaseType.CUSTOM.toString());
-
-        if (mcMMO.getDatabaseManager().getDatabaseType() == DatabaseType.CUSTOM) {
-            databaseTypes.add(DatabaseManagerFactory.getCustomDatabaseManagerClass().getName());
-        }
-
-        Collections.sort(formulaTypes);
-        Collections.sort(databaseTypes);
-
-        FORMULA_TYPES = ImmutableList.copyOf(formulaTypes);
-        DATABASE_TYPES = ImmutableList.copyOf(databaseTypes);
-
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-            case 2:
-                if (args[0].equalsIgnoreCase("database") || args[0].equalsIgnoreCase("db")) {
-                    return databaseConvertCommand.onCommand(sender, command, label, args);
-                }
-                else if (args[0].equalsIgnoreCase("experience") || args[0].equalsIgnoreCase("xp") || args[1].equalsIgnoreCase("exp")) {
-                    return experienceConvertCommand.onCommand(sender, command, label, args);
-                }
-
-                return false;
-            default:
-                return false;
-        }
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                return StringUtil.copyPartialMatches(args[0], SUBCOMMANDS, new ArrayList<String>(SUBCOMMANDS.size()));
-            case 2:
-                if (args[0].equalsIgnoreCase("database") || args[0].equalsIgnoreCase("db")) {
-                    return StringUtil.copyPartialMatches(args[0], DATABASE_TYPES, new ArrayList<String>(DATABASE_TYPES.size()));
-                }
-
-                if (args[0].equalsIgnoreCase("experience") || args[0].equalsIgnoreCase("xp") || args[0].equalsIgnoreCase("exp")) {
-                    return StringUtil.copyPartialMatches(args[0], FORMULA_TYPES, new ArrayList<String>(FORMULA_TYPES.size()));
-                }
-
-                return ImmutableList.of();
-            default:
-                return ImmutableList.of();
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/McgodCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/McgodCommand.java
@@ -2,7 +2,6 @@ package com.gmail.nossr50.commands;

 import org.bukkit.command.CommandSender;

-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;

@@ -18,13 +17,13 @@ public class McgodCommand extends ToggleCommand {
    }

    @Override
-    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
-        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.GodMode." + (mcMMOPlayer.getGodMode() ? "Disabled" : "Enabled")));
+    protected void applyCommandAction() {
+        player.sendMessage(LocaleLoader.getString("Commands.GodMode." + (mcMMOPlayer.getGodMode() ? "Disabled" : "Enabled")));
        mcMMOPlayer.toggleGodMode();
    }

    @Override
-    protected void sendSuccessMessage(CommandSender sender, String playerName) {
-        sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Toggle", playerName));
+    protected void sendSuccessMessage(CommandSender sender) {
+        sender.sendMessage("God mode has been toggled for " + player.getName()); // TODO: Localize
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java
@@ -4,12 +4,14 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;

 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.party.PartySubcommandType;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.spout.SpoutUtils;

 public class McmmoCommand implements CommandExecutor {
    @Override
@@ -26,15 +28,16 @@ public class McmmoCommand implements CommandExecutor {
                sender.sendMessage(mcSplit);

                if (Config.getInstance().getDonateMessageEnabled()) {
-                    sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
-                    sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
+                    if (mcMMO.isSpoutEnabled() && sender instanceof Player) {
+                        SpoutUtils.sendDonationNotification((Player) sender);
+                    }
+                    else {
+                        sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
+                        sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
+                    }
                }

-                if (Permissions.showversion(sender)) {
-                    sender.sendMessage(LocaleLoader.getString("MOTD.Version", mcMMO.p.getDescription().getVersion()));
-                }
-
-                mcMMO.getHolidayManager().anniversaryCheck(sender);
+                sender.sendMessage(LocaleLoader.getString("MOTD.Version", mcMMO.p.getDescription().getVersion()));
                return true;

            case 1:
@@ -45,9 +48,9 @@ public class McmmoCommand implements CommandExecutor {
                    }

                    sender.sendMessage(LocaleLoader.getString("Commands.mcc.Header"));
-                    displayGeneralCommands(sender);
-                    displayOtherCommands(sender);
                    displayPartyCommands(sender);
+                    displayOtherCommands(sender);
+
                }
                return true;

@@ -56,57 +59,55 @@ public class McmmoCommand implements CommandExecutor {
        }
    }

-    private void displayGeneralCommands(CommandSender sender) {
-        sender.sendMessage(ChatColor.DARK_AQUA + " /mcstats " + LocaleLoader.getString("Commands.Stats"));
-        sender.sendMessage(ChatColor.DARK_AQUA + " /<skill>" + LocaleLoader.getString("Commands.SkillInfo"));
-        sender.sendMessage(ChatColor.DARK_AQUA + " /mctop " + LocaleLoader.getString("Commands.Leaderboards"));
+    private void displayPartyCommands(CommandSender sender) {
+        if (Permissions.party(sender)) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Party.Commands"));
+            sender.sendMessage(" /party create <" + LocaleLoader.getString("Commands.Usage.PartyName") + "> " + LocaleLoader.getString("Commands.Party1"));
+            sender.sendMessage(" /party join <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party2"));
+            sender.sendMessage(" /party quit " + LocaleLoader.getString("Commands.Party.Quit"));

-        if (Permissions.inspect(sender)) {
-            sender.sendMessage(ChatColor.DARK_AQUA + " /inspect " + LocaleLoader.getString("Commands.Inspect"));
-        }
+            if (Permissions.partyChat(sender)) {
+                sender.sendMessage(" /party chat " + LocaleLoader.getString("Commands.Party.Toggle"));
+            }

-        if (Permissions.mcability(sender)) {
-            sender.sendMessage(ChatColor.DARK_AQUA + " /mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
+            sender.sendMessage(" /party invite <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Invite"));
+            sender.sendMessage(" /party accept " + LocaleLoader.getString("Commands.Party.Accept"));
+
+            if (Permissions.partySubcommand(sender, PartySubcommandType.TELEPORT)) {
+                sender.sendMessage(" /party teleport " + LocaleLoader.getString("Commands.Party.Teleport"));
+            }
        }
    }

    private void displayOtherCommands(CommandSender sender) {
        sender.sendMessage(LocaleLoader.getString("Commands.Other"));
+        sender.sendMessage(" /mcstats " + LocaleLoader.getString("Commands.Stats"));
+        sender.sendMessage(" /mctop " + LocaleLoader.getString("Commands.Leaderboards"));

        if (Permissions.skillreset(sender)) {
-            sender.sendMessage(ChatColor.DARK_AQUA + " /skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
+            sender.sendMessage(" /skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
        }

-        if (Permissions.mmoedit(sender)) {
-            sender.sendMessage(ChatColor.DARK_AQUA + " /mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
+        if (Permissions.mcability(sender)) {
+            sender.sendMessage(" /mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
        }

        if (Permissions.adminChat(sender)) {
-            sender.sendMessage(ChatColor.DARK_AQUA + " /adminchat " + LocaleLoader.getString("Commands.AdminToggle"));
+            sender.sendMessage(" /adminchat " + LocaleLoader.getString("Commands.AdminToggle"));
+        }
+
+        if (Permissions.inspect(sender)) {
+            sender.sendMessage(" /inspect " + LocaleLoader.getString("Commands.Inspect"));
+        }
+
+        if (Permissions.mmoedit(sender)) {
+            sender.sendMessage(" /mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
        }

        if (Permissions.mcgod(sender)) {
-            sender.sendMessage(ChatColor.DARK_AQUA + " /mcgod " + LocaleLoader.getString("Commands.mcgod"));
+            sender.sendMessage(" /mcgod " + LocaleLoader.getString("Commands.mcgod"));
        }
-    }

-    private void displayPartyCommands(CommandSender sender) {
-        if (Permissions.party(sender)) {
-            sender.sendMessage(LocaleLoader.getString("Commands.Party.Commands"));
-            sender.sendMessage(ChatColor.DARK_AQUA + " /party create <" + LocaleLoader.getString("Commands.Usage.PartyName") + "> " + LocaleLoader.getString("Commands.Party1"));
-            sender.sendMessage(ChatColor.DARK_AQUA + " /party join <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party2"));
-            sender.sendMessage(ChatColor.DARK_AQUA + " /party quit " + LocaleLoader.getString("Commands.Party.Quit"));
-
-            if (Permissions.partyChat(sender)) {
-                sender.sendMessage(ChatColor.DARK_AQUA + " /party chat " + LocaleLoader.getString("Commands.Party.Toggle"));
-            }
-
-            sender.sendMessage(ChatColor.DARK_AQUA + " /party invite <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Invite"));
-            sender.sendMessage(ChatColor.DARK_AQUA + " /party accept " + LocaleLoader.getString("Commands.Party.Accept"));
-
-            if (Permissions.partySubcommand(sender, PartySubcommandType.TELEPORT)) {
-                sender.sendMessage(ChatColor.DARK_AQUA + " /party teleport <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Teleport"));
-            }
-        }
+        sender.sendMessage(" /<skill>" + LocaleLoader.getString("Commands.SkillInfo"));
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java
@@ -2,7 +2,6 @@ package com.gmail.nossr50.commands;

 import org.bukkit.command.CommandSender;

-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;

@@ -18,17 +17,17 @@ public class McrefreshCommand extends ToggleCommand {
    }

    @Override
-    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
+    protected void applyCommandAction() {
        mcMMOPlayer.setRecentlyHurt(0);
-        mcMMOPlayer.resetCooldowns();
+        mcMMOPlayer.getProfile().resetCooldowns();
        mcMMOPlayer.resetToolPrepMode();
        mcMMOPlayer.resetAbilityMode();

-        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
+        player.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
    }

    @Override
-    protected void sendSuccessMessage(CommandSender sender, String playerName) {
-        sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", playerName));
+    protected void sendSuccessMessage(CommandSender sender) {
+        sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", player.getName()));
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java
@@ -6,17 +6,20 @@ import java.util.List;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;

+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-
 import com.google.common.collect.ImmutableList;

 public class McscoreboardCommand implements TabExecutor {
-    private static final List<String> FIRST_ARGS = ImmutableList.of("keep", "time", "clear");
+    private static final List<String> SCOREBOARD_TYPES = ImmutableList.of("clear", "rank", "stats", "top");

    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -24,49 +27,94 @@ public class McscoreboardCommand implements TabExecutor {
            return true;
        }

+        Player player = (Player) sender;
+
        switch (args.length) {
+            case 0:
+                clearScoreboard(player);
+                return true;
+
            case 1:
-                if (args[0].equalsIgnoreCase("clear") || args[0].equalsIgnoreCase("reset")) {
-                    ScoreboardManager.clearBoard(sender.getName());
-                    sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Clear"));
-                    return true;
+                if (args[0].equalsIgnoreCase("clear")) {
+                    clearScoreboard(player);
                }
-
-                if (args[0].equalsIgnoreCase("keep")) {
-                    if (!Config.getInstance().getAllowKeepBoard()) {
-                        sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
+                else if (args[0].equalsIgnoreCase("rank")) {
+                    if (!Config.getInstance().getMcrankScoreboardEnabled()) {
+                        sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
                        return true;
                    }

-                    if (!ScoreboardManager.isBoardShown(sender.getName())) {
-                        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.NoBoard"));
+                    ScoreboardManager.setupPlayerScoreboard(player.getName());
+                    ScoreboardManager.enablePlayerRankScoreboard(player);
+                }
+                else if (args[0].equalsIgnoreCase("stats")) {
+                    if (!Config.getInstance().getMcstatsScoreboardsEnabled()) {
+                        sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
                        return true;
                    }

-                    ScoreboardManager.keepBoard(sender.getName());
-                    sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Keep"));
-                    return true;
+                    ScoreboardManager.setupPlayerScoreboard(player.getName());
+                    ScoreboardManager.enablePlayerStatsScoreboard(UserManager.getPlayer(player));
+                }
+                else if (args[0].equalsIgnoreCase("top")) {
+                    if (!Config.getInstance().getMctopScoreboardEnabled()) {
+                        sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
+                        return true;
+                    }
+
+                    ScoreboardManager.enableGlobalStatsScoreboard(player, "all", 1);
+                }
+                else {
+                    return false;
                }

-                return help(sender);
+                return true;

            case 2:
-                if (args[0].equalsIgnoreCase("time") || args[0].equalsIgnoreCase("timer")) {
-                    if (CommandUtils.isInvalidInteger(sender, args[1])) {
-                        return true;
-                    }
+                if (!args[0].equalsIgnoreCase("top")) {
+                    return false;
+                }

-                    int time = Math.abs(Integer.parseInt(args[1]));
-
-                    ScoreboardManager.setRevertTimer(sender.getName(), time);
-                    sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Timer", time));
+                if (!Config.getInstance().getMctopScoreboardEnabled()) {
+                    sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
                    return true;
                }

-                return help(sender);
+                if (StringUtils.isInt(args[1])) {
+                    ScoreboardManager.enableGlobalStatsScoreboard(player, "all", Math.abs(Integer.parseInt(args[1])));
+                    return true;
+                }
+
+                if (CommandUtils.isInvalidSkill(sender, args[1])) {
+                    return true;
+                }
+
+                ScoreboardManager.enableGlobalStatsScoreboard(player, args[1], 1);
+                return true;
+
+            case 3:
+                if (!args[0].equalsIgnoreCase("top")) {
+                    return false;
+                }
+
+                if (!Config.getInstance().getMctopScoreboardEnabled()) {
+                    sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
+                    return true;
+                }
+
+                if (CommandUtils.isInvalidSkill(sender, args[1])) {
+                    return true;
+                }
+
+                if (CommandUtils.isInvalidInteger(sender, args[2])) {
+                    return true;
+                }
+
+                ScoreboardManager.enableGlobalStatsScoreboard(player, args[1], Math.abs(Integer.parseInt(args[2])));
+                return true;

            default:
-                return help(sender);
+                return false;
        }
    }

@@ -74,17 +122,20 @@ public class McscoreboardCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                return StringUtil.copyPartialMatches(args[0], FIRST_ARGS, new ArrayList<String>(FIRST_ARGS.size()));
+                return StringUtil.copyPartialMatches(args[0], SCOREBOARD_TYPES, new ArrayList<String>(SCOREBOARD_TYPES.size()));
+            case 2:
+                if (args[0].equalsIgnoreCase("top")) {
+                    return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
+                }
+                // Fallthrough
+
            default:
                return ImmutableList.of();
        }
    }

-    private boolean help(CommandSender sender) {
-        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Help.0"));
-        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Help.1"));
-        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Help.2"));
-        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Help.3"));
-        return true;
+    private void clearScoreboard(Player player) {
+        player.setScoreboard(mcMMO.p.getServer().getScoreboardManager().getMainScoreboard());
+        player.sendMessage("Your scoreboard has been cleared!"); //TODO: Locale
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java
@@ -11,7 +11,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;

 import com.gmail.nossr50.datatypes.MobHealthbarType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;

@@ -39,14 +39,16 @@ public class MobhealthCommand implements TabExecutor {

        switch (args.length) {
            case 1:
+                PlayerProfile playerProfile = UserManager.getPlayer((Player) sender).getProfile();
+
                try {
                    MobHealthbarType type = MobHealthbarType.valueOf(args[0].toUpperCase().trim());
-                    UserManager.getPlayer((Player) sender).getProfile().setMobHealthbarType(type);
-                    sender.sendMessage(LocaleLoader.getString("Commands.Healthbars.Changed." + type.name()));
+                    playerProfile.setMobHealthbarType(type);
+                    sender.sendMessage("Display type changed to: " + type); //TODO: Localize
                    return true;
                }
                catch (IllegalArgumentException ex) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Healthbars.Invalid"));
+                    sender.sendMessage("Invalid type!"); //TODO: Localize
                    return true;
                }

--- a/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java
@@ -2,10 +2,12 @@ package com.gmail.nossr50.commands;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;

 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
@@ -15,6 +17,9 @@ import com.gmail.nossr50.util.player.UserManager;
 import com.google.common.collect.ImmutableList;

 public abstract class ToggleCommand implements TabExecutor {
+    protected McMMOPlayer mcMMOPlayer;
+    protected Player player;
+
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        switch (args.length) {
@@ -28,7 +33,10 @@ public abstract class ToggleCommand implements TabExecutor {
                    return true;
                }

-                applyCommandAction(UserManager.getPlayer(sender.getName()));
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
+
+                applyCommandAction();
                return true;

            case 1:
@@ -37,19 +45,20 @@ public abstract class ToggleCommand implements TabExecutor {
                    return true;
                }

-                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName);
+                mcMMOPlayer = UserManager.getPlayer(args[0]);

-                if (!CommandUtils.checkPlayerExistence(sender, playerName, mcMMOPlayer)) {
+                if (!CommandUtils.checkPlayerExistence(sender, args[0], mcMMOPlayer)) {
                    return true;
                }

-                if (CommandUtils.isOffline(sender, mcMMOPlayer.getPlayer())) {
+                player = mcMMOPlayer.getPlayer();
+
+                if (CommandUtils.isOffline(sender, player)) {
                    return true;
                }

-                applyCommandAction(mcMMOPlayer);
-                sendSuccessMessage(sender, playerName);
+                applyCommandAction();
+                sendSuccessMessage(sender);
                return true;

            default:
@@ -61,7 +70,7 @@ public abstract class ToggleCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayers().keySet();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            default:
                return ImmutableList.of();
@@ -70,6 +79,6 @@ public abstract class ToggleCommand implements TabExecutor {

    protected abstract boolean hasOtherPermission(CommandSender sender);
    protected abstract boolean hasSelfPermission(CommandSender sender);
-    protected abstract void applyCommandAction(McMMOPlayer mcMMOPlayer);
-    protected abstract void sendSuccessMessage(CommandSender sender, String playerName);
+    protected abstract void applyCommandAction();
+    protected abstract void sendSuccessMessage(CommandSender sender);
 }
--- a/src/main/java/com/gmail/nossr50/commands/XprateCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/XprateCommand.java
@@ -9,7 +9,7 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.util.StringUtil;

 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.experience.ExperienceConfig;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
@@ -18,7 +18,11 @@ import com.gmail.nossr50.util.commands.CommandUtils;
 import com.google.common.collect.ImmutableList;

 public class XprateCommand implements TabExecutor {
-    private final double ORIGINAL_XP_RATE = ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier();
+    private double originalRate;
+
+    public XprateCommand() {
+        originalRate = Config.getInstance().getExperienceGainsGlobalMultiplier();
+    }

    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -38,7 +42,7 @@ public class XprateCommand implements TabExecutor {
                    mcMMO.p.toggleXpEventEnabled();
                }

-                ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(ORIGINAL_XP_RATE);
+                Config.getInstance().setExperienceGainsGlobalMultiplier(originalRate);
                return true;

            case 2:
@@ -62,7 +66,7 @@ public class XprateCommand implements TabExecutor {
                }

                int newXpRate = Integer.parseInt(args[0]);
-                ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);
+                Config.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);

                if (mcMMO.p.isXPEventEnabled()) {
                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.started.0"));
--- a/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java
@@ -2,7 +2,7 @@ package com.gmail.nossr50.commands.chat;

 import org.bukkit.command.CommandSender;

-import com.gmail.nossr50.datatypes.chat.ChatMode;
+import com.gmail.nossr50.chat.ChatMode;

 public class AdminChatCommand extends ChatCommand {
    public AdminChatCommand() {
--- a/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
@@ -12,9 +12,7 @@ import org.bukkit.util.StringUtil;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.chat.ChatManagerFactory;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.chat.ChatMode;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.chat.ChatMode;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
@@ -23,8 +21,9 @@ import com.gmail.nossr50.util.player.UserManager;
 import com.google.common.collect.ImmutableList;

 public abstract class ChatCommand implements TabExecutor {
-    private ChatMode chatMode;
+    protected ChatMode chatMode;
    protected ChatManager chatManager;
+    private McMMOPlayer mcMMOPlayer;

    public ChatCommand(ChatMode chatMode) {
        this.chatMode = chatMode;
@@ -33,21 +32,19 @@ public abstract class ChatCommand implements TabExecutor {

    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        McMMOPlayer mcMMOPlayer;
-
        switch (args.length) {
            case 0:
                if (CommandUtils.noConsoleUsage(sender)) {
                    return true;
                }

-                mcMMOPlayer = UserManager.getPlayer(sender.getName());
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);

-                if (mcMMOPlayer.isChatEnabled(chatMode)) {
-                    disableChatMode(mcMMOPlayer, sender);
+                if (chatMode.isEnabled(mcMMOPlayer)) {
+                    disableChatMode(sender);
                }
                else {
-                    enableChatMode(mcMMOPlayer, sender);
+                    enableChatMode(sender);
                }

                return true;
@@ -58,7 +55,9 @@ public abstract class ChatCommand implements TabExecutor {
                        return true;
                    }

-                    enableChatMode(UserManager.getPlayer(sender.getName()), sender);
+                    mcMMOPlayer = UserManager.getPlayer((Player) sender);
+
+                    enableChatMode(sender);
                    return true;
                }

@@ -67,7 +66,9 @@ public abstract class ChatCommand implements TabExecutor {
                        return true;
                    }

-                    disableChatMode(UserManager.getPlayer(sender.getName()), sender);
+                    mcMMOPlayer = UserManager.getPlayer((Player) sender);
+
+                    disableChatMode(sender);
                    return true;
                }

@@ -107,28 +108,23 @@ public abstract class ChatCommand implements TabExecutor {

    protected abstract void handleChatSending(CommandSender sender, String[] args);

-    private void enableChatMode(McMMOPlayer mcMMOPlayer, CommandSender sender) {
+    private void enableChatMode(CommandSender sender) {
        if (chatMode == ChatMode.PARTY && mcMMOPlayer.getParty() == null) {
            sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
            return;
        }

-        if (chatMode == ChatMode.PARTY && (mcMMOPlayer.getParty().getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.CHAT))) {
-            sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.1"));
-            return;
-        }
-
-        mcMMOPlayer.enableChat(chatMode);
+        chatMode.enable(mcMMOPlayer);
        sender.sendMessage(chatMode.getEnabledMessage());
    }

-    private void disableChatMode(McMMOPlayer mcMMOPlayer, CommandSender sender) {
+    private void disableChatMode(CommandSender sender) {
        if (chatMode == ChatMode.PARTY && mcMMOPlayer.getParty() == null) {
            sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
            return;
        }

-        mcMMOPlayer.disableChat(chatMode);
+        chatMode.disable(mcMMOPlayer);
        sender.sendMessage(chatMode.getDisabledMessage());
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java
@@ -3,11 +3,9 @@ package com.gmail.nossr50.commands.chat;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

+import com.gmail.nossr50.chat.ChatMode;
 import com.gmail.nossr50.chat.PartyChatManager;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.chat.ChatMode;
 import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.player.UserManager;
@@ -30,11 +28,6 @@ public class PartyChatCommand extends ChatCommand {
                return;
            }

-            if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.CHAT)) {
-                sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.1"));
-                return;
-            }
-
            message = buildChatMessage(args, 0);
        }
        else {
--- a/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java
@@ -1,74 +0,0 @@
-package com.gmail.nossr50.commands.database;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.database.DatabaseManager;
-import com.gmail.nossr50.database.DatabaseManagerFactory;
-import com.gmail.nossr50.datatypes.database.DatabaseType;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.runnables.database.DatabaseConversionTask;
-import com.gmail.nossr50.util.player.UserManager;
-
-public class ConvertDatabaseCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-            case 2:
-                DatabaseType previousType = DatabaseType.getDatabaseType(args[1]);
-                DatabaseType newType = mcMMO.getDatabaseManager().getDatabaseType();
-
-                if (previousType == newType || (newType == DatabaseType.CUSTOM && DatabaseManagerFactory.getCustomDatabaseManagerClass().getSimpleName().equalsIgnoreCase(args[1]))) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.Same", newType.toString()));
-                    return true;
-                }
-
-                DatabaseManager oldDatabase = DatabaseManagerFactory.createDatabaseManager(previousType);
-
-                if (previousType == DatabaseType.CUSTOM) {
-                    Class<?> clazz;
-
-                    try {
-                        clazz = Class.forName(args[1]);
-
-                        if (!DatabaseManager.class.isAssignableFrom(clazz)) {
-                            sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.InvalidType", args[1]));
-                            return true;
-                        }
-
-                        oldDatabase = DatabaseManagerFactory.createCustomDatabaseManager((Class<? extends DatabaseManager>) clazz);
-                    }
-                    catch (Throwable e) {
-                        e.printStackTrace();
-                        sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.InvalidType", args[1]));
-                        return true;
-                    }
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.Start", previousType.toString(), newType.toString()));
-
-                UserManager.saveAll();
-                UserManager.clearAll();
-
-                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-                    PlayerProfile profile = oldDatabase.loadPlayerProfile(player.getName(), false);
-
-                    if (profile.isLoaded()) {
-                        mcMMO.getDatabaseManager().saveUser(profile);
-                    }
-
-                    UserManager.addUser(player);
-                }
-
-                new DatabaseConversionTask(oldDatabase, sender, previousType.toString(), newType.toString()).runTaskAsynchronously(mcMMO.p);
-                return true;
-
-            default:
-                return false;
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.database;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -20,17 +21,15 @@ public class McremoveCommand implements TabExecutor {
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        switch (args.length) {
            case 1:
-                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-
-                if (UserManager.getOfflinePlayer(playerName) == null && CommandUtils.unloadedProfile(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false))) {
+                if (UserManager.getPlayer(args[0]) == null && CommandUtils.unloadedProfile(sender, mcMMO.getDatabaseManager().loadPlayerProfile(args[0], false))) {
                    return true;
                }

-                if (mcMMO.getDatabaseManager().removeUser(playerName)) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", playerName));
+                if (mcMMO.getDatabaseManager().removeUser(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", args[0]));
                }
                else {
-                    sender.sendMessage(playerName + " could not be removed from the database."); // Pretty sure this should NEVER happen.
+                    sender.sendMessage(args[0] + " could not be removed from the database."); // Pretty sure this should NEVER happen.
                }

                return true;
@@ -44,7 +43,7 @@ public class McremoveCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayers().keySet();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            default:
                return ImmutableList.of();
--- a/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java
@@ -9,26 +9,29 @@ import org.bukkit.command.TabExecutor;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.database.DatabaseManagerFactory;
 import com.gmail.nossr50.locale.LocaleLoader;
-
 import com.google.common.collect.ImmutableList;

 public class MmoshowdbCommand implements TabExecutor {
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-            case 0:
-                Class<?> clazz = DatabaseManagerFactory.getCustomDatabaseManagerClass();
-
-                if (clazz != null) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", clazz.getName()));
-                    return true;
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", (Config.getInstance().getUseMySQL() ? "sql" : "flatfile")));
+        if (args.length != 0) {
+            return false;
+        }
+        else {
+            Class<?> clazz = DatabaseManagerFactory.getCustomDatabaseManagerClass();
+            if (clazz != null) {
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", clazz.getName()));
                return true;
-
-            default:
-                return false;
+            }
+            else {
+                if (Config.getInstance().getUseMySQL()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", "sql"));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", "flatfile"));
+                }
+                return true;
+            }
        }
    }

--- a/src/main/java/com/gmail/nossr50/commands/database/MmoupdateCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/database/MmoupdateCommand.java
@@ -0,0 +1,138 @@
+package com.gmail.nossr50.commands.database;
+
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.DatabaseManager;
+import com.gmail.nossr50.database.DatabaseManagerFactory;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.runnables.database.ConversionTask;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class MmoupdateCommand implements TabExecutor {
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                String argType = args[0];
+                String oldType = validateName(sender, args[0]);
+                if (oldType == null) {
+                    return true;
+                }
+
+                String newType = getCurrentDb();
+
+                if (newType.equals(oldType)) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Same", argType));
+                    return true;
+                }
+
+                DatabaseManager oldDb;
+                if (oldType == "sql") {
+                    oldDb = DatabaseManagerFactory.createSQLDatabaseManager();
+                }
+                else if (oldType == "flatfile") {
+                    oldDb = DatabaseManagerFactory.createFlatfileDatabaseManager();
+                }
+                else try {
+                    @SuppressWarnings("unchecked")
+                    Class<? extends DatabaseManager> clazz = (Class<? extends DatabaseManager>) Class.forName(oldType);
+                    oldDb = DatabaseManagerFactory.createCustomDatabaseManager((Class<? extends DatabaseManager>) clazz);
+
+                    oldType = clazz.getSimpleName(); // For pretty-printing; we have the database now
+                }
+                catch (Throwable e) {
+                    return false;
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Start", oldType, newType));
+
+                // Convert the online players right away, without waiting
+                // first, flush out the current data
+                UserManager.saveAll();
+                UserManager.clearAll();
+
+                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+                    // Get the profile from the old database and save it in the new
+                    PlayerProfile profile = oldDb.loadPlayerProfile(player.getName(), false);
+                    if (profile.isLoaded()) {
+                        mcMMO.getDatabaseManager().saveUser(profile);
+                    }
+
+                    // Reload from the current database via UserManager
+                    UserManager.addUser(player);
+                }
+
+                // Schedule the task for all users
+                new ConversionTask(oldDb, sender, oldType, newType).runTaskAsynchronously(mcMMO.p);
+
+                return true;
+
+            default:
+                break;
+        }
+        return false;
+    }
+
+    /**
+     * @return null - if type not recognized / class not found
+     *         empty string - if type is same as current
+     *         normalized string - if type is recognized
+     */
+    private String validateName(CommandSender sender, String type) {
+        if (type.equalsIgnoreCase("sql") || type.equalsIgnoreCase("mysql")) {
+            return "sql";
+        }
+
+        if (type.equalsIgnoreCase("flatfile") || type.equalsIgnoreCase("file")) {
+            return "flatfile";
+        }
+
+        try {
+            Class<?> clazz = Class.forName(type);
+
+            if (!DatabaseManager.class.isAssignableFrom(clazz)) {
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.InvalidType", type));
+                return null;
+            }
+
+            return type;
+        }
+        catch (Exception e) {
+            sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.InvalidType", type));
+            return null;
+        }
+    }
+
+    private String getCurrentDb() {
+        if (DatabaseManagerFactory.getCustomDatabaseManagerClass() != null) {
+            return DatabaseManagerFactory.getCustomDatabaseManagerClass().getSimpleName();
+        }
+
+        if (Config.getInstance().getUseMySQL()) {
+            return "sql";
+        }
+        else {
+            return "flatfile";
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        Class<?> clazz = DatabaseManagerFactory.getCustomDatabaseManagerClass();
+        if (clazz != null) {
+            return ImmutableList.of("flatfile", "sql", clazz.getName());
+        }
+        return ImmutableList.of("flatfile", "sql");
+    }
+}
--- a/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java
@@ -1,14 +1,13 @@
 package com.gmail.nossr50.commands.experience;

 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;

-import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;
+import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.skills.SkillUtils;

 public class AddlevelsCommand extends ExperienceCommand {
    @Override
@@ -22,25 +21,21 @@ public class AddlevelsCommand extends ExperienceCommand {
    }

    @Override
-    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
-        float xpRemoved = profile.getSkillXpLevelRaw(skill);
+    protected void handleCommand(SkillType skill) {
        profile.addLevels(skill, value);

-        if (player == null) {
-            profile.scheduleAsyncSave();
-            return;
+        if (player != null) {
+            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelUpEvent(player, skill, value));
        }
-
-        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, true, XPGainReason.COMMAND);
    }

    @Override
-    protected void handlePlayerMessageAll(Player player, int value) {
+    protected void handlePlayerMessageAll() {
        player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", value));
    }

    @Override
-    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
-        player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", value, skill.getName()));
+    protected void handlePlayerMessageSkill() {
+        player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", value, SkillUtils.getSkillName(skill)));
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java
@@ -1,14 +1,11 @@
 package com.gmail.nossr50.commands.experience;

 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;

-import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.skills.SkillUtils;

 public class AddxpCommand extends ExperienceCommand {
    @Override
@@ -22,23 +19,22 @@ public class AddxpCommand extends ExperienceCommand {
    }

    @Override
-    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
+    protected void handleCommand(SkillType skill) {
        if (player != null) {
-            UserManager.getPlayer(player).applyXpGain(skill, value, XPGainReason.COMMAND);
+            mcMMOPlayer.applyXpGain(skill, value);
        }
        else {
-            profile.addXp(skill, value);
-            profile.scheduleAsyncSave();
+            profile.addExperience(skill, value);
        }
    }

    @Override
-    protected void handlePlayerMessageAll(Player player, int value) {
+    protected void handlePlayerMessageAll() {
        player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", value));
    }

    @Override
-    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
-        player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", value, skill.getName()));
+    protected void handlePlayerMessageSkill() {
+        player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", value, SkillUtils.getSkillName(skill)));
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java
@@ -1,49 +0,0 @@
-package com.gmail.nossr50.commands.experience;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.experience.FormulaType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.runnables.database.FormulaConversionTask;
-import com.gmail.nossr50.util.player.UserManager;
-
-public class ConvertExperienceCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-            case 2:
-                FormulaType previousType = mcMMO.getFormulaManager().getPreviousFormulaType();
-                FormulaType newType = FormulaType.getFormulaType(args[1].toUpperCase());
-
-                if (newType == FormulaType.UNKNOWN) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Experience.Invalid"));
-                    return true;
-                }
-
-                if (previousType == newType) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Experience.Same", newType.toString()));
-                    return true;
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Experience.Start", previousType.toString(), newType.toString()));
-
-                UserManager.saveAll();
-                UserManager.clearAll();
-
-                new FormulaConversionTask(sender, newType).runTaskLater(mcMMO.p, 1);
-
-                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-                    UserManager.addUser(player);
-                }
-
-                return true;
-
-            default:
-                return false;
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.experience;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -16,14 +17,21 @@ import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.skills.SkillUtils;

 import com.google.common.collect.ImmutableList;

 public abstract class ExperienceCommand implements TabExecutor {
+    protected McMMOPlayer mcMMOPlayer;
+    protected Player player;
+    protected PlayerProfile profile;
+
+    protected boolean allSkills;
+    protected SkillType skill;
+    protected int value;
+
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        SkillType skill;
-
        switch (args.length) {
            case 2:
                if (CommandUtils.noConsoleUsage(sender)) {
@@ -39,13 +47,12 @@ public abstract class ExperienceCommand implements TabExecutor {
                    return true;
                }

-                skill = SkillType.getSkill(args[0]);
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
+                profile = mcMMOPlayer.getProfile();

-                if (args[1].equalsIgnoreCase("all")) {
-                    skill = null;
-                }
-
-                editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), skill, Integer.parseInt(args[1]));
+                editValues();
+                allSkills = false;
                return true;

            case 3:
@@ -58,32 +65,27 @@ public abstract class ExperienceCommand implements TabExecutor {
                    return true;
                }

-                skill = SkillType.getSkill(args[1]);
-
-                if (args[1].equalsIgnoreCase("all")) {
-                    skill = null;
-                }
-
-                int value = Integer.parseInt(args[2]);
-
-                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+                mcMMOPlayer = UserManager.getPlayer(args[0]);

                // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                if (mcMMOPlayer == null) {
-                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
+                    profile = mcMMO.getDatabaseManager().loadPlayerProfile(args[0], false);

                    if (CommandUtils.unloadedProfile(sender, profile)) {
                        return true;
                    }

-                    editValues(null, profile, skill, value);
+                    editValues();
+                    profile.save(); // Since this is a temporary profile, we save it here.
                }
                else {
-                    editValues(mcMMOPlayer.getPlayer(), mcMMOPlayer.getProfile(), skill, value);
+                    profile = mcMMOPlayer.getProfile();
+                    player = mcMMOPlayer.getPlayer();
+                    editValues();
                }

-                handleSenderMessage(sender, playerName, skill);
+                handleSenderMessage(sender, args[0]);
+                allSkills = false;
                return true;

            default:
@@ -95,7 +97,7 @@ public abstract class ExperienceCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayers().keySet();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            case 2:
                return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
@@ -106,38 +108,64 @@ public abstract class ExperienceCommand implements TabExecutor {

    protected abstract boolean permissionsCheckSelf(CommandSender sender);
    protected abstract boolean permissionsCheckOthers(CommandSender sender);
-    protected abstract void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value);
-    protected abstract void handlePlayerMessageAll(Player player, int value);
-    protected abstract void handlePlayerMessageSkill(Player player, int value, SkillType skill);
+    protected abstract void handleCommand(SkillType skill);
+    protected abstract void handlePlayerMessageAll();
+    protected abstract void handlePlayerMessageSkill();

    private boolean validateArguments(CommandSender sender, String skillName, String value) {
-        return !(CommandUtils.isInvalidInteger(sender, value) || (!skillName.equalsIgnoreCase("all") && CommandUtils.isInvalidSkill(sender, skillName)));
+        if (isInvalidInteger(sender, value) || isInvalidSkill(sender, skillName)) {
+            return false;
+        }
+
+        return true;
    }

-    protected static void handleSenderMessage(CommandSender sender, String playerName, SkillType skill) {
-        if (skill == null) {
+    private boolean isInvalidInteger(CommandSender sender, String value) {
+        if (CommandUtils.isInvalidInteger(sender, value)) {
+            return true;
+        }
+
+        this.value = Integer.parseInt(value);
+        return false;
+    }
+
+    protected boolean isInvalidSkill(CommandSender sender, String skillName) {
+        if (skillName.equalsIgnoreCase("all")) {
+            allSkills = true;
+            return false;
+        }
+        else if (CommandUtils.isInvalidSkill(sender, skillName)) {
+            return true;
+        }
+
+        skill = SkillType.getSkill(skillName);
+        return false;
+    }
+
+    protected void handleSenderMessage(CommandSender sender, String playerName) {
+        if (allSkills) {
            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
        }
        else {
-            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", skill.getName(), playerName));
+            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", SkillUtils.getSkillName(skill), playerName));
        }
    }

-    protected void editValues(Player player, PlayerProfile profile, SkillType skill, int value) {
-        if (skill == null) {
-            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
-                handleCommand(player, profile, skillType, value);
+    protected void editValues() {
+        if (allSkills) {
+            for (SkillType skillType : SkillType.values()) {
+                handleCommand(skillType);
            }

            if (player != null) {
-                handlePlayerMessageAll(player, value);
+                handlePlayerMessageAll();
            }
        }
        else {
-            handleCommand(player, profile, skill, value);
+            handleCommand(skill);

            if (player != null) {
-                handlePlayerMessageSkill(player, value, skill);
+                handlePlayerMessageSkill();
            }
        }
    }
--- a/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java
@@ -1,14 +1,13 @@
 package com.gmail.nossr50.commands.experience;

 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;

-import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;
+import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.skills.SkillUtils;

 public class MmoeditCommand extends ExperienceCommand {
    @Override
@@ -22,31 +21,21 @@ public class MmoeditCommand extends ExperienceCommand {
    }

    @Override
-    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
-        int skillLevel = profile.getSkillLevel(skill);
-        float xpRemoved = profile.getSkillXpLevelRaw(skill);
-
+    protected void handleCommand(SkillType skill) {
        profile.modifySkill(skill, value);

-        if (player == null) {
-            profile.scheduleAsyncSave();
-            return;
+        if (player != null) {
+            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelUpEvent(player, skill, value - profile.getSkillLevel(skill)));
        }
-
-        if (value == skillLevel) {
-            return;
-        }
-
-        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, value > skillLevel, XPGainReason.COMMAND);
    }

    @Override
-    protected void handlePlayerMessageAll(Player player, int value) {
+    protected void handlePlayerMessageAll() {
        player.sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", value));
    }

    @Override
-    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
-        player.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", skill.getName(), value));
+    protected void handlePlayerMessageSkill() {
+        player.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", SkillUtils.getSkillName(skill), value));
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java
@@ -1,88 +1,82 @@
 package com.gmail.nossr50.commands.experience;

-import java.util.ArrayList;
-import java.util.List;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;

 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.skills.XPGainReason;
+import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.skills.SkillUtils;

-import com.google.common.collect.ImmutableList;
+public class SkillresetCommand extends ExperienceCommand {
+    private CommandSender sender;
+    private Command command;
+    private int argsLength;

-/**
- * This class mirrors the structure of ExperienceCommand, except the
- * value/quantity argument is removed.
- */
-public class SkillresetCommand implements TabExecutor {
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        this.command = command;
+        this.sender = sender;
+        argsLength = args.length;
+
        switch (args.length) {
            case 1:
                if (CommandUtils.noConsoleUsage(sender)) {
                    return true;
                }

-                if (!permissionsCheckSelf(sender)) {
+                if (!Permissions.skillreset(sender)) {
                    sender.sendMessage(command.getPermissionMessage());
                    return true;
                }

-                if (!validateArguments(sender, args[0])) {
+                if (isInvalidSkill(sender, args[0])) {
                    return true;
                }

-                editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), SkillType.getSkill(args[0]));
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
+                profile = mcMMOPlayer.getProfile();
+
+                editValues();
                return true;

            case 2:
-                if (!permissionsCheckOthers(sender)) {
+                if (!Permissions.skillresetOthers(sender)) {
                    sender.sendMessage(command.getPermissionMessage());
                    return true;
                }

-                if (!validateArguments(sender, args[1])) {
+                if (isInvalidSkill(sender, args[1])) {
                    return true;
                }

-                SkillType skill;
-                if (args[1].equalsIgnoreCase("all")) {
-                    skill = null;
-                }
-                else {
-                    skill = SkillType.getSkill(args[1]);
-                }
-
-                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+                mcMMOPlayer = UserManager.getPlayer(args[0]);

                // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                if (mcMMOPlayer == null) {
-                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
+                    profile = mcMMO.getDatabaseManager().loadPlayerProfile(args[0], false);

                    if (CommandUtils.unloadedProfile(sender, profile)) {
                        return true;
                    }

-                    editValues(null, profile, skill);
+                    editValues();
+                    profile.save(); // Since this is a temporary profile, we save it here.
                }
                else {
-                    editValues(mcMMOPlayer.getPlayer(), mcMMOPlayer.getProfile(), skill);
+                    profile = mcMMOPlayer.getProfile();
+                    player = mcMMOPlayer.getPlayer();
+
+                    editValues();
                }

-                handleSenderMessage(sender, playerName, skill);
+                handleSenderMessage(sender, args[0]);
                return true;

            default:
@@ -91,77 +85,36 @@ public class SkillresetCommand implements TabExecutor {
    }

    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
-                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
-            case 2:
-                return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
-            default:
-                return ImmutableList.of();
-        }
+    protected boolean permissionsCheckSelf(CommandSender sender) {
+        return false;
    }

-    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill) {
-        int levelsRemoved = profile.getSkillLevel(skill);
-        float xpRemoved = profile.getSkillXpLevelRaw(skill);
+    @Override
+    protected boolean permissionsCheckOthers(CommandSender sender) {
+        return false;
+    }

-        profile.modifySkill(skill, 0);
-
-        if (player == null) {
-            profile.scheduleAsyncSave();
+    @Override
+    protected void handleCommand(SkillType skill) {
+        if (argsLength == 1 && !Permissions.skillreset(sender, skill) || (argsLength == 2 && !Permissions.skillresetOthers(sender, skill))) {
+            sender.sendMessage(command.getPermissionMessage());
            return;
        }

-        EventUtils.handleLevelChangeEvent(player, skill, levelsRemoved, xpRemoved, false, XPGainReason.COMMAND);
+        profile.modifySkill(skill, 0);
+
+        if (player != null) {
+            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelUpEvent(player, skill, 0 - profile.getSkillLevel(skill)));
+        }
    }

-    protected boolean permissionsCheckSelf(CommandSender sender) {
-        return Permissions.skillreset(sender);
-    }
-
-    protected boolean permissionsCheckOthers(CommandSender sender) {
-        return Permissions.skillresetOthers(sender);
-    }
-
-    protected void handlePlayerMessageAll(Player player) {
+    @Override
+    protected void handlePlayerMessageAll() {
        player.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
    }

-    protected void handlePlayerMessageSkill(Player player, SkillType skill) {
-        player.sendMessage(LocaleLoader.getString("Commands.Reset.Single", skill.getName()));
-    }
-
-    private boolean validateArguments(CommandSender sender, String skillName) {
-        return !(CommandUtils.isInvalidSkill(sender, skillName) && !skillName.equalsIgnoreCase("all"));
-    }
-
-    protected static void handleSenderMessage(CommandSender sender, String playerName, SkillType skill) {
-        if (skill == null) {
-            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
-        }
-        else {
-            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", skill.getName(), playerName));
-        }
-    }
-
-    protected void editValues(Player player, PlayerProfile profile, SkillType skill) {
-        if (skill == null) {
-            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
-                handleCommand(player, profile, skillType);
-            }
-
-            if (player != null) {
-                handlePlayerMessageAll(player);
-            }
-        }
-        else {
-            handleCommand(player, profile, skill);
-
-            if (player != null) {
-                handlePlayerMessageSkill(player, skill);
-            }
-        }
+    @Override
+    protected void handlePlayerMessageSkill() {
+        player.sendMessage(LocaleLoader.getString("Commands.Reset.Single", SkillUtils.getSkillName(skill)));
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java
@@ -1,65 +1,41 @@
 package com.gmail.nossr50.commands.hardcore;

-import org.bukkit.command.CommandSender;
-
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;

 public class HardcoreCommand extends HardcoreModeCommand {
    @Override
-    protected boolean checkTogglePermissions(CommandSender sender) {
+    protected void disable() {
+        Config.getInstance().setHardcoreEnabled(false);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Disabled"));
+    }
+
+    @Override
+    protected void enable() {
+        Config.getInstance().setHardcoreEnabled(true);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Enabled"));
+    }
+
+    @Override
+    protected boolean checkTogglePermissions() {
        return Permissions.hardcoreToggle(sender);
    }

    @Override
-    protected boolean checkModifyPermissions(CommandSender sender) {
+    protected boolean checkModifyPermissions() {
        return Permissions.hardcoreModify(sender);
    }

    @Override
-    protected boolean checkEnabled(SkillType skill) {
-        if (skill == null) {
-            for (SkillType skillType : SkillType.values()) {
-                if (!skillType.getHardcoreStatLossEnabled()) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        return skill.getHardcoreStatLossEnabled();
+    protected boolean checkEnabled() {
+        return Config.getInstance().getHardcoreEnabled();
    }

    @Override
-    protected void enable(SkillType skill) {
-        toggle(true, skill);
-    }
-
-    @Override
-    protected void disable(SkillType skill) {
-        toggle(false, skill);
-    }
-
-    @Override
-    protected void modify(CommandSender sender, double newPercentage) {
-        Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercentage);
-        sender.sendMessage(LocaleLoader.getString("Hardcore.DeathStatLoss.PercentageChanged", percent.format(newPercentage / 100.0D)));
-    }
-
-    private void toggle(boolean enable, SkillType skill) {
-        if (skill == null) {
-            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
-                skillType.setHardcoreStatLossEnabled(enable);
-            }
-        }
-        else {
-            skill.setHardcoreStatLossEnabled(enable);
-        }
-
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enable ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.DeathStatLoss.Name"), (skill == null ? "all skills" : skill.getName())));
+    protected void modify() {
+        Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercent);
+        sender.sendMessage(LocaleLoader.getString("Hardcore.PercentageChanged", percent.format(newPercent / 100D)));
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java
@@ -9,7 +9,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.util.StringUtil;

-import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
@@ -17,22 +16,30 @@ import com.gmail.nossr50.util.commands.CommandUtils;
 import com.google.common.collect.ImmutableList;

 public abstract class HardcoreModeCommand implements TabExecutor {
-    protected final DecimalFormat percent = new DecimalFormat("##0.00%");
+    protected CommandSender sender;
+    protected double newPercent;
+    protected DecimalFormat percent;
+
+    public HardcoreModeCommand() {
+        percent = new DecimalFormat("##0.00%");
+    }

    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        switch (args.length) {
            case 0:
-                if (!checkTogglePermissions(sender)) {
+                this.sender = sender;
+
+                if (!checkTogglePermissions()) {
                    sender.sendMessage(command.getPermissionMessage());
                    return true;
                }

-                if (checkEnabled(null)) {
-                    disable(null);
+                if (checkEnabled()) {
+                    disable();
                }
                else {
-                    enable(null);
+                    enable();
                }

                return true;
@@ -44,7 +51,7 @@ public abstract class HardcoreModeCommand implements TabExecutor {
                        return true;
                    }

-                    enable(null);
+                    enable();
                    return true;
                }

@@ -54,11 +61,11 @@ public abstract class HardcoreModeCommand implements TabExecutor {
                        return true;
                    }

-                    disable(null);
+                    disable();
                    return true;
                }

-                if (CommandUtils.isInvalidDouble(sender, args[0])) {
+                if (isInvalidPercentage(sender, args[0])) {
                    return true;
                }

@@ -67,41 +74,7 @@ public abstract class HardcoreModeCommand implements TabExecutor {
                    return true;
                }

-                modify(sender, Double.parseDouble(args[0]));
-                return true;
-
-
-            case 2:
-                if (CommandUtils.isInvalidSkill(sender, args[0])) {
-                    return true;
-                }
-
-                SkillType skill = SkillType.getSkill(args[0]);
-
-                if (!CommandUtils.isChildSkill(sender, skill)) {
-                    return true;
-                }
-
-                if (CommandUtils.shouldEnableToggle(args[1])) {
-                    if (!Permissions.hardcoreToggle(sender)) {
-                        sender.sendMessage(command.getPermissionMessage());
-                        return true;
-                    }
-
-                    enable(skill);
-                    return true;
-                }
-
-                if (CommandUtils.shouldDisableToggle(args[1])) {
-                    if (!Permissions.hardcoreToggle(sender)) {
-                        sender.sendMessage(command.getPermissionMessage());
-                        return true;
-                    }
-
-                    enable(skill);
-                    return true;
-                }
-
+                modify();
                return true;

            default:
@@ -123,10 +96,19 @@ public abstract class HardcoreModeCommand implements TabExecutor {
        }
    }

-    protected abstract boolean checkTogglePermissions(CommandSender sender);
-    protected abstract boolean checkModifyPermissions(CommandSender sender);
-    protected abstract boolean checkEnabled(SkillType skill);
-    protected abstract void enable(SkillType skill);
-    protected abstract void disable(SkillType skill);
-    protected abstract void modify(CommandSender sender, double newPercentage);
+    protected abstract boolean checkTogglePermissions();
+    protected abstract boolean checkModifyPermissions();
+    protected abstract boolean checkEnabled();
+    protected abstract void enable();
+    protected abstract void disable();
+    protected abstract void modify();
+
+    private boolean isInvalidPercentage(CommandSender sender, String value) {
+        if (CommandUtils.isInvalidDouble(sender, value)) {
+            return true;
+        }
+
+        newPercent = Double.parseDouble(value);
+        return false;
+    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java
@@ -1,65 +1,41 @@
 package com.gmail.nossr50.commands.hardcore;

-import org.bukkit.command.CommandSender;
-
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;

 public class VampirismCommand extends HardcoreModeCommand {
    @Override
-    protected boolean checkTogglePermissions(CommandSender sender) {
+    protected boolean checkTogglePermissions() {
        return Permissions.vampirismToggle(sender);
    }

    @Override
-    protected boolean checkModifyPermissions(CommandSender sender) {
+    protected boolean checkModifyPermissions() {
        return Permissions.vampirismModify(sender);
    }

    @Override
-    protected boolean checkEnabled(SkillType skill) {
-        if (skill == null) {
-            for (SkillType skillType : SkillType.values()) {
-                if (!skillType.getHardcoreVampirismEnabled()) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        return skill.getHardcoreVampirismEnabled();
+    protected boolean checkEnabled() {
+        return Config.getInstance().getHardcoreVampirismEnabled();
    }

    @Override
-    protected void enable(SkillType skill) {
-        toggle(true, skill);
+    protected void enable() {
+        Config.getInstance().setHardcoreVampirismEnabled(true);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Enabled"));
    }

    @Override
-    protected void disable(SkillType skill) {
-        toggle(false, skill);
+    protected void disable() {
+        Config.getInstance().setHardcoreVampirismEnabled(false);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Disabled"));
    }

    @Override
-    protected void modify(CommandSender sender, double newPercentage) {
-        Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercentage);
-        sender.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.PercentageChanged", percent.format(newPercentage / 100.0D)));
-    }
-
-    private void toggle(boolean enable, SkillType skill) {
-        if (skill == null) {
-            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
-                skillType.setHardcoreVampirismEnabled(enable);
-            }
-        }
-        else {
-            skill.setHardcoreVampirismEnabled(enable);
-        }
-
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enable ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.Vampirism.Name"), (skill == null ? "all skills" : skill)));
+    protected void modify() {
+        Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercent);
+        sender.sendMessage(LocaleLoader.getString("Vampirism.PercentageChanged", percent.format(newPercent / 100D)));
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java
@@ -24,11 +24,11 @@ public class PartyAcceptCommand implements CommandExecutor {
                }

                // Changing parties
-                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, mcMMOPlayer.getPartyInvite().getName())) {
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), mcMMOPlayer.getPartyInvite().getName())) {
                    return true;
                }

-                PartyManager.joinInvitedParty(mcMMOPlayer);
+                PartyManager.joinInvitedParty(player, mcMMOPlayer);
                return true;

            default:
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java
@@ -8,7 +8,6 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyChangeOwnerCommand implements CommandExecutor {
@@ -17,14 +16,13 @@ public class PartyChangeOwnerCommand implements CommandExecutor {
        switch (args.length) {
            case 2:
                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
-                String targetName = CommandUtils.getMatchedPlayerName(args[1]);

-                if (!playerParty.getMembers().contains(targetName)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
+                if (!playerParty.getMembers().contains(args[1])) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
                    return true;
                }

-                PartyManager.setPartyLeader(targetName, playerParty);
+                PartyManager.setPartyLeader(args[1], playerParty);
                return true;

            default:
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java
@@ -10,22 +10,24 @@ import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyChangePasswordCommand implements CommandExecutor {
+    private Party playerParty;
+
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Party party = UserManager.getPlayer((Player) sender).getParty();
+        playerParty = UserManager.getPlayer((Player) sender).getParty();

        switch (args.length) {
            case 1:
-                unprotectParty(party, sender);
+                unprotectParty(sender);
                return true;

            case 2:
                if (args[1].equalsIgnoreCase("clear") || args[1].equalsIgnoreCase("reset")) {
-                    unprotectParty(party, sender);
+                    unprotectParty(sender);
                    return true;
                }

-                protectParty(party, sender, args[1]);
+                protectParty(sender, args[1]);
                return true;

            default:
@@ -35,15 +37,15 @@ public class PartyChangePasswordCommand implements CommandExecutor {
        }
    }

-    private void unprotectParty(Party party, CommandSender sender) {
-        party.setLocked(true);
-        party.setPassword(null);
+    private void unprotectParty(CommandSender sender) {
+        playerParty.setLocked(true);
+        playerParty.setPassword(null);
        sender.sendMessage(LocaleLoader.getString("Party.Password.Removed"));
    }

-    private void protectParty(Party party, CommandSender sender, String password) {
-        party.setLocked(true);
-        party.setPassword(password);
+    private void protectParty(CommandSender sender, String password) {
+        playerParty.setLocked(true);
+        playerParty.setPassword(password);
        sender.sendMessage(LocaleLoader.getString("Party.Password.Set", password));
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
@@ -1,9 +1,9 @@
 package com.gmail.nossr50.commands.party;

 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -12,21 +12,22 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;

+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.chat.PartyChatCommand;
-import com.gmail.nossr50.commands.party.alliance.PartyAllianceCommand;
 import com.gmail.nossr50.commands.party.teleport.PtpCommand;
-import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-
 import com.google.common.collect.ImmutableList;

 public class PartyCommand implements TabExecutor {
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+
    private static final List<String> PARTY_SUBCOMMANDS;
-    private static final List<String> XPSHARE_COMPLETIONS = ImmutableList.of("none", "equal");
+    private static final List<String> EXPSHARE_COMPLETIONS = ImmutableList.of("none", "equal");
    private static final List<String> ITEMSHARE_COMPLETIONS = ImmutableList.of("none", "equal", "random", "loot", "mining", "herbalism", "woodcutting", "misc");

    static {
@@ -44,7 +45,7 @@ public class PartyCommand implements TabExecutor {
    private CommandExecutor partyAcceptCommand         = new PartyAcceptCommand();
    private CommandExecutor partyCreateCommand         = new PartyCreateCommand();
    private CommandExecutor partyQuitCommand           = new PartyQuitCommand();
-    private CommandExecutor partyXpShareCommand        = new PartyXpShareCommand();
+    private CommandExecutor partyExpShareCommand       = new PartyExpShareCommand();
    private CommandExecutor partyItemShareCommand      = new PartyItemShareCommand();
    private CommandExecutor partyInviteCommand         = new PartyInviteCommand();
    private CommandExecutor partyKickCommand           = new PartyKickCommand();
@@ -55,9 +56,8 @@ public class PartyCommand implements TabExecutor {
    private CommandExecutor partyRenameCommand         = new PartyRenameCommand();
    private CommandExecutor partyInfoCommand           = new PartyInfoCommand();
    private CommandExecutor partyHelpCommand           = new PartyHelpCommand();
-    private CommandExecutor partyTeleportCommand       = new PtpCommand();
+    private CommandExecutor partyTeleportCommand       = mcMMO.p.getCommand("ptp").getExecutor();
    private CommandExecutor partyChatCommand           = new PartyChatCommand();
-    private CommandExecutor partyAllianceCommand       = new PartyAllianceCommand();

    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -70,13 +70,13 @@ public class PartyCommand implements TabExecutor {
            return true;
        }

-        Player player = (Player) sender;
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+        player = (Player) sender;
+        mcMMOPlayer = UserManager.getPlayer(player);

        if (args.length < 1) {
            if (!mcMMOPlayer.inParty()) {
                sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-                return printUsage(player);
+                return printUsage();
            }

            return partyInfoCommand.onCommand(sender, command, label, args);
@@ -85,7 +85,7 @@ public class PartyCommand implements TabExecutor {
        PartySubcommandType subcommand = PartySubcommandType.getSubcommand(args[0]);

        if (subcommand == null) {
-            return printUsage(player);
+            return printUsage();
        }

        // Can't use this for lock/unlock since they're handled by the same command
@@ -110,7 +110,7 @@ public class PartyCommand implements TabExecutor {
        // Party member commands
        if (!mcMMOPlayer.inParty()) {
            sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-            return printUsage(player);
+            return printUsage();
        }

        switch (subcommand) {
@@ -135,8 +135,8 @@ public class PartyCommand implements TabExecutor {
        }

        switch (subcommand) {
-            case XPSHARE:
-                return partyXpShareCommand.onCommand(sender, command, label, args);
+            case EXPSHARE:
+                return partyExpShareCommand.onCommand(sender, command, label, args);
            case ITEMSHARE:
                return partyItemShareCommand.onCommand(sender, command, label, args);
            case KICK:
@@ -152,8 +152,6 @@ public class PartyCommand implements TabExecutor {
                return partyChangePasswordCommand.onCommand(sender, command, label, args);
            case RENAME:
                return partyRenameCommand.onCommand(sender, command, label, args);
-            case ALLIANCE:
-                return partyAllianceCommand.onCommand(sender, command, label, args);
            default:
                break;
        }
@@ -178,10 +176,10 @@ public class PartyCommand implements TabExecutor {
                    case INVITE:
                    case KICK:
                    case OWNER:
-                        List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                        Set<String> playerNames = UserManager.getPlayers().keySet();
                        return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(playerNames.size()));
-                    case XPSHARE:
-                        return StringUtil.copyPartialMatches(args[1], XPSHARE_COMPLETIONS, new ArrayList<String>(XPSHARE_COMPLETIONS.size()));
+                    case EXPSHARE:
+                        return StringUtil.copyPartialMatches(args[1], EXPSHARE_COMPLETIONS, new ArrayList<String>(EXPSHARE_COMPLETIONS.size()));
                    case ITEMSHARE:
                        return StringUtil.copyPartialMatches(args[1], ITEMSHARE_COMPLETIONS, new ArrayList<String>(ITEMSHARE_COMPLETIONS.size()));
                    case LOCK:
@@ -193,10 +191,7 @@ public class PartyCommand implements TabExecutor {
                        List<String> matches = StringUtil.copyPartialMatches(args[1], PtpCommand.TELEPORT_SUBCOMMANDS, new ArrayList<String>(PtpCommand.TELEPORT_SUBCOMMANDS.size()));

                        if (matches.size() == 0) {
-                            Player player = (Player) sender;
-                            Party party = UserManager.getPlayer(player).getParty();
-
-                            playerNames = party.getOnlinePlayerNames(player);
+                            playerNames = UserManager.getPlayers().keySet();
                            return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(playerNames.size()));
                        }

@@ -215,7 +210,7 @@ public class PartyCommand implements TabExecutor {
        }
    }

-    private boolean printUsage(Player player) {
+    private boolean printUsage() {
        player.sendMessage(LocaleLoader.getString("Party.Help.0", "/party join"));
        player.sendMessage(LocaleLoader.getString("Party.Help.1", "/party create"));
        player.sendMessage(LocaleLoader.getString("Party.Help.2", "/party ?"));
@@ -223,7 +218,13 @@ public class PartyCommand implements TabExecutor {
    }

    private String[] extractArgs(String[] args) {
-        return Arrays.copyOfRange(args, 1, args.length);
+        String[] newArgs = new String[args.length - 1];
+
+        for (int i = 1; i < args.length; i++) {
+            newArgs[i - 1] = args[i];
+        }
+
+        return newArgs;
    }

    private boolean isItemShareCategory(String category) {
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java
@@ -5,6 +5,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

+import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
@@ -16,20 +17,22 @@ public class PartyCreateCommand implements CommandExecutor {
        switch (args.length) {
            case 2:
            case 3:
+                Party newParty = PartyManager.getParty(args[1]);
+
                Player player = (Player) sender;
                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);

                // Check to see if the party exists, and if it does cancel creating a new party
-                if (PartyManager.checkPartyExistence(player, args[1])) {
+                if (PartyManager.checkPartyExistence(player, newParty, args[1])) {
                    return true;
                }

                // Changing parties
-                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, args[1])) {
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), args[1])) {
                    return true;
                }

-                PartyManager.createParty(mcMMOPlayer, args[1], getPassword(args));
+                PartyManager.createParty(player, mcMMOPlayer, args[1], getPassword(args));
                return true;

            default:
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyExpShareCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyExpShareCommand.java
@@ -7,49 +7,51 @@ import org.bukkit.entity.Player;

 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
-import com.gmail.nossr50.datatypes.party.ShareMode;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.ShareHandler;
+import com.gmail.nossr50.party.ShareHandler.ShareMode;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;

-public class PartyXpShareCommand implements CommandExecutor {
+public class PartyExpShareCommand implements CommandExecutor {
+    private Party playerParty;
+
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Party party = UserManager.getPlayer((Player) sender).getParty();
-
-        if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.XP_SHARE)) {
-            sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.5"));
+        if (!Config.getInstance().getExpShareEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Party.ExpShare.Disabled"));
            return true;
        }

        switch (args.length) {
            case 2:
+                playerParty = UserManager.getPlayer((Player) sender).getParty();
+
                if (args[1].equalsIgnoreCase("none") || CommandUtils.shouldDisableToggle(args[1])) {
-                    handleChangingShareMode(party, ShareMode.NONE);
+                    handleChangingShareMode(ShareMode.NONE);
                }
                else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even") || CommandUtils.shouldEnableToggle(args[1])) {
-                    handleChangingShareMode(party, ShareMode.EQUAL);
+                    handleChangingShareMode(ShareMode.EQUAL);
                }
                else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "xpshare", "<NONE | EQUAL>"));
+                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "<NONE | EQUAL>"));
                }

                return true;

            default:
-                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "xpshare", "<NONE | EQUAL>"));
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "<NONE | EQUAL>"));
                return true;
        }
    }

-    private void handleChangingShareMode(Party party, ShareMode mode) {
-        party.setXpShareMode(mode);
+    private void handleChangingShareMode(ShareHandler.ShareMode mode) {
+        playerParty.setXpShareMode(mode);

-        String changeModeMessage = LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Xp"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString())));
+        String changeModeMessage = LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Exp"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString())));

-        for (Player member : party.getOnlineMembers()) {
+        for (Player member : playerParty.getOnlineMembers()) {
            member.sendMessage(changeModeMessage);
        }
    }
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java
@@ -20,7 +20,7 @@ public class PartyHelpCommand implements CommandExecutor {
                sender.sendMessage(LocaleLoader.getString("Party.Help.7", "/party leader"));
                sender.sendMessage(LocaleLoader.getString("Party.Help.8", "/party disband"));
                sender.sendMessage(LocaleLoader.getString("Party.Help.9", "/party itemshare"));
-                sender.sendMessage(LocaleLoader.getString("Party.Help.10", "/party xpshare"));
+                sender.sendMessage(LocaleLoader.getString("Party.Help.10", "/party expshare"));
                return true;

            default:
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java
@@ -1,92 +1,70 @@
 package com.gmail.nossr50.commands.party;

-import java.util.ArrayList;
-import java.util.List;
-
 import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
-import com.gmail.nossr50.datatypes.party.ShareMode;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.party.ShareHandler;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyInfoCommand implements CommandExecutor {
+    private Player player;
+    private Party playerParty;
+
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        switch (args.length) {
            case 0:
            case 1:
-                Player player = (Player) sender;
+                player = (Player) sender;
                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-                Party party = mcMMOPlayer.getParty();
+                playerParty = mcMMOPlayer.getParty();

-                displayPartyHeader(player, party);
-                displayShareModeInfo(player, party);
-                displayPartyFeatures(player, party);
-                displayMemberInfo(player, mcMMOPlayer, party);
+                displayPartyHeader();
+                displayShareModeInfo();
+                displayMemberInfo();
                return true;
-
            default:
                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "info"));
                return true;
        }
    }

-    private void displayPartyHeader(Player player, Party party) {
-        player.sendMessage(LocaleLoader.getString("Commands.Party.Header"));
+    private String createMembersList() {
+        StringBuilder memberList = new StringBuilder();

-        StringBuilder status = new StringBuilder();
-        status.append(LocaleLoader.getString("Commands.Party.Status", party.getName(), LocaleLoader.getString("Party.Status." + (party.isLocked() ? "Locked" : "Unlocked")), party.getLevel()));
+        for (String memberName : playerParty.getMembers()) {
+            OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberName);

-        if (!party.hasReachedLevelCap()) {
-            status.append(" (").append(party.getXpToLevelPercentage()).append(")");
-        }
-
-        player.sendMessage(status.toString());
-    }
-
-    private void displayPartyFeatures(Player player, Party party) {
-        player.sendMessage(LocaleLoader.getString("Commands.Party.Features.Header"));
-
-        List<String> unlockedPartyFeatures = new ArrayList<String>();
-        List<String> lockedPartyFeatures = new ArrayList<String>();
-
-        for (PartyFeature partyFeature : PartyFeature.values()) {
-            if (!partyFeature.hasPermission(player)) {
-                continue;
+            if (playerParty.getLeader().equalsIgnoreCase(memberName)) {
+                memberList.append(ChatColor.GOLD);
            }
-
-            if (isUnlockedFeature(party, partyFeature)) {
-                unlockedPartyFeatures.add(partyFeature.getLocaleString());
+            else if (member.isOnline()) {
+                memberList.append(ChatColor.WHITE);
            }
            else {
-                lockedPartyFeatures.add(partyFeature.getFeatureLockedLocaleString());
+                memberList.append(ChatColor.GRAY);
            }
+
+            memberList.append(memberName).append(" ");
        }

-        player.sendMessage(LocaleLoader.getString("Commands.Party.UnlockedFeatures", unlockedPartyFeatures.isEmpty() ? "None" : unlockedPartyFeatures));
-
-        for (String message : lockedPartyFeatures) {
-            player.sendMessage(message);
-        }
+        return memberList.toString();
    }

-    private boolean isUnlockedFeature(Party party, PartyFeature partyFeature) {
-        return party.getLevel() >= Config.getInstance().getPartyFeatureUnlockLevel(partyFeature);
-    }
-
-    private void displayShareModeInfo(Player player, Party party) {
-        boolean xpShareEnabled = isUnlockedFeature(party, PartyFeature.XP_SHARE);
-        boolean itemShareEnabled = isUnlockedFeature(party, PartyFeature.ITEM_SHARE);
-        boolean itemSharingActive = (party.getItemShareMode() != ShareMode.NONE);
+    private void displayShareModeInfo() {
+        boolean xpShareEnabled = Config.getInstance().getExpShareEnabled();
+        boolean itemShareEnabled = Config.getInstance().getItemShareEnabled();
+        boolean itemSharingActive = (playerParty.getItemShareMode() != ShareHandler.ShareMode.NONE);

        if (!xpShareEnabled && !itemShareEnabled) {
            return;
@@ -97,11 +75,11 @@ public class PartyInfoCommand implements CommandExecutor {
        String separator = "";

        if (xpShareEnabled) {
-            expShareInfo = LocaleLoader.getString("Commands.Party.ExpShare", party.getXpShareMode().toString());
+            expShareInfo = LocaleLoader.getString("Commands.Party.ExpShare", playerParty.getXpShareMode().toString());
        }

        if (itemShareEnabled) {
-            itemShareInfo = LocaleLoader.getString("Commands.Party.ItemShare", party.getItemShareMode().toString());
+            itemShareInfo = LocaleLoader.getString("Commands.Party.ItemShare", playerParty.getItemShareMode().toString());
        }

        if (xpShareEnabled && itemShareEnabled) {
@@ -109,18 +87,28 @@ public class PartyInfoCommand implements CommandExecutor {
        }

        player.sendMessage(LocaleLoader.getString("Commands.Party.ShareMode") + expShareInfo + separator + itemShareInfo);
-
        if (itemSharingActive) {
-            player.sendMessage(LocaleLoader.getString("Commands.Party.ItemShareCategories", party.getItemShareCategories()));
+            player.sendMessage(LocaleLoader.getString("Commands.Party.ItemShareCategories", playerParty.getItemShareCategories()));
        }
    }

-    private void displayMemberInfo(Player player, McMMOPlayer mcMMOPlayer, Party party) {
-        List<Player> nearMembers = PartyManager.getNearMembers(mcMMOPlayer);
-        int membersOnline = party.getOnlineMembers().size() - 1;
+    private void displayPartyHeader() {
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Header"));
+
+        if (playerParty.isLocked()) {
+            player.sendMessage(LocaleLoader.getString("Commands.Party.Status", playerParty.getName(), LocaleLoader.getString("Party.Status.Locked")));
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString("Commands.Party.Status", playerParty.getName(), LocaleLoader.getString("Party.Status.Unlocked")));
+        }
+    }
+
+    private void displayMemberInfo() {
+        int membersNear = PartyManager.getNearMembers(player, playerParty, Config.getInstance().getPartyShareRange()).size();
+        int membersOnline = playerParty.getOnlineMembers().size() - 1;

        player.sendMessage(LocaleLoader.getString("Commands.Party.Members.Header"));
-        player.sendMessage(LocaleLoader.getString("Commands.Party.MembersNear", nearMembers.size(), membersOnline));
-        player.sendMessage(party.createMembersList(player.getName(), nearMembers));
+        player.sendMessage(LocaleLoader.getString("Commands.Party.MembersNear", membersNear, membersOnline));
+        player.sendMessage(createMembersList());
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java
@@ -17,17 +17,15 @@ public class PartyInviteCommand implements CommandExecutor {
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        switch (args.length) {
            case 2:
-                String targetName = CommandUtils.getMatchedPlayerName(args[1]);
-                McMMOPlayer mcMMOTarget = UserManager.getOfflinePlayer(targetName);
+                McMMOPlayer mcMMOTarget = UserManager.getPlayer(args[1]);

-                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
+                if (!CommandUtils.checkPlayerExistence(sender, args[1], mcMMOTarget)) {
                    return false;
                }

                Player target = mcMMOTarget.getPlayer();
                Player player = (Player) sender;
                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-                String playerName = player.getName();

                if (player.equals(target)) {
                    sender.sendMessage(LocaleLoader.getString("Party.Invite.Self"));
@@ -35,20 +33,21 @@ public class PartyInviteCommand implements CommandExecutor {
                }

                if (PartyManager.inSameParty(player, target)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", targetName));
-                    return true;
-                }
-
-                if (!PartyManager.canInvite(mcMMOPlayer)) {
-                    player.sendMessage(LocaleLoader.getString("Party.Locked"));
+                    sender.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", target.getName()));
                    return true;
                }

                Party playerParty = mcMMOPlayer.getParty();
+
+                if (!PartyManager.canInvite(player, playerParty)) {
+                    player.sendMessage(LocaleLoader.getString("Party.Locked"));
+                    return true;
+                }
+
                mcMMOTarget.setPartyInvite(playerParty);

                sender.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
-                target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", playerParty.getName(), playerName));
+                target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", playerParty.getName(), player.getName()));
                target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.1"));
                return true;

--- a/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java
@@ -8,25 +8,25 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.party.ItemShareType;
 import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
-import com.gmail.nossr50.datatypes.party.ShareMode;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.ShareHandler.ShareMode;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyItemShareCommand implements CommandExecutor {
+    private Party playerParty;
+
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Party party = UserManager.getPlayer((Player) sender).getParty();
-
-        if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.ITEM_SHARE)) {
-            sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.4"));
+        if (!Config.getInstance().getItemShareEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Party.ItemShare.Disabled"));
            return true;
        }

        switch (args.length) {
            case 2:
+                playerParty = UserManager.getPlayer((Player) sender).getParty();
                ShareMode mode = ShareMode.getShareMode(args[1].toUpperCase());

                if (mode == null) {
@@ -34,11 +34,12 @@ public class PartyItemShareCommand implements CommandExecutor {
                    return true;
                }

-                handleChangingShareMode(party, mode);
+                handleChangingShareMode(mode);
                return true;

            case 3:
-                boolean toggle;
+                playerParty = UserManager.getPlayer((Player) sender).getParty();
+                boolean toggle = false;

                if (CommandUtils.shouldEnableToggle(args[2])) {
                    toggle = true;
@@ -52,7 +53,7 @@ public class PartyItemShareCommand implements CommandExecutor {
                }

                try {
-                    handleToggleItemShareCategory(party, ItemShareType.valueOf(args[1].toUpperCase()), toggle);
+                    handleToggleItemShareCategory(ItemShareType.valueOf(args[1].toUpperCase()), toggle);
                }
                catch (IllegalArgumentException ex) {
                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting | misc> <true | false>"));
@@ -67,22 +68,22 @@ public class PartyItemShareCommand implements CommandExecutor {
        }
    }

-    private void handleChangingShareMode(Party party, ShareMode mode) {
-        party.setItemShareMode(mode);
+    private void handleChangingShareMode(ShareMode mode) {
+        playerParty.setItemShareMode(mode);

        String changeModeMessage = LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Item"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString())));

-        for (Player member : party.getOnlineMembers()) {
+        for (Player member : playerParty.getOnlineMembers()) {
            member.sendMessage(changeModeMessage);
        }
    }

-    private void handleToggleItemShareCategory(Party party, ItemShareType type, boolean toggle) {
-        party.setSharingDrops(type, toggle);
+    private void handleToggleItemShareCategory(ItemShareType type, boolean toggle) {
+        playerParty.setSharingDrops(type, toggle);

        String toggleMessage = LocaleLoader.getString("Commands.Party.ToggleShareCategory", StringUtils.getCapitalized(type.toString()), toggle ? "enabled" : "disabled");

-        for (Player member : party.getOnlineMembers()) {
+        for (Player member : playerParty.getOnlineMembers()) {
            member.sendMessage(toggleMessage);
        }
    }
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java
@@ -13,33 +13,26 @@ import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyJoinCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOTarget;
+    private Player target;
+    private Party targetParty;
+
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+    private Party playerParty;
+
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        switch (args.length) {
            case 2:
            case 3:
-                String targetName = CommandUtils.getMatchedPlayerName(args[1]);
-                McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
-
-                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
+                // Verify target exists and is in a different party than the player
+                if (!canJoinParty(sender, args[1])) {
                    return true;
                }

-                Player target = mcMMOTarget.getPlayer();
-
-                if (!mcMMOTarget.inParty()) {
-                    sender.sendMessage(LocaleLoader.getString("Party.PlayerNotInParty", targetName));
-                    return true;
-                }
-
-                Player player = (Player) sender;
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-                Party targetParty = mcMMOTarget.getParty();
-
-                if (player.equals(target) || (mcMMOPlayer.inParty() && mcMMOPlayer.getParty().equals(targetParty))) {
-                    sender.sendMessage(LocaleLoader.getString("Party.Join.Self"));
-                    return true;
-                }
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);
+                player = mcMMOPlayer.getPlayer();

                String password = getPassword(args);

@@ -48,15 +41,12 @@ public class PartyJoinCommand implements CommandExecutor {
                    return true;
                }

-                String partyName = targetParty.getName();
-
                // Changing parties
-                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, partyName)) {
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, playerParty, targetParty.getName())) {
                    return true;
                }

-                player.sendMessage(LocaleLoader.getString("Commands.Party.Join", partyName));
-                PartyManager.addToParty(mcMMOPlayer, targetParty);
+                PartyManager.joinParty(player, mcMMOPlayer, targetParty, password);
                return true;

            default:
@@ -72,4 +62,32 @@ public class PartyJoinCommand implements CommandExecutor {

        return null;
    }
+
+    private boolean canJoinParty(CommandSender sender, String targetName) {
+        mcMMOTarget = UserManager.getPlayer(targetName);
+
+        if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
+            return false;
+        }
+
+        target = mcMMOTarget.getPlayer();
+
+        if (!mcMMOTarget.inParty()) {
+            sender.sendMessage(LocaleLoader.getString("Party.PlayerNotInParty", targetName));
+            return false;
+        }
+
+        player = (Player) sender;
+        mcMMOPlayer = UserManager.getPlayer(player);
+
+        playerParty = mcMMOPlayer.getParty();
+        targetParty = mcMMOTarget.getParty();
+
+        if (player.equals(target) || (mcMMOPlayer.inParty() && playerParty.equals(targetParty))) {
+            sender.sendMessage(LocaleLoader.getString("Party.Join.Self"));
+            return false;
+        }
+
+        return true;
+    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java
@@ -11,7 +11,6 @@ import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyKickCommand implements CommandExecutor {
@@ -20,15 +19,13 @@ public class PartyKickCommand implements CommandExecutor {
        switch (args.length) {
            case 2:
                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
-                String targetName = CommandUtils.getMatchedPlayerName(args[1]);
+                OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(args[1]);

-                if (!playerParty.getMembers().contains(targetName)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
+                if (!playerParty.getMembers().contains(target.getName())) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
                    return true;
                }

-                OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(targetName);
-
                if (target.isOnline()) {
                    Player onlineTarget = target.getPlayer();
                    String partyName = playerParty.getName();
@@ -37,7 +34,6 @@ public class PartyKickCommand implements CommandExecutor {
                        return true;
                    }

-                    PartyManager.processPartyLeaving(UserManager.getPlayer(onlineTarget));
                    onlineTarget.sendMessage(LocaleLoader.getString("Commands.Party.Kick", partyName));
                }

--- a/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java
@@ -12,15 +12,19 @@ import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyLockCommand implements CommandExecutor {
+    private Party playerParty;
+
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        playerParty = UserManager.getPlayer((Player) sender).getParty();
+
        switch (args.length) {
            case 1:
                if (args[0].equalsIgnoreCase("lock")) {
-                    togglePartyLock(sender, true);
+                    lockParty(sender, command.getPermissionMessage());
                }
                else if (args[0].equalsIgnoreCase("unlock")) {
-                    togglePartyLock(sender, false);
+                    unlockParty(sender, command.getPermissionMessage());
                }

                return true;
@@ -32,10 +36,10 @@ public class PartyLockCommand implements CommandExecutor {
                }

                if (CommandUtils.shouldEnableToggle(args[1])) {
-                    togglePartyLock(sender, true);
+                    lockParty(sender, command.getPermissionMessage());
                }
                else if (CommandUtils.shouldDisableToggle(args[1])) {
-                    togglePartyLock(sender, false);
+                    unlockParty(sender, command.getPermissionMessage());
                }
                else {
                    sendUsageStrings(sender);
@@ -49,25 +53,46 @@ public class PartyLockCommand implements CommandExecutor {
        }
    }

+    /**
+     * Handle locking a party.
+     */
+    private void lockParty(CommandSender sender, String permissionMessage) {
+        if (!Permissions.partySubcommand(sender, PartySubcommandType.LOCK)) {
+            sender.sendMessage(permissionMessage);
+            return;
+        }
+
+        if (playerParty.isLocked()) {
+            sender.sendMessage(LocaleLoader.getString("Party.IsLocked"));
+            return;
+        }
+
+        playerParty.setLocked(true);
+        sender.sendMessage(LocaleLoader.getString("Party.Locked"));
+    }
+
+    /**
+     * Handle unlocking a party.
+     *
+     * @return true if party is successfully unlocked, false otherwise.
+     */
+    private void unlockParty(CommandSender sender, String permissionMessage) {
+        if (!Permissions.partySubcommand(sender, PartySubcommandType.UNLOCK)) {
+            sender.sendMessage(permissionMessage);
+            return;
+        }
+
+        if (!playerParty.isLocked()) {
+            sender.sendMessage(LocaleLoader.getString("Party.IsntLocked"));
+            return;
+        }
+
+        playerParty.setLocked(false);
+        sender.sendMessage(LocaleLoader.getString("Party.Unlocked"));
+    }
+
    private void sendUsageStrings(CommandSender sender) {
        sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "lock", "[on|off]"));
        sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "unlock"));
    }
-
-    private void togglePartyLock(CommandSender sender, boolean lock) {
-        Party party = UserManager.getPlayer((Player) sender).getParty();
-
-        if (!Permissions.partySubcommand(sender, lock ? PartySubcommandType.LOCK : PartySubcommandType.UNLOCK)) {
-            sender.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
-            return;
-        }
-
-        if (lock ? party.isLocked() : !party.isLocked()) {
-            sender.sendMessage(LocaleLoader.getString("Party." + (lock ? "IsLocked" : "IsntLocked")));
-            return;
-        }
-
-        party.setLocked(lock);
-        sender.sendMessage(LocaleLoader.getString("Party." + (lock ? "Locked" : "Unlocked")));
-    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java
@@ -6,7 +6,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
@@ -18,14 +17,13 @@ public class PartyQuitCommand implements CommandExecutor {
        switch (args.length) {
            case 1:
                Player player = (Player) sender;
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-                Party playerParty = mcMMOPlayer.getParty();
+                Party playerParty = UserManager.getPlayer(player).getParty();

                if (!PartyManager.handlePartyChangeEvent(player, playerParty.getName(), null, EventReason.LEFT_PARTY)) {
                    return true;
                }

-                PartyManager.removeFromParty(mcMMOPlayer);
+                PartyManager.removeFromParty(player, playerParty);
                sender.sendMessage(LocaleLoader.getString("Commands.Party.Leave"));
                return true;

--- a/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java
@@ -30,9 +30,10 @@ public class PartyRenameCommand implements CommandExecutor {
                }

                Player player = mcMMOPlayer.getPlayer();
+                Party newParty = PartyManager.getParty(newPartyName);

                // Check to see if the party exists, and if it does cancel renaming the party
-                if (PartyManager.checkPartyExistence(player, newPartyName)) {
+                if (PartyManager.checkPartyExistence(player, newParty, newPartyName)) {
                    return true;
                }

--- a/src/main/java/com/gmail/nossr50/commands/party/PartySubcommandType.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartySubcommandType.java
@@ -7,7 +7,7 @@ public enum PartySubcommandType {
    HELP,
    INFO,
    QUIT,
-    XPSHARE,
+    EXPSHARE,
    ITEMSHARE,
    INVITE,
    KICK,
@@ -18,8 +18,7 @@ public enum PartySubcommandType {
    PASSWORD,
    RENAME,
    TELEPORT,
-    CHAT,
-    ALLIANCE;
+    CHAT;

    public static PartySubcommandType getSubcommand(String commandName) {
        for (PartySubcommandType command : values()) {
@@ -38,14 +37,11 @@ public enum PartySubcommandType {
            return OWNER;
        }
        else if (commandName.equalsIgnoreCase("xpshare") || commandName.equalsIgnoreCase("shareexp") || commandName.equalsIgnoreCase("sharexp")) {
-            return XPSHARE;
+            return EXPSHARE;
        }
        else if (commandName.equalsIgnoreCase("shareitem") || commandName.equalsIgnoreCase("shareitems")) {
            return ITEMSHARE;
        }
-        else if (commandName.equalsIgnoreCase("ally")) {
-            return ALLIANCE;
-        }

        return null;
    }
--- a/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java
@@ -1,39 +0,0 @@
-package com.gmail.nossr50.commands.party.alliance;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.player.UserManager;
-
-public class PartyAllianceAcceptCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-            case 2:
-                Player player = (Player) sender;
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-
-                if (!mcMMOPlayer.hasPartyAllianceInvite()) {
-                    sender.sendMessage(LocaleLoader.getString("mcMMO.NoInvites"));
-                    return true;
-                }
-
-                if (mcMMOPlayer.getParty().getAlly() != null) {
-                    player.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.AlreadyAllies"));
-                    return true;
-                }
-
-                PartyManager.acceptAllianceInvite(mcMMOPlayer);
-                return true;
-
-            default:
-                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "alliance", "accept"));
-                return true;
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java
@@ -1,135 +0,0 @@
-package com.gmail.nossr50.commands.party.alliance;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
-
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
-
-import com.google.common.collect.ImmutableList;
-
-public class PartyAllianceCommand implements TabExecutor {
-    private Player player;
-    private Party playerParty;
-    private Party targetParty;
-
-    public static final List<String> ALLIANCE_SUBCOMMANDS = ImmutableList.of("invite", "accept", "disband");
-
-    private CommandExecutor partyAllianceInviteCommand = new PartyAllianceInviteCommand();
-    private CommandExecutor partyAllianceAcceptCommand = new PartyAllianceAcceptCommand();
-    private CommandExecutor partyAllianceDisbandCommand = new PartyAllianceDisbandCommand();
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandUtils.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        player = (Player) sender;
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-
-        playerParty = mcMMOPlayer.getParty();
-
-        switch (args.length) {
-            case 1:
-                if (playerParty.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.ALLIANCE)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.3"));
-                    return true;
-                }
-
-                if (playerParty.getAlly() == null) {
-                    printUsage();
-                    return true;
-                }
-
-                targetParty = playerParty.getAlly();
-
-                displayPartyHeader();
-                displayMemberInfo(mcMMOPlayer);
-                return true;
-
-            case 2:
-            case 3:
-                if (playerParty.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.ALLIANCE)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.3"));
-                    return true;
-                }
-
-                if (args[1].equalsIgnoreCase("invite")) {
-                    return partyAllianceInviteCommand.onCommand(sender, command, label, args);
-                }
-
-                if (args[1].equalsIgnoreCase("accept")) {
-                    return partyAllianceAcceptCommand.onCommand(sender, command, label, args);
-                }
-
-                if (args[1].equalsIgnoreCase("disband")) {
-                    return partyAllianceDisbandCommand.onCommand(sender, command, label, args);
-                }
-
-                if (playerParty.getAlly() == null) {
-                    printUsage();
-                    return true;
-                }
-
-                targetParty = playerParty.getAlly();
-
-                displayPartyHeader();
-                displayMemberInfo(mcMMOPlayer);
-                return true;
-
-            default:
-                return false;
-        }
-    }
-
-    private boolean printUsage() {
-        player.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.Help.0"));
-        player.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.Help.1"));
-        return true;
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender commandSender, Command command, String label, String[] args) {
-        switch (args.length) {
-            case 1:
-                List<String> matches = StringUtil.copyPartialMatches(args[0], ALLIANCE_SUBCOMMANDS, new ArrayList<String>(ALLIANCE_SUBCOMMANDS.size()));
-
-                if (matches.size() == 0) {
-                    List<String> playerNames = CommandUtils.getOnlinePlayerNames(commandSender);
-                    return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
-                }
-
-                return matches;
-            default:
-                return ImmutableList.of();
-        }
-    }
-
-    private void displayPartyHeader() {
-        player.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.Header"));
-        player.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.Ally", playerParty.getName(), targetParty.getName()));
-    }
-
-    private void displayMemberInfo(McMMOPlayer mcMMOPlayer) {
-        List<Player> nearMembers = PartyManager.getNearMembers(mcMMOPlayer);
-        player.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.Members.Header"));
-        player.sendMessage(playerParty.createMembersList(player.getName(), nearMembers));
-        player.sendMessage(ChatColor.DARK_GRAY + "----------------------------");
-        player.sendMessage(targetParty.createMembersList(player.getName(), nearMembers));
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java
@@ -1,36 +0,0 @@
-package com.gmail.nossr50.commands.party.alliance;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.player.UserManager;
-
-public class PartyAllianceDisbandCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-            case 2:
-                Player player = (Player) sender;
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-                Party party = mcMMOPlayer.getParty();
-
-                if (party.getAlly() == null) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.None"));
-                    return true;
-                }
-
-                PartyManager.disbandAlliance(player, party, party.getAlly());
-                return true;
-
-            default:
-                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "alliance", "disband"));
-                return true;
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java
@@ -1,71 +0,0 @@
-package com.gmail.nossr50.commands.party.alliance;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
-
-public class PartyAllianceInviteCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-            case 3:
-                String targetName = CommandUtils.getMatchedPlayerName(args[2]);
-                McMMOPlayer mcMMOTarget = UserManager.getOfflinePlayer(targetName);
-
-                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
-                    return false;
-                }
-
-                Player target = mcMMOTarget.getPlayer();
-                Player player = (Player) sender;
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-                String playerName = player.getName();
-
-                if (player.equals(target)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.Invite.Self"));
-                    return true;
-                }
-
-                if (!mcMMOTarget.inParty()) {
-                    player.sendMessage(LocaleLoader.getString("Party.PlayerNotInParty", targetName));
-                    return true;
-                }
-
-                if (PartyManager.inSameParty(player, target)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", targetName));
-                    return true;
-                }
-
-                if (!mcMMOTarget.getParty().getLeader().equalsIgnoreCase(targetName)) {
-                    player.sendMessage(LocaleLoader.getString("Party.Target.NotOwner", targetName));
-                    return true;
-                }
-
-                Party playerParty = mcMMOPlayer.getParty();
-
-                if (playerParty.getAlly() != null) {
-                    player.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.AlreadyAllies"));
-                    return true;
-                }
-
-                mcMMOTarget.setPartyAllianceInvite(playerParty);
-
-                sender.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
-                target.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.Invite.0", playerParty.getName(), playerName));
-                target.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.Invite.1"));
-                return true;
-
-            default:
-                sender.sendMessage(LocaleLoader.getString("Commands.Usage.3", "party", "alliance", "invite", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
-                return true;
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java
@@ -3,8 +3,9 @@ package com.gmail.nossr50.commands.party.teleport;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;

-import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
@@ -17,16 +18,17 @@ public class PtpAcceptAnyCommand implements CommandExecutor {
            return true;
        }

-        PartyTeleportRecord ptpRecord = UserManager.getPlayer(sender.getName()).getPartyTeleportRecord();
+        Player player = (Player) sender;
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);

-        if (ptpRecord.isConfirmRequired()) {
-            sender.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Disabled"));
+        if (mcMMOPlayer.getPtpConfirmRequired()) {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Disabled"));
        }
        else {
-            sender.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Enabled"));
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Enabled"));
        }

-        ptpRecord.toggleConfirmRequired();
+        mcMMOPlayer.togglePtpConfirmRequired();
        return true;
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java
@@ -7,11 +7,11 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.skills.SkillUtils;

 public class PtpAcceptCommand implements CommandExecutor {
    @Override
@@ -22,21 +22,21 @@ public class PtpAcceptCommand implements CommandExecutor {
        }

        Player player = (Player) sender;
-        PartyTeleportRecord ptpRecord = UserManager.getPlayer(player).getPartyTeleportRecord();
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);

-        if (!ptpRecord.hasRequest()) {
+        if (!mcMMOPlayer.hasPtpRequest()) {
            player.sendMessage(LocaleLoader.getString("Commands.ptp.NoRequests"));
            return true;
        }

-        if (SkillUtils.cooldownExpired(ptpRecord.getTimeout(), Config.getInstance().getPTPCommandTimeout())) {
-            ptpRecord.removeRequest();
+        if ((mcMMOPlayer.getPtpTimeout() + Config.getInstance().getPTPCommandTimeout()) * Misc.TIME_CONVERSION_FACTOR < System.currentTimeMillis()) {
+            mcMMOPlayer.removePtpRequest();
            player.sendMessage(LocaleLoader.getString("Commands.ptp.RequestExpired"));
            return true;
        }

-        Player target = ptpRecord.getRequestor();
-        ptpRecord.removeRequest();
+        Player target = mcMMOPlayer.getPtpRequest();
+        mcMMOPlayer.removePtpRequest();

        if (!PtpCommand.canTeleport(sender, player, target.getName())) {
            return true;
--- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.party.teleport;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -12,23 +13,22 @@ import org.bukkit.util.StringUtil;

 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
-import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.runnables.items.TeleportationWarmup;
-import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.skills.SkillUtils;
-
 import com.google.common.collect.ImmutableList;

 public class PtpCommand implements TabExecutor {
+    private static Player target;
+    private static McMMOPlayer mcMMOTarget;
+
    public static final List<String> TELEPORT_SUBCOMMANDS = ImmutableList.of("toggle", "accept", "acceptany", "acceptall");

    private CommandExecutor ptpToggleCommand = new PtpToggleCommand();
@@ -41,21 +41,6 @@ public class PtpCommand implements TabExecutor {
            return true;
        }

-        Player player = (Player) sender;
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-
-        if (!mcMMOPlayer.inParty()) {
-            sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-            return true;
-        }
-
-        Party party = mcMMOPlayer.getParty();
-
-        if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.TELEPORT)) {
-            sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.2"));
-            return true;
-        }
-
        switch (args.length) {
            case 1:
                if (args[0].equalsIgnoreCase("toggle")) {
@@ -66,6 +51,9 @@ public class PtpCommand implements TabExecutor {
                    return ptpAcceptAnyCommand.onCommand(sender, command, label, args);
                }

+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
                long recentlyHurt = mcMMOPlayer.getRecentlyHurt();
                int hurtCooldown = Config.getInstance().getPTPCommandRecentlyHurtCooldown();

@@ -88,10 +76,10 @@ public class PtpCommand implements TabExecutor {
                }

                int ptpCooldown = Config.getInstance().getPTPCommandCooldown();
-                long ptpLastUse = mcMMOPlayer.getPartyTeleportRecord().getLastUse();
+                long lastTeleport = mcMMOPlayer.getLastTeleport();

                if (ptpCooldown > 0) {
-                    int timeRemaining = SkillUtils.calculateTimeLeft(ptpLastUse * Misc.TIME_CONVERSION_FACTOR, ptpCooldown, player);
+                    int timeRemaining = SkillUtils.calculateTimeLeft(lastTeleport * Misc.TIME_CONVERSION_FACTOR, ptpCooldown, player);

                    if (timeRemaining > 0) {
                        player.sendMessage(LocaleLoader.getString("Item.Generic.Wait", timeRemaining));
@@ -99,7 +87,7 @@ public class PtpCommand implements TabExecutor {
                    }
                }

-                sendTeleportRequest(sender, player, CommandUtils.getMatchedPlayerName(args[0]));
+                sendTeleportRequest(sender, player, args[0]);
                return true;

            default:
@@ -114,14 +102,7 @@ public class PtpCommand implements TabExecutor {
                List<String> matches = StringUtil.copyPartialMatches(args[0], TELEPORT_SUBCOMMANDS, new ArrayList<String>(TELEPORT_SUBCOMMANDS.size()));

                if (matches.size() == 0) {
-                    Player player = (Player) sender;
-                    McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-
-                    if (!mcMMOPlayer.inParty()) {
-                        return ImmutableList.of();
-                    }
-
-                    List<String> playerNames = mcMMOPlayer.getParty().getOnlinePlayerNames(player);
+                    Set<String> playerNames = UserManager.getPlayers().keySet();
                    return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
                }

@@ -136,18 +117,13 @@ public class PtpCommand implements TabExecutor {
            return;
        }

-        McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
-        Player target = mcMMOTarget.getPlayer();
-
-        PartyTeleportRecord ptpRecord = mcMMOTarget.getPartyTeleportRecord();
-
-        if (!ptpRecord.isConfirmRequired()) {
+        if (!mcMMOTarget.getPtpConfirmRequired()) {
            handleTeleportWarmup(player, target);
            return;
        }

-        ptpRecord.setRequestor(player);
-        ptpRecord.actualizeTimeout();
+        mcMMOTarget.setPtpRequest(player);
+        mcMMOTarget.actualizePtpTimeout();

        player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));

@@ -156,13 +132,14 @@ public class PtpCommand implements TabExecutor {
    }

    protected static boolean canTeleport(CommandSender sender, Player player, String targetName) {
-        McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
+        mcMMOTarget = UserManager.getPlayer(targetName);

        if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
            return false;
        }

-        Player target = mcMMOTarget.getPlayer();
+        target = mcMMOTarget.getPlayer();
+        targetName = target.getName();

        if (player.equals(target)) {
            player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
@@ -174,7 +151,7 @@ public class PtpCommand implements TabExecutor {
            return false;
        }

-        if (!mcMMOTarget.getPartyTeleportRecord().isEnabled()) {
+        if (!mcMMOTarget.getPtpEnabled()) {
            player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", targetName));
            return false;
        }
@@ -189,7 +166,7 @@ public class PtpCommand implements TabExecutor {

    protected static void handleTeleportWarmup(Player teleportingPlayer, Player targetPlayer) {
        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(teleportingPlayer);
-        McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetPlayer);
+        mcMMOTarget = UserManager.getPlayer(targetPlayer);

        long warmup = Config.getInstance().getPTPCommandWarmup();

@@ -200,7 +177,25 @@ public class PtpCommand implements TabExecutor {
            new TeleportationWarmup(mcMMOPlayer, mcMMOTarget).runTaskLater(mcMMO.p, 20 * warmup);
        }
        else {
-            EventUtils.handlePartyTeleportEvent(teleportingPlayer, targetPlayer);
+            handlePartyTeleportEvent(teleportingPlayer, targetPlayer);
        }
    }
+
+    public static void handlePartyTeleportEvent(Player teleportingPlayer, Player targetPlayer) {
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(teleportingPlayer);
+        McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(teleportingPlayer, targetPlayer, mcMMOPlayer.getParty().getName());
+
+        mcMMO.p.getServer().getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) {
+            return;
+        }
+
+        teleportingPlayer.teleport(targetPlayer);
+
+        teleportingPlayer.sendMessage(LocaleLoader.getString("Party.Teleport.Player", targetPlayer.getName()));
+        targetPlayer.sendMessage(LocaleLoader.getString("Party.Teleport.Target", teleportingPlayer.getName()));
+
+        mcMMOPlayer.actualizeRecentlyHurt();
+    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java
@@ -3,8 +3,9 @@ package com.gmail.nossr50.commands.party.teleport;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;

-import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
@@ -17,16 +18,17 @@ public class PtpToggleCommand implements CommandExecutor {
            return true;
        }

-        PartyTeleportRecord ptpRecord = UserManager.getPlayer(sender.getName()).getPartyTeleportRecord();
+        Player player = (Player) sender;
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);

-        if (ptpRecord.isEnabled()) {
-            sender.sendMessage(LocaleLoader.getString("Commands.ptp.Disabled"));
+        if (mcMMOPlayer.getPtpEnabled()) {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.Disabled"));
        }
        else {
-            sender.sendMessage(LocaleLoader.getString("Commands.ptp.Enabled"));
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.Enabled"));
        }

-        ptpRecord.toggleEnabled();
+        mcMMOPlayer.togglePtpUse();
        return true;
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.player;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -27,42 +28,44 @@ public class InspectCommand implements TabExecutor {
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        switch (args.length) {
            case 1:
-                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+                if (sender instanceof Player && Config.getInstance().getInspectScoreboardEnabled()) {
+                    ScoreboardManager.setupPlayerScoreboard(sender.getName());
+                }
+
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0]);

                // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                if (mcMMOPlayer == null) {
-                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false); // Temporary Profile
+                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(args[0], false); // Temporary Profile

                    if (CommandUtils.inspectOffline(sender, profile, Permissions.inspectOffline(sender))) {
                        return true;
                    }

-                    if (sender instanceof Player && Config.getInstance().getInspectUseBoard()) {
-                        ScoreboardManager.enablePlayerInspectScoreboard((Player) sender, profile);
-
-                        if (!Config.getInstance().getInspectUseChat()) {
-                            return true;
-                        }
+                    if (sender instanceof Player && Config.getInstance().getInspectScoreboardEnabled()) {
+                        ScoreboardManager.enablePlayerInspectScoreboardOffline((Player) sender, profile);
+                        return true;
                    }

-                    sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", playerName));
+                    sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", args[0]));

                    sender.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
-                    for (SkillType skill : SkillType.GATHERING_SKILLS) {
-                        sender.sendMessage(CommandUtils.displaySkill(profile, skill));
-                    }
+                    CommandUtils.displaySkill(sender, profile, SkillType.EXCAVATION);
+                    CommandUtils.displaySkill(sender, profile, SkillType.FISHING);
+                    CommandUtils.displaySkill(sender, profile, SkillType.HERBALISM);
+                    CommandUtils.displaySkill(sender, profile, SkillType.MINING);
+                    CommandUtils.displaySkill(sender, profile, SkillType.WOODCUTTING);

                    sender.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
-                    for (SkillType skill : SkillType.COMBAT_SKILLS) {
-                        sender.sendMessage(CommandUtils.displaySkill(profile, skill));
-                    }
+                    CommandUtils.displaySkill(sender, profile, SkillType.AXES);
+                    CommandUtils.displaySkill(sender, profile, SkillType.ARCHERY);
+                    CommandUtils.displaySkill(sender, profile, SkillType.SWORDS);
+                    CommandUtils.displaySkill(sender, profile, SkillType.TAMING);
+                    CommandUtils.displaySkill(sender, profile, SkillType.UNARMED);

                    sender.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
-                    for (SkillType skill : SkillType.MISC_SKILLS) {
-                        sender.sendMessage(CommandUtils.displaySkill(profile, skill));
-                    }
-
+                    CommandUtils.displaySkill(sender, profile, SkillType.ACROBATICS);
+                    CommandUtils.displaySkill(sender, profile, SkillType.REPAIR);
                }
                else {
                    Player target = mcMMOPlayer.getPlayer();
@@ -77,12 +80,9 @@ public class InspectCommand implements TabExecutor {
                        return true;
                    }

-                    if (sender instanceof Player && Config.getInstance().getInspectUseBoard()) {
-                        ScoreboardManager.enablePlayerInspectScoreboard((Player) sender, mcMMOPlayer.getProfile());
-
-                        if (!Config.getInstance().getInspectUseChat()) {
-                            return true;
-                        }
+                    if (sender instanceof Player && Config.getInstance().getInspectScoreboardEnabled()) {
+                        ScoreboardManager.enablePlayerInspectScoreboardOnline((Player) sender, mcMMOPlayer);
+                        return true;
                    }

                    sender.sendMessage(LocaleLoader.getString("Inspect.Stats", target.getName()));
@@ -103,7 +103,7 @@ public class InspectCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayers().keySet();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            default:
                return ImmutableList.of();
--- a/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java
@@ -1,70 +0,0 @@
-package com.gmail.nossr50.commands.player;
-
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.skills.AbilityType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-
-import com.google.common.collect.ImmutableList;
-
-public class MccooldownCommand implements TabExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandUtils.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        switch (args.length) {
-            case 0:
-                Player player = (Player) sender;
-
-                if (Config.getInstance().getCooldownUseBoard()) {
-                    ScoreboardManager.enablePlayerCooldownScoreboard(player);
-
-                    if (!Config.getInstance().getCooldownUseChat()) {
-                        return true;
-                    }
-                }
-
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-
-                player.sendMessage(LocaleLoader.getString("Commands.Cooldowns.Header"));
-                player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
-
-                for (AbilityType ability : AbilityType.values()) {
-                    if (!ability.getPermissions(player)) {
-                        continue;
-                    }
-
-                    int seconds = mcMMOPlayer.calculateTimeRemaining(ability);
-
-                    if (seconds <= 0) {
-                        player.sendMessage(LocaleLoader.getString("Commands.Cooldowns.Row.Y", ability.getName()));
-                    }
-                    else {
-                        player.sendMessage(LocaleLoader.getString("Commands.Cooldowns.Row.N", ability.getName(), seconds));
-                    }
-                }
-
-                return true;
-
-            default:
-                return false;
-        }
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        return ImmutableList.of();
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.player;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -12,12 +13,11 @@ import org.bukkit.util.StringUtil;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.commands.McrankCommandAsyncTask;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 import com.google.common.collect.ImmutableList;

 public class McrankCommand implements TabExecutor {
@@ -34,7 +34,13 @@ public class McrankCommand implements TabExecutor {
                    return true;
                }

-                display(sender, sender.getName());
+                if (Config.getInstance().getMcrankScoreboardEnabled()) {
+                    ScoreboardManager.setupPlayerScoreboard(sender.getName());
+                    ScoreboardManager.enablePlayerRankScoreboard((Player) sender);
+                }
+                else {
+                    display(sender, sender.getName());
+                }

                return true;

@@ -44,14 +50,13 @@ public class McrankCommand implements TabExecutor {
                    return true;
                }

-                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+                String playerName = args[0];
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName);

                if (mcMMOPlayer != null) {
-                    Player player = mcMMOPlayer.getPlayer();
-                    playerName = player.getName();
+                    playerName = mcMMOPlayer.getPlayer().getName();

-                    if (CommandUtils.tooFar(sender, player, Permissions.mcrankFar(sender))) {
+                    if (CommandUtils.tooFar(sender, mcMMOPlayer.getPlayer(), Permissions.mcrankFar(sender))) {
                        return true;
                    }
                }
@@ -59,7 +64,13 @@ public class McrankCommand implements TabExecutor {
                    return true;
                }

-                display(sender, playerName);
+                if (sender instanceof Player && Config.getInstance().getMcrankScoreboardEnabled()) {
+                    ScoreboardManager.setupPlayerScoreboard(sender.getName());
+                    ScoreboardManager.enablePlayerRankScoreboardOthers((Player) sender, playerName);
+                }
+                else {
+                    display(sender, playerName);
+                }
                return true;

            default:
@@ -71,7 +82,7 @@ public class McrankCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayers().keySet();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            default:
                return ImmutableList.of();
@@ -79,21 +90,6 @@ public class McrankCommand implements TabExecutor {
    }

    private void display(CommandSender sender, String playerName) {
-        if (sender instanceof Player) {
-            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-            long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750);
-
-            if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown"));
-                return;
-            }
-
-            mcMMOPlayer.actualizeDatabaseATS();
-        }
-
-        boolean useBoard = (sender instanceof Player) && (Config.getInstance().getRankUseBoard());
-        boolean useChat = !useBoard || Config.getInstance().getRankUseChat();
-
-        new McrankCommandAsyncTask(playerName, sender, useBoard, useChat).runTaskAsynchronously(mcMMO.p);
+        new McrankCommandAsyncTask(playerName, sender).runTaskAsynchronously(mcMMO.p);
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java
@@ -8,11 +8,11 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-
 import com.google.common.collect.ImmutableList;

 public class McstatsCommand implements TabExecutor {
@@ -25,29 +25,28 @@ public class McstatsCommand implements TabExecutor {
        switch (args.length) {
            case 0:
                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);

-                if (Config.getInstance().getStatsUseBoard()) {
-                    ScoreboardManager.enablePlayerStatsScoreboard(player);
-
-                    if (!Config.getInstance().getStatsUseChat()) {
-                        return true;
-                    }
-                }
-
-                player.sendMessage(LocaleLoader.getString("Stats.Own.Stats"));
-                player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
-
-                CommandUtils.printGatheringSkills(player);
-                CommandUtils.printCombatSkills(player);
-                CommandUtils.printMiscSkills(player);
-
-                int powerLevelCap = Config.getInstance().getPowerLevelCap();
-
-                if (powerLevelCap != Integer.MAX_VALUE) {
-                    player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", UserManager.getPlayer(player).getPowerLevel(), powerLevelCap));
+                if (Config.getInstance().getMcstatsScoreboardsEnabled()) {
+                    ScoreboardManager.setupPlayerScoreboard(player.getName());
+                    ScoreboardManager.enablePlayerStatsScoreboard(mcMMOPlayer);
                }
                else {
-                    player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", UserManager.getPlayer(player).getPowerLevel()));
+                    player.sendMessage(LocaleLoader.getString("Stats.Own.Stats"));
+                    player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
+
+                    CommandUtils.printGatheringSkills(player);
+                    CommandUtils.printCombatSkills(player);
+                    CommandUtils.printMiscSkills(player);
+
+                    int powerLevelCap = Config.getInstance().getPowerLevelCap();
+
+                    if (powerLevelCap != Integer.MAX_VALUE) {
+                        player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", UserManager.getPlayer(player).getPowerLevel(), powerLevelCap));
+                    }
+                    else {
+                        player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", UserManager.getPlayer(player).getPowerLevel()));
+                    }
                }

                return true;
--- a/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
@@ -11,40 +11,36 @@ import org.bukkit.util.StringUtil;

 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.commands.MctopCommandAsyncTask;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;

 import com.google.common.collect.ImmutableList;

 public class MctopCommand implements TabExecutor {
+    private SkillType skill;
+
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        SkillType skill = null;
-
        switch (args.length) {
            case 0:
-                display(1, skill, sender, command);
+                display(1, "ALL", sender, command);
                return true;

            case 1:
                if (StringUtils.isInt(args[0])) {
-                    display(Math.abs(Integer.parseInt(args[0])), skill, sender, command);
+                    display(Math.abs(Integer.parseInt(args[0])), "ALL", sender, command);
                    return true;
                }

-                skill = extractSkill(sender, args[0]);
-
-                if (skill == null) {
+                if (!extractSkill(sender, args[0])) {
                    return true;
                }

-                display(1, skill, sender, command);
+                display(1, skill.toString(), sender, command);
                return true;

            case 2:
@@ -52,13 +48,11 @@ public class MctopCommand implements TabExecutor {
                    return true;
                }

-                skill = extractSkill(sender, args[0]);
-
-                if (skill == null) {
+                if (!extractSkill(sender, args[0])) {
                    return true;
                }

-                display(Math.abs(Integer.parseInt(args[1])), skill, sender, command);
+                display(Math.abs(Integer.parseInt(args[1])), skill.toString(), sender, command);
                return true;

            default:
@@ -76,45 +70,35 @@ public class MctopCommand implements TabExecutor {
        }
    }

-    private void display(int page, SkillType skill, CommandSender sender, Command command) {
-        if (skill != null && !Permissions.mctop(sender, skill)) {
+    private void display(int page, String skill, CommandSender sender, Command command) {
+        if (!skill.equalsIgnoreCase("all") && !Permissions.mctop(sender, this.skill)) {
            sender.sendMessage(command.getPermissionMessage());
            return;
        }

-        if (sender instanceof Player) {
-            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-            long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750);
-
-            if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown"));
-                return;
-            }
-
-            mcMMOPlayer.actualizeDatabaseATS();
+        if (sender instanceof Player && Config.getInstance().getMctopScoreboardEnabled()) {
+            ScoreboardManager.enableGlobalStatsScoreboard((Player) sender, skill, page);
+        }
+        else {
+            display(page, skill, sender);
        }
-
-        display(page, skill, sender);
    }

-    private void display(int page, SkillType skill, CommandSender sender) {
-        boolean useBoard = (sender instanceof Player) && (Config.getInstance().getTopUseBoard());
-        boolean useChat = !useBoard || Config.getInstance().getTopUseChat();
-
-        new MctopCommandAsyncTask(page, skill, sender, useBoard, useChat).runTaskAsynchronously(mcMMO.p);
+    private void display(int page, String query, CommandSender sender) {
+        new MctopCommandAsyncTask(page, query, sender).runTaskAsynchronously(mcMMO.p);
    }

-    private SkillType extractSkill(CommandSender sender, String skillName) {
+    private boolean extractSkill(CommandSender sender, String skillName) {
        if (CommandUtils.isInvalidSkill(sender, skillName)) {
-            return null;
+            return false;
        }

-        SkillType skill = SkillType.getSkill(skillName);
+        skill = SkillType.getSkill(skillName);

        if (CommandUtils.isChildSkill(sender, skill)) {
-            return null;
+            return false;
        }

-        return skill;
+        return true;
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java
@@ -1,13 +1,8 @@
 package com.gmail.nossr50.commands.skills;

-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.acrobatics.Acrobatics;
 import com.gmail.nossr50.util.Permissions;

 public class AcrobaticsCommand extends SkillCommand {
@@ -27,71 +22,75 @@ public class AcrobaticsCommand extends SkillCommand {
    }

    @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
        // DODGE
        if (canDodge) {
-            String[] dodgeStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.DODGE, isLucky);
+            String[] dodgeStrings = calculateAbilityDisplayValues(Acrobatics.dodgeMaxBonusLevel, Acrobatics.dodgeMaxChance);
            dodgeChance = dodgeStrings[0];
            dodgeChanceLucky = dodgeStrings[1];
        }

        // ROLL
        if (canRoll) {
-            String[] rollStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.ROLL, isLucky);
+            String[] rollStrings = calculateAbilityDisplayValues(Acrobatics.rollMaxBonusLevel, Acrobatics.rollMaxChance);
            rollChance = rollStrings[0];
            rollChanceLucky = rollStrings[1];
        }

        // GRACEFUL ROLL
        if (canGracefulRoll) {
-            String[] gracefulRollStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.GRACEFUL_ROLL, isLucky);
+            String[] gracefulRollStrings = calculateAbilityDisplayValues(Acrobatics.gracefulRollMaxBonusLevel, Acrobatics.gracefulRollMaxChance);
            gracefulRollChance = gracefulRollStrings[0];
            gracefulRollChanceLucky = gracefulRollStrings[1];
        }
    }

    @Override
-    protected void permissionsCheck(Player player) {
-        canDodge = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.DODGE);
-        canRoll = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ROLL);
-        canGracefulRoll = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.GRACEFUL_ROLL);
+    protected void permissionsCheck() {
+        canDodge = Permissions.dodge(player);
+        canRoll = Permissions.roll(player);
+        canGracefulRoll = Permissions.gracefulRoll(player);
    }

    @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canRoll) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1")));
-        }
-
-        if (canGracefulRoll) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.2"), LocaleLoader.getString("Acrobatics.Effect.3")));
-        }
-
-        if (canDodge) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.4"), LocaleLoader.getString("Acrobatics.Effect.5")));
-        }
-
-        return messages;
+    protected boolean effectsHeaderPermissions() {
+        return canDodge || canGracefulRoll || canRoll;
    }

    @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();

        if (canRoll) {
-            messages.add(LocaleLoader.getString("Acrobatics.Roll.Chance", rollChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", rollChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1")));
        }

        if (canGracefulRoll) {
-            messages.add(LocaleLoader.getString("Acrobatics.Roll.GraceChance", gracefulRollChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", gracefulRollChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.2"), LocaleLoader.getString("Acrobatics.Effect.3")));
        }

        if (canDodge) {
-            messages.add(LocaleLoader.getString("Acrobatics.DodgeChance", dodgeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", dodgeChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.4"), LocaleLoader.getString("Acrobatics.Effect.5")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canDodge || canGracefulRoll || canRoll;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canRoll) {
+            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", rollChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", rollChanceLucky) : ""));
        }

-        return messages;
+        if (canGracefulRoll) {
+            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", gracefulRollChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", gracefulRollChanceLucky) : ""));
+        }
+
+        if (canDodge) {
+            player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", dodgeChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", dodgeChanceLucky) : ""));
+        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java
@@ -1,103 +0,0 @@
-package com.gmail.nossr50.commands.skills;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.alchemy.Alchemy.Tier;
-import com.gmail.nossr50.skills.alchemy.AlchemyManager;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
-
-public class AlchemyCommand extends SkillCommand {
-    private String brewSpeed;
-    private String brewSpeedLucky;
-
-    private int    tier;
-    private int    ingredientCount;
-    private String ingredientList;
-
-    private boolean canCatalysis;
-    private boolean canConcoctions;
-
-    public AlchemyCommand() {
-        super(SkillType.ALCHEMY);
-    }
-
-    protected String[] calculateAbilityDisplayValues(Player player, boolean isLucky) {
-        AlchemyManager alchemyManager = UserManager.getPlayer(player).getAlchemyManager();
-        String[] displayValues = new String[2];
-
-        displayValues[0] = decimal.format(alchemyManager.calculateBrewSpeed(false)) + "x";
-        displayValues[1] = isLucky ? decimal.format(alchemyManager.calculateBrewSpeed(true)) + "x" : null;
-
-        return displayValues;
-    }
-
-    @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
-        // CATALYSIS
-        if (canCatalysis) {
-            String[] catalysisStrings = calculateAbilityDisplayValues(player, isLucky);
-            brewSpeed = catalysisStrings[0];
-            brewSpeedLucky = catalysisStrings[1];
-        }
-
-        // CONCOCTIONS
-        if (canConcoctions) {
-            AlchemyManager alchemyManager = UserManager.getPlayer(player).getAlchemyManager();
-            tier = alchemyManager.getTier();
-            ingredientCount = alchemyManager.getIngredients().size();
-            ingredientList = alchemyManager.getIngredientList();
-        }
-    }
-
-    @Override
-    protected void permissionsCheck(Player player) {
-        canCatalysis = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CATALYSIS);
-        canConcoctions = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CONCOCTIONS);
-    }
-
-    @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canCatalysis) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Alchemy.Effect.0"), LocaleLoader.getString("Alchemy.Effect.1")));
-        }
-
-        if (canConcoctions) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Alchemy.Effect.2"), LocaleLoader.getString("Alchemy.Effect.3")));
-        }
-
-        return messages;
-    }
-
-    @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
-
-        if (canCatalysis) {
-            int unlockLevel = AdvancedConfig.getInstance().getCatalysisUnlockLevel();
-
-            if (skillValue < unlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Alchemy.Ability.Locked.0", unlockLevel)));
-            }
-            else {
-                messages.add(LocaleLoader.getString("Alchemy.Catalysis.Speed", brewSpeed) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", brewSpeedLucky) : ""));
-            }
-        }
-
-        if (canConcoctions) {
-            messages.add(LocaleLoader.getString("Alchemy.Concoctions.Rank", tier, Tier.values().length));
-            messages.add(LocaleLoader.getString("Alchemy.Concoctions.Ingredients", ingredientCount, ingredientList));
-        }
-
-        return messages;
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java
@@ -1,205 +0,0 @@
-package com.gmail.nossr50.commands.skills;
-
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.HolidayManager.FakeSkillType;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.StringUtils;
-import com.gmail.nossr50.util.commands.CommandUtils;
-
-import com.google.common.collect.ImmutableList;
-
-public class AprilCommand implements TabExecutor {
-    private String skillName;
-
-    protected DecimalFormat percent = new DecimalFormat("##0.00%");
-    protected DecimalFormat decimal = new DecimalFormat("##0.00");
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandUtils.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        skillName = StringUtils.getCapitalized(label);
-
-        switch (args.length) {
-            case 0:
-                Player player = (Player) sender;
-                FakeSkillType fakeSkillType = FakeSkillType.getByName(skillName);
-
-                float skillValue = Misc.getRandom().nextInt(99);
-
-                player.sendMessage(LocaleLoader.getString("Skills.Header", skillName));
-                player.sendMessage(LocaleLoader.getString("Commands.XPGain", getXPGainString(fakeSkillType)));
-                player.sendMessage(LocaleLoader.getString("Effects.Level", (int) skillValue, Misc.getRandom().nextInt(1000), 1000 + Misc.getRandom().nextInt(1000)));
-
-
-                List<String> effectMessages = effectsDisplay(fakeSkillType);
-
-                if (!effectMessages.isEmpty()) {
-                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.Effects")));
-
-                    for (String message : effectMessages) {
-                        player.sendMessage(message);
-                    }
-                }
-
-                List<String> statsMessages = statsDisplay(fakeSkillType);
-
-                if (!statsMessages.isEmpty()) {
-                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Commands.Stats.Self")));
-
-                    for (String message : statsMessages) {
-                        player.sendMessage(message);
-                    }
-                }
-
-                player.sendMessage(LocaleLoader.formatString("[[DARK_AQUA]]Guide for {0} available - type /APRIL FOOLS ! :D", skillName));
-                return true;
-
-            default:
-                return true;
-        }
-    }
-
-    private String getXPGainString(FakeSkillType fakeSkillType) {
-        switch (fakeSkillType) {
-            case MACHO:
-                return "Get beaten up";
-            case JUMPING:
-                return "Kris Kross will make ya Jump Jump";
-            case THROWING:
-                return "Chuck your items on the floor";
-            case WRECKING:
-                return "I'M GONNA WRECK IT!";
-            case CRAFTING:
-                return "Craft apple pies";
-            case WALKING:
-                return "Walk around the park";
-            case SWIMMING:
-                return "Like a fish on a bicycle";
-            case FALLING:
-                return "Faceplant the floor, headbutt the ground";
-            case CLIMBING:
-                return "Climb the highest mountain";
-            case FLYING:
-                return "I believe I can fly";
-            case DIVING:
-                return "Scuba club 4000";
-            case PIGGY:
-                return "OINK! OINK!";
-            default:
-                return "Sit and wait?";
-        }
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                return ImmutableList.of("?");
-            default:
-                return ImmutableList.of();
-        }
-    }
-
-    private List<String> effectsDisplay(FakeSkillType fakeSkillType) {
-        List<String> messages = new ArrayList<String>();
-
-        switch (fakeSkillType) {
-            case MACHO:
-                messages.add(LocaleLoader.getString("Effects.Template", "Punching bag", "Absorb damage, like a bag of sand"));
-                break;
-            case JUMPING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Jump", "PRESS SPACE TO JUMP"));
-                messages.add(LocaleLoader.getString("Effects.Template", "Jump Twice", "PRESS SPACE TWICE TO JUMP TWICE"));
-                break;
-            case THROWING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Drop Item", "Randomly drop items, at random"));
-                break;
-            case WRECKING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Ralphinator", "Smash windows with your fists"));
-                break;
-            case CRAFTING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Crafting", "Chance of successful craft"));
-                break;
-            case WALKING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Walk", "Traveling gracefully by foot"));
-                break;
-            case SWIMMING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Swim", "Just keep swimming, swimming, swimming"));
-                break;
-            case FALLING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Skydiving", "Go jump of a cliff. No, seriously."));
-                break;
-            case CLIMBING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Rock Climber", "Use string to climb mountains faster"));
-                break;
-            case FLYING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Fly", "Throw yourself at the ground and miss"));
-                break;
-            case DIVING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Hold Breath", "Press shift to hold your breath longer"));
-                break;
-            case PIGGY:
-                messages.add(LocaleLoader.getString("Effects.Template", "Carrot Turbo", "Supercharge your pigs with carrots"));
-                break;
-        }
-
-        return messages;
-    }
-
-    private List<String> statsDisplay(FakeSkillType fakeSkillType) {
-        List<String> messages = new ArrayList<String>();
-
-        switch (fakeSkillType) {
-            case MACHO:
-                messages.add(LocaleLoader.formatString("[[RED]]Damage Taken: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(77))));
-                break;
-            case JUMPING:
-                messages.add(LocaleLoader.formatString("[[RED]]Double Jump Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case THROWING:
-                messages.add(LocaleLoader.formatString("[[RED]]Drop Item Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(87))));
-                break;
-            case WRECKING:
-                messages.add(LocaleLoader.formatString("[[RED]]Wrecking Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(14))));
-                break;
-            case CRAFTING:
-                messages.add(LocaleLoader.formatString("[[RED]]Crafting Success: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case WALKING:
-                messages.add(LocaleLoader.formatString("[[RED]]Walk Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case SWIMMING:
-                messages.add(LocaleLoader.formatString("[[RED]]Swim Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case FALLING:
-                messages.add(LocaleLoader.formatString("[[RED]]Skydiving Success: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(37))));
-                break;
-            case CLIMBING:
-                messages.add(LocaleLoader.formatString("[[RED]]Rock Climber Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case FLYING:
-                messages.add(LocaleLoader.formatString("[[RED]]Fly Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case DIVING:
-                messages.add(LocaleLoader.formatString("[[RED]]Hold Breath Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case PIGGY:
-                messages.add(LocaleLoader.formatString("[[RED]]Carrot Turbo Boost: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(80)) + 10));
-                break;
-        }
-
-        return messages;
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java
@@ -1,11 +1,5 @@
 package com.gmail.nossr50.commands.skills;

-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.archery.Archery;
@@ -27,7 +21,7 @@ public class ArcheryCommand extends SkillCommand {
    }

    @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
        // SKILL SHOT
        if (canSkillShot) {
            double bonus = (skillValue / Archery.skillShotIncreaseLevel) * Archery.skillShotIncreasePercentage;
@@ -36,61 +30,65 @@ public class ArcheryCommand extends SkillCommand {

        // DAZE
        if (canDaze) {
-            String[] dazeStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.DAZE, isLucky);
+            String[] dazeStrings = calculateAbilityDisplayValues(Archery.dazeMaxBonusLevel, Archery.dazeMaxBonus);
            dazeChance = dazeStrings[0];
            dazeChanceLucky = dazeStrings[1];
        }

        // RETRIEVE
        if (canRetrieve) {
-            String[] retrieveStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.RETRIEVE, isLucky);
+            String[] retrieveStrings = calculateAbilityDisplayValues(Archery.retrieveMaxBonusLevel, Archery.retrieveMaxChance);
            retrieveChance = retrieveStrings[0];
            retrieveChanceLucky = retrieveStrings[1];
        }
    }

    @Override
-    protected void permissionsCheck(Player player) {
-        canSkillShot = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SKILL_SHOT);
-        canDaze = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.DAZE);
-        canRetrieve = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.RETRIEVE);
+    protected void permissionsCheck() {
+        canSkillShot = Permissions.bonusDamage(player, skill);
+        canDaze = Permissions.daze(player);
+        canRetrieve = Permissions.arrowRetrieval(player);
    }

    @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canSkillShot) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1")));
-        }
-
-        if (canDaze) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3", Archery.dazeModifier)));
-        }
-
-        if (canRetrieve) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.4"), LocaleLoader.getString("Archery.Effect.5")));
-        }
-
-        return messages;
+    protected boolean effectsHeaderPermissions() {
+        return canSkillShot || canDaze || canRetrieve;
    }

    @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();

        if (canSkillShot) {
-            messages.add(LocaleLoader.getString("Archery.Combat.SkillshotBonus", skillShotBonus));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1")));
        }

        if (canDaze) {
-            messages.add(LocaleLoader.getString("Archery.Combat.DazeChance", dazeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", dazeChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3", Archery.dazeModifier)));
        }

        if (canRetrieve) {
-            messages.add(LocaleLoader.getString("Archery.Combat.RetrieveChance", retrieveChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", retrieveChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.4"), LocaleLoader.getString("Archery.Effect.5")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canSkillShot || canDaze || canRetrieve;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canSkillShot) {
+            player.sendMessage(LocaleLoader.getString("Archery.Combat.SkillshotBonus", skillShotBonus));
        }

-        return messages;
+        if (canDaze) {
+            player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", dazeChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", dazeChanceLucky) : ""));
+        }
+
+        if (canRetrieve) {
+            player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", retrieveChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", retrieveChanceLucky) : ""));
+        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java
@@ -1,11 +1,5 @@
 package com.gmail.nossr50.commands.skills;

-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.axes.Axes;
@@ -14,14 +8,14 @@ import com.gmail.nossr50.util.Permissions;
 public class AxesCommand extends SkillCommand {
    private String critChance;
    private String critChanceLucky;
-    private double axeMasteryDamage;
-    private double impactDamage;
+    private float bonusDamage;
+    private float impactDamage;
    private String skullSplitterLength;
    private String skullSplitterLengthEndurance;

    private boolean canSkullSplitter;
    private boolean canCritical;
-    private boolean canAxeMastery;
+    private boolean canBonusDamage;
    private boolean canImpact;
    private boolean canGreaterImpact;

@@ -30,92 +24,96 @@ public class AxesCommand extends SkillCommand {
    }

    @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
-        // ARMOR IMPACT
+    protected void dataCalculations() {
+        // IMPACT
        if (canImpact) {
            impactDamage = 1 + (skillValue / Axes.impactIncreaseLevel);
        }

        // SKULL SPLITTER
        if (canSkullSplitter) {
-            String[] skullSplitterStrings = calculateLengthDisplayValues(player, skillValue);
+            String[] skullSplitterStrings = calculateLengthDisplayValues();
            skullSplitterLength = skullSplitterStrings[0];
            skullSplitterLengthEndurance = skullSplitterStrings[1];
        }

-        // CRITICAL HIT
+        // CRITICAL STRIKES
        if (canCritical) {
-            String[] criticalHitStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.CRITICAL_HIT, isLucky);
-            critChance = criticalHitStrings[0];
-            critChanceLucky = criticalHitStrings[1];
+            String[] criticalStrikeStrings = calculateAbilityDisplayValues(Axes.criticalHitMaxBonusLevel, Axes.criticalHitMaxChance);
+            critChance = criticalStrikeStrings[0];
+            critChanceLucky = criticalStrikeStrings[1];
        }

        // AXE MASTERY
-        if (canAxeMastery) {
-            axeMasteryDamage = Math.min(skillValue / (Axes.axeMasteryMaxBonusLevel / Axes.axeMasteryMaxBonus), Axes.axeMasteryMaxBonus);
+        if (canBonusDamage) {
+            bonusDamage = Math.min(skillValue / (Axes.bonusDamageMaxBonusLevel / Axes.bonusDamageMaxBonus), Axes.bonusDamageMaxBonus);
        }
    }

    @Override
-    protected void permissionsCheck(Player player) {
+    protected void permissionsCheck() {
        canSkullSplitter = Permissions.skullSplitter(player);
-        canCritical = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CRITICAL_HIT);
-        canAxeMastery = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.AXE_MASTERY);
-        canImpact = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ARMOR_IMPACT);
-        canGreaterImpact = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.GREATER_IMPACT);
+        canCritical = Permissions.criticalStrikes(player);
+        canBonusDamage = Permissions.bonusDamage(player, skill);
+        canImpact = Permissions.armorImpact(player);
+        canGreaterImpact = Permissions.greaterImpact(player);
    }

    @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canSkullSplitter) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1")));
-        }
-
-        if (canCritical) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.2"), LocaleLoader.getString("Axes.Effect.3")));
-        }
-
-        if (canAxeMastery) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.4"), LocaleLoader.getString("Axes.Effect.5")));
-        }
-
-        if (canImpact) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.6"), LocaleLoader.getString("Axes.Effect.7")));
-        }
-
-        if (canGreaterImpact) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.8"), LocaleLoader.getString("Axes.Effect.9")));
-        }
-
-        return messages;
+    protected boolean effectsHeaderPermissions() {
+        return canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact;
    }

    @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();

-        if (canAxeMastery) {
-            messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.0"), LocaleLoader.getString("Axes.Ability.Bonus.1", axeMasteryDamage)));
-        }
-
-        if (canImpact) {
-            messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.2"), LocaleLoader.getString("Axes.Ability.Bonus.3", impactDamage)));
-        }
-
-        if (canGreaterImpact) {
-            messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", Axes.greaterImpactBonusDamage)));
+        if (canSkullSplitter) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1")));
        }

        if (canCritical) {
-            messages.add(LocaleLoader.getString("Axes.Combat.CritChance", critChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", critChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.2"), LocaleLoader.getString("Axes.Effect.3")));
+        }
+
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.4"), LocaleLoader.getString("Axes.Effect.5")));
+        }
+
+        if (canImpact) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.6"), LocaleLoader.getString("Axes.Effect.7")));
+        }
+
+        if (canGreaterImpact) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.8"), LocaleLoader.getString("Axes.Effect.9")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.0"), LocaleLoader.getString("Axes.Ability.Bonus.1", bonusDamage)));
+        }
+
+        if (canImpact) {
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.2"), LocaleLoader.getString("Axes.Ability.Bonus.3", impactDamage)));
+        }
+
+        if (canGreaterImpact) {
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", Axes.greaterImpactBonusDamage)));
+        }
+
+        if (canCritical) {
+            player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", critChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", critChanceLucky) : ""));
        }

        if (canSkullSplitter) {
-            messages.add(LocaleLoader.getString("Axes.Combat.SS.Length", skullSplitterLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", skullSplitterLengthEndurance) : ""));
+            player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", skullSplitterLength) + (hasEndurance ? LocaleLoader.getString("Perks.activationtime.bonus", skullSplitterLengthEndurance) : ""));
        }
-
-        return messages;
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java
@@ -1,11 +1,5 @@
 package com.gmail.nossr50.commands.skills;

-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
@@ -22,44 +16,48 @@ public class ExcavationCommand extends SkillCommand {
    }

    @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
        // GIGA DRILL BREAKER
        if (canGigaDrill) {
-            String gigaDrillStrings[] = calculateLengthDisplayValues(player, skillValue);
+            String gigaDrillStrings[] = calculateLengthDisplayValues();
            gigaDrillBreakerLength = gigaDrillStrings[0];
            gigaDrillBreakerLengthEndurance = gigaDrillStrings[1];
        }
    }

    @Override
-    protected void permissionsCheck(Player player) {
+    protected void permissionsCheck() {
        canGigaDrill = Permissions.gigaDrillBreaker(player);
-        canTreasureHunt = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.EXCAVATION_TREASURE_HUNTER);
+        canTreasureHunt = Permissions.excavationTreasureHunter(player);
    }

    @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
+    protected boolean effectsHeaderPermissions() {
+        return canGigaDrill || canTreasureHunt;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();

        if (canGigaDrill) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1")));
        }

        if (canTreasureHunt) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.2"), LocaleLoader.getString("Excavation.Effect.3")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.2"), LocaleLoader.getString("Excavation.Effect.3")));
        }
-
-        return messages;
    }

    @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected boolean statsHeaderPermissions() {
+        return canGigaDrill;
+    }

+    @Override
+    protected void statsDisplay() {
        if (canGigaDrill) {
-            messages.add(LocaleLoader.getString("Excavation.Effect.Length", gigaDrillBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", gigaDrillBreakerLengthEndurance) : ""));
+            player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", gigaDrillBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.activationtime.bonus", gigaDrillBreakerLengthEndurance) : ""));
        }
-
-        return messages;
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
@@ -1,42 +1,25 @@
 package com.gmail.nossr50.commands.skills;

-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.Location;
 import org.bukkit.block.Biome;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;

 import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.config.treasure.TreasureConfig;
-import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.treasure.Rarity;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.fishing.Fishing;
-import com.gmail.nossr50.skills.fishing.Fishing.Tier;
-import com.gmail.nossr50.skills.fishing.FishingManager;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;

 public class FishingCommand extends SkillCommand {
    private int lootTier;
+    private String magicChance;
+    private String magicChanceLucky;
+    private String chanceRaining = "";
    private String shakeChance;
    private String shakeChanceLucky;
    private int fishermansDietRank;
    private String biteChance;

-    private String trapTreasure;
-    private String commonTreasure;
-    private String uncommonTreasure;
-    private String rareTreasure;
-    private String epicTreasure;
-    private String legendaryTreasure;
-    private String recordTreasure;
-
-    private String magicChance;
-
    private boolean canTreasureHunt;
    private boolean canMagicHunt;
    private boolean canShake;
@@ -49,160 +32,140 @@ public class FishingCommand extends SkillCommand {
    }

    @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
-        FishingManager fishingManager = UserManager.getPlayer(player).getFishingManager();
+    protected void dataCalculations() {
+        boolean isStorming = player.getWorld().hasStorm();

        // TREASURE HUNTER
        if (canTreasureHunt) {
-            lootTier = fishingManager.getLootTier();
+            lootTier = mcMMOPlayer.getFishingManager().getLootTier();
+            double enchantChance = lootTier * AdvancedConfig.getInstance().getFishingMagicMultiplier();

-            // Item drop rates
-            trapTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.TRAP) / 100.0);
-            commonTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.COMMON) / 100.0);
-            uncommonTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.UNCOMMON) / 100.0);
-            rareTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RARE) / 100.0);
-            epicTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.EPIC) / 100.0);
-            legendaryTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.LEGENDARY) / 100.0);
-            recordTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RECORD) / 100.0);
-
-            // Magic hunter drop rates
-            double totalEnchantChance = 0;
-
-            for (Rarity rarity : Rarity.values()) {
-                if (rarity != Rarity.TRAP && rarity != Rarity.RECORD) {
-                    totalEnchantChance += TreasureConfig.getInstance().getEnchantmentDropRate(lootTier, rarity);
-                }
+            if (isStorming) {
+                chanceRaining = LocaleLoader.getString("Fishing.Chance.Raining");
+                enchantChance *= 1.1D;
            }

-            magicChance = percent.format(totalEnchantChance / 100.0);
+            String[] treasureHunterStrings = calculateAbilityDisplayValues(enchantChance);
+            magicChance = treasureHunterStrings[0];
+            magicChanceLucky = treasureHunterStrings[1];
        }

        // SHAKE
        if (canShake) {
-            String[] shakeStrings = calculateAbilityDisplayValues(UserManager.getPlayer(player).getFishingManager().getShakeProbability(), isLucky);
+            String[] shakeStrings = calculateAbilityDisplayValues(UserManager.getPlayer(player).getFishingManager().getShakeProbability());
            shakeChance = shakeStrings[0];
            shakeChanceLucky = shakeStrings[1];
        }

        // FISHERMAN'S DIET
        if (canFishermansDiet) {
-            fishermansDietRank = calculateRank(skillValue, Fishing.fishermansDietMaxLevel, Fishing.fishermansDietRankLevel1);
+            fishermansDietRank = calculateRank(Fishing.fishermansDietMaxLevel, Fishing.fishermansDietRankLevel1);
        }

        // MASTER ANGLER
        if (canMasterAngler) {
-            double rawBiteChance = 1.0 / (player.getWorld().hasStorm() ? 300 : 500);
-            Location location = fishingManager.getHookLocation();
-
-            if (location == null) {
-                location = player.getLocation();
-            }
-
-            Biome biome = location.getBlock().getBiome();
+            double rawBiteChance = ((Math.max((skillValue / 200.0), 1.0)) / (isStorming ? 300 : 500));
+            Biome biome = player.getLocation().getBlock().getBiome();

            if (biome == Biome.RIVER || biome == Biome.OCEAN) {
-                rawBiteChance = rawBiteChance * AdvancedConfig.getInstance().getMasterAnglerBiomeModifier();
+                rawBiteChance = rawBiteChance * 2.0;
            }

            if (player.isInsideVehicle() && player.getVehicle().getType() == EntityType.BOAT) {
-                rawBiteChance = rawBiteChance * AdvancedConfig.getInstance().getMasterAnglerBoatModifier();
+                rawBiteChance = rawBiteChance * 2.0;
            }

-            biteChance = calculateAbilityDisplayValues(rawBiteChance * 100.0, isLucky)[0];
+            biteChance = calculateAbilityDisplayValues(rawBiteChance * 100.0)[0];
        }
    }

    @Override
-    protected void permissionsCheck(Player player) {
-        canTreasureHunt = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FISHING_TREASURE_HUNTER);
-        canMagicHunt = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.MAGIC_HUNTER);
-        canShake = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SHAKE);
-        canFishermansDiet = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FISHERMANS_DIET);
-        canMasterAngler = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.MASTER_ANGLER);
-        canIceFish = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ICE_FISHING);
+    protected void permissionsCheck() {
+        canTreasureHunt = Permissions.fishingTreasureHunter(player);
+        canMagicHunt = Permissions.magicHunter(player);
+        canShake = Permissions.shake(player);
+        canFishermansDiet = Permissions.fishermansDiet(player);
+        canMasterAngler = Permissions.masterAngler(player);
+        canIceFish = Permissions.iceFishing(player);
    }

    @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
+    protected boolean effectsHeaderPermissions() {
+        return canTreasureHunt || canMagicHunt || canShake || canMasterAngler || canFishermansDiet || canIceFish;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();

        if (canTreasureHunt) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1")));
        }

        if (canMagicHunt) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.2"), LocaleLoader.getString("Fishing.Effect.3")));
-        }
-
-        if (canIceFish) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.10"), LocaleLoader.getString("Fishing.Effect.11")));
-        }
-
-        if (canMasterAngler) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.8"), LocaleLoader.getString("Fishing.Effect.9")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.2"), LocaleLoader.getString("Fishing.Effect.3")));
        }

        if (canShake) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5")));
        }

        if (canFishermansDiet) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.6"), LocaleLoader.getString("Fishing.Effect.7")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.6"), LocaleLoader.getString("Fishing.Effect.7")));
        }

-        return messages;
+        if (canMasterAngler) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.8"), LocaleLoader.getString("Fishing.Effect.9")));
+        }
+
+        if (canIceFish) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.10"), LocaleLoader.getString("Fishing.Effect.11")));
+        }
    }

    @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected boolean statsHeaderPermissions() {
+        return canTreasureHunt || canMagicHunt || canShake || canMasterAngler || canFishermansDiet || canIceFish;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canMasterAngler) {
+            player.sendMessage(LocaleLoader.getString("Fishing.Ability.Chance", biteChance));
+        }

        if (canTreasureHunt) {
-            messages.add(LocaleLoader.getString("Fishing.Ability.Rank", lootTier, Tier.values().length));
-            messages.add(LocaleLoader.getString("Fishing.Ability.TH.DropRate", trapTreasure, commonTreasure, uncommonTreasure, rareTreasure, epicTreasure, legendaryTreasure, recordTreasure));
+            player.sendMessage(LocaleLoader.getString("Fishing.Ability.Rank", lootTier));
        }

        if (canMagicHunt) {
-            messages.add(LocaleLoader.getString("Fishing.Ability.TH.MagicRate", magicChance));
+            player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", magicChance) + chanceRaining + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", magicChanceLucky) : ""));
+        }
+
+        if (canShake) {
+            int unlockLevel = AdvancedConfig.getInstance().getShakeUnlockLevel();
+
+            if (skillValue < unlockLevel) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.0", unlockLevel)));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", shakeChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", shakeChanceLucky) : ""));
+            }
+        }
+
+        if (canFishermansDiet) {
+            player.sendMessage(LocaleLoader.getString("Fishing.Ability.FD", fishermansDietRank));
        }

        if (canIceFish) {
            int unlockLevel = AdvancedConfig.getInstance().getIceFishingUnlockLevel();

            if (skillValue < unlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.1", unlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.1", unlockLevel)));
            }
            else {
-                messages.add(LocaleLoader.getString("Fishing.Ability.IceFishing"));
+                player.sendMessage(LocaleLoader.getString("Fishing.Ability.IceFishing"));
            }
        }
-
-        if (canMasterAngler) {
-            int unlockLevel = AdvancedConfig.getInstance().getMasterAnglerUnlockLevel();
-
-            if (skillValue < unlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.2", unlockLevel)));
-            }
-            else {
-                messages.add(LocaleLoader.getString("Fishing.Ability.Chance", biteChance));
-            }
-        }
-
-        if (canShake) {
-            int unlockLevel = AdvancedConfig.getInstance().getFishingTierLevel(Tier.ONE);
-
-            if (skillValue < unlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.0", unlockLevel)));
-            }
-            else {
-                messages.add(LocaleLoader.getString("Fishing.Ability.Shake", shakeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shakeChanceLucky) : ""));
-            }
-        }
-
-        if (canFishermansDiet) {
-            messages.add(LocaleLoader.getString("Fishing.Ability.FD", fishermansDietRank));
-        }
-
-        return messages;
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java
@@ -1,12 +1,7 @@
 package com.gmail.nossr50.commands.skills;

-import java.util.ArrayList;
-import java.util.List;
-
 import org.bukkit.Material;
-import org.bukkit.entity.Player;

-import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.herbalism.Herbalism;
@@ -39,128 +34,132 @@ public class HerbalismCommand extends SkillCommand {
    }

    @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
        // GREEN TERRA
        if (canGreenTerra) {
-            String[] greenTerraStrings = calculateLengthDisplayValues(player, skillValue);
+            String[] greenTerraStrings = calculateLengthDisplayValues();
            greenTerraLength = greenTerraStrings[0];
            greenTerraLengthEndurance = greenTerraStrings[1];
        }

        // FARMERS DIET
        if (canFarmersDiet) {
-            farmersDietRank = calculateRank(skillValue, Herbalism.farmersDietMaxLevel, Herbalism.farmersDietRankLevel1);
+            farmersDietRank = calculateRank(Herbalism.farmersDietMaxLevel, Herbalism.farmersDietRankLevel1);
        }

        // GREEN THUMB
        if (canGreenThumbBlocks || canGreenThumbPlants) {
-            greenThumbStage = calculateRank(skillValue, Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageChangeLevel);
+            greenThumbStage = calculateRank(Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageChangeLevel);

-            String[] greenThumbStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.GREEN_THUMB_PLANT, isLucky);
+            String[] greenThumbStrings = calculateAbilityDisplayValues(Herbalism.greenThumbMaxLevel, Herbalism.greenThumbMaxChance);
            greenThumbChance = greenThumbStrings[0];
            greenThumbChanceLucky = greenThumbStrings[1];
        }

        // DOUBLE DROPS
        if (canDoubleDrop) {
-            String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.HERBALISM_DOUBLE_DROPS, isLucky);
+            String[] doubleDropStrings = calculateAbilityDisplayValues(Herbalism.doubleDropsMaxLevel, Herbalism.doubleDropsMaxChance);
            doubleDropChance = doubleDropStrings[0];
            doubleDropChanceLucky = doubleDropStrings[1];
        }

        // HYLIAN LUCK
        if (hasHylianLuck) {
-            String[] hylianLuckStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.HYLIAN_LUCK, isLucky);
+            String[] hylianLuckStrings = calculateAbilityDisplayValues(Herbalism.hylianLuckMaxLevel, Herbalism.hylianLuckMaxChance);
            hylianLuckChance = hylianLuckStrings[0];
            hylianLuckChanceLucky = hylianLuckStrings[1];
        }

        // SHROOM THUMB
        if (canShroomThumb) {
-            String[] shroomThumbStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.SHROOM_THUMB, isLucky);
+            String[] shroomThumbStrings = calculateAbilityDisplayValues(Herbalism.shroomThumbMaxLevel, Herbalism.shroomThumbMaxChance);
            shroomThumbChance = shroomThumbStrings[0];
            shroomThumbChanceLucky = shroomThumbStrings[1];
        }
    }

    @Override
-    protected void permissionsCheck(Player player) {
-        hasHylianLuck = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HYLIAN_LUCK);
+    protected void permissionsCheck() {
+        hasHylianLuck = Permissions.hylianLuck(player);
        canGreenTerra = Permissions.greenTerra(player);
        canGreenThumbPlants = Permissions.greenThumbPlant(player, Material.CROPS) || Permissions.greenThumbPlant(player, Material.CARROT) || Permissions.greenThumbPlant(player, Material.POTATO) || Permissions.greenThumbPlant(player, Material.NETHER_WARTS) || Permissions.greenThumbPlant(player, Material.COCOA);
        canGreenThumbBlocks = Permissions.greenThumbBlock(player, Material.DIRT) || Permissions.greenThumbBlock(player, Material.COBBLESTONE) || Permissions.greenThumbBlock(player, Material.COBBLE_WALL) || Permissions.greenThumbBlock(player, Material.SMOOTH_BRICK);
-        canFarmersDiet = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FARMERS_DIET);
-        canDoubleDrop = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HERBALISM_DOUBLE_DROPS) && !skill.getDoubleDropsDisabled();
-        canShroomThumb = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SHROOM_THUMB);
+        canFarmersDiet = Permissions.farmersDiet(player);
+        canDoubleDrop = Permissions.doubleDrops(player, skill) && !skill.getDoubleDropsDisabled();
+        canShroomThumb = Permissions.shroomThumb(player);
    }

    @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
+    protected boolean effectsHeaderPermissions() {
+        return canGreenTerra || canDoubleDrop || canFarmersDiet || canGreenThumbBlocks || canGreenThumbPlants || canShroomThumb;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();

        if (canGreenTerra) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1")));
        }

        if (canGreenThumbPlants) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.2"), LocaleLoader.getString("Herbalism.Effect.3")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.2"), LocaleLoader.getString("Herbalism.Effect.3")));
        }

        if (canGreenThumbBlocks) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.4"), LocaleLoader.getString("Herbalism.Effect.5")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.4"), LocaleLoader.getString("Herbalism.Effect.5")));
        }

        if (canFarmersDiet) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.6"), LocaleLoader.getString("Herbalism.Effect.7")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.6"), LocaleLoader.getString("Herbalism.Effect.7")));
        }

        if (hasHylianLuck) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.10"), LocaleLoader.getString("Herbalism.Effect.11")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.10"), LocaleLoader.getString("Herbalism.Effect.11")));
        }

        if (canShroomThumb) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.12"), LocaleLoader.getString("Herbalism.Effect.13")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.12"), LocaleLoader.getString("Herbalism.Effect.13")));
        }

        if (canDoubleDrop) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9")));
        }
-
-        return messages;
    }

    @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected boolean statsHeaderPermissions() {
+        return canGreenTerra || canDoubleDrop || canFarmersDiet || canGreenThumbBlocks || canGreenThumbPlants || canShroomThumb;
+    }

+    @Override
+    protected void statsDisplay() {
        if (canGreenTerra) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", greenTerraLengthEndurance) : ""));
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength) + (hasEndurance ? LocaleLoader.getString("Perks.activationtime.bonus", greenTerraLengthEndurance) : ""));
        }

        if (canGreenThumbBlocks || canGreenThumbPlants) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", greenThumbChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", greenThumbChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", greenThumbChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", greenThumbChanceLucky) : ""));
        }

        if (canGreenThumbPlants) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", greenThumbStage));
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", greenThumbStage));
        }

        if (canFarmersDiet) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.FD", farmersDietRank));
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.FD", farmersDietRank));
        }

        if (hasHylianLuck) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.HylianLuck", hylianLuckChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", hylianLuckChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.HylianLuck", hylianLuckChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", hylianLuckChanceLucky) : ""));
        }

        if (canShroomThumb) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Chance", shroomThumbChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shroomThumbChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Chance", shroomThumbChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", shroomThumbChanceLucky) : ""));
        }

        if (canDoubleDrop) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", doubleDropChanceLucky) : ""));
        }
-
-        return messages;
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
@@ -1,18 +1,11 @@
 package com.gmail.nossr50.commands.skills;

-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-
 import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.mining.BlastMining.Tier;
+import com.gmail.nossr50.skills.mining.Mining;
 import com.gmail.nossr50.skills.mining.MiningManager;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;

 public class MiningCommand extends SkillCommand {
    private String doubleDropChance;
@@ -38,24 +31,24 @@ public class MiningCommand extends SkillCommand {
    }

    @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
        // SUPER BREAKER
        if (canSuperBreaker) {
-            String[] superBreakerStrings = calculateLengthDisplayValues(player, skillValue);
+            String[] superBreakerStrings = calculateLengthDisplayValues();
            superBreakerLength = superBreakerStrings[0];
            superBreakerLengthEndurance = superBreakerStrings[1];
        }

        // DOUBLE DROPS
        if (canDoubleDrop) {
-            String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.MINING_DOUBLE_DROPS, isLucky);
+            String[] doubleDropStrings = calculateAbilityDisplayValues(Mining.doubleDropsMaxLevel, Mining.doubleDropsMaxChance);
            doubleDropChance = doubleDropStrings[0];
            doubleDropChanceLucky = doubleDropStrings[1];
        }

        // BLAST MINING
        if (canBlast || canDemoExpert || canBiggerBombs) {
-            MiningManager miningManager = UserManager.getPlayer(player).getMiningManager();
+            MiningManager miningManager = mcMMOPlayer.getMiningManager();

            blastMiningRank = miningManager.getBlastMiningTier();
            bonusTNTDrops = miningManager.getDropMultiplier();
@@ -67,86 +60,90 @@ public class MiningCommand extends SkillCommand {
    }

    @Override
-    protected void permissionsCheck(Player player) {
+    protected void permissionsCheck() {
        canBiggerBombs = Permissions.biggerBombs(player);
        canBlast = Permissions.remoteDetonation(player);
        canDemoExpert = Permissions.demolitionsExpertise(player);
-        canDoubleDrop = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.MINING_DOUBLE_DROPS) && !skill.getDoubleDropsDisabled();
+        canDoubleDrop = Permissions.doubleDrops(player, skill) && !skill.getDoubleDropsDisabled();
        canSuperBreaker = Permissions.superBreaker(player);
    }

    @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canSuperBreaker) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1")));
-        }
-
-        if (canDoubleDrop) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.2"), LocaleLoader.getString("Mining.Effect.3")));
-        }
-
-        if (canBlast) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.4"), LocaleLoader.getString("Mining.Effect.5")));
-        }
-
-        if (canBiggerBombs) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.6"), LocaleLoader.getString("Mining.Effect.7")));
-        }
-
-        if (canDemoExpert) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.8"), LocaleLoader.getString("Mining.Effect.9")));
-        }
-
-        return messages;
+    protected boolean effectsHeaderPermissions() {
+        return canBiggerBombs || canBlast || canDemoExpert || canDoubleDrop || canSuperBreaker;
    }

    @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
-
-        if (canDoubleDrop) {
-            messages.add(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
-        }
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();

        if (canSuperBreaker) {
-            messages.add(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", superBreakerLengthEndurance) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1")));
+        }
+
+        if (canDoubleDrop) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.2"), LocaleLoader.getString("Mining.Effect.3")));
        }

        if (canBlast) {
-            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRankLevel(Tier.ONE);
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.4"), LocaleLoader.getString("Mining.Effect.5")));
+        }
+
+        if (canBiggerBombs) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.6"), LocaleLoader.getString("Mining.Effect.7")));
+        }
+
+        if (canDemoExpert) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.8"), LocaleLoader.getString("Mining.Effect.9")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canBiggerBombs || canBlast || canDemoExpert || canDoubleDrop || canSuperBreaker;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canDoubleDrop) {
+            player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", doubleDropChanceLucky) : ""));
+        }
+
+        if (canSuperBreaker) {
+            player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.activationtime.bonus", superBreakerLengthEndurance) : ""));
+        }
+
+        if (canBlast) {
+            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRank1();

            if (skillValue < unlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.0", unlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.0", unlockLevel)));
            }
            else {
-                messages.add(LocaleLoader.getString("Mining.Blast.Rank", blastMiningRank, Tier.values().length, LocaleLoader.getString("Mining.Blast.Effect", oreBonus, debrisReduction, bonusTNTDrops)));
+                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect", oreBonus, debrisReduction, bonusTNTDrops)));
            }
        }

        if (canBiggerBombs) {
-            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRankLevel(Tier.TWO);
+            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRank2();

            if (skillValue < unlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.1", unlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.1", unlockLevel)));
            }
            else {
-                messages.add(LocaleLoader.getString("Mining.Blast.Radius.Increase", blastRadiusIncrease));
+                player.sendMessage(LocaleLoader.getString("Mining.Blast.Radius.Increase", blastRadiusIncrease));
            }
        }

        if (canDemoExpert) {
-            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRankLevel(Tier.FOUR);
+            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRank4();

            if (skillValue < unlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.2", unlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.2", unlockLevel)));
            }
            else {
-                messages.add(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));
            }
        }
-
-        return messages;
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/RanchingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/RanchingCommand.java
@@ -0,0 +1,146 @@
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.ranching.Ranching;
+import com.gmail.nossr50.util.Permissions;
+
+public class RanchingCommand extends SkillCommand {
+    private String multipleBirthChance;
+    private String multipleBirthChanceLucky;
+    private int masterHerderTime;
+    private String shearsMasteryChance;
+    private String shearsMasteryChanceLucky;
+    private String artisanButcherChance;
+    private String artisanButcherChanceLucky;
+    private int carnivoresDietRank;
+
+    private boolean canMultipleBirth;
+    private boolean canMasterHerder;
+    private boolean canShearsMastery;
+    private boolean canArtisanButcher;
+    private boolean canCarnivoresDiet;
+
+    public RanchingCommand() {
+        super(SkillType.RANCHING);
+    }
+
+    @Override
+    protected void dataCalculations() {
+        // MULTIPLE BIRTH
+        if (canMultipleBirth) {
+            String[] multipleBirthStrings = calculateAbilityDisplayValues(Ranching.multipleBirthIncreaseLevel, Ranching.multipleBirthMaxChance);
+            multipleBirthChance = multipleBirthStrings[0];
+            multipleBirthChanceLucky = multipleBirthStrings[1];
+        }
+
+        // MASTER HERDER
+        if (canMasterHerder) {
+            int masterHerderTime = (int) (300 - (skillValue / Ranching.masterHerderIncreaseLevel) * 10);
+
+            if (masterHerderTime < Ranching.masterHerderMinimumSeconds) {
+                masterHerderTime = Ranching.masterHerderMinimumSeconds;
+            }
+        }
+
+        // SHEARS MASTERY
+        if (canShearsMastery) {
+            String[] shearsMasteryStrings = calculateAbilityDisplayValues(Ranching.shearsMasteryMaxLevel, Ranching.shearsMasteryMaxChance);
+            shearsMasteryChance = shearsMasteryStrings[0];
+            shearsMasteryChanceLucky = shearsMasteryStrings[1];
+        }
+
+        // ARTISAN BUTCHER
+        if (canArtisanButcher) {
+            String[] artisanButcherStrings = calculateAbilityDisplayValues(Ranching.artisanButcherMaxLevel, Ranching.artisanButcherMaxChance);
+            artisanButcherChance = artisanButcherStrings[0];
+            artisanButcherChanceLucky = artisanButcherStrings[1];
+        }
+
+        // CARNIVORES DIET
+        if (canCarnivoresDiet) {
+            carnivoresDietRank = calculateRank(Ranching.carnivoresDietMaxLevel, Ranching.carnivoresDietRankLevel1);
+        }
+    }
+
+    @Override
+    protected void permissionsCheck() {
+        canMultipleBirth = Permissions.multipleBirth(player);
+        canMasterHerder = Permissions.masterHerder(player);
+        canShearsMastery = Permissions.shearsMastery(player);
+        canArtisanButcher = Permissions.artisanButcher(player);
+        canCarnivoresDiet = Permissions.carnivoresDiet(player);
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canMultipleBirth || canMasterHerder || canShearsMastery || canArtisanButcher || canCarnivoresDiet;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        if (canMultipleBirth) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Ranching.Effect.0"), LocaleLoader.getString("Ranching.Effect.1")));
+        }
+
+        if (canMasterHerder) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Ranching.Effect.2"), LocaleLoader.getString("Ranching.Effect.3")));
+        }
+
+        if (canShearsMastery) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Ranching.Effect.4"), LocaleLoader.getString("Ranching.Effect.5")));
+        }
+
+        if (canArtisanButcher) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Ranching.Effect.6"), LocaleLoader.getString("Ranching.Effect.7")));
+        }
+
+        if (canCarnivoresDiet) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Ranching.Effect.8"), LocaleLoader.getString("Ranching.Effect.9")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canMultipleBirth || canMasterHerder || canShearsMastery || canArtisanButcher || canCarnivoresDiet;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canMultipleBirth) {
+            int unlockLevel = Ranching.multipleBirthIncreaseLevel;
+
+            if (skillValue < unlockLevel) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Ranching.Ability.Locked.0", unlockLevel)));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Ranching.Ability.MultipleBirth", multipleBirthChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", multipleBirthChanceLucky) : ""));
+            }
+        }
+
+        if (canMasterHerder) {
+            int unlockLevel = Ranching.masterHerderIncreaseLevel;
+
+            if (skillValue < unlockLevel) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Ranching.Ability.Locked.1", unlockLevel)));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Ranching.Ability.MasterHerder", masterHerderTime));
+            }
+        }
+
+        if (canShearsMastery) {
+            player.sendMessage(LocaleLoader.getString("Ranching.Ability.ShearsMastery", shearsMasteryChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", shearsMasteryChanceLucky) : ""));
+        }
+
+        if (canArtisanButcher) {
+            player.sendMessage(LocaleLoader.getString("Ranching.Ability.ArtisanButcher", artisanButcherChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", artisanButcherChanceLucky) : ""));
+        }
+
+        if (canCarnivoresDiet) {
+            player.sendMessage(LocaleLoader.getString("Ranching.Ability.CarnivoresDiet", carnivoresDietRank));
+        }
+    }
+}
--- a/Show More
+++ b/Show More