diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c465a3ef..a2197c6f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,119 +1,532 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="BookmarkManager">
-    <bookmark url="file://$PROJECT_DIR$/src/main/java/Main/Utility.java" line="187" />
-    <bookmark url="file://$PROJECT_DIR$/src/main/java/POGOs/BlackLists.java" line="28" />
-    <bookmark url="file://$PROJECT_DIR$/src/main/java/Main/Constants.java" line="85" />
+    <bookmark url="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/main/Utility.java" line="197" />
+    <bookmark url="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/BlackLists.java" line="28" />
+    <bookmark url="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/main/Constants.java" line="84" />
+    <bookmark url="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/main/AnnotationListener.java" description="        Emoji pin = EmojiManager.getForAlias(&quot;push..." line="234" />
+    <bookmark url="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/main/AnnotationListener.java" description="if (command.message.getContent().length() &gt; charLi..." line="330" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="1119069f-7e16-4993-aa39-0cdad260914a" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/Commands/Admin/DenyXpPrefix.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/Commands/Admin/PruneEmptyProfiles.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/Commands/Creator/DailyMsg.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/Commands/Pixels/FixLevelErrors.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/Commands/Pixels/SetLevelUpReaction.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/ReactToLevelUp.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/SelfDestructLevelUps.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/UserInfoShowsDate.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/Handlers/QueueHandler.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/Main/InitEvent.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/Objects/ChannelStatsObject.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/Objects/QueueObject.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/Objects/ToggleStatsObject.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/OldCode/OldCharacterObject.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/OldCode/OldCharacters.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/OldCode/OldGlobalData.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/OldCode/OldGuildConfig.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/OldCode/OldUserDailyMessageObject.java" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Handlers/DailyHandler.java" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/annotations/TagAnnotation.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/channelsettings/InitChannels.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/channelsettings/settings/BotCommands.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/channelsettings/settings/DontLog.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/channelsettings/settings/Groups.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/channelsettings/settings/LevelUpDenied.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/channelsettings/settings/Rank.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/channelsettings/settings/Servers.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/channelsettings/settings/Shitpost.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/channelsettings/settings/XpDenied.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/channelsettings/types/Admin.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/channelsettings/types/AdminLog.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/channelsettings/types/Art.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/channelsettings/types/General.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/channelsettings/types/Info.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/channelsettings/types/LevelUp.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/channelsettings/types/ServerLog.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/CommandInit.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/CommandObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/DMCommandObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/ChannelHere.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/ChannelStats.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/DenyXpPrefix.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/EditInfoFiles.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/InfoEditModes.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/Module.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/Mute.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/PruneEmptyProfiles.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/PurgeBannedData.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/RewardRole.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/SetAdminRole.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/SetJoinMessage.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/SetMutedRole.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/SetRateLimit.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/SetTrustedRoles.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/Test.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/Toggle.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/UpdateInfo.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/UpdateRolePerms.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/UserSettings.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/CCEditModes.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/DelCC.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/EditCC.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/GetCCData.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/InfoCC.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/ListCCs.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/NewCC.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/RandomCC.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/SearchCCs.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/TransferCC.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/characters/CharEditModes.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/characters/CharInfo.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/characters/DelChar.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/characters/EditChar.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/characters/ListChars.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/characters/SelectChar.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/characters/SetBioRolePrefix.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/characters/UpdateChar.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/competition/EnterComp.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/competition/EnterVote.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/competition/FinalTally.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/competition/GetCompEntries.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/competition/PurgeComp.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/DailyMsg.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/GetGlobalStats.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/ResetPlayingStatus.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/SetPlayingStatus.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/Shutdown.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/Sudo.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/ToggleTypingStatus.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/UpdateAvatar.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/directmessages/BlockUser.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/directmessages/GetGuildInfo.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/directmessages/GetGuildList.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/directmessages/QuickRespond.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/directmessages/Respond.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/directmessages/ShutdownDM.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/directmessages/TestDM.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/dmCommands/ClearReminderDM.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/dmCommands/HelpDM.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/dmCommands/InfoDM.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/dmCommands/ReminderDM.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/ClearReminder.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/EditLinks.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/GetAvatar.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/Hello.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/LastDailyMessage.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/NewDailyMessage.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/ProfileSettings.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/RemindMe.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/SetGender.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/SetQuote.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/UserInfo.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/groups/ClearGroupUp.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/groups/GroupUp.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/help/BotInfo.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/help/GetGuildInfo.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/help/Help.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/help/HelpTags.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/help/Info.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/help/Ping.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/help/Report.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/help/SilentReport.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/help/StartUpGuide.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/CheckPixelRoles.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/DefaultLevelMode.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/LevelUpMessage.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/ManagePixelRoles.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/PixelHelp.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/Pixels.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/Rank.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/SetLevel.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/SetLevelUpReaction.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/SetPixelModifier.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/SetXp.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/TopTen.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/TopUserForRole.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/TransferLevels.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/roleSelect/CosmeticRoles.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/roleSelect/ListModifs.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/roleSelect/ListRoles.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/roleSelect/ModifierRoles.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/servers/AddServer.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/servers/DelServer.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/servers/EditServerDesc.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/servers/EditServerIP.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/servers/EditServerName.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/servers/ListServers.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/servers/Server.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/slash/DealWithIt.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/slash/Disapproval.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/slash/Fite.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/slash/Gib.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/slash/Lenny.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/slash/Shrug.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/slash/TableFlip.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/slash/UnFlip.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/enums/EnumString.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/enums/UserSetting.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/ToggleInit.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleArtPinning.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleCC.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleChars.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleComp.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleGroups.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleMe.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleModMuting.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/modules/ModulePixels.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleRoles.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleServers.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleSlash.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/AdminLogging.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/AutoArtPinning.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/ChannelLogging.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/CompEntries.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/DailyMessage.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/DeleteLogging.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/DenyInvites.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/DontLogBot.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/EditLogging.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/ExtendEditLog.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/GeneralLogging.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/JoinLeaveLgging.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/JoinServerMessages.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/MentionSpam.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/MuteRepeatOffender.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/RateLimiting.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/ReactToLevelUp.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/RoleIsToggle.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/SelfDestructLevelUps.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/ShitpostFiltering.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/UseTimeStamps.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/UserInfoShowsDate.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/UserRoleLogging.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/Voting.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/XpDecay.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/guildtoggles/toggles/XpGain.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/ArtHandler.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/CCHandler.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/CreatorHandler.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/DMHandler.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/EventHandler.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/FileHandler.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/GuildCreateListener.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/InfoHandler.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/MessageHandler.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/QueueHandler.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/TagHandler.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/XpHandler.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/interfaces/ChannelSetting.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/interfaces/Command.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/interfaces/DMCommand.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/interfaces/GlobalFile.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/interfaces/GuildFile.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/interfaces/GuildToggle.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/interfaces/SlashCommand.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/main/AnnotationListener.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/main/Client.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/main/Constants.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/main/Globals.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/main/InitEvent.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/main/Main.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/main/Utility.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/masterobjects/ChannelObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/masterobjects/ClientObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/masterobjects/GuildObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/masterobjects/MessageObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/masterobjects/UserObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/BlackListObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/CCommandObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/ChannelSettingObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/ChannelStatsObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/CharacterObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/CompObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/DailyMessageObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/DailyUserMessageObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/GroupUpObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/GuildContentObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/OffenderObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/PatchObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/PollObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/ProfileObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/QueueObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/RandomStatusObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/ReminderObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/ReplaceObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/RewardRoleObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/RoleStatsObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/ServerObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/SplitFirstObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/ToggleStatsObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/UserCountDown.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/UserLinkObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/UserRateObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/VoteObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/XEmbedBuilder.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/XRequestBuffer.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/oldcode/ChannelData.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/oldcode/ChannelTypeObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/oldcode/CustomCommands.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/oldcode/OldCharacterObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/oldcode/OldCharacters.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/oldcode/OldGlobalData.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/oldcode/OldGuildConfig.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/oldcode/OldUserDailyMessageObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/oldcode/RoleTypeObject.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/BlackLists.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/ChannelData.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/Characters.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/Competition.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/Config.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/CustomCommands.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/DailyMessages.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/GlobalData.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/GuildConfig.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/GuildUsers.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/Servers.java" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Annotations/TagAnnotation.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/InitChannels.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/Settings/BotCommands.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/Settings/DontLog.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/Settings/Groups.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/Settings/LevelUpDenied.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/Settings/Rank.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/Settings/Servers.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/Settings/Shitpost.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/Settings/XpDenied.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/Types/Admin.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/Types/AdminLog.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/Types/Art.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/Types/General.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/Types/Info.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/Types/LevelUp.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/Types/ServerLog.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/ChannelHere.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/ChannelStats.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/DenyXpPrefix.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/EditInfoFiles.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/InfoEditModes.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/MaxMessages.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/Module.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/Mute.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/PruneEmptyProfiles.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/RewardRole.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/SetAdminRole.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/SetJoinMessage.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/SetMutedRole.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/SetTrustedRoles.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/Toggle.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/UpdateInfo.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/UpdateRolePerms.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/UserSettings.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/BlackList/BlacklistEditModes.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/BlackList/EditBlackList.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/BlackList/ListBlackLists.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/BlackList/NewBlackList.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/CC/CCEditModes.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/CC/DelCC.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/CC/EditCC.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/CC/GetCCData.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/CC/InfoCC.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/CC/ListCCs.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/CC/NewCC.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/CC/SearchCCs.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/CC/TransferCC.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Characters/CharEditModes.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Characters/CharInfo.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Characters/DelChar.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Characters/EditChar.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Characters/ListChars.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Characters/SelectChar.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Characters/SetBioRolePrefix.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Characters/UpdateChar.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/CommandInit.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/CommandObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Competition/EnterComp.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Competition/EnterVote.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Competition/FinalTally.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Competition/GetCompEntries.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Competition/PurgeComp.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Creator/DailyMsg.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Creator/GetGlobalStats.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Creator/ResetPlayingStatus.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Creator/SetPlayingStatus.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Creator/Shutdown.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Creator/Sudo.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Creator/ToggleTypingStatus.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Creator/UpdateAvatar.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/DMCommandObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/DMCommands/BlockUser.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/DMCommands/ClearReminderDM.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/DMCommands/GetGuildInfo.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/DMCommands/GetGuildList.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/DMCommands/HelpDM.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/DMCommands/InfoDM.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/DMCommands/QuickRespond.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/DMCommands/ReminderDM.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/DMCommands/Respond.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/DMCommands/ShutdownDM.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/DMCommands/TestDM.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/General/ClearReminder.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/General/EditLinks.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/General/GetAvatar.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/General/Hello.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/General/NewDailyMessage.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/General/Ping.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/General/RemindMe.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/General/SetGender.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/General/SetQuote.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/General/SlashList.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/General/Test.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/General/UserInfo.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Groups/ClearGroupUp.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Groups/GroupUp.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Help/BotInfo.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Help/GetGuildInfo.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Help/Help.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Help/HelpTags.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Help/Info.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Help/Report.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Help/SilentReport.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Help/StartUpGuide.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/CheckPixelRoles.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/DefaultLevelMode.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/FixLevelErrors.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/LevelUpMessage.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/ManagePixelRoles.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/PixelHelp.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/PixelSettings.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/Pixels.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/Rank.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/SetLevel.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/SetLevelUpReaction.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/SetPixelModifier.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/SetXp.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/TopTen.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/TopUserForRole.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/TransferLevels.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/RoleSelect/CosmeticRoles.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/RoleSelect/ListModifs.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/RoleSelect/ListRoles.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/RoleSelect/ModifierRoles.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Servers/AddServer.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Servers/DelServer.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Servers/EditServerDesc.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Servers/EditServerIP.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Servers/EditServerName.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Servers/ListServers.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Servers/Server.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Slash/DealWithIt.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Slash/Disapproval.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Slash/Fite.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Slash/Gib.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Slash/Lenny.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Slash/Shrug.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Slash/TableFlip.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Slash/UnFlip.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Enums/EnumString.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Enums/UserSetting.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModuleArtPinning.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModuleCC.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModuleChars.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModuleComp.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModuleGroups.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModuleMe.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModuleModMuting.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModulePixels.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModuleRoles.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModuleServers.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/ToggleInit.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/AdminLogging.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/AutoArtPinning.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/ChannelLogging.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/CompEntries.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/DailyMessage.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/DeleteLogging.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/DenyInvites.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/DontLogBot.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/EditLogging.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/ExtendEditLog.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/GeneralLogging.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/JoinLeaveLgging.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/JoinServerMessages.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/MentionSpam.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/MuteRepeatOffender.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/RateLimiting.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/ReactToLevelUp.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/RoleIsToggle.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/SelfDestructLevelUps.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/ShitpostFiltering.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/SlashCommands.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/UseTimeStamps.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/UserInfoShowsDate.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/UserRoleLogging.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/Voting.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/XpDecay.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/XpGain.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Handlers/ArtHandler.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Handlers/CCHandler.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Handlers/DMHandler.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Handlers/EventHandler.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Handlers/FileHandler.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Handlers/InfoHandler.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Handlers/MessageHandler.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Handlers/PatchHandler.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Handlers/QueueHandler.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Handlers/WikiBuilder.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Handlers/XpHandler.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Interfaces/ChannelSetting.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Interfaces/Command.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Interfaces/DMCommand.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Interfaces/GuildToggle.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Interfaces/SlashCommand.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Main/AnnotationListener.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Main/Client.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Main/Constants.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Main/Globals.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Main/InitEvent.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Main/Main.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Main/TagSystem.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Main/Utility.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/BlackListObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/CCommandObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/ChannelSettingObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/ChannelStatsObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/CharacterObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/CompObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/DailyMessageObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/DailyUserMessageObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/GroupUpObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/GuildContentObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/OffenderObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/PatchObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/PollObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/QueueObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/RandomStatusObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/ReminderObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/ReplaceObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/RewardRoleObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/RoleStatsObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/ServerObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/SplitFirstObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/ToggleStatsObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/UserCountDown.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/UserLinkObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/UserRateObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/UserTypeObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/VoteObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Objects/XEmbedBuilder.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/OldCode/ChannelData.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/OldCode/ChannelTypeObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/OldCode/CustomCommands.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/OldCode/OldCharacterObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/OldCode/OldCharacters.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/OldCode/OldGlobalData.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/OldCode/OldGuildConfig.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/OldCode/OldUserDailyMessageObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/OldCode/RoleTypeObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/POGOs/BlackLists.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/POGOs/ChannelData.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/POGOs/Characters.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/POGOs/Competition.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/POGOs/Config.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/POGOs/CustomCommands.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/POGOs/GlobalData.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/POGOs/GuildConfig.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/POGOs/GuildUsers.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/POGOs/Servers.java" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/JavaDiscordSAILv2.jar" afterPath="$PROJECT_DIR$/target/JavaDiscordSAILv2.jar" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/original-JavaDiscordSAILv2.jar" afterPath="$PROJECT_DIR$/target/original-JavaDiscordSAILv2.jar" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/dependency-reduced-pom.xml" afterPath="$PROJECT_DIR$/dependency-reduced-pom.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/ChannelSettings/InitChannels.java" afterPath="$PROJECT_DIR$/src/main/java/ChannelSettings/InitChannels.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/ChannelStats.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Admin/ChannelStats.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/EditInfoFiles.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Admin/EditInfoFiles.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/InfoEditModes.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Admin/InfoEditModes.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/Module.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Admin/Module.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/Mute.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Admin/Mute.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/SetAdminRole.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Admin/SetAdminRole.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/SetMutedRole.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Admin/SetMutedRole.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/SetTrustedRoles.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Admin/SetTrustedRoles.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/Toggle.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Admin/Toggle.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/UpdateInfo.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Admin/UpdateInfo.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/UpdateRolePerms.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Admin/UpdateRolePerms.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Admin/UserSettings.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Admin/UserSettings.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/CC/CCEditModes.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/CC/CCEditModes.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/CC/EditCC.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/CC/EditCC.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/CC/GetCCData.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/CC/GetCCData.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/CC/InfoCC.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/CC/InfoCC.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/CC/NewCC.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/CC/NewCC.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/CC/TransferCC.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/CC/TransferCC.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Characters/CharInfo.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Characters/CharInfo.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Characters/EditChar.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Characters/EditChar.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Characters/ListChars.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Characters/ListChars.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Characters/SelectChar.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Characters/SelectChar.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Characters/UpdateChar.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Characters/UpdateChar.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/CommandInit.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/CommandInit.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/CommandObject.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/CommandObject.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/DMCommands/HelpDM.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/DMCommands/HelpDM.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/DMCommands/TestDM.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/DMCommands/TestDM.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/General/GetAvatar.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/General/GetAvatar.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/General/NewDailyMessage.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/General/NewDailyMessage.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/General/Test.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/General/Test.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/General/UserInfo.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/General/UserInfo.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Groups/GroupUp.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Groups/GroupUp.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Help/BotInfo.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Help/BotInfo.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Help/Help.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Help/Help.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Help/Info.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Help/Info.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Help/Report.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Help/Report.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/ManagePixelRoles.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Pixels/ManagePixelRoles.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/PixelHelp.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Pixels/PixelHelp.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/Pixels.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Pixels/Pixels.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/TopTen.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Pixels/TopTen.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/TopUserForRole.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Pixels/TopUserForRole.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Pixels/TransferLevels.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Pixels/TransferLevels.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/RoleSelect/CosmeticRoles.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/RoleSelect/CosmeticRoles.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/RoleSelect/ListModifs.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/RoleSelect/ListModifs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/RoleSelect/ListRoles.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/RoleSelect/ListRoles.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/RoleSelect/ModifierRoles.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/RoleSelect/ModifierRoles.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Commands/Servers/Server.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Servers/Server.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Enums/EnumString.java" afterPath="$PROJECT_DIR$/src/main/java/Enums/EnumString.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Enums/UserSetting.java" afterPath="$PROJECT_DIR$/src/main/java/Enums/UserSetting.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModuleMe.java" afterPath="$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModuleMe.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModulePixels.java" afterPath="$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModulePixels.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/GuildToggles/ToggleInit.java" afterPath="$PROJECT_DIR$/src/main/java/GuildToggles/ToggleInit.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Handlers/ArtHandler.java" afterPath="$PROJECT_DIR$/src/main/java/Handlers/ArtHandler.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Handlers/CCHandler.java" afterPath="$PROJECT_DIR$/src/main/java/Handlers/CCHandler.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Handlers/DMHandler.java" afterPath="$PROJECT_DIR$/src/main/java/Handlers/DMHandler.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Handlers/EventHandler.java" afterPath="$PROJECT_DIR$/src/main/java/Handlers/EventHandler.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Handlers/InfoHandler.java" afterPath="$PROJECT_DIR$/src/main/java/Handlers/InfoHandler.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Handlers/MessageHandler.java" afterPath="$PROJECT_DIR$/src/main/java/Handlers/MessageHandler.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Handlers/PatchHandler.java" afterPath="$PROJECT_DIR$/src/main/java/Handlers/PatchHandler.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Handlers/WikiBuilder.java" afterPath="$PROJECT_DIR$/src/main/java/Handlers/WikiBuilder.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Handlers/XpHandler.java" afterPath="$PROJECT_DIR$/src/main/java/Handlers/XpHandler.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Main/AnnotationListener.java" afterPath="$PROJECT_DIR$/src/main/java/Main/AnnotationListener.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Main/Constants.java" afterPath="$PROJECT_DIR$/src/main/java/Main/Constants.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Main/Globals.java" afterPath="$PROJECT_DIR$/src/main/java/Main/Globals.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Main/Main.java" afterPath="$PROJECT_DIR$/src/main/java/Main/Main.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Main/TagSystem.java" afterPath="$PROJECT_DIR$/src/main/java/Main/TagSystem.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Main/Utility.java" afterPath="$PROJECT_DIR$/src/main/java/Main/Utility.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Objects/CharacterObject.java" afterPath="$PROJECT_DIR$/src/main/java/Objects/CharacterObject.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Objects/DailyUserMessageObject.java" afterPath="$PROJECT_DIR$/src/main/java/Objects/DailyUserMessageObject.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Objects/RoleStatsObject.java" afterPath="$PROJECT_DIR$/src/main/java/Objects/RoleStatsObject.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/OldCode/ChannelData.java" afterPath="$PROJECT_DIR$/src/main/java/OldCode/ChannelData.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/POGOs/Characters.java" afterPath="$PROJECT_DIR$/src/main/java/POGOs/Characters.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/POGOs/Config.java" afterPath="$PROJECT_DIR$/src/main/java/POGOs/Config.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/POGOs/GlobalData.java" afterPath="$PROJECT_DIR$/src/main/java/POGOs/GlobalData.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/POGOs/GuildConfig.java" afterPath="$PROJECT_DIR$/src/main/java/POGOs/GuildConfig.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/POGOs/GuildUsers.java" afterPath="$PROJECT_DIR$/src/main/java/POGOs/GuildUsers.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/POGOs/Servers.java" afterPath="$PROJECT_DIR$/src/main/java/POGOs/Servers.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/logback.xml" afterPath="$PROJECT_DIR$/src/main/resources/logback.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/logback.xml" afterPath="$PROJECT_DIR$/target/classes/logback.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/project.properties" afterPath="$PROJECT_DIR$/target/classes/project.properties" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" afterPath="$PROJECT_DIR$/target/maven-archiver/pom.properties" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/Commands/Creator/GetMessageData.java" afterPath="$PROJECT_DIR$/src/main/java/Commands/Creator/GetGlobalStats.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/Objects/ChannelTypeObject.java" afterPath="$PROJECT_DIR$/src/main/java/OldCode/ChannelTypeObject.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/Objects/RoleTypeObject.java" afterPath="$PROJECT_DIR$/src/main/java/OldCode/RoleTypeObject.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/website.blacklist" afterPath="$PROJECT_DIR$/website.blacklist" />
     </list>
     <ignored path="DiscordSailv2.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -138,147 +551,105 @@
     <favorites_list name="DiscordSailv2" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="QueueHandler.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/Handlers/QueueHandler.java">
+    <leaf>
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="398">
-              <caret line="51" column="33" lean-forward="true" selection-start-line="51" selection-start-column="33" selection-end-line="51" selection-end-column="33" />
+            <state relative-caret-position="-578">
+              <caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="DenyXpPrefix.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/Commands/Admin/DenyXpPrefix.java">
+      <file leaf-file-name="Mute.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/Mute.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-17">
-              <caret line="38" column="56" lean-forward="true" selection-start-line="38" selection-start-column="56" selection-end-line="38" selection-end-column="56" />
+            <state relative-caret-position="272">
+              <caret line="62" column="53" lean-forward="false" selection-start-line="62" selection-start-column="53" selection-end-line="62" selection-end-column="53" />
               <folding>
-                <element signature="e#2081#2082#0" expanded="true" />
-                <element signature="e#2119#2120#0" expanded="true" />
+                <element signature="e#3376#3377#0" expanded="true" />
+                <element signature="e#3438#3439#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="XpHandler.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/Handlers/XpHandler.java">
+      <file leaf-file-name="ProfileSettings.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/ProfileSettings.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="464">
-              <caret line="225" column="0" lean-forward="false" selection-start-line="225" selection-start-column="0" selection-end-line="225" selection-end-column="0" />
+            <state relative-caret-position="119">
+              <caret line="16" column="20" lean-forward="false" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CommandInit.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/Commands/CommandInit.java">
+      <file leaf-file-name="TagHandler.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/TagHandler.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="629">
-              <caret line="60" column="41" lean-forward="false" selection-start-line="60" selection-start-column="41" selection-end-line="60" selection-end-column="41" />
+            <state relative-caret-position="393">
+              <caret line="64" column="45" lean-forward="false" selection-start-line="64" selection-start-column="45" selection-end-line="64" selection-end-column="45" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GuildConfig.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/POGOs/GuildConfig.java">
+      <file leaf-file-name="XpHandler.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/XpHandler.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="262">
-              <caret line="86" column="67" lean-forward="false" selection-start-line="86" selection-start-column="67" selection-end-line="86" selection-end-column="67" />
-              <folding>
-                <element signature="e#13226#13227#0" expanded="true" />
-                <element signature="e#13265#13266#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="-238">
+              <caret line="258" column="55" lean-forward="false" selection-start-line="258" selection-start-column="55" selection-end-line="258" selection-end-column="55" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="String.java" pinned="false" current-in-tab="false">
-        <entry file="jar://E:/Program Files/Java/Jdk1.8.0_91/src.zip!/java/lang/String.java">
+      <file leaf-file-name="SetGender.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/SetGender.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="202">
-              <caret line="2131" column="19" lean-forward="false" selection-start-line="2131" selection-start-column="19" selection-end-line="2131" selection-end-column="19" />
-              <folding>
-                <element signature="e#82971#82972#0" expanded="true" />
-                <element signature="e#83020#83021#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="102">
+              <caret line="22" column="100" lean-forward="false" selection-start-line="22" selection-start-column="100" selection-end-line="22" selection-end-column="100" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ChannelStats.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/Commands/Admin/ChannelStats.java">
+      <file leaf-file-name="EditLinks.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/EditLinks.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="119">
-              <caret line="16" column="13" lean-forward="false" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+            <state relative-caret-position="1037">
+              <caret line="72" column="76" lean-forward="false" selection-start-line="72" selection-start-column="76" selection-end-line="72" selection-end-column="76" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="NewDailyMessage.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/Commands/General/NewDailyMessage.java">
+      <file leaf-file-name="UserInfo.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/UserInfo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="202">
-              <caret line="22" column="35" lean-forward="false" selection-start-line="22" selection-start-column="35" selection-end-line="22" selection-end-column="35" />
+            <state relative-caret-position="255">
+              <caret line="42" column="145" lean-forward="false" selection-start-line="42" selection-start-column="145" selection-end-line="42" selection-end-column="145" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Guild_Config.json" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Storage/176434793674833920/Guild_Config.json">
+      <file leaf-file-name="StatusType.java" pinned="false" current-in-tab="false">
+        <entry file="jar://$MAVEN_REPOSITORY$/com/github/austinv11/Discord4j/2.8.4/Discord4j-2.8.4-sources.jar!/sx/blah/discord/handle/obj/StatusType.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2040">
-              <caret line="164" column="21" lean-forward="false" selection-start-line="164" selection-start-column="21" selection-end-line="164" selection-end-column="21" />
-              <folding>
-                <marker date="1501570866053" expanded="true" signature="1675:3670" ph="[...]" />
-                <marker date="1501570866053" expanded="true" signature="1681:1772" ph="{&quot;type&quot;: &quot;General&quot;...}" />
-                <marker date="1501570866053" expanded="true" signature="1728:1766" ph="[...]" />
-                <marker date="1501570866053" expanded="true" signature="1778:1867" ph="{&quot;type&quot;: &quot;Admin&quot;...}" />
-                <marker date="1501570866053" expanded="true" signature="1823:1861" ph="[...]" />
-                <marker date="1501570866053" expanded="true" signature="1873:1994" ph="{&quot;type&quot;: &quot;Servers&quot;...}" />
-                <marker date="1501570866053" expanded="true" signature="1920:1988" ph="[...]" />
-                <marker date="1501570866053" expanded="true" signature="2000:2088" ph="{&quot;type&quot;: &quot;Info&quot;...}" />
-                <marker date="1501570866053" expanded="true" signature="2044:2082" ph="[...]" />
-                <marker date="1501570866053" expanded="true" signature="2094:2396" ph="{&quot;type&quot;: &quot;ShitPost&quot;...}" />
-                <marker date="1501570866053" expanded="true" signature="2142:2390" ph="[...]" />
-                <marker date="1501570866053" expanded="true" signature="2402:2494" ph="{&quot;type&quot;: &quot;AdminLog&quot;...}" />
-                <marker date="1501570866053" expanded="true" signature="2450:2488" ph="[...]" />
-                <marker date="1501570866053" expanded="true" signature="2500:2593" ph="{&quot;type&quot;: &quot;ServerLog&quot;...}" />
-                <marker date="1501570866053" expanded="true" signature="2549:2587" ph="[...]" />
-                <marker date="1501570866053" expanded="true" signature="2599:2724" ph="{&quot;type&quot;: &quot;BotCommands&quot;...}" />
-                <marker date="1501570866053" expanded="true" signature="2650:2718" ph="[...]" />
-                <marker date="1501570866053" expanded="true" signature="2730:3031" ph="{&quot;type&quot;: &quot;DontLog&quot;...}" />
-                <marker date="1501570866053" expanded="true" signature="2777:3025" ph="[...]" />
-                <marker date="1501570866053" expanded="true" signature="3037:3088" ph="{&quot;type&quot;: &quot;Art&quot;...}" />
-                <marker date="1501570866053" expanded="true" signature="3094:3184" ph="{&quot;type&quot;: &quot;Groups&quot;...}" />
-                <marker date="1501570866053" expanded="true" signature="3140:3178" ph="[...]" />
-                <marker date="1501570866053" expanded="true" signature="3190:3308" ph="{&quot;type&quot;: &quot;Rank&quot;...}" />
-                <marker date="1501570866053" expanded="true" signature="3234:3302" ph="[...]" />
-                <marker date="1501570866053" expanded="true" signature="3314:3466" ph="{&quot;type&quot;: &quot;XpDenied&quot;...}" />
-                <marker date="1501570866053" expanded="true" signature="3362:3460" ph="[...]" />
-                <marker date="1501570866053" expanded="true" signature="3472:3563" ph="{&quot;type&quot;: &quot;LevelUp&quot;...}" />
-                <marker date="1501570866053" expanded="true" signature="3519:3557" ph="[...]" />
-                <marker date="1501570866053" expanded="true" signature="3569:3666" ph="{&quot;type&quot;: &quot;LevelUpDenied&quot;...}" />
-                <marker date="1501570866053" expanded="true" signature="3622:3660" ph="[...]" />
-                <marker date="1501570866053" expanded="true" signature="3743:3744" ph="[...]" />
-                <marker date="1501570866053" expanded="true" signature="3769:3830" ph="{&quot;roleID&quot;: 201711165334749184...}" />
-                <marker date="1501570866053" expanded="true" signature="3836:3897" ph="{&quot;roleID&quot;: 330213226665213955...}" />
-                <marker date="1501570866053" expanded="true" signature="3903:3964" ph="{&quot;roleID&quot;: 201608404567851008...}" />
-                <marker date="1501570866053" expanded="true" signature="3970:4031" ph="{&quot;roleID&quot;: 330213339852570625...}" />
-              </folding>
+            <state relative-caret-position="17">
+              <caret line="22" column="12" lean-forward="false" selection-start-line="22" selection-start-column="12" selection-end-line="22" selection-end-column="12" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Global_Data.json" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Storage/Global_Data.json">
+      <file leaf-file-name="SetQuote.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/SetQuote.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="982">
-              <caret line="292" column="5" lean-forward="true" selection-start-line="292" selection-start-column="5" selection-end-line="292" selection-end-column="5" />
+            <state relative-caret-position="119">
+              <caret line="23" column="100" lean-forward="true" selection-start-line="23" selection-start-column="59" selection-end-line="23" selection-end-column="100" />
               <folding />
             </state>
           </provider>
@@ -290,9 +661,9 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="AnnotationType" />
-        <option value="Interface" />
         <option value="JUnit3 Test Class" />
         <option value="Enum" />
+        <option value="Interface" />
         <option value="Class" />
         <option value="Command" />
       </list>
@@ -300,28 +671,81 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>182502964404027392</find>
-      <find>+= &quot;</find>
-      <find>.toString().replace</find>
-      <find>StringBuffer</find>
-      <find>+=</find>
-      <find>while (Globals</find>
+      <find>command.authorID</find>
+      <find>command.client.getGuilds()</find>
+      <find>command.author</find>
+      <find>command.commands</find>
+      <find>object.authorSID</find>
+      <find>commandObject.authorID</find>
+      <find>retur</find>
+      <find>testfor</find>
+      <find>sendMessa</find>
+      <find>request()</find>
+      <find>get</find>
+      <find>callable</find>
+      <find>RequestBuffer</find>
+      <find>e.p</find>
       <find>e.printStackTrace();</find>
-      <find>ReadyEvent.class</find>
-      <find>while (</find>
-      <find>&quot;ID&quot;</find>
-      <find>role is no</find>
-      <find>system.out.</find>
-      <find>Cosmetic</find>
-      <find>vali</find>
-      <find>roleIDs</find>
-      <find>handle</find>
-      <find>-&gt; {</find>
-      <find>channel</find>
-      <find>t.is</find>
-      <find>level</find>
+      <find>com.github.vaerys.commands</find>
+      <find>it is sun</find>
+      <find>checkque</find>
+      <find>Utility.getCommands</find>
+      <find>message</find>
+      <find>sendFileUR</find>
+      <find>avallible tags</find>
+      <find>* //</find>
+      <find>[Admin] Dawn Felstar</find>
+      <find>\[Admin\] Dawn Felstar\n\[dawn</find>
+      <find>\[Admin\] Dawn Felstar\n\[Admin] Dawn</find>
+      <find>\</find>
+      <find>getUsersByName</find>
+      <find>\&quot;</find>
+      <find>userID</find>
     </findStrings>
+    <replaceStrings>
+      <replace>command.guild.users</replace>
+      <replace>object.guild.users</replace>
+      <replace>command.user.get();</replace>
+      <replace>command.user.get().</replace>
+      <replace>user.get(),</replace>
+      <replace>user.get().</replace>
+      <replace>user.get())</replace>
+      <replace>command.channel.stringID</replace>
+      <replace>command.client.color</replace>
+      <replace>command.message.stringID</replace>
+      <replace>command.guild.stringID</replace>
+      <replace>command.guild.customCommands</replace>
+      <replace>command.guild.characters</replace>
+      <replace>command.user.notAllowed</replace>
+      <replace>command.message.get().getMentions()</replace>
+      <replace>command.guild.get().getRoleByID</replace>
+      <replace>command.guild.competition</replace>
+      <replace>command.client.bot</replace>
+      <replace>command.client.get().getUserByID</replace>
+      <replace>command.user.longID</replace>
+      <replace>command.user.get()</replace>
+      <replace>command.user.stringID</replace>
+      <replace>object.user.stringID</replace>
+      <replace>commandObject.user.longID</replace>
+      <replace>sentStack(e);</replace>
+      <replace>XRequestBuffer</replace>
+      <replace>sendStack(e);</replace>
+      <replace>Utility.sendStack(e);</replace>
+      <replace>commands</replace>
+      <replace>command.message.get()</replace>
+    </replaceStrings>
     <dirStrings>
+      <dir>E:\Repositories\DiscordSailv2\src\main\java\com\github\vaerys\commands</dir>
+      <dir>E:\Repositories\DiscordSailv2\src\main\java\com\github\vaerys\channelsettings</dir>
+      <dir>E:\Repositories\DiscordSailv2\src\main\java\com\github\vaerys\annotations</dir>
+      <dir>E:\Repositories\DiscordSailv2\src\main\java\com\github\vaerys\enums</dir>
+      <dir>E:\Repositories\DiscordSailv2\src\main\java\com\github\vaerys\guildtoggles</dir>
+      <dir>E:\Repositories\DiscordSailv2\src\main\java\com\github\vaerys\handlers</dir>
+      <dir>E:\Repositories\DiscordSailv2\src\main\java\com\github\vaerys\interfaces</dir>
+      <dir>E:\Repositories\DiscordSailv2\src\main\java\com\github\vaerys\main</dir>
+      <dir>E:\Repositories\DiscordSailv2\src\main\java\com\github\vaerys\objects</dir>
+      <dir>E:\Repositories\DiscordSailv2\src\main\java\com\github\vaerys\oldcode</dir>
+      <dir>E:\Repositories\DiscordSailv2\src\main\java\com\github\vaerys\pogos</dir>
       <dir>E:\Repositories\DiscordSailv2\src\main\java</dir>
     </dirStrings>
   </component>
@@ -337,57 +761,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/Commands/RoleSelect/ModifierRoles.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/RoleSelect/CosmeticRoles.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Handlers/MessageHandler.java" />
-        <option value="$PROJECT_DIR$/Storage/176434793674833920/Guild_Config.json" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/CC/CCEditModes.java" />
-        <option value="$PROJECT_DIR$/Storage/254790152851816458/Characters.json" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/Characters/UpdateChar.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Main/Globals.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/dmCommands/InfoDM.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/interfaces/Command.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/dmCommands/HelpDM.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/SlashList.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/GuildConfig.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/Hello.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/Test.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/main/AnnotationListener.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/ArtHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/QueueHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/NewDailyMessage.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/LevelUpMessage.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/DailyMsg.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/EventHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/DailyUserMessageObject.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/DailyMessageObject.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/main/TagSystem.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/main/TagHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/CommandInit.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/GetCCData.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/RandomCC.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/help/Help.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/enums/EnumString.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/XpHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/GuildUsers.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/CustomCommands.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/masterobjects/UserObject.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/MessageHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/help/SilentReport.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/help/Report.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/main/Utility.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/SetLevel.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/ListCCs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/Pixels.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/Rank.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/GetAvatar.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/characters/ListChars.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/UserSettings.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/SetXp.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/Sudo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/PixelSettings.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/PixelSettings.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/ProfileSettings.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/TagHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/main/Globals.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/UserInfo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/SetQuote.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/SetGender.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/EditLinks.java" />
         <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/UserInfoShowsDate.java" />
-        <option value="$PROJECT_DIR$/src/main/java/ChannelSettings/InitChannels.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Handlers/InfoHandler.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/Pixels/FixLevelErrors.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/Creator/GetGlobalStats.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/Groups/GroupUp.java" />
-        <option value="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/SelfDestructLevelUps.java" />
-        <option value="$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModuleMe.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Main/AnnotationListener.java" />
-        <option value="$PROJECT_DIR$/src/main/java/GuildToggles/Toggles/ReactToLevelUp.java" />
-        <option value="$PROJECT_DIR$/src/main/java/GuildToggles/ToggleInit.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/Pixels/SetLevelUpReaction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModulePixels.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/General/UserInfo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/Admin/Toggle.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/Admin/Module.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/General/GetAvatar.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/Pixels/PixelHelp.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/General/Test.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/Pixels/Pixels.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/Creator/DailyMessages.java" />
-        <option value="$PROJECT_DIR$/src/main/java/OldCode/OldUserDailyMessageObject.java" />
-        <option value="$PROJECT_DIR$/src/main/java/OldCode/OldGlobalData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Handlers/EventHandler.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Objects/ShutdownHook.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Main/Main.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Handlers/PatchHandler.java" />
-        <option value="$PROJECT_DIR$/src/main/java/POGOs/GlobalData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Main/Constants.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/General/NewDailyMessage.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Objects/QueueObject.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Main/Utility.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Handlers/DailyHandler.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/Creator/DailyMsgEditModes.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Objects/DailyUserMessageObject.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/Creator/DailyMsg.java" />
-        <option value="$PROJECT_DIR$/Storage/Global_Data.json" />
-        <option value="$PROJECT_DIR$/src/main/java/Handlers/QueueHandler.java" />
-        <option value="$PROJECT_DIR$/src/main/java/POGOs/GuildConfig.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Handlers/XpHandler.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/CommandInit.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Commands/Admin/DenyXpPrefix.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/Mute.java" />
       </list>
     </option>
   </component>
@@ -404,8 +828,8 @@
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-8" />
     <option name="y" value="-8" />
-    <option name="width" value="861" />
-    <option name="height" value="945" />
+    <option name="width" value="648" />
+    <option name="height" value="977" />
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
@@ -447,6 +871,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -477,33 +902,58 @@
               <item name="DiscordSailv2" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="vaerys" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="DiscordSailv2" type="b2602c69:ProjectViewProjectNode" />
               <item name="DiscordSailv2" type="462c0819:PsiDirectoryNode" />
-              <item name="Storage" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="vaerys" type="462c0819:PsiDirectoryNode" />
+              <item name="commands" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="DiscordSailv2" type="b2602c69:ProjectViewProjectNode" />
               <item name="DiscordSailv2" type="462c0819:PsiDirectoryNode" />
-              <item name="Storage" type="462c0819:PsiDirectoryNode" />
-              <item name="176434793674833920" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="vaerys" type="462c0819:PsiDirectoryNode" />
+              <item name="commands" type="462c0819:PsiDirectoryNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="DiscordSailv2" type="b2602c69:ProjectViewProjectNode" />
+              <item name="DiscordSailv2" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="vaerys" type="462c0819:PsiDirectoryNode" />
+              <item name="commands" type="462c0819:PsiDirectoryNode" />
+              <item name="general" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="DiscordSailv2" type="b2602c69:ProjectViewProjectNode" />
               <item name="DiscordSailv2" type="462c0819:PsiDirectoryNode" />
-              <item name="Storage" type="462c0819:PsiDirectoryNode" />
-              <item name="Backups" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="vaerys" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="DiscordSailv2" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-      <pane id="Scratches" />
       <pane id="Scope" />
+      <pane id="Scratches" />
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -511,8 +961,8 @@
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.4827586" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../BlakeAI" />
-    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../Discord4J" />
+    <property name="settings.editor.selected.configurable" value="reference.settings.project.statistic.project.settings" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="291" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="291" />
@@ -538,10 +988,10 @@
   <component name="RecentsManager">
     <key name="CreateClassDialog.RecentsKey">
       <recent name="Objects" />
-      <recent name="OldCode" />
       <recent name="Handlers" />
+      <recent name="Interfaces" />
+      <recent name="OldCode" />
       <recent name="Commands.DMCommands" />
-      <recent name="SlashCommands.Commands" />
     </key>
     <key name="CreateTestDialog.RecentsKey">
       <recent name="GuildToggles.Toggles" />
@@ -605,11 +1055,11 @@
     <configuration name="Main - BuildWiki" type="Application" factoryName="Application">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
         <pattern>
-          <option name="PATTERN" value="Handlers.*" />
+          <option name="PATTERN" value="com.github.vaerys.handlers.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="MAIN_CLASS_NAME" value="Main.Main" />
+      <option name="MAIN_CLASS_NAME" value="com.github.vaerys.main.Main" />
       <option name="VM_PARAMETERS" value="" />
       <option name="PROGRAM_PARAMETERS" value="-w" />
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
@@ -624,11 +1074,11 @@
     <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
         <pattern>
-          <option name="PATTERN" value="Handlers.*" />
+          <option name="PATTERN" value="com.github.vaerys.handlers.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="MAIN_CLASS_NAME" value="Main.Main" />
+      <option name="MAIN_CLASS_NAME" value="com.github.vaerys.main.Main" />
       <option name="VM_PARAMETERS" value="" />
       <option name="PROGRAM_PARAMETERS" value="" />
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
@@ -970,34 +1420,34 @@
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4312026" sideWeight="0.49676377" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3228261" sideWeight="0.4935275" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4312026" sideWeight="0.49676377" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29456523" sideWeight="0.4935275" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25568798" sideWeight="0.5117271" order="6" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3304904" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.31413043" sideWeight="0.48827294" order="11" side_tool="false" content_ui="tabs" x="14" y="443" width="1892" height="389" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.12242687" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27302274" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.41630435" sideWeight="0.5165245" order="6" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3304904" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3869565" sideWeight="0.48347548" order="1" side_tool="false" content_ui="tabs" x="14" y="443" width="1892" height="389" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3611111" sideWeight="0.4911003" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27302274" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18336888" sideWeight="0.49415204" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16976744" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="true" internal_type="SLIDING" type="FLOATING" visible="false" show_stripe_button="true" weight="0.24130435" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26332623" sideWeight="0.746114" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32291666" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="true" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.3021739" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" x="2281" y="612" width="241" height="457" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.38586956" sideWeight="0.49200428" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17537314" sideWeight="0.50584793" order="5" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.41956523" sideWeight="0.49200428" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.26066098" sideWeight="0.253886" order="5" side_tool="true" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
-      <window_info id="Inspection" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3997833" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3997833" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995737" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
-      <window_info id="Thumbnails" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32936078" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Thumbnails" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32936078" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -1021,10 +1471,18 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/Toggle.java</url>
+          <line>59</line>
+          <properties />
+          <option name="timeStamp" value="956" />
+        </line-breakpoint>
+      </breakpoints>
       <breakpoints-dialog>
         <breakpoints-dialog />
       </breakpoints-dialog>
-      <option name="time" value="929" />
+      <option name="time" value="1011" />
     </breakpoint-manager>
     <watches-manager>
       <configuration name="Application">
@@ -1040,494 +1498,424 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://$MAVEN_REPOSITORY$/com/github/austinv11/Discord4j/2.8.4/Discord4j-2.8.4-sources.jar!/sx/blah/discord/handle/obj/IEmoji.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/LevelUpMessage.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="416">
-          <caret line="83" column="11" lean-forward="false" selection-start-line="83" selection-start-column="11" selection-end-line="83" selection-end-column="11" />
+        <state relative-caret-position="459">
+          <caret line="32" column="34" lean-forward="false" selection-start-line="32" selection-start-column="34" selection-end-line="32" selection-end-column="34" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/github/austinv11/Discord4j/2.8.4/Discord4j-2.8.4-shaded.jar!/com/vdurmont/emoji/EmojiManager.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/QueueHandler.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="50" column="0" lean-forward="false" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" />
-          <folding>
-            <element signature="e#1510#1511#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/github/austinv11/Discord4j/2.8.4/Discord4j-2.8.4-shaded.jar!/com/vdurmont/emoji/EmojiTrie.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="248">
-          <caret line="64" column="0" lean-forward="false" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
+        <state relative-caret-position="-964">
+          <caret line="49" column="37" lean-forward="false" selection-start-line="49" selection-start-column="37" selection-end-line="49" selection-end-column="37" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/Pixels/SetLevelUpReaction.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/CommandInit.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-502">
-          <caret line="17" column="89" lean-forward="false" selection-start-line="17" selection-start-column="89" selection-end-line="17" selection-end-column="89" />
-          <folding />
+        <state relative-caret-position="238">
+          <caret line="89" column="35" lean-forward="false" selection-start-line="89" selection-start-column="35" selection-end-line="89" selection-end-column="35" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/GuildToggles/Modules/ModulePixels.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/CCHandler.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="314">
-          <caret line="38" column="51" lean-forward="false" selection-start-line="38" selection-start-column="51" selection-end-line="38" selection-end-column="51" />
+        <state relative-caret-position="289">
+          <caret line="61" column="8" lean-forward="false" selection-start-line="61" selection-start-column="8" selection-end-line="62" selection-end-column="46" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Vaerys/Downloads/MusicHelpCommand.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/GetCCData.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="526">
-          <caret line="89" column="23" lean-forward="false" selection-start-line="89" selection-start-column="16" selection-end-line="89" selection-end-column="23" />
-          <folding>
-            <element signature="e#0#7041#0" expanded="false" />
-          </folding>
+        <state relative-caret-position="425">
+          <caret line="34" column="17" lean-forward="false" selection-start-line="34" selection-start-column="17" selection-end-line="34" selection-end-column="17" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Vaerys/Downloads/CommandsCommand.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/RandomCC.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-86">
-          <caret line="40" column="48" lean-forward="false" selection-start-line="40" selection-start-column="41" selection-end-line="40" selection-end-column="48" />
+        <state relative-caret-position="340">
+          <caret line="55" column="9" lean-forward="true" selection-start-line="55" selection-start-column="9" selection-end-line="55" selection-end-column="9" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/General/UserInfo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/help/Help.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="629">
-          <caret line="101" column="64" lean-forward="false" selection-start-line="101" selection-start-column="64" selection-end-line="101" selection-end-column="64" />
+        <state relative-caret-position="221">
+          <caret line="22" column="54" lean-forward="false" selection-start-line="22" selection-start-column="54" selection-end-line="22" selection-end-column="54" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/Admin/SetTrustedRoles.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/SetLevelUpReaction.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="68">
+          <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/Admin/Module.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/enums/EnumString.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="170">
-          <caret line="19" column="66" lean-forward="false" selection-start-line="19" selection-start-column="66" selection-end-line="19" selection-end-column="66" />
+          <caret line="16" column="31" lean-forward="false" selection-start-line="16" selection-start-column="31" selection-end-line="16" selection-end-column="31" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/Admin/Toggle.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/GuildUsers.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="58" column="24" lean-forward="false" selection-start-line="58" selection-start-column="24" selection-end-line="58" selection-end-column="24" />
+        <state relative-caret-position="403">
+          <caret line="75" column="30" lean-forward="false" selection-start-line="75" selection-start-column="30" selection-end-line="75" selection-end-column="30" />
           <folding>
-            <element signature="e#469#470#0" expanded="false" />
-            <element signature="e#530#531#0" expanded="false" />
+            <element signature="e#2215#2216#0" expanded="true" />
+            <element signature="e#2252#2253#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/General/GetAvatar.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/CustomCommands.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="22" column="55" lean-forward="false" selection-start-line="22" selection-start-column="55" selection-end-line="22" selection-end-column="55" />
+        <state relative-caret-position="213">
+          <caret line="178" column="24" lean-forward="false" selection-start-line="178" selection-start-column="24" selection-end-line="178" selection-end-column="24" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/Pixels/PixelHelp.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/MessageHandler.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="30" column="22" lean-forward="false" selection-start-line="30" selection-start-column="22" selection-end-line="30" selection-end-column="22" />
+        <state relative-caret-position="196">
+          <caret line="95" column="28" lean-forward="false" selection-start-line="95" selection-start-column="28" selection-end-line="95" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/RoleSelect/CosmeticRoles.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/Test.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="26" column="31" lean-forward="true" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
+        <state relative-caret-position="34">
+          <caret line="16" column="52" lean-forward="false" selection-start-line="16" selection-start-column="52" selection-end-line="16" selection-end-column="52" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/General/Test.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/github/austinv11/Discord4j/2.8.4/Discord4j-2.8.4-sources.jar!/sx/blah/discord/handle/impl/obj/User.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="169">
+          <caret line="125" column="0" lean-forward="false" selection-start-line="125" selection-start-column="0" selection-end-line="125" selection-end-column="0" />
+          <folding>
+            <element signature="e#3555#3556#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://E:/Program Files/Java/Jdk1.8.0_91/src.zip!/java/util/regex/Matcher.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="56" column="37" lean-forward="false" selection-start-line="56" selection-start-column="37" selection-end-line="56" selection-end-column="37" />
+        <state relative-caret-position="417">
+          <caret line="710" column="29" lean-forward="false" selection-start-line="710" selection-start-column="29" selection-end-line="710" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/Creator/DailyMessages.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/github/austinv11/Discord4j/2.8.4/Discord4j-2.8.4-sources.jar!/sx/blah/discord/handle/obj/IGuild.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="179">
+          <caret line="149" column="25" lean-forward="false" selection-start-line="149" selection-start-column="25" selection-end-line="149" selection-end-column="25" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/Pixels/Pixels.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/github/austinv11/Discord4j/2.8.4/Discord4j-2.8.4-sources.jar!/sx/blah/discord/handle/impl/obj/Guild.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="48" column="0" lean-forward="false" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="2" />
+        <state relative-caret-position="191">
+          <caret line="276" column="37" lean-forward="false" selection-start-line="276" selection-start-column="23" selection-end-line="276" selection-end-column="37" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/OldCode/OldUserDailyMessageObject.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/CommandObject.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="31" lean-forward="false" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
-          <folding>
-            <element signature="e#206#207#0" expanded="true" />
-            <element signature="e#240#241#0" expanded="true" />
-            <element signature="e#270#271#0" expanded="true" />
-            <element signature="e#303#304#0" expanded="true" />
-            <element signature="e#329#330#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="179">
+          <caret line="18" column="23" lean-forward="false" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://E:/Program Files/Java/Jdk1.8.0_91/src.zip!/java/util/Random.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/XRequestBuffer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="952">
-          <caret line="385" column="15" lean-forward="false" selection-start-line="385" selection-start-column="15" selection-end-line="385" selection-end-column="15" />
+        <state relative-caret-position="179">
+          <caret line="298" column="0" lean-forward="false" selection-start-line="298" selection-start-column="0" selection-end-line="298" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/OldCode/OldGlobalData.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/masterobjects/UserObject.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+        <state relative-caret-position="118">
+          <caret line="60" column="0" lean-forward="false" selection-start-line="60" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
           <folding>
-            <element signature="e#218#219#0" expanded="true" />
-            <element signature="e#258#259#0" expanded="true" />
+            <element signature="e#2577#2578#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/CommandObject.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/masterobjects/GuildObject.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-221">
-          <caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-          <folding />
+        <state relative-caret-position="169">
+          <caret line="94" column="0" lean-forward="false" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
+          <folding>
+            <element signature="e#3889#3890#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Handlers/DMHandler.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/pogos/GuildConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        <state relative-caret-position="-178">
+          <caret line="137" column="29" lean-forward="false" selection-start-line="137" selection-start-column="29" selection-end-line="137" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Handlers/EventHandler.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/main/Utility.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="350">
-          <caret line="169" column="37" lean-forward="false" selection-start-line="169" selection-start-column="37" selection-end-line="169" selection-end-column="37" />
+        <state relative-caret-position="342">
+          <caret line="855" column="27" lean-forward="false" selection-start-line="855" selection-start-column="27" selection-end-line="855" selection-end-column="27" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Storage/bot.log">
+    <entry file="jar://E:/Program Files/Java/Jdk1.8.0_91/src.zip!/java/text/SimpleDateFormat.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="149">
-          <caret line="11114" column="98" lean-forward="false" selection-start-line="11114" selection-start-column="98" selection-end-line="11114" selection-end-column="98" />
+        <state relative-caret-position="-1198">
+          <caret line="554" column="11" lean-forward="false" selection-start-line="554" selection-start-column="11" selection-end-line="554" selection-end-column="11" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Storage/Backups/Global_Data.json1">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/TopTen.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="63" selection-end-column="1" />
+        <state relative-caret-position="68">
+          <caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://E:/Program Files/Java/Jdk1.8.0_91/src.zip!/java/lang/Runnable.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/EditCC.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="55" column="21" lean-forward="true" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
+        <state relative-caret-position="119">
+          <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Objects/ShutdownHook.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/characters/ListChars.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="13" lean-forward="false" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        <state relative-caret-position="272">
+          <caret line="30" column="13" lean-forward="false" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://E:/Program Files/Java/Jdk1.8.0_91/src.zip!/java/lang/Runtime.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/main/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-106">
-          <caret line="205" column="16" lean-forward="false" selection-start-line="205" selection-start-column="16" selection-end-line="205" selection-end-column="16" />
+        <state relative-caret-position="119">
+          <caret line="26" column="13" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Main/Main.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/UserSettings.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="33" column="0" lean-forward="false" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#976#1170#0" expanded="true" />
-            <element signature="e#1169#1170#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="442">
+          <caret line="120" column="17" lean-forward="false" selection-start-line="120" selection-start-column="17" selection-end-line="120" selection-end-column="17" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Handlers/PatchHandler.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/GetAvatar.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="213" column="47" lean-forward="false" selection-start-line="213" selection-start-column="47" selection-end-line="213" selection-end-column="47" />
+        <state relative-caret-position="187">
+          <caret line="24" column="64" lean-forward="false" selection-start-line="24" selection-start-column="64" selection-end-line="24" selection-end-column="64" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/POGOs/GlobalData.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/help/Report.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="19" column="29" lean-forward="false" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#801#802#0" expanded="true" />
-            <element signature="e#838#839#0" expanded="true" />
-            <element signature="e#895#896#0" expanded="true" />
-            <element signature="e#932#933#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="13">
+          <caret line="49" column="60" lean-forward="false" selection-start-line="49" selection-start-column="60" selection-end-line="49" selection-end-column="60" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Main/Globals.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/help/SilentReport.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="314" column="36" lean-forward="true" selection-start-line="314" selection-start-column="36" selection-end-line="314" selection-end-column="36" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="142">
+          <caret line="17" column="38" lean-forward="false" selection-start-line="17" selection-start-column="38" selection-end-line="17" selection-end-column="38" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Main/Constants.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/cc/ListCCs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="143" column="35" lean-forward="false" selection-start-line="143" selection-start-column="35" selection-end-line="143" selection-end-column="35" />
+        <state relative-caret-position="-1003">
+          <caret line="23" column="65" lean-forward="false" selection-start-line="23" selection-start-column="65" selection-end-line="23" selection-end-column="65" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Main/Utility.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/Pixels.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="443">
-          <caret line="1101" column="22" lean-forward="true" selection-start-line="1101" selection-start-column="22" selection-end-line="1101" selection-end-column="22" />
+        <state relative-caret-position="17">
+          <caret line="73" column="8" lean-forward="false" selection-start-line="73" selection-start-column="8" selection-end-line="76" selection-end-column="9" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://E:/Program Files/Java/Jdk1.8.0_91/src.zip!/java/time/DayOfWeek.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/SetXp.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-565">
-          <caret line="108" column="12" lean-forward="false" selection-start-line="108" selection-start-column="12" selection-end-line="108" selection-end-column="12" />
+        <state relative-caret-position="340">
+          <caret line="51" column="26" lean-forward="false" selection-start-line="51" selection-start-column="26" selection-end-line="51" selection-end-column="26" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Objects/QueueObject.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/SetLevel.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
-          <caret line="4" column="12" lean-forward="true" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
-          <folding>
-            <element signature="e#285#286#0" expanded="true" />
-            <element signature="e#317#318#0" expanded="true" />
-            <element signature="e#345#346#0" expanded="true" />
-            <element signature="e#371#372#0" expanded="true" />
-            <element signature="e#402#403#0" expanded="true" />
-            <element signature="e#429#430#0" expanded="true" />
-          </folding>
+          <caret line="33" column="57" lean-forward="false" selection-start-line="33" selection-start-column="57" selection-end-line="33" selection-end-column="57" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/Creator/DailyMsgEditModes.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/pixels/Rank.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="4" lean-forward="true" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
+        <state relative-caret-position="-1020">
+          <caret line="32" column="92" lean-forward="false" selection-start-line="32" selection-start-column="92" selection-end-line="32" selection-end-column="92" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/Creator/GetGlobalStats.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/creator/Sudo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="39" column="31" lean-forward="false" selection-start-line="39" selection-start-column="31" selection-end-line="39" selection-end-column="31" />
+        <state relative-caret-position="277">
+          <caret line="41" column="19" lean-forward="false" selection-start-line="41" selection-start-column="19" selection-end-line="41" selection-end-column="19" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Objects/DailyUserMessageObject.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/PurgeBannedData.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="447">
-          <caret line="39" column="29" lean-forward="false" selection-start-line="39" selection-start-column="29" selection-end-line="39" selection-end-column="29" />
-          <folding>
-            <element signature="e#781#782#0" expanded="true" />
-            <element signature="e#820#821#0" expanded="true" />
-            <element signature="e#880#881#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="-1564">
+          <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Objects/SplitFirstObject.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/objects/ProfileObject.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+        <state relative-caret-position="179">
+          <caret line="92" column="16" lean-forward="false" selection-start-line="92" selection-start-column="16" selection-end-line="92" selection-end-column="16" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/Creator/DailyMsg.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/main/Globals.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="850">
-          <caret line="66" column="0" lean-forward="false" selection-start-line="66" selection-start-column="0" selection-end-line="66" selection-end-column="0" />
+        <state relative-caret-position="104">
+          <caret line="115" column="0" lean-forward="false" selection-start-line="115" selection-start-column="0" selection-end-line="115" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Storage/Global_Data.json">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/XpHandler.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="982">
-          <caret line="292" column="5" lean-forward="true" selection-start-line="292" selection-start-column="5" selection-end-line="292" selection-end-column="5" />
+        <state relative-caret-position="-238">
+          <caret line="258" column="55" lean-forward="false" selection-start-line="258" selection-start-column="55" selection-end-line="258" selection-end-column="55" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Storage/176434793674833920/Guild_Config.json">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/handlers/TagHandler.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2040">
-          <caret line="164" column="21" lean-forward="false" selection-start-line="164" selection-start-column="21" selection-end-line="164" selection-end-column="21" />
-          <folding>
-            <marker date="1501570866053" expanded="true" signature="1675:3670" ph="[...]" />
-            <marker date="1501570866053" expanded="true" signature="1681:1772" ph="{&quot;type&quot;: &quot;General&quot;...}" />
-            <marker date="1501570866053" expanded="true" signature="1728:1766" ph="[...]" />
-            <marker date="1501570866053" expanded="true" signature="1778:1867" ph="{&quot;type&quot;: &quot;Admin&quot;...}" />
-            <marker date="1501570866053" expanded="true" signature="1823:1861" ph="[...]" />
-            <marker date="1501570866053" expanded="true" signature="1873:1994" ph="{&quot;type&quot;: &quot;Servers&quot;...}" />
-            <marker date="1501570866053" expanded="true" signature="1920:1988" ph="[...]" />
-            <marker date="1501570866053" expanded="true" signature="2000:2088" ph="{&quot;type&quot;: &quot;Info&quot;...}" />
-            <marker date="1501570866053" expanded="true" signature="2044:2082" ph="[...]" />
-            <marker date="1501570866053" expanded="true" signature="2094:2396" ph="{&quot;type&quot;: &quot;ShitPost&quot;...}" />
-            <marker date="1501570866053" expanded="true" signature="2142:2390" ph="[...]" />
-            <marker date="1501570866053" expanded="true" signature="2402:2494" ph="{&quot;type&quot;: &quot;AdminLog&quot;...}" />
-            <marker date="1501570866053" expanded="true" signature="2450:2488" ph="[...]" />
-            <marker date="1501570866053" expanded="true" signature="2500:2593" ph="{&quot;type&quot;: &quot;ServerLog&quot;...}" />
-            <marker date="1501570866053" expanded="true" signature="2549:2587" ph="[...]" />
-            <marker date="1501570866053" expanded="true" signature="2599:2724" ph="{&quot;type&quot;: &quot;BotCommands&quot;...}" />
-            <marker date="1501570866053" expanded="true" signature="2650:2718" ph="[...]" />
-            <marker date="1501570866053" expanded="true" signature="2730:3031" ph="{&quot;type&quot;: &quot;DontLog&quot;...}" />
-            <marker date="1501570866053" expanded="true" signature="2777:3025" ph="[...]" />
-            <marker date="1501570866053" expanded="true" signature="3037:3088" ph="{&quot;type&quot;: &quot;Art&quot;...}" />
-            <marker date="1501570866053" expanded="true" signature="3094:3184" ph="{&quot;type&quot;: &quot;Groups&quot;...}" />
-            <marker date="1501570866053" expanded="true" signature="3140:3178" ph="[...]" />
-            <marker date="1501570866053" expanded="true" signature="3190:3308" ph="{&quot;type&quot;: &quot;Rank&quot;...}" />
-            <marker date="1501570866053" expanded="true" signature="3234:3302" ph="[...]" />
-            <marker date="1501570866053" expanded="true" signature="3314:3466" ph="{&quot;type&quot;: &quot;XpDenied&quot;...}" />
-            <marker date="1501570866053" expanded="true" signature="3362:3460" ph="[...]" />
-            <marker date="1501570866053" expanded="true" signature="3472:3563" ph="{&quot;type&quot;: &quot;LevelUp&quot;...}" />
-            <marker date="1501570866053" expanded="true" signature="3519:3557" ph="[...]" />
-            <marker date="1501570866053" expanded="true" signature="3569:3666" ph="{&quot;type&quot;: &quot;LevelUpDenied&quot;...}" />
-            <marker date="1501570866053" expanded="true" signature="3622:3660" ph="[...]" />
-            <marker date="1501570866053" expanded="true" signature="3743:3744" ph="[...]" />
-            <marker date="1501570866053" expanded="true" signature="3769:3830" ph="{&quot;roleID&quot;: 201711165334749184...}" />
-            <marker date="1501570866053" expanded="true" signature="3836:3897" ph="{&quot;roleID&quot;: 330213226665213955...}" />
-            <marker date="1501570866053" expanded="true" signature="3903:3964" ph="{&quot;roleID&quot;: 201608404567851008...}" />
-            <marker date="1501570866053" expanded="true" signature="3970:4031" ph="{&quot;roleID&quot;: 330213339852570625...}" />
-          </folding>
+        <state relative-caret-position="393">
+          <caret line="64" column="45" lean-forward="false" selection-start-line="64" selection-start-column="45" selection-end-line="64" selection-end-column="45" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/General/NewDailyMessage.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/ProfileSettings.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="202">
-          <caret line="22" column="35" lean-forward="false" selection-start-line="22" selection-start-column="35" selection-end-line="22" selection-end-column="35" />
+        <state relative-caret-position="119">
+          <caret line="16" column="20" lean-forward="false" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Handlers/QueueHandler.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/github/austinv11/Discord4j/2.8.4/Discord4j-2.8.4-sources.jar!/sx/blah/discord/handle/obj/StatusType.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="398">
-          <caret line="51" column="33" lean-forward="true" selection-start-line="51" selection-start-column="33" selection-end-line="51" selection-end-column="33" />
+        <state relative-caret-position="17">
+          <caret line="22" column="12" lean-forward="false" selection-start-line="22" selection-start-column="12" selection-end-line="22" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://E:/Program Files/Java/Jdk1.8.0_91/src.zip!/java/lang/String.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/UserInfo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="202">
-          <caret line="2131" column="19" lean-forward="false" selection-start-line="2131" selection-start-column="19" selection-end-line="2131" selection-end-column="19" />
-          <folding>
-            <element signature="e#82971#82972#0" expanded="true" />
-            <element signature="e#83020#83021#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="255">
+          <caret line="42" column="145" lean-forward="false" selection-start-line="42" selection-start-column="145" selection-end-line="42" selection-end-column="145" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/Admin/ChannelStats.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/SetQuote.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
-          <caret line="16" column="13" lean-forward="false" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+          <caret line="23" column="100" lean-forward="true" selection-start-line="23" selection-start-column="59" selection-end-line="23" selection-end-column="100" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/POGOs/GuildConfig.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/SetGender.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="262">
-          <caret line="86" column="67" lean-forward="false" selection-start-line="86" selection-start-column="67" selection-end-line="86" selection-end-column="67" />
-          <folding>
-            <element signature="e#13226#13227#0" expanded="true" />
-            <element signature="e#13265#13266#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="102">
+          <caret line="22" column="100" lean-forward="false" selection-start-line="22" selection-start-column="100" selection-end-line="22" selection-end-column="100" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Handlers/XpHandler.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/general/EditLinks.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="464">
-          <caret line="225" column="0" lean-forward="false" selection-start-line="225" selection-start-column="0" selection-end-line="225" selection-end-column="0" />
+        <state relative-caret-position="1037">
+          <caret line="72" column="76" lean-forward="false" selection-start-line="72" selection-start-column="76" selection-end-line="72" selection-end-column="76" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/CommandInit.java">
+    <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="629">
-          <caret line="60" column="41" lean-forward="false" selection-start-line="60" selection-start-column="41" selection-end-line="60" selection-end-column="41" />
+        <state relative-caret-position="-578">
+          <caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Commands/Admin/DenyXpPrefix.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/github/vaerys/commands/admin/Mute.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-17">
-          <caret line="38" column="56" lean-forward="true" selection-start-line="38" selection-start-column="56" selection-end-line="38" selection-end-column="56" />
+        <state relative-caret-position="272">
+          <caret line="62" column="53" lean-forward="false" selection-start-line="62" selection-start-column="53" selection-end-line="62" selection-end-column="53" />
           <folding>
-            <element signature="e#2081#2082#0" expanded="true" />
-            <element signature="e#2119#2120#0" expanded="true" />
+            <element signature="e#3376#3377#0" expanded="true" />
+            <element signature="e#3438#3439#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 19a9214f..4b470163 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.vaerys</groupId>
   <artifactId>DiscordSAIL</artifactId>
-  <version>2.8.2</version>
+  <version>2.8.3</version>
   <build>
     <resources>
       <resource>
@@ -41,7 +41,7 @@
             <configuration>
               <transformers>
                 <transformer>
-                  <mainClass>Main.Main</mainClass>
+                  <mainClass>com.github.vaerys.main.Main</mainClass>
                 </transformer>
               </transformers>
             </configuration>
diff --git a/pom.xml b/pom.xml
index 56518f26..34a820b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.vaerys</groupId>
     <artifactId>DiscordSAIL</artifactId>
-    <version>2.8.2</version>
+    <version>2.8.3</version>
 
     <build>
         <resources>
@@ -56,8 +56,9 @@
                         <configuration>
                             <transformers>
                                 <!-- add Main-Class to manifest file -->
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>Main.Main</mainClass>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>com.github.vaerys.main.Main</mainClass>
                                 </transformer>
                             </transformers>
                         </configuration>
diff --git a/src/main/java/Commands/Admin/Mute.java b/src/main/java/Commands/Admin/Mute.java
deleted file mode 100644
index 619cb0ed..00000000
--- a/src/main/java/Commands/Admin/Mute.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package Commands.Admin;
-
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.SplitFirstObject;
-import sx.blah.discord.handle.obj.IRole;
-import sx.blah.discord.handle.obj.IUser;
-import sx.blah.discord.handle.obj.Permissions;
-
-/**
- * Created by Vaerys on 02/03/2017.
- */
-public class Mute implements Command {
-
-    @Override
-    public String execute(String args, CommandObject command) {
-        SplitFirstObject userCall = new SplitFirstObject(args);
-        IRole mutedRole = command.client.getRoleByID(command.guildConfig.getMutedRoleID());
-        if (mutedRole == null) {
-            return "> Cannot Mute/UnMute user. No mute role exists.";
-        }
-        if (userCall.getRest() != null) {
-            SplitFirstObject modifier = new SplitFirstObject(userCall.getRest());
-            IUser muted;
-            if (command.message.getMentions().size() > 0) {
-                muted = command.message.getMentions().get(0);
-            } else {
-                muted = command.client.getUserByID(userCall.getFirstWord());
-                if (muted == null) {
-                    return "> Cannot Mute/UnMute user. User ID invalid.";
-                }
-            }
-            if (muted.getStringID().equals(command.authorSID)){
-                return "> Don't try to mute yourself you numpty.";
-            }
-            if (Utility.testModifier(modifier.getFirstWord()) != null) {
-                if (Utility.testUserHierarchy(command.author, muted, command.guild)) {
-                    if (Utility.testModifier(modifier.getFirstWord())) {
-                        long timeSecs = -1;
-                        if (modifier.getRest() != null) {
-                            SplitFirstObject time = new SplitFirstObject(modifier.getRest());
-                            timeSecs = Utility.textToSeconds(time.getFirstWord());
-                        }
-                        command.guildUsers.muteUser(muted.getStringID(), timeSecs, command.guildSID);
-                        if (timeSecs == -1) {
-                            return "> User Was Muted.";
-                        } else {
-                            return "> User Was Muted for " + timeSecs + " Seconds.";
-                        }
-                    }else {
-                        command.guildUsers.unMuteUser(muted.getStringID(),command.guildSID);
-                        return "> User UnMuted.";
-                    }
-                } else {
-                    return "> Cannot Mute/UnMute user, User hierarchy higher than yours.";
-                }
-            } else {
-                return "> Cannot Mute/UnMute user. Modifier Invalid. Must be either +/-/add/del";
-            }
-        } else {
-            return "> Cannot Mute/UnMute user. No modifier specified.";
-        }
-    }
-
-    @Override
-    public String[] names() {
-        return new String[]{"Mute"};
-    }
-
-    @Override
-    public String description() {
-        return "Allows for Users with ManageMessages to mute a user.";
-    }
-
-    @Override
-    public String usage() {
-        return "[@user/UserID] [+/-/add/del] (Time) (Reason)";
-    }
-
-    @Override
-    public String type() {
-        return TYPE_ADMIN;
-    }
-
-    @Override
-    public String channel() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] perms() {
-        return new Permissions[]{Permissions.MANAGE_MESSAGES};
-    }
-
-    @Override
-    public boolean requiresArgs() {
-        return true;
-    }
-
-    @Override
-    public boolean doAdminLogging() {
-        return true;
-    }
-
-    @Override
-    public String dualDescription() {
-        return null;
-    }
-
-    @Override
-    public String dualUsage() {
-        return null;
-    }
-
-    @Override
-    public String dualType() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] dualPerms() {
-        return new Permissions[0];
-    }
-}
diff --git a/src/main/java/Commands/Admin/UserSettings.java b/src/main/java/Commands/Admin/UserSettings.java
deleted file mode 100644
index ea7e36ea..00000000
--- a/src/main/java/Commands/Admin/UserSettings.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package Commands.Admin;
-
-import Commands.CommandObject;
-import Enums.UserSetting;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.SplitFirstObject;
-import Objects.UserTypeObject;
-import sx.blah.discord.handle.obj.IUser;
-import sx.blah.discord.handle.obj.Permissions;
-
-import java.util.ListIterator;
-
-/**
- * Created by Vaerys on 06/07/2017.
- */
-public class UserSettings implements Command {
-    private String settings = "**Settings**\n" +
-            "> DeniedXp\n" +
-            "> DontShowRank\n" +
-            "> DenyMakeCC\n" +
-            "> DenyUseCCs\n" +
-            "> AutoShitpost";
-
-    @Override
-    public String execute(String args, CommandObject command) {
-        SplitFirstObject split = new SplitFirstObject(args);
-        IUser user;
-        if (command.message.getMentions().size() > 0) {
-            user = command.message.getMentions().get(0);
-        } else {
-            user = command.guild.getUserByID(split.getFirstWord());
-        }
-        if (user == null) {
-            return "> no user Specified";
-        }
-        UserTypeObject userObject = command.guildUsers.getUserByID(user.getStringID());
-        if (userObject != null) {
-            switch (split.getRest().toLowerCase()) {
-                case "deniedxp":
-                    return toggleSetting(userObject, UserSetting.DENY_MAKE_CC,
-                            "> User will now gain xp again.",
-                            "> User will no longer gain XP.");
-                case "dontshowrank":
-                    return toggleSetting(userObject, UserSetting.DENY_MAKE_CC,
-                            "> User's rank is now visible.",
-                            "> User will no longer display their rank.");
-                case "denymakecc":
-                    return toggleSetting(userObject, UserSetting.DENY_MAKE_CC,
-                            "> User can now make custom commands.",
-                            "> User can no longer make custom commands.");
-                case "denyuseccs":
-                    return toggleSetting(userObject, UserSetting.DENY_MAKE_CC,
-                            "> User can now use custom commands.",
-                            "> User can no longer use custom commands.");
-                case "autoshitpost":
-                    return toggleSetting(userObject, UserSetting.AUTO_SHITPOST,
-                            "> User no longer has the shitpost tag automatically added to all of their new Custom Commands.",
-                            "> User now has the shitpost tag automatically added to all of their new Custom Commands.");
-                default:
-                    return "> Invalid setting.\n" + settings + "\n\n" + Utility.getCommandInfo(this, command);
-            }
-        } else {
-            return "> Invalid user.";
-        }
-    }
-
-    private String toggleSetting(UserTypeObject user, UserSetting setting, String remove, String add) {
-        if (user.getSettings().contains(setting)) {
-            ListIterator iterator = user.getSettings().listIterator();
-            while (iterator.hasNext()) {
-                UserSetting s = (UserSetting) iterator.next();
-                if (s == setting) {
-                    iterator.remove();
-                }
-            }
-            return remove;
-        } else {
-            user.getSettings().add(setting);
-            return add;
-        }
-    }
-
-    @Override
-    public String[] names() {
-        return new String[]{"UserSettings"};
-    }
-
-    @Override
-    public String description() {
-        return "allows setting of certain user settings.\n" + settings;
-    }
-
-    @Override
-    public String usage() {
-        return "[UserID/@User] [Setting]";
-    }
-
-    @Override
-    public String type() {
-        return TYPE_ADMIN;
-    }
-
-    @Override
-    public String channel() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] perms() {
-        return new Permissions[]{Permissions.MANAGE_SERVER};
-    }
-
-    @Override
-    public boolean requiresArgs() {
-        return true;
-    }
-
-    @Override
-    public boolean doAdminLogging() {
-        return true;
-    }
-
-    @Override
-    public String dualDescription() {
-        return null;
-    }
-
-    @Override
-    public String dualUsage() {
-        return null;
-    }
-
-    @Override
-    public String dualType() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] dualPerms() {
-        return new Permissions[0];
-    }
-}
diff --git a/src/main/java/Commands/BlackList/BlacklistEditModes.java b/src/main/java/Commands/BlackList/BlacklistEditModes.java
deleted file mode 100644
index 25866b05..00000000
--- a/src/main/java/Commands/BlackList/BlacklistEditModes.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package Commands.BlackList;
-
-/**
- * Created by Vaerys on 04/04/2017.
- */
-public class BlacklistEditModes {
-}
diff --git a/src/main/java/Commands/BlackList/EditBlackList.java b/src/main/java/Commands/BlackList/EditBlackList.java
deleted file mode 100644
index c7c873bf..00000000
--- a/src/main/java/Commands/BlackList/EditBlackList.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package Commands.BlackList;
-
-/**
- * Created by Vaerys on 04/04/2017.
- */
-public class EditBlackList {
-}
diff --git a/src/main/java/Commands/BlackList/ListBlackLists.java b/src/main/java/Commands/BlackList/ListBlackLists.java
deleted file mode 100644
index 671760f6..00000000
--- a/src/main/java/Commands/BlackList/ListBlackLists.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package Commands.BlackList;
-
-/**
- * Created by Vaerys on 04/04/2017.
- */
-public class ListBlackLists {
-}
diff --git a/src/main/java/Commands/BlackList/NewBlackList.java b/src/main/java/Commands/BlackList/NewBlackList.java
deleted file mode 100644
index 27e3b2b1..00000000
--- a/src/main/java/Commands/BlackList/NewBlackList.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package Commands.BlackList;
-
-/**
- * Created by Vaerys on 04/04/2017.
- */
-public class NewBlackList {
-
-    //todo this.
-}
diff --git a/src/main/java/Commands/Characters/ListChars.java b/src/main/java/Commands/Characters/ListChars.java
deleted file mode 100644
index 76c3abd7..00000000
--- a/src/main/java/Commands/Characters/ListChars.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package Commands.Characters;
-
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.CharacterObject;
-import Objects.XEmbedBuilder;
-import sx.blah.discord.handle.obj.IUser;
-import sx.blah.discord.handle.obj.Permissions;
-
-import java.util.ArrayList;
-
-/**
- * Created by Vaerys on 31/01/2017.
- */
-public class ListChars implements Command {
-    @Override
-    public String execute(String args, CommandObject command) {
-        XEmbedBuilder builder = new XEmbedBuilder();
-        String id = command.authorSID;
-        String title = "> Here are all of your characters.";
-        if (command.message.getMentions().size() > 0){
-            IUser mentioned = command.message.getMentions().get(0);
-            id = mentioned.getStringID();
-            title = "> Here are all of **@" + mentioned.getName() + "#" + mentioned.getDiscriminator() + "'s** Characters.";
-        }
-        ArrayList<String> list = new ArrayList<>();
-        for (CharacterObject c: command.characters.getCharacters(command.guild)){
-            if (c.getUserID().equals(id)){
-                list.add(c.getName());
-            }
-        }
-        Utility.listFormatterEmbed(title,builder,list,true);
-        builder.appendField(spacer,Utility.getCommandInfo(new SelectChar(),command),false);
-        builder.withColor(Utility.getUsersColour(command.client.getOurUser(), command.guild));
-        Utility.sendEmbedMessage("",builder,command.channel);
-        return null;
-    }
-
-    @Override
-    public String[] names() {
-        return new String[]{"ListChars","Chars","CharList"};
-    }
-
-    @Override
-    public String description() {
-        return "Shows you all of your characters.";
-    }
-
-    @Override
-    public String usage() {
-        return "(@User)";
-    }
-
-    @Override
-    public String type() {
-        return TYPE_CHARACTER;
-    }
-
-    @Override
-    public String channel() {
-        return CHANNEL_BOT_COMMANDS;
-    }
-
-    @Override
-    public Permissions[] perms() {
-        return new Permissions[0];
-    }
-
-    @Override
-    public boolean requiresArgs() {
-        return false;
-    }
-
-    @Override
-    public boolean doAdminLogging() {
-        return false;
-    }
-
-    @Override
-    public String dualDescription() {
-        return null;
-    }
-
-    @Override
-    public String dualUsage() {
-        return null;
-    }
-
-    @Override
-    public String dualType() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] dualPerms() {
-        return new Permissions[0];
-    }
-}
diff --git a/src/main/java/Commands/CommandObject.java b/src/main/java/Commands/CommandObject.java
deleted file mode 100644
index 181b2310..00000000
--- a/src/main/java/Commands/CommandObject.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package Commands;
-
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
-import Interfaces.DMCommand;
-import Interfaces.GuildToggle;
-import Main.Globals;
-import Main.Utility;
-import Objects.GuildContentObject;
-import POGOs.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import sx.blah.discord.api.IDiscordClient;
-import sx.blah.discord.handle.obj.*;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-
-
-/**
- * Created by Vaerys on 29/01/2017.
- */
-public class CommandObject {
-
-    public IMessage message;
-    public String messageSID;
-    public long messageID;
-    public IGuild guild;
-    public String guildSID;
-    public long guildID;
-    public IChannel channel;
-    public String channelSID;
-    public long channelID;
-    public IUser author;
-    public String authorSID;
-    public long authorID;
-    public String authorDisplayName;
-    public String authorUserName;
-    public Color authorColour;
-    public List<IRole> authorRoles;
-    public IUser botUser;
-    public String notAllowed;
-
-    public GuildContentObject guildContent;
-    public GuildConfig guildConfig;
-    public CustomCommands customCommands;
-    public Characters characters;
-    public Servers servers;
-    public Competition competition;
-    public GuildUsers guildUsers;
-    public ChannelData channelData;
-
-    public ArrayList<Command> commands = new ArrayList<>();
-    public ArrayList<DMCommand> dmCommands = new ArrayList<>();
-    public ArrayList<String> commandTypes = new ArrayList<>();
-    public ArrayList<GuildToggle> guildToggles = new ArrayList<>();
-    private ArrayList<GuildToggle> toRemove = new ArrayList<>();
-    public ArrayList<ChannelSetting> channelSettings = new ArrayList<>();
-
-    public IDiscordClient client;
-
-
-    final static Logger logger = LoggerFactory.getLogger(CommandObject.class);
-
-
-    public CommandObject(IMessage message) {
-        this.message = message;
-        guild = message.getGuild();
-        channel = message.getChannel();
-        author = message.getAuthor();
-        init();
-    }
-
-    public CommandObject(IMessage message, IGuild guild, IChannel channel, IUser author) {
-        this.message = message;
-        this.guild = guild;
-        this.channel = channel;
-        this.author = author;
-        validate();
-        init();
-    }
-
-    public CommandObject(DMCommandObject command) {
-        this.message = command.message;
-        this.channel = command.channel;
-        this.author = command.author;
-        for (IGuild g : command.client.getGuilds()) {
-            if (g.getUsers().contains(command.author)) {
-                this.guild = g;
-            }
-        }
-        validate();
-        init();
-    }
-
-    private void init() {
-        messageSID = message.getStringID();
-        guildSID = guild.getStringID();
-        channelSID = channel.getStringID();
-        authorSID = author.getStringID();
-        messageID = message.getLongID();
-        guildID = guild.getLongID();
-        channelID = channel.getLongID();
-        authorID = author.getLongID();
-        authorUserName = author.getName() + "#" + author.getDiscriminator();
-        authorDisplayName = author.getDisplayName(guild);
-        authorColour = Utility.getUsersColour(author, guild);
-        authorRoles = author.getRolesForGuild(guild);
-        guildContent = Globals.getGuildContent(guildSID);
-        guildConfig = guildContent.getGuildConfig();
-        customCommands = guildContent.getCustomCommands();
-        characters = guildContent.getCharacters();
-        servers = guildContent.getServers();
-        competition = guildContent.getCompetition();
-        guildUsers = guildContent.getGuildUsers();
-        channelData = guildContent.getChannelData();
-        client = Globals.getClient();
-        botUser = client.getOurUser();
-
-        commands = (ArrayList<Command>) Globals.getCommands().clone();
-        commandTypes = (ArrayList<String>) Globals.getCommandTypes().clone();
-        channelSettings = (ArrayList<ChannelSetting>) Globals.getChannelSettings().clone();
-        guildToggles = (ArrayList<GuildToggle>) Globals.getGuildGuildToggles().clone();
-
-        checkToggles();
-
-        dmCommands = Globals.getCommandsDM();
-
-        notAllowed = "> I'm sorry " + author.getDisplayName(guild) + ", I'm afraid I can't let you do that.";
-    }
-
-    private void validate() throws IllegalStateException {
-        if (message == null) throw new IllegalStateException("message can't be null");
-        if (guild == null) throw new IllegalStateException("guild can't be null");
-        if (channel == null) throw new IllegalStateException("channel can't be null");
-        if (author == null) throw new IllegalStateException("author can't be null");
-    }
-
-    public CommandObject setAuthor(IUser author) {
-        this.author = author;
-        validate();
-        init();
-        return this;
-    }
-
-    public CommandObject setChannel(IChannel channel) {
-        this.channel = channel;
-        validate();
-        init();
-        return this;
-    }
-
-    public CommandObject setGuild(IGuild guild) {
-        this.guild = guild;
-        validate();
-        init();
-        return this;
-    }
-
-    public CommandObject setMessage(IMessage message) {
-        this.message = message;
-        validate();
-        init();
-        return this;
-    }
-
-    private void checkToggles() {
-        for (GuildToggle g : guildToggles) {
-            if (!g.get(guildConfig)) {
-                g.execute(this);
-            }
-        }
-
-        for (GuildToggle g : toRemove) {
-            ListIterator iterator = guildToggles.listIterator();
-            while (iterator.hasNext()) {
-                GuildToggle toggle = (GuildToggle) iterator.next();
-                if (toggle.name().equalsIgnoreCase(g.name())) {
-                    if (g.isModule()) {
-                        logger.trace("Module: " + g.name() + " removed.");
-                    } else {
-                        logger.trace("Toggle: " + g.name() + " removed.");
-                    }
-                    iterator.remove();
-                }
-            }
-        }
-    }
-
-    public void removeCommandsByType(String type) {
-        ListIterator iterator = commands.listIterator();
-        while (iterator.hasNext()) {
-            Command c = (Command) iterator.next();
-            if (c.type().equals(type)) {
-                logger.trace("Command: " + c.names()[0] + " removed.");
-                iterator.remove();
-            }
-        }
-        for (String s : commandTypes) {
-            if (s.equals(type)) {
-                logger.trace("Type: " + s + " removed.");
-                commandTypes.remove(s);
-                return;
-            }
-        }
-    }
-
-    public void removeChannel(String channel) {
-        ListIterator iterator = channelSettings.listIterator();
-        while (iterator.hasNext()) {
-            ChannelSetting c = (ChannelSetting) iterator.next();
-            if (c.type().equals(channel)) {
-                iterator.remove();
-                logger.trace("Channel Setting: " + c.type() + " removed.");
-            }
-        }
-    }
-
-    public void removeCommand(String[] names) {
-        ListIterator iterator = commands.listIterator();
-        while (iterator.hasNext()) {
-            Command c = (Command) iterator.next();
-            if (c.names()[0].equals(names[0])) {
-                iterator.remove();
-                logger.trace("Command: " + c.names()[0] + " removed.");
-            }
-        }
-    }
-
-    public void removeToggle(String name) {
-        for (GuildToggle g : guildToggles) {
-            if (g.name().equalsIgnoreCase(name)) {
-                toRemove.add(g);
-            }
-        }
-    }
-}
diff --git a/src/main/java/Commands/DMCommands/InfoDM.java b/src/main/java/Commands/DMCommands/InfoDM.java
deleted file mode 100644
index 708ef504..00000000
--- a/src/main/java/Commands/DMCommands/InfoDM.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package Commands.DMCommands;
-
-import Commands.DMCommandObject;
-import Interfaces.DMCommand;
-import Main.Globals;
-import Main.Utility;
-import Objects.XEmbedBuilder;
-
-import java.util.ArrayList;
-
-/**
- * Created by Vaerys on 05/02/2017.
- */
-public class InfoDM implements DMCommand {
-    @Override
-    public String execute(String args, DMCommandObject command) {
-        ArrayList<DMCommand> commands = Globals.getCommandsDM();
-
-        for (DMCommand c : commands) {
-            for (String s : c.names()) {
-                if (args.equalsIgnoreCase(s)) {
-                    XEmbedBuilder infoEmbed = new XEmbedBuilder();
-
-                    //command info
-                    StringBuilder builder = new StringBuilder();
-                    builder.append("**" + Globals.defaultPrefixCommand + c.names()[0]);
-                    if (c.usage() != null) {
-                        builder.append(" " + c.usage());
-                    }
-                    builder.append("**\nDesc: **" + c.description() + "**\n");
-                    builder.append("Type: **" + c.type() + "**\n");
-                    if (c.type().equals(DMCommand.TYPE_CREATOR)) {
-                        builder.append("**" + ownerOnly + "**");
-                    }
-                    infoEmbed.appendField("> Info - " + c.names()[0],builder.toString(),false);
-
-                    //aliases
-                    if (c.names().length > 1) {
-                        StringBuilder aliasBuilder = new StringBuilder();
-                        for (int i = 1; i < c.names().length; i++) {
-                            aliasBuilder.append(Globals.defaultPrefixCommand + c.names()[i] + ", ");
-                        }
-                        aliasBuilder.delete(aliasBuilder.length() - 2, aliasBuilder.length());
-                        aliasBuilder.append(".\n");
-                        infoEmbed.appendField("Aliases:", aliasBuilder.toString(), false);
-                    }
-                    Utility.sendEmbedMessage("", infoEmbed, command.channel);
-                    return "";
-                }
-            }
-        }
-        return "> Command with the name " + args + " not found.";
-    }
-
-    @Override
-    public String[] names() {
-        return new String[]{"Info"};
-    }
-
-    @Override
-    public String description() {
-        return "Tells you information about DM commands.";
-    }
-
-    @Override
-    public String usage() {
-        return "[Command Name]";
-    }
-
-    @Override
-    public String type() {
-        return TYPE_HELP;
-    }
-
-    @Override
-    public boolean requiresArgs() {
-        return true;
-    }
-}
diff --git a/src/main/java/Commands/General/SlashList.java b/src/main/java/Commands/General/SlashList.java
deleted file mode 100644
index 122cc9b1..00000000
--- a/src/main/java/Commands/General/SlashList.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package Commands.General;
-
-import Commands.CommandObject;
-import Interfaces.Command;
-import Interfaces.SlashCommand;
-import Main.Globals;
-import Main.Utility;
-import Objects.XEmbedBuilder;
-import sx.blah.discord.handle.obj.Permissions;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-/**
- * Created by Vaerys on 13/03/2017.
- */
-public class SlashList implements Command {
-    @Override
-    public String execute(String args, CommandObject command) {
-        ArrayList<String> list = new ArrayList<>();
-        for (SlashCommand s: Globals.getSlashCommands()){
-            list.add(s.call());
-        }
-        Collections.sort(list);
-        XEmbedBuilder builder = new XEmbedBuilder();
-        builder.withColor(Utility.getUsersColour(command.client.getOurUser(),command.guild));
-        Utility.listFormatterEmbed("> Available Slash Commands.",builder,list,false);
-        Utility.sendEmbedMessage("",builder,command.channel);
-        return null;
-    }
-
-    @Override
-    public String[] names() {
-        return new String[]{"SlashList","SlashCommands","Slash"};
-    }
-
-    @Override
-    public String description() {
-        return "List Available Slash Commands.";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String type() {
-        return TYPE_GENERAL;
-    }
-
-    @Override
-    public String channel() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] perms() {
-        return new Permissions[0];
-    }
-
-    @Override
-    public boolean requiresArgs() {
-        return false;
-    }
-
-    @Override
-    public boolean doAdminLogging() {
-        return false;
-    }
-
-    @Override
-    public String dualDescription() {
-        return null;
-    }
-
-    @Override
-    public String dualUsage() {
-        return null;
-    }
-
-    @Override
-    public String dualType() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] dualPerms() {
-        return new Permissions[0];
-    }
-}
diff --git a/src/main/java/Commands/General/UserInfo.java b/src/main/java/Commands/General/UserInfo.java
deleted file mode 100644
index 5b67147f..00000000
--- a/src/main/java/Commands/General/UserInfo.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package Commands.General;
-
-import Commands.CommandObject;
-import Handlers.XpHandler;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.UserTypeObject;
-import Objects.XEmbedBuilder;
-import sx.blah.discord.handle.obj.IRole;
-import sx.blah.discord.handle.obj.IUser;
-import sx.blah.discord.handle.obj.Permissions;
-
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Created by Vaerys on 27/02/2017.
- */
-public class UserInfo implements Command {
-
-    @Override
-    public String execute(String args, CommandObject command) {
-        IUser user = command.author;
-        if (command.message.getMentions().size() > 0) {
-            user = command.message.getMentions().get(0);
-        }
-        for (UserTypeObject u : command.guildUsers.getUsers()) {
-            if (u.getID().equals(user.getStringID())) {
-
-                XEmbedBuilder builder = new XEmbedBuilder();
-                List<IRole> roles = user.getRolesForGuild(command.guild);
-                ArrayList<String> roleNames = new ArrayList<>();
-                ArrayList<String> links = new ArrayList<>();
-
-                //If user is a bot it will display the image below as the user avatar icon.
-                if (user.isBot()) {
-                    builder.withAuthorIcon("http://i.imgur.com/aRJpAP4.png");
-                }
-                //sets title to user Display Name;
-                builder.withAuthorName(user.getDisplayName(command.guild));
-
-
-                //sets thumbnail to user Avatar.
-                builder.withThumbnail(user.getAvatarURL());
-
-                //gets the age of the account.
-                long nowUTC = ZonedDateTime.now(ZoneOffset.UTC).toEpochSecond();
-                ZonedDateTime creationDate = user.getCreationDate().atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneOffset.UTC);
-                long creationUTC = creationDate.toEpochSecond();
-
-                long difference = nowUTC - creationUTC;
-
-                //sets sidebar colour
-                builder.withColor(Utility.getUsersColour(user, command.guild));
-
-                //collect role names;
-                roleNames.addAll(roles.stream().filter(role -> !role.isEveryoneRole()).map(IRole::getName).collect(Collectors.toList()));
-
-                if (u.getLinks() != null && u.getLinks().size() > 0) {
-                    links.addAll(u.getLinks().stream().map(link -> "[" + link.getName() + "](" + link.getLink() + ")").collect(Collectors.toList()));
-                }
-
-                //builds desc
-
-                command.setAuthor(user);
-
-                DateTimeFormatter formatter = DateTimeFormatter.RFC_1123_DATE_TIME;
-                StringBuilder desc = new StringBuilder();
-                if (command.guildConfig.userInfoShowsDate) {
-                    desc.append("**Account Created: **" + creationDate.format(formatter));
-                } else {
-                    desc.append("**Account Created: **" + Utility.formatTimeDifference(difference));
-                }
-                desc.append("\n**Gender: **" + u.getGender());
-
-                boolean showLevel = true;
-                boolean showCC = command.guildConfig.moduleCC;
-
-                if (!command.guildConfig.modulePixels || u.getXP() == 0) {
-                    showLevel = false;
-                }
-
-                if (showCC && !showLevel) {
-                    desc.append("\n**Custom Commands: **" + command.customCommands.getUserCommandCount(command));
-                } else if (showLevel && !showCC) {
-                    desc.append("\n**Level: **" + XpHandler.xpToLevel(u.getXP()));
-                } else if (showLevel && showCC) {
-                    desc.append("\n**Custom Commands: **" + command.customCommands.getUserCommandCount(command) +
-                            indent + indent + indent + "**Level: **" + XpHandler.xpToLevel(u.getXP()));
-                }
-
-                desc.append("\n**Roles: **" + Utility.listFormatter(roleNames, true));
-                desc.append("\n\n*" + u.getQuote() + "*");
-                desc.append("\n" + Utility.listFormatter(links, true));
-
-                builder.withDesc(desc.toString());
-                builder.withFooterText("User ID: " + u.getID());
-
-                //sends Message
-                Utility.sendEmbedMessage("", builder, command.channel);
-                return null;
-            }
-        }
-        if (user.isBot()) {
-            command.guildUsers.addUser(user.getStringID());
-            return execute(args, command);
-        }
-        return "> Unfortunately that user doesn't seem to have a user info right now.";
-    }
-
-    @Override
-    public String[] names() {
-        return new String[]{"Profile", "UserInfo", "Me"};
-    }
-
-    @Override
-    public String description() {
-        return "Lets you see some information about yourself or another user.";
-    }
-
-    @Override
-    public String usage() {
-        return "(@user)";
-    }
-
-    @Override
-    public String type() {
-        return TYPE_GENERAL;
-    }
-
-    @Override
-    public String channel() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] perms() {
-        return new Permissions[0];
-    }
-
-    @Override
-    public boolean requiresArgs() {
-        return false;
-    }
-
-    @Override
-    public boolean doAdminLogging() {
-        return false;
-    }
-
-    @Override
-    public String dualDescription() {
-        return null;
-    }
-
-    @Override
-    public String dualUsage() {
-        return null;
-    }
-
-    @Override
-    public String dualType() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] dualPerms() {
-        return new Permissions[0];
-    }
-}
diff --git a/src/main/java/Commands/Help/Help.java b/src/main/java/Commands/Help/Help.java
deleted file mode 100644
index 4b62293c..00000000
--- a/src/main/java/Commands/Help/Help.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package Commands.Help;
-
-import Commands.CommandObject;
-import Interfaces.Command;
-import Interfaces.DMCommand;
-import Main.Globals;
-import Main.Utility;
-import Objects.XEmbedBuilder;
-import sx.blah.discord.handle.obj.Permissions;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Collections;
-
-/**
- * Created by Vaerys on 29/01/2017.
- */
-
-
-public class Help implements Command {
-
-    @Override
-    public String execute(String args, CommandObject command) {
-        ArrayList<String> types = (ArrayList<String>) command.commandTypes.clone();
-        XEmbedBuilder helpEmbed = new XEmbedBuilder();
-        StringBuilder builder = new StringBuilder();
-        ArrayList<String> commandList = new ArrayList<>();
-        ArrayList<Command> commands = command.commands;
-        String error = "> There are no commands with the type: **" + args + "**.\n" + Utility.getCommandInfo(this, command);
-        //setting embed colour to match Bot's Colour
-        Color color = Utility.getUsersColour(Globals.getClient().getOurUser(), command.guild);
-        if (color != null) {
-            helpEmbed.withColor(color);
-        }
-
-        //getting Types of commands.
-
-        if (!command.authorSID.equalsIgnoreCase(Globals.creatorID)) {
-            for (int i = 0; i < types.size(); i++) {
-                if (types.get(i).equals(TYPE_CREATOR)) {
-                    types.remove(i);
-                }
-            }
-        }
-
-        //sort types
-        Collections.sort(types);
-
-        boolean showAdmin = false;
-        for (Command c : command.commands) {
-            if (c.type().equals(Command.TYPE_ADMIN)) {
-                if (Utility.testForPerms(c.perms(), command.author, command.guild)) {
-                    showAdmin = true;
-                }
-            }
-        }
-
-        if (!showAdmin) {
-            for (int i = 0; i < types.size(); i++) {
-                if (types.get(i).equalsIgnoreCase(Command.TYPE_ADMIN)) {
-                    types.remove(i);
-                }
-            }
-        }
-
-        //building the embed
-        if (args.isEmpty()) {
-            builder.append(codeBlock + "\n");
-            builder.append(Utility.listFormatter(types, false));
-            builder.append(codeBlock + "\n");
-            helpEmbed.withTitle("Here are the Command Types I have available for use:");
-            builder.append(Utility.getCommandInfo(this, command) + "\n");
-            helpEmbed.withDescription(builder.toString());
-//            helpEmbed.appendField("Helpful Links", desc, true);
-
-        } else {
-            boolean isFound = false;
-            String title = "ERROR";
-            String suffix = Utility.getCommandInfo(new Info(), command);
-            for (String s : types) {
-                if (args.equalsIgnoreCase(s) || args.equalsIgnoreCase(command.guildConfig.getPrefixCommand() + s)) {
-                    title = "> Here are all of the " + s + " Commands I have available.";
-                    isFound = true;
-                    if (s.equalsIgnoreCase(TYPE_DM)) {
-                        for (DMCommand cDM : Globals.getCommandsDM()){
-                            if (!cDM.type().equalsIgnoreCase(DMCommand.TYPE_CREATOR)){
-                                commandList.add(Globals.defaultPrefixCommand + cDM.names()[0]);
-                            }
-                        }
-                        suffix = "**These commands can only be performed in DMs.**\n" +
-                                "> If you send a non command message to my DMs it will send it to my creator.";
-                    } else {
-                        for (Command c : commands) {
-                            if (Utility.testForPerms(c.perms(), command.author, command.guild)) {
-                                if (c.type().equalsIgnoreCase(s)) {
-                                    if (c.dualType() != null) {
-                                        commandList.add(command.guildConfig.getPrefixCommand() + c.names()[0] + indent + "*");
-                                    } else {
-                                        commandList.add(command.guildConfig.getPrefixCommand() + c.names()[0]);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            Collections.sort(commandList);
-            Utility.listFormatterEmbed(title, helpEmbed, commandList, false, suffix);
-            if (!isFound) {
-                return error;
-            }
-        }
-        Utility.sendEmbedMessage("", helpEmbed, command.channel);
-        return null;
-    }
-
-    @Override
-    public String[] names() {
-        return new String[]{"Help"};
-    }
-
-    @Override
-    public String description() {
-        return "Lists the commands that users can run.";
-    }
-
-    @Override
-    public String usage() {
-        return "(Command Type)";
-    }
-
-    @Override
-    public String type() {
-        return TYPE_HELP;
-    }
-
-    @Override
-    public String channel() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] perms() {
-        return new Permissions[0];
-    }
-
-    @Override
-    public boolean requiresArgs() {
-        return false;
-    }
-
-    @Override
-    public boolean doAdminLogging() {
-        return false;
-    }
-
-    @Override
-    public String dualDescription() {
-        return null;
-    }
-
-    @Override
-    public String dualUsage() {
-        return null;
-    }
-
-    @Override
-    public String dualType() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] dualPerms() {
-        return new Permissions[0];
-    }
-}
diff --git a/src/main/java/Commands/Help/Info.java b/src/main/java/Commands/Help/Info.java
deleted file mode 100644
index 05be16b9..00000000
--- a/src/main/java/Commands/Help/Info.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package Commands.Help;
-
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Globals;
-import Main.Utility;
-import Objects.XEmbedBuilder;
-import org.apache.commons.lang3.ArrayUtils;
-import sx.blah.discord.handle.obj.IChannel;
-import sx.blah.discord.handle.obj.Permissions;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.EnumSet;
-
-/**
- * Created by Vaerys on 29/01/2017.
- */
-public class Info implements Command {
-
-    @Override
-    public String execute(String args, CommandObject command) {
-        ArrayList<Command> commands = command.commands;
-
-        String error = "> Could not find information on any commands named **" + args + "**.";
-        for (Command c : commands) {
-            for (String s : c.names()) {
-                if (args.equalsIgnoreCase(s)) {
-                    if (c.type().equalsIgnoreCase(TYPE_CREATOR) && !command.authorSID.equalsIgnoreCase(Globals.creatorID)) {
-                        return error;
-                    }
-                    if (!Utility.testForPerms(c.perms(), command.author, command.guild)) {
-                        return error;
-                    }
-
-                    XEmbedBuilder infoEmbed = new XEmbedBuilder();
-                    Color color = Utility.getUsersColour(Globals.getClient().getOurUser(), command.guild);
-                    if (color != null) {
-                        infoEmbed.withColor(color);
-                    }
-
-                    //command info
-                    StringBuilder builder = new StringBuilder();
-                    StringBuilder primaryCommand = new StringBuilder(command.guildConfig.getPrefixCommand() + c.names()[0]);
-                    if (c.usage() != null) {
-                        primaryCommand.append(" " + c.usage());
-                    }
-                    builder.append("**" + primaryCommand + "**\n");
-                    builder.append("**Desc: **" + c.description() + "\n");
-                    builder.append("**Type: **" + c.type() + "\n");
-                    if (c.perms().length != 0) {
-                        builder.append("**Perms: **");
-                        ArrayList<String> permList = new ArrayList<>();
-                        for (Permissions p : c.perms()) {
-                            permList.add(p.toString());
-                        }
-                        builder.append(Utility.listFormatter(permList, true));
-                    }
-                    //dual command info
-                    if (c.dualType() != null && Utility.testForPerms(c.dualPerms(), command.author, command.guild)) {
-                        StringBuilder dualCommand = new StringBuilder(command.guildConfig.getPrefixCommand() + c.names()[0]);
-                        if (c.dualUsage() != null) {
-                            dualCommand.append(" " + c.dualUsage());
-                        }
-                        StringBuilder builderDual = new StringBuilder();
-                        builder.append("\n**" + dualCommand + "**\n");
-                        builder.append("**Desc: **" + c.dualDescription() + "\n");
-                        builder.append("**Type: **" + c.dualType() + "\n");
-                        if (c.perms().length != 0 || c.dualPerms().length != 0) {
-                            Permissions[] perms;
-                            perms = ArrayUtils.addAll(c.dualPerms(), c.perms());
-                            builder.append("**Perms: **");
-                            ArrayList<String> permList = new ArrayList<>();
-                            for (Permissions p : perms) {
-                                permList.add(p.toString());
-                            }
-                            builder.append(Utility.listFormatter(permList, true));
-                        }
-                        builder.append(builderDual.toString());
-                    }
-                    infoEmbed.appendField("> Info - " + c.names()[0], builder.toString(), false);
-
-                    //Handle channels
-                    ArrayList<String> channelIDs = command.guildConfig.getChannelIDsByType(c.channel());
-                    ArrayList<String> channelMentions = new ArrayList<>();
-
-                    if (channelIDs != null) {
-                        for (String id : channelIDs) {
-                            IChannel temp = command.guild.getChannelByID(id);
-                            if (temp != null) {
-                                EnumSet<Permissions> userPerms = temp.getModifiedPermissions(command.author);
-                                if (userPerms.contains(Permissions.SEND_MESSAGES) && userPerms.contains(Permissions.READ_MESSAGES)) {
-                                    channelMentions.add(temp.mention());
-                                }
-                            }
-                        }
-                        builder.append("\n" + Utility.listFormatter(channelMentions, true));
-                    }
-
-                    //channel
-                    if (channelMentions.size() > 0) {
-                        if (channelMentions.size() == 1) {
-                            infoEmbed.appendField("Channel ", Utility.listFormatter(channelMentions, true), false);
-                        } else {
-                            infoEmbed.appendField("Channels ", Utility.listFormatter(channelMentions, true), false);
-                        }
-                    }
-
-                    //aliases
-                    if (c.names().length > 1) {
-                        StringBuilder aliasBuilder = new StringBuilder();
-                        for (int i = 1; i < c.names().length; i++) {
-                            aliasBuilder.append(command.guildConfig.getPrefixCommand() + c.names()[i] + ", ");
-                        }
-                        aliasBuilder.delete(aliasBuilder.length() - 2, aliasBuilder.length());
-                        aliasBuilder.append(".\n");
-                        infoEmbed.appendField("Aliases", aliasBuilder.toString(), false);
-                    }
-                    Utility.sendEmbedMessage("", infoEmbed, command.channel);
-                    return "";
-                }
-            }
-
-        }
-        return error;
-    }
-
-    @Override
-    public String[] names() {
-        return new String[]{"Info"};
-    }
-
-    @Override
-    public String description() {
-        return "Gives information about a command.";
-    }
-
-    @Override
-    public String usage() {
-        return "[Command Name]";
-    }
-
-    @Override
-    public String type() {
-        return TYPE_HELP;
-    }
-
-    @Override
-    public String channel() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] perms() {
-        return new Permissions[0];
-    }
-
-    @Override
-    public boolean requiresArgs() {
-        return true;
-    }
-
-    @Override
-    public boolean doAdminLogging() {
-        return false;
-    }
-
-    @Override
-    public String dualDescription() {
-        return null;
-    }
-
-    @Override
-    public String dualUsage() {
-        return null;
-    }
-
-    @Override
-    public String dualType() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] dualPerms() {
-        return new Permissions[0];
-    }
-
-
-}
diff --git a/src/main/java/Commands/Pixels/FixLevelErrors.java b/src/main/java/Commands/Pixels/FixLevelErrors.java
deleted file mode 100644
index 67d019df..00000000
--- a/src/main/java/Commands/Pixels/FixLevelErrors.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package Commands.Pixels;
-
-import Commands.CommandObject;
-import Handlers.XpHandler;
-import Interfaces.Command;
-import Objects.UserTypeObject;
-import sx.blah.discord.handle.obj.Permissions;
-
-public class FixLevelErrors implements Command {
-
-    @Override
-    public String execute(String args, CommandObject command) {
-        for (UserTypeObject u : command.guildUsers.getUsers()) {
-            u.setCurrentLevel(XpHandler.xpToLevel(u.getXP()));
-        }
-        return "> Levels have been adjusted.";
-    }
-
-    @Override
-    public String[] names() {
-        return new String[]{"FixLevelErrors"};
-    }
-
-    @Override
-    public String description() {
-        return "Fixes errors where levels weren't set properly.";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String type() {
-        return TYPE_PIXEL;
-    }
-
-    @Override
-    public String channel() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] perms() {
-        return new Permissions[]{Permissions.MANAGE_SERVER};
-    }
-
-    @Override
-    public boolean requiresArgs() {
-        return false;
-    }
-
-    @Override
-    public boolean doAdminLogging() {
-        return true;
-    }
-
-    @Override
-    public String dualDescription() {
-        return null;
-    }
-
-    @Override
-    public String dualUsage() {
-        return null;
-    }
-
-    @Override
-    public String dualType() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] dualPerms() {
-        return new Permissions[0];
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/Commands/Pixels/PixelHelp.java b/src/main/java/Commands/Pixels/PixelHelp.java
deleted file mode 100644
index 98fcbf7f..00000000
--- a/src/main/java/Commands/Pixels/PixelHelp.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package Commands.Pixels;
-
-import Commands.CommandObject;
-import Handlers.XpHandler;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.SplitFirstObject;
-import sx.blah.discord.handle.obj.Permissions;
-
-import java.text.NumberFormat;
-
-/**
- * Created by Vaerys on 01/07/2017.
- */
-public class PixelHelp implements Command {
-    @Override
-    public String execute(String args, CommandObject command) {
-        SplitFirstObject obe = new SplitFirstObject(args);
-        try {
-            if (obe.getFirstWord().equalsIgnoreCase("levelToXP")) {
-                long level = Long.parseLong(obe.getRest());
-                if (level < 0) {
-                    return "> Please use a positive number.";
-                }
-                if (level > 1000) {
-                    return "> No, I don't want to calculate the total xp for level " + level + "!";
-                }
-                return "> Level: " + level + " = " + NumberFormat.getInstance().format(XpHandler.totalXPForLevel(level)) + " pixels.";
-            } else if (obe.getFirstWord().equalsIgnoreCase("xpToLevel")) {
-                long xp = Long.parseLong(obe.getRest());
-                if (xp < 0) {
-                    return "> Please use a positive number.";
-                }
-                if (xp > 1345412000) {
-                    return "> Its something over level 1000, could you leave me alone.";
-                }
-                return "> " + xp + "XP = Level: " + XpHandler.xpToLevel(xp);
-            } else {
-                return "> Pixels are S.A.I.L's Form of Xp. you can gain 20 pixels once every minute in channels that allow for pixel gain.\n\n" +
-                        Utility.getCommandInfo(this, command);
-            }
-        } catch (NumberFormatException e) {
-            return "> You must supply a valid number.";
-        }
-    }
-
-    @Override
-    public String[] names() {
-        return new String[]{"PixelHelp", "HelpPixels"};
-    }
-
-    @Override
-    public String description() {
-        return "Gives you information about pixels";
-    }
-
-    @Override
-    public String usage() {
-        return ("(LevelToXp/XpToLevel) (Level/XP)");
-    }
-
-    @Override
-    public String type() {
-        return TYPE_PIXEL;
-    }
-
-    @Override
-    public String channel() {
-        return CHANNEL_PIXELS;
-    }
-
-    @Override
-    public Permissions[] perms() {
-        return new Permissions[0];
-    }
-
-    @Override
-    public boolean requiresArgs() {
-        return false;
-    }
-
-    @Override
-    public boolean doAdminLogging() {
-        return false;
-    }
-
-    @Override
-    public String dualDescription() {
-        return null;
-    }
-
-    @Override
-    public String dualUsage() {
-        return null;
-    }
-
-    @Override
-    public String dualType() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] dualPerms() {
-        return new Permissions[0];
-    }
-}
diff --git a/src/main/java/Commands/Pixels/PixelSettings.java b/src/main/java/Commands/Pixels/PixelSettings.java
deleted file mode 100644
index ed982746..00000000
--- a/src/main/java/Commands/Pixels/PixelSettings.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package Commands.Pixels;
-
-import Commands.CommandObject;
-import Enums.EnumString;
-import Enums.UserSetting;
-import Interfaces.Command;
-import Main.Constants;
-import Main.Utility;
-import Objects.UserTypeObject;
-import sx.blah.discord.handle.obj.Permissions;
-
-/**
- * Created by Vaerys on 02/07/2017.
- */
-public class PixelSettings implements Command {
-    String settings = "**Settings:**\n" +
-            "> LevelChannel\n" +
-            "> CurrentChannel\n" +
-            "> DMs\n" +
-            "> NoLvLMessages - `Hides your rank on the server`\n" +
-            "> NoXP - `Stops you from gaining pixels`";
-
-    @Override
-    public String execute(String args, CommandObject command) {
-        String message = "> Your Level messages will now be sent to ";
-        UserTypeObject userObject = command.guildUsers.getUserByID(command.authorSID);
-        switch (args.toLowerCase()) {
-            case "levelchannel":
-                removeLevelSettings(userObject);
-                userObject.getSettings().add(UserSetting.SEND_LVLUP_RANK_CHANNEL);
-                return message + "the server's level up channel.";
-            case "currentchannel":
-                removeLevelSettings(userObject);
-                userObject.getSettings().add(UserSetting.SEND_LVLUP_CURRENT_CHANNEL);
-                return message + "the current channel.";
-            case "dms":
-                removeLevelSettings(userObject);
-                userObject.getSettings().add(UserSetting.SEND_LVLUP_DMS);
-                return message + "your Direct messages.";
-            case "nolvlmessages":
-                removeLevelSettings(userObject);
-                userObject.getSettings().add(UserSetting.DONT_SEND_LVLUP);
-                return "> You will no longer see any level up messages.";
-            case "noxp":
-                if (userObject.getSettings().contains(UserSetting.NO_XP_GAIN)) {
-                    for (UserSetting s : userObject.getSettings()) {
-                        if (s == UserSetting.NO_XP_GAIN) {
-                            userObject.getSettings().remove(s);
-                            return "> You will now gain Xp again.";
-                        }
-                    }
-                } else {
-                    userObject.getSettings().add(UserSetting.NO_XP_GAIN);
-                    return "> You will no longer gain XP";
-                }
-            case "hiderank":
-                if (userObject.getSettings().contains(UserSetting.HIDE_RANK)) {
-                    for (UserSetting s : userObject.getSettings()) {
-                        if (s == UserSetting.HIDE_RANK) {
-                            userObject.getSettings().remove(s);
-                            return "> Your rank is now visible.";
-                        }
-                    }
-                } else {
-                    userObject.getSettings().add(UserSetting.HIDE_RANK);
-                    return "> Your rank is now hidden.";
-                }
-            default:
-                return settings + "\n\nCurrent Guild Default: **" + EnumString.get(command.guildConfig.getDefaultLevelMode()) + "**\n\n" +
-                        Utility.getCommandInfo(this, command);
-        }
-    }
-
-    private static void removeLevelSettings(UserTypeObject user) {
-        for (int i = 0; i < user.getSettings().size(); i++) {
-            if (Constants.levelUpStates.contains(user.getSettings().get(i))) {
-                user.getSettings().remove(i);
-            }
-        }
-    }
-
-    @Override
-    public String[] names() {
-        return new String[]{"PixelSettings"};
-    }
-
-    @Override
-    public String description() {
-        return "Allows you to set where your level up messages will be sent.\n" + settings;
-    }
-
-    @Override
-    public String usage() {
-        return "[Setting]";
-    }
-
-    @Override
-    public String type() {
-        return TYPE_PIXEL;
-    }
-
-    @Override
-    public String channel() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] perms() {
-        return new Permissions[0];
-    }
-
-    @Override
-    public boolean requiresArgs() {
-        return true;
-    }
-
-    @Override
-    public boolean doAdminLogging() {
-        return false;
-    }
-
-    @Override
-    public String dualDescription() {
-        return null;
-    }
-
-    @Override
-    public String dualUsage() {
-        return null;
-    }
-
-    @Override
-    public String dualType() {
-        return null;
-    }
-
-    @Override
-    public Permissions[] dualPerms() {
-        return new Permissions[0];
-    }
-}
diff --git a/src/main/java/Commands/Slash/DealWithIt.java b/src/main/java/Commands/Slash/DealWithIt.java
deleted file mode 100644
index 11529f39..00000000
--- a/src/main/java/Commands/Slash/DealWithIt.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package Commands.Slash;
-
-import Interfaces.SlashCommand;
-
-/**
- * Created by Vaerys on 13/03/2017.
- */
-public class DealWithIt implements SlashCommand {
-    @Override
-    public String call() {
-        return "/DealWithIt";
-    }
-
-    @Override
-    public String response() {
-        return "(•\\_•) ( •\\_•)>⌐■-■ (⌐■_■)";
-    }
-}
diff --git a/src/main/java/Commands/Slash/Disapproval.java b/src/main/java/Commands/Slash/Disapproval.java
deleted file mode 100644
index 35e69c09..00000000
--- a/src/main/java/Commands/Slash/Disapproval.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package Commands.Slash;
-
-import Interfaces.SlashCommand;
-
-/**
- * Created by Vaerys on 13/03/2017.
- */
-public class Disapproval implements SlashCommand {
-    @Override
-    public String call() {
-        return "/Disapprove";
-    }
-
-    @Override
-    public String response() {
-        return "ಠ_ಠ";
-    }
-}
diff --git a/src/main/java/Commands/Slash/Fite.java b/src/main/java/Commands/Slash/Fite.java
deleted file mode 100644
index eb34f9ad..00000000
--- a/src/main/java/Commands/Slash/Fite.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package Commands.Slash;
-
-import Interfaces.SlashCommand;
-
-/**
- * Created by Vaerys on 13/03/2017.
- */
-public class Fite implements SlashCommand {
-    @Override
-    public String call() {
-        return "/Fite";
-    }
-
-    @Override
-    public String response() {
-        return "(ง'̀-'́)ง";
-    }
-}
diff --git a/src/main/java/Commands/Slash/Gib.java b/src/main/java/Commands/Slash/Gib.java
deleted file mode 100644
index 7c418f97..00000000
--- a/src/main/java/Commands/Slash/Gib.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package Commands.Slash;
-
-import Interfaces.SlashCommand;
-
-/**
- * Created by Vaerys on 13/03/2017.
- */
-public class Gib implements SlashCommand {
-    @Override
-    public String call() {
-        return "/Gib";
-    }
-
-    @Override
-    public String response() {
-        return "༼ つ ◕_◕ ༽つ";
-    }
-}
diff --git a/src/main/java/Commands/Slash/Lenny.java b/src/main/java/Commands/Slash/Lenny.java
deleted file mode 100644
index 849571c0..00000000
--- a/src/main/java/Commands/Slash/Lenny.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package Commands.Slash;
-
-import Interfaces.SlashCommand;
-
-/**
- * Created by Vaerys on 13/03/2017.
- */
-public class Lenny implements SlashCommand {
-    @Override
-    public String call() {
-        return "/Lenny";
-    }
-
-    @Override
-    public String response() {
-        return "( ͡° ͜ʖ ͡°)";
-    }
-}
diff --git a/src/main/java/Commands/Slash/Shrug.java b/src/main/java/Commands/Slash/Shrug.java
deleted file mode 100644
index 751205c9..00000000
--- a/src/main/java/Commands/Slash/Shrug.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package Commands.Slash;
-
-import Interfaces.SlashCommand;
-
-/**
- * Created by Vaerys on 13/03/2017.
- */
-public class Shrug implements SlashCommand {
-    @Override
-    public String call() {
-        return "/Shrug";
-    }
-
-    @Override
-    public String response() {
-        return "¯\\_(ツ)_/¯";
-    }
-}
diff --git a/src/main/java/Commands/Slash/TableFlip.java b/src/main/java/Commands/Slash/TableFlip.java
deleted file mode 100644
index c40c3816..00000000
--- a/src/main/java/Commands/Slash/TableFlip.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package Commands.Slash;
-
-import Interfaces.SlashCommand;
-
-/**
- * Created by Vaerys on 13/03/2017.
- */
-public class TableFlip implements SlashCommand {
-    @Override
-    public String call() {
-        return "/TableFlip";
-    }
-
-    @Override
-    public String response() {
-        return "(╯°□°）╯︵ ┻━┻";
-    }
-}
diff --git a/src/main/java/Commands/Slash/UnFlip.java b/src/main/java/Commands/Slash/UnFlip.java
deleted file mode 100644
index 0e720055..00000000
--- a/src/main/java/Commands/Slash/UnFlip.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package Commands.Slash;
-
-import Interfaces.SlashCommand;
-
-/**
- * Created by Vaerys on 13/03/2017.
- */
-public class UnFlip implements SlashCommand {
-    @Override
-    public String call() {
-        return "/UnFlip";
-    }
-
-    @Override
-    public String response() {
-        return "┬─┬ ノ( ゜-゜ノ)";
-    }
-}
diff --git a/src/main/java/GuildToggles/Modules/ModuleMe.java b/src/main/java/GuildToggles/Modules/ModuleMe.java
deleted file mode 100644
index 28e424b5..00000000
--- a/src/main/java/GuildToggles/Modules/ModuleMe.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package GuildToggles.Modules;
-
-import Commands.CommandObject;
-import Commands.General.EditLinks;
-import Commands.General.SetGender;
-import Commands.General.SetQuote;
-import Commands.General.UserInfo;
-import GuildToggles.Toggles.UserInfoShowsDate;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
-
-/**
- * Created by Vaerys on 02/03/2017.
- */
-public class ModuleMe implements GuildToggle {
-
-    @Override
-    public String name() {
-        return "UserInfo";
-    }
-
-    @Override
-    public boolean toggle(GuildConfig config) {
-        return config.moduleMe = !config.moduleMe;
-    }
-
-    @Override
-    public boolean get(GuildConfig config) {
-        return config.moduleMe;
-    }
-
-    @Override
-    public boolean getDefault() {
-        return new GuildConfig().moduleMe;
-    }
-
-    @Override
-    public void execute(CommandObject command) {
-        command.removeCommand(new UserInfo().names());
-        command.removeCommand(new SetGender().names());
-        command.removeCommand(new SetQuote().names());
-        command.removeCommand(new EditLinks().names());
-        command.removeToggle(new UserInfoShowsDate().name());
-    }
-
-    @Override
-    public boolean isModule() {
-        return true;
-    }
-}
diff --git a/src/main/java/GuildToggles/Modules/ModulePixels.java b/src/main/java/GuildToggles/Modules/ModulePixels.java
deleted file mode 100644
index 1c84f149..00000000
--- a/src/main/java/GuildToggles/Modules/ModulePixels.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package GuildToggles.Modules;
-
-import Commands.CommandObject;
-import GuildToggles.Toggles.ReactToLevelUp;
-import GuildToggles.Toggles.SelfDestructLevelUps;
-import GuildToggles.Toggles.XpDecay;
-import GuildToggles.Toggles.XpGain;
-import Interfaces.Command;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
-
-/**
- * Created by Vaerys on 04/07/2017.
- */
-public class ModulePixels implements GuildToggle {
-    @Override
-    public String name() {
-        return "Pixels";
-    }
-
-    @Override
-    public boolean toggle(GuildConfig config) {
-        return config.modulePixels = !config.modulePixels;
-    }
-
-    @Override
-    public boolean get(GuildConfig config) {
-        return config.modulePixels;
-    }
-
-    @Override
-    public boolean getDefault() {
-        return new GuildConfig().modulePixels;
-    }
-
-    @Override
-    public void execute(CommandObject command) {
-        command.removeCommandsByType(Command.TYPE_PIXEL);
-        command.removeToggle(new XpDecay().name());
-        command.removeToggle(new XpGain().name());
-        command.removeToggle(new SelfDestructLevelUps().name());
-        command.removeToggle(new ReactToLevelUp().name());
-    }
-
-    @Override
-    public boolean isModule() {
-        return true;
-    }
-}
diff --git a/src/main/java/Handlers/DMHandler.java b/src/main/java/Handlers/DMHandler.java
deleted file mode 100644
index 67a9d0d3..00000000
--- a/src/main/java/Handlers/DMHandler.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package Handlers;
-
-import Commands.DMCommandObject;
-import Interfaces.DMCommand;
-import Main.Globals;
-import Main.Utility;
-import Objects.SplitFirstObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import sx.blah.discord.handle.obj.IMessage;
-
-/**
- * Created by Vaerys on 27/08/2016.
- */
-public class DMHandler {
-
-    final static Logger logger = LoggerFactory.getLogger(DMHandler.class);
-
-    public DMHandler(IMessage message) {
-        message.getTimestamp();
-        if (message.getAuthor().isBot()) {
-            return;
-        }
-        for (String blocked : Globals.getGlobalData().getBlockedFromDMS()) {
-            if (message.getAuthor().getStringID().equals(blocked)) {
-                Utility.sendDM("> You have been blocked from sending DMs to S.A.I.L by the Bot Creator.", blocked);
-                return;
-            }
-        }
-        if (message.toString().startsWith(Globals.defaultPrefixCommand)) {
-            DMCommandObject commandObject = new DMCommandObject(message);
-            SplitFirstObject args = new SplitFirstObject(message.toString());
-            for (DMCommand command : Globals.getCommandsDM()) {
-                for (String name : command.names()) {
-                    if (args.getFirstWord().equalsIgnoreCase(Globals.defaultPrefixCommand + name)) {
-                        //logging
-                        logger.debug(Utility.loggingFormatter(args.getFirstWord(), args.getRest(), commandObject));
-
-                        if (command.requiresArgs() && (args.getRest() == null || args.getRest().isEmpty())) {
-                            Utility.sendDM("> Command Missing arguments.\n" + Utility.getCommandInfo(command), commandObject.authorID);
-                            return;
-                        }
-                        if (command.type().equals(DMCommand.TYPE_CREATOR)) {
-                            if (commandObject.authorID.equals(Globals.creatorID)) {
-                                Utility.sendDM(command.execute(args.getRest(), commandObject), commandObject.authorID);
-                                return;
-                            } else {
-                                Utility.sendDM(commandObject.notAllowed, commandObject.authorID);
-                                return;
-                            }
-                        } else {
-                            Utility.sendDM(command.execute(args.getRest(), commandObject), commandObject.authorID);
-                            return;
-                        }
-                    }
-                }
-            }
-        } else if (!message.getAuthor().getStringID().equals(Globals.creatorID)) {
-            String logging = "[" + message.getAuthor().getStringID() + "] " + message.getAuthor().getName() + "#" + message.getAuthor().getDiscriminator() + ": " + message.toString();
-            logger.info(logging);
-            Globals.lastDmUserID = message.getAuthor().getLongID();
-            if (message.getAttachments().size() > 0) {
-                String attachmemts = "";
-                for (IMessage.Attachment a : message.getAttachments()) {
-                    attachmemts = "\n" + a.getUrl();
-                }
-                Utility.sendDM(logging + attachmemts, Globals.creatorID);
-            } else {
-                Utility.sendDM(logging, Globals.creatorID);
-            }
-        }
-    }
-}
diff --git a/src/main/java/Handlers/MessageHandler.java b/src/main/java/Handlers/MessageHandler.java
deleted file mode 100644
index c20518dd..00000000
--- a/src/main/java/Handlers/MessageHandler.java
+++ /dev/null
@@ -1,279 +0,0 @@
-package Handlers;
-
-import Commands.CommandObject;
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
-import Interfaces.SlashCommand;
-import Main.Globals;
-import Main.Utility;
-import Objects.BlackListObject;
-import Objects.OffenderObject;
-import POGOs.GuildConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import sx.blah.discord.api.IDiscordClient;
-import sx.blah.discord.handle.impl.events.guild.member.UserRoleUpdateEvent;
-import sx.blah.discord.handle.obj.*;
-
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-
-
-/**
- * This Class Handles all of the commands that the bot can run not incluting custom commands.
- */
-
-
-@SuppressWarnings({"unused", "StringConcatenationInsideStringBufferAppend"})
-public class MessageHandler {
-
-    private FileHandler handler = new FileHandler();
-
-    private final static Logger logger = LoggerFactory.getLogger(MessageHandler.class);
-
-    public MessageHandler(String command, String args, CommandObject commandObject) {
-        if (Globals.isModifingFiles) {
-            try {
-                Thread.sleep(200);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-
-        if (checkForInvites(commandObject)) return;
-        if (checkMentionCount(commandObject)) return;
-        if (rateLimiting(commandObject)) return;
-        XpHandler.grantXP(commandObject);
-
-
-        if (commandObject.guildConfig.slashCommands) {
-            for (SlashCommand s : Globals.getSlashCommands()) {
-                if (commandObject.message.getContent().toLowerCase().startsWith(s.call().toLowerCase())) {
-                    Utility.sendMessage(s.response(), commandObject.channel);
-                    return;
-                }
-            }
-        }
-        if (commandObject.guildConfig.artPinning) {
-            if (commandObject.guildConfig.autoArtPinning) {
-                new ArtHandler(commandObject);
-            }
-        }
-        if (command.toLowerCase().startsWith(commandObject.guildConfig.getPrefixCommand().toLowerCase())) {
-            handleCommand(commandObject, command, args);
-        }
-        if (commandObject.guildConfig.moduleCC) {
-            if (command.toLowerCase().startsWith(commandObject.guildConfig.getPrefixCC().toLowerCase())) {
-                new CCHandler(command, args, commandObject);
-            }
-        }
-    }
-
-    //Command Handler
-    private void handleCommand(CommandObject commandObject, String command, String args) {
-        IChannel channel = commandObject.channel;
-        GuildConfig guildConfig = commandObject.guildConfig;
-        ArrayList<Command> commands = commandObject.commands;
-        IDiscordClient client = commandObject.client;
-        for (Command c : commands) {
-            for (String name : c.names()) {
-                if (command.equalsIgnoreCase(guildConfig.getPrefixCommand() + name)) {
-                    if (c.type().equals(Command.TYPE_CREATOR) && !commandObject.authorSID.equalsIgnoreCase(Globals.creatorID)) {
-                        return;
-                    }
-
-                    logger.debug(Utility.loggingFormatter("COMMAND", command, args, commandObject));
-
-                    //permissions checking
-                    if (c.perms().length != 0 && !Utility.canBypass(commandObject.author, commandObject.guild)) {
-                        if (!Utility.testForPerms(c.perms(), commandObject.author, commandObject.guild)) {
-                            Utility.sendMessage(commandObject.notAllowed, channel);
-                            return;
-                        }
-                    }
-
-                    //channel checking
-                    if (c.channel() != null && !Utility.canBypass(commandObject.author, commandObject.guild)) {
-                        boolean channelFound = false;
-                        ArrayList<String> channelMentions = new ArrayList<>();
-                        for (ChannelSetting s : commandObject.channelSettings) {
-                            if (s.type().equals(c.channel())) {
-                                if (s.getIDs(commandObject.guildConfig) != null) {
-                                    for (String id : s.getIDs(commandObject.guildConfig)) {
-                                        if (id.equals(commandObject.channelSID)) {
-                                            channelFound = true;
-                                        }
-                                        IChannel testPerms = client.getChannelByID(id);
-                                        EnumSet<Permissions> userPerms = testPerms.getModifiedPermissions(commandObject.author);
-                                        if (userPerms.contains(Permissions.SEND_MESSAGES) && userPerms.contains(Permissions.READ_MESSAGES)) {
-                                            channelMentions.add(commandObject.client.getChannelByID(id).mention());
-                                        }
-                                    }
-                                } else {
-                                    channelFound = true;
-                                }
-                            }
-                        }
-                        //correct channel message formatting
-                        if (!channelFound) {
-                            if (channelMentions.size() == 0) {
-                                Utility.sendMessage("> You do not have access to any channels that you are able to run this command in.", channel);
-                            } else if (channelMentions.size() > 1) {
-                                Utility.sendMessage("> Command must be performed in any of the following channels: \n" + Utility.listFormatter(channelMentions, true), channel);
-                            } else {
-                                Utility.sendMessage("> Command must be performed in: " + channelMentions.get(0), channel);
-                            }
-                            return;
-                        }
-                    }
-
-                    //arguments checking.
-                    if (c.requiresArgs() && args.isEmpty()) {
-                        Utility.sendMessage(Utility.getCommandInfo(c, commandObject), channel);
-                        return;
-                    }
-
-                    //command logging
-                    if (c.doAdminLogging()) {
-                        if (guildConfig.adminLogging) {
-                            handleLogging(commandObject, args, c, true);
-                        }
-                    } else {
-                        if (guildConfig.generalLogging) {
-                            handleLogging(commandObject, args, c, false);
-                        }
-                    }
-                    if (!commandObject.channel.getTypingStatus()) {
-                        commandObject.channel.toggleTypingStatus();
-                    }
-                    Utility.sendMessage(c.execute(args, commandObject), channel);
-                }
-            }
-        }
-    }
-
-    private void handleLogging(CommandObject commandObject, String args, Command command, boolean isAdmin) {
-        StringBuilder builder = new StringBuilder();
-        builder.append("> **@" + commandObject.authorUserName + "** Has Used Command `" + command.names()[0] + "`");
-        if (!args.isEmpty()) {
-            builder.append(" with args: `" + args + "`");
-        }
-        builder.append(" in channel " + commandObject.channel.mention() + ".");
-        Utility.sendLog(builder.toString(), commandObject.guildConfig, isAdmin);
-    }
-
-    private boolean checkMentionCount(CommandObject command) {
-        IMessage message = command.message;
-        GuildConfig guildConfig = command.guildConfig;
-        IUser author = command.author;
-        List<IRole> oldRoles = new ArrayList<>(command.author.getRolesForGuild(command.guild));
-        IGuild guild = command.guild;
-
-        if (message.toString().contains("@everyone") || message.toString().contains("@here")) {
-            return false;
-        }
-        if (guildConfig.maxMentions) {
-            if (message.getMentions().size() > 8) {
-                Utility.deleteMessage(message);
-                int i = 0;
-                boolean offenderFound = false;
-                for (OffenderObject o : guildConfig.getRepeatOffenders()) {
-                    if (author.getStringID().equals(o.getID())) {
-                        guildConfig.addOffence(o.getID());
-                        offenderFound = true;
-                        i++;
-                        if (o.getCount() > Globals.maxWarnings) {
-                            Utility.roleManagement(author, guild, guildConfig.getMutedRoleID(), true);
-                            command.client.getDispatcher().dispatch(new UserRoleUpdateEvent(guild, author, oldRoles, command.author.getRolesForGuild(guild)));
-                            Utility.sendMessage("> " + author.mention() + " Has been Muted for repeat offences of spamming Mentions.", command.channel);
-                        }
-                    }
-                }
-                if (!offenderFound) {
-                    guildConfig.addOffender(new OffenderObject(author.getStringID()));
-                }
-                String response = "> #mentionAdmin# " + author.mention() + "  has attempted to post more than " + guildConfig.getMaxMentionLimit() + " Mentions in a single message.";
-                IRole roleToMention = command.guild.getRoleByID(guildConfig.getRoleToMentionID());
-                if (roleToMention != null) {
-                    response = response.replaceAll("#mentionAdmin#", roleToMention.mention());
-                } else {
-                    response = response.replaceAll("#mentionAdmin#", "Admin");
-                }
-                Utility.sendMessage(response, command.channel);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean rateLimiting(CommandObject command) {
-        if (Utility.testForPerms(new Permissions[]{Permissions.MANAGE_MESSAGES}, command.author, command.guild) ||
-                Utility.canBypass(command.author, command.guild, false)) {
-            return false;
-        }
-        if (command.guildConfig.rateLimiting) {
-            if (command.guildContent.rateLimit(command.authorSID)) {
-                List<IRole> oldRoles = new ArrayList<>(command.author.getRolesForGuild(command.guild));
-                command.message.delete();
-                Utility.sendDM("Your message was deleted because you are being rate limited.\nMax messages per 10 seconds : " + command.guildConfig.messageLimit, command.authorSID);
-                if (command.guildConfig.muteRepeatOffenders) {
-                    int rate = command.guildContent.getUserRate(command.authorSID);
-                    if (rate - 3 > command.guildConfig.messageLimit) {
-                        //mutes users if they abuse it.
-                        boolean failed = Utility.roleManagement(command.author, command.guild, command.guildConfig.getMutedRoleID(), true).get();
-                        command.client.getDispatcher().dispatch(new UserRoleUpdateEvent(command.guild, command.author, oldRoles, command.author.getRolesForGuild(command.guild)));
-                        if (!failed) {
-                            IChannel adminChannel = null;
-                            if (command.guildConfig.getChannelIDsByType(Command.CHANNEL_ADMIN) != null) {
-                                adminChannel = command.client.getChannelByID(command.guildConfig.getChannelIDsByType(Command.CHANNEL_ADMIN).get(0));
-                            }
-                            if (adminChannel == null) {
-                                adminChannel = command.channel;
-                            }
-                            Utility.sendDM("You have been muted for abusing the Guild rate limit.", command.authorSID);
-                            Utility.sendMessage("> " + command.author.mention() + " has been muted for repetitively abusing Guild rateLimit.", adminChannel);
-                        }
-                    }
-                }
-                if (command.guildConfig.deleteLogging) {
-                    Utility.sendLog("> **@" + command.authorUserName + "** is being rate limited", command.guildConfig, false);
-                }
-                return true;
-            }
-            return false;
-        } else {
-            return false;
-        }
-    }
-
-    //File handlers
-
-    //BlackListed Phrase Remover
-    private boolean checkForInvites(CommandObject command) {
-        GuildConfig guildConfig = command.guildConfig;
-        IMessage message = command.message;
-        IGuild guild = command.guild;
-        IUser author = command.author;
-        ArrayList<String> inviteformats = new ArrayList<String>() {{
-            add("discord.gg");
-            add("discordapp.com/Invite/");
-        }};
-
-
-        if (guildConfig.denyInvites) {
-            for (String s : inviteformats) {
-                if (message.toString().toLowerCase().contains(s.toLowerCase())) {
-                    if (guildConfig.testIsTrusted(author, guild)) {
-                        return false;
-                    }
-                    String response = "> Please do not post Instant Invites.";
-                    Utility.deleteMessage(message);
-                    Utility.sendMessage(response, command.channel);
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/Handlers/WikiBuilder.java b/src/main/java/Handlers/WikiBuilder.java
deleted file mode 100644
index b07b26a6..00000000
--- a/src/main/java/Handlers/WikiBuilder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package Handlers;
-
-import Interfaces.*;
-import Main.Constants;
-import Main.Globals;
-import sx.blah.discord.api.IDiscordClient;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-
-
-/**
- * Created by Vaerys on 31/05/2017.
- */
-public class WikiBuilder {
-
-    public static void handleCommandLists() {
-        ArrayList<Command> commands = Globals.getCommands();
-        ArrayList<ChannelSetting> channels = Globals.getChannelSettings();
-        ArrayList<GuildToggle> toggles = Globals.getGuildGuildToggles();
-        ArrayList<String> types = Globals.getCommandTypes();
-        ArrayList<DMCommand> dmCommands = Globals.getCommandsDM();
-        ArrayList<SlashCommand> slashCommands = Globals.getSlashCommands();
-        IDiscordClient client = Globals.getClient();
-        File commandMenu = new File(Constants.DIRECTORY_WIKI + "Command-Menu.md");
-        String pagePath = "https://github.com/Vaerys-Dawn/DiscordSailv2/wiki/";
-        FileHandler.createDirectory(Constants.DIRECTORY_WIKI_COMMANDS);
-
-        StringBuilder menuContents = new StringBuilder();
-        menuContents.append("### Command Types:   \n  \n");
-        for (String s : types) {
-            File temp = new File(Constants.DIRECTORY_WIKI_COMMANDS + s + ".md");
-            StringBuilder contents = new StringBuilder();
-            menuContents.append("[" + s + "](" + pagePath + s + ")  \n");
-            if (!temp.exists()) {
-                try {
-                    temp.createNewFile();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            contents.append("### " + s + "\n  \n  ");
-            for (Command c : commands) {
-                if (c.type().equalsIgnoreCase(s)) {
-                    contents.append("##" + c.names()[0] + "\n");
-                }
-            }
-        }
-        System.out.println("Creating Wiki Menu");
-        FileHandler.writeToFile(commandMenu.getPath(), menuContents.toString(), true);
-    }
-}
diff --git a/src/main/java/Interfaces/Command.java b/src/main/java/Interfaces/Command.java
deleted file mode 100644
index 693d748d..00000000
--- a/src/main/java/Interfaces/Command.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package Interfaces;
-
-import Commands.CommandObject;
-import sx.blah.discord.handle.obj.Permissions;
-
-
-/**
- * Created by Vaerys on 29/01/2017.
- */
-public interface Command {
-    //Type Constants
-    String TYPE_GENERAL = "General";
-    String TYPE_ADMIN = "Admin";
-    String TYPE_ROLE_SELECT = "Role";
-    String TYPE_CHARACTER = "Characters";
-    String TYPE_SERVERS = "Servers";
-    String TYPE_CC = "CC";
-    String TYPE_HELP = "Help";
-    String TYPE_COMPETITION = "Competition";
-    String TYPE_DM = "DM";
-    String TYPE_CREATOR = "Creator";
-    String TYPE_PIXEL = "Pixels";
-    String TYPE_GROUPS = "Groups";
-
-    //Channel Constants
-    String CHANNEL_GENERAL = "General";
-    String CHANNEL_SERVERS = "Servers";
-    String CHANNEL_BOT_COMMANDS = "BotCommands";
-    String CHANNEL_SERVER_LOG = "ServerLog";
-    String CHANNEL_ADMIN_LOG = "AdminLog";
-    String CHANNEL_ADMIN = "Admin";
-    String CHANNEL_INFO = "Info";
-    String CHANNEL_SHITPOST = "ShitPost";
-    String CHANNEL_DONT_LOG = "DontLog";
-    String CHANNEL_ART = "Art";
-    String CHANNEL_GROUPS = "Groups";
-    String CHANNEL_XP_DENIED = "XpDenied";
-    String CHANNEL_PIXELS = "Pixels";
-    String CHANNEL_LEVEL_UP = "LevelUp";
-    String CHANNEL_LEVEL_UP_DENIED = "LevelUpDenied";
-
-    String spacer = "\u200B";
-    String indent = "    ";
-    String codeBlock = "```";
-    String ownerOnly = ">> ONLY THE BOT'S OWNER CAN RUN THIS <<";
-
-
-    String execute(String args, CommandObject command);
-
-    //descriptors
-    String[] names();
-    String description();
-    String usage();
-    String type();
-    String channel();
-    Permissions[] perms();
-    boolean requiresArgs();
-    boolean doAdminLogging();
-    String dualDescription();
-    String dualUsage();
-    String dualType();
-    Permissions[] dualPerms();
-
-}
diff --git a/src/main/java/Interfaces/DMCommand.java b/src/main/java/Interfaces/DMCommand.java
deleted file mode 100644
index c9c3adce..00000000
--- a/src/main/java/Interfaces/DMCommand.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package Interfaces;
-
-import Commands.DMCommandObject;
-
-/**
- * Created by Vaerys on 05/02/2017.
- */
-public interface DMCommand {
-    String TYPE_GENERAL = "General";
-    String TYPE_HELP = "Help";
-    String TYPE_CREATOR = "Creator";
-
-    //Channel Constants
-
-    String spacer = "\u200B";
-    String indent = "    ";
-    String codeBlock = "```";
-    String ownerOnly = ">> ONLY THE BOT'S OWNER CAN RUN THIS <<";
-
-    String execute(String args, DMCommandObject command);
-
-    //descriptors
-    String[] names();
-    String description();
-    String usage();
-    String type();
-    boolean requiresArgs();
-}
diff --git a/src/main/java/Interfaces/SlashCommand.java b/src/main/java/Interfaces/SlashCommand.java
deleted file mode 100644
index 6eaa9d70..00000000
--- a/src/main/java/Interfaces/SlashCommand.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package Interfaces;
-
-/**
- * Created by Vaerys on 13/03/2017.
- */
-public interface SlashCommand {
-    String call();
-    String response();
-}
diff --git a/src/main/java/OldCode/OldGlobalData.java b/src/main/java/OldCode/OldGlobalData.java
deleted file mode 100644
index 7e945a6b..00000000
--- a/src/main/java/OldCode/OldGlobalData.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package OldCode;
-
-import java.util.ArrayList;
-
-public class OldGlobalData {
-    ArrayList<OldUserDailyMessageObject> dailyUserMessages = new ArrayList<>();
-
-    public ArrayList<OldUserDailyMessageObject> getObjects() {
-        return dailyUserMessages;
-    }
-}
diff --git a/src/main/java/POGOs/GlobalData.java b/src/main/java/POGOs/GlobalData.java
deleted file mode 100644
index c13bbbfd..00000000
--- a/src/main/java/POGOs/GlobalData.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package POGOs;
-
-
-import Objects.DailyUserMessageObject;
-import Objects.PatchObject;
-import Objects.QueueObject;
-import Objects.ReminderObject;
-
-import java.time.DayOfWeek;
-import java.util.ArrayList;
-
-/**
- * Created by Vaerys on 10/02/2017.
- */
-public class GlobalData {
-    ArrayList<String> blockedFromDMS = new ArrayList<>();
-    ArrayList<ReminderObject> reminders = new ArrayList<>();
-    private ArrayList<PatchObject> patches = new ArrayList<>();
-    private ArrayList<String> globalPatches = new ArrayList<>();
-    private ArrayList<QueueObject> queuedRequests = new ArrayList<>();
-    private ArrayList<DailyUserMessageObject> dailyMessages = new ArrayList<>();
-
-    public ArrayList<PatchObject> getPatches() {
-        return patches;
-    }
-
-    public ArrayList<String> getBlockedFromDMS() {
-        return blockedFromDMS;
-    }
-
-    public ArrayList<QueueObject> getQueuedRequests() {
-        return queuedRequests;
-    }
-
-    public boolean blockUserFromDMS(String userID) {
-        blockedFromDMS.add(userID);
-        return true;
-    }
-
-
-    public ArrayList<ReminderObject> getReminders() {
-        return reminders;
-    }
-
-    public void addReminder(ReminderObject object) {
-        reminders.add(object);
-    }
-
-    public void removeReminder(String userID) {
-        for (int i = 0; i < reminders.size();i++){
-            if(reminders.get(i).getUserID().equals(userID)){
-                reminders.remove(i);
-            }
-        }
-    }
-
-    public void removeReminder(String userID,String reminder) {
-        for (int i = 0; i < reminders.size();i++){
-            if(reminders.get(i).getUserID().equals(userID) && reminders.get(i).getMessage().equals(reminder)){
-                reminders.remove(i);
-            }
-        }
-    }
-
-    public ArrayList<String> getGlobalPatches() {
-        return globalPatches;
-    }
-
-    public ArrayList<DailyUserMessageObject> getDailyMessages() {
-        return dailyMessages;
-    }
-
-    public ArrayList<DailyUserMessageObject> getDailyMessages(DayOfWeek day) {
-        ArrayList dailyMessages = new ArrayList();
-        for (DailyUserMessageObject d: this.dailyMessages){
-            if (d.getDay() == day){
-                dailyMessages.add(d);
-            }
-        }
-        return dailyMessages;
-    }
-}
diff --git a/src/main/java/Annotations/TagAnnotation.java b/src/main/java/com/github/vaerys/annotations/TagAnnotation.java
similarity index 80%
rename from src/main/java/Annotations/TagAnnotation.java
rename to src/main/java/com/github/vaerys/annotations/TagAnnotation.java
index 209b05eb..30bf9a34 100644
--- a/src/main/java/Annotations/TagAnnotation.java
+++ b/src/main/java/com/github/vaerys/annotations/TagAnnotation.java
@@ -1,6 +1,6 @@
-package Annotations;
+package com.github.vaerys.annotations;
 
-import Main.Constants;
+import com.github.vaerys.main.Constants;
 
 import java.lang.annotation.*;
 
diff --git a/src/main/java/ChannelSettings/InitChannels.java b/src/main/java/com/github/vaerys/channelsettings/InitChannels.java
similarity index 83%
rename from src/main/java/ChannelSettings/InitChannels.java
rename to src/main/java/com/github/vaerys/channelsettings/InitChannels.java
index f1bce8c6..266f556b 100644
--- a/src/main/java/ChannelSettings/InitChannels.java
+++ b/src/main/java/com/github/vaerys/channelsettings/InitChannels.java
@@ -1,8 +1,8 @@
-package ChannelSettings;
+package com.github.vaerys.channelsettings;
 
-import ChannelSettings.Settings.*;
-import ChannelSettings.Types.*;
-import Interfaces.ChannelSetting;
+import com.github.vaerys.channelsettings.settings.*;
+import com.github.vaerys.channelsettings.types.*;
+import com.github.vaerys.interfaces.ChannelSetting;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/ChannelSettings/Settings/BotCommands.java b/src/main/java/com/github/vaerys/channelsettings/settings/BotCommands.java
similarity index 64%
rename from src/main/java/ChannelSettings/Settings/BotCommands.java
rename to src/main/java/com/github/vaerys/channelsettings/settings/BotCommands.java
index e1a835d9..723a2f52 100644
--- a/src/main/java/ChannelSettings/Settings/BotCommands.java
+++ b/src/main/java/com/github/vaerys/channelsettings/settings/BotCommands.java
@@ -1,7 +1,7 @@
-package ChannelSettings.Settings;
+package com.github.vaerys.channelsettings.settings;
 
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
 
 /**
  * Created by Vaerys on 09/04/2017.
diff --git a/src/main/java/ChannelSettings/Settings/DontLog.java b/src/main/java/com/github/vaerys/channelsettings/settings/DontLog.java
similarity index 63%
rename from src/main/java/ChannelSettings/Settings/DontLog.java
rename to src/main/java/com/github/vaerys/channelsettings/settings/DontLog.java
index 59eed6ee..dd702edb 100644
--- a/src/main/java/ChannelSettings/Settings/DontLog.java
+++ b/src/main/java/com/github/vaerys/channelsettings/settings/DontLog.java
@@ -1,7 +1,7 @@
-package ChannelSettings.Settings;
+package com.github.vaerys.channelsettings.settings;
 
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
 
 /**
  * Created by Vaerys on 09/04/2017.
diff --git a/src/main/java/ChannelSettings/Settings/Groups.java b/src/main/java/com/github/vaerys/channelsettings/settings/Groups.java
similarity index 63%
rename from src/main/java/ChannelSettings/Settings/Groups.java
rename to src/main/java/com/github/vaerys/channelsettings/settings/Groups.java
index a7c7147f..5fda216b 100644
--- a/src/main/java/ChannelSettings/Settings/Groups.java
+++ b/src/main/java/com/github/vaerys/channelsettings/settings/Groups.java
@@ -1,7 +1,7 @@
-package ChannelSettings.Settings;
+package com.github.vaerys.channelsettings.settings;
 
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
 
 /**
  * Created by Vaerys on 31/05/2017.
diff --git a/src/main/java/ChannelSettings/Settings/LevelUpDenied.java b/src/main/java/com/github/vaerys/channelsettings/settings/LevelUpDenied.java
similarity index 64%
rename from src/main/java/ChannelSettings/Settings/LevelUpDenied.java
rename to src/main/java/com/github/vaerys/channelsettings/settings/LevelUpDenied.java
index 71c17a93..177f986d 100644
--- a/src/main/java/ChannelSettings/Settings/LevelUpDenied.java
+++ b/src/main/java/com/github/vaerys/channelsettings/settings/LevelUpDenied.java
@@ -1,7 +1,7 @@
-package ChannelSettings.Settings;
+package com.github.vaerys.channelsettings.settings;
 
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
 
 /**
  * Created by Vaerys on 04/07/2017.
diff --git a/src/main/java/ChannelSettings/Settings/Rank.java b/src/main/java/com/github/vaerys/channelsettings/settings/Rank.java
similarity index 63%
rename from src/main/java/ChannelSettings/Settings/Rank.java
rename to src/main/java/com/github/vaerys/channelsettings/settings/Rank.java
index 93b0a799..bd98c654 100644
--- a/src/main/java/ChannelSettings/Settings/Rank.java
+++ b/src/main/java/com/github/vaerys/channelsettings/settings/Rank.java
@@ -1,7 +1,7 @@
-package ChannelSettings.Settings;
+package com.github.vaerys.channelsettings.settings;
 
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
 
 /**
  * Created by Vaerys on 01/07/2017.
diff --git a/src/main/java/ChannelSettings/Settings/Servers.java b/src/main/java/com/github/vaerys/channelsettings/settings/Servers.java
similarity index 63%
rename from src/main/java/ChannelSettings/Settings/Servers.java
rename to src/main/java/com/github/vaerys/channelsettings/settings/Servers.java
index e2a250dd..cc559e2d 100644
--- a/src/main/java/ChannelSettings/Settings/Servers.java
+++ b/src/main/java/com/github/vaerys/channelsettings/settings/Servers.java
@@ -1,7 +1,7 @@
-package ChannelSettings.Settings;
+package com.github.vaerys.channelsettings.settings;
 
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
 
 /**
  * Created by Vaerys on 09/04/2017.
diff --git a/src/main/java/ChannelSettings/Settings/Shitpost.java b/src/main/java/com/github/vaerys/channelsettings/settings/Shitpost.java
similarity index 63%
rename from src/main/java/ChannelSettings/Settings/Shitpost.java
rename to src/main/java/com/github/vaerys/channelsettings/settings/Shitpost.java
index be1d5b3a..62eff671 100644
--- a/src/main/java/ChannelSettings/Settings/Shitpost.java
+++ b/src/main/java/com/github/vaerys/channelsettings/settings/Shitpost.java
@@ -1,7 +1,7 @@
-package ChannelSettings.Settings;
+package com.github.vaerys.channelsettings.settings;
 
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
 
 /**
  * Created by Vaerys on 09/04/2017.
diff --git a/src/main/java/ChannelSettings/Settings/XpDenied.java b/src/main/java/com/github/vaerys/channelsettings/settings/XpDenied.java
similarity index 63%
rename from src/main/java/ChannelSettings/Settings/XpDenied.java
rename to src/main/java/com/github/vaerys/channelsettings/settings/XpDenied.java
index d5fe59cf..a0bef07b 100644
--- a/src/main/java/ChannelSettings/Settings/XpDenied.java
+++ b/src/main/java/com/github/vaerys/channelsettings/settings/XpDenied.java
@@ -1,7 +1,7 @@
-package ChannelSettings.Settings;
+package com.github.vaerys.channelsettings.settings;
 
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
 
 /**
  * Created by Vaerys on 17/06/2017.
diff --git a/src/main/java/ChannelSettings/Types/Admin.java b/src/main/java/com/github/vaerys/channelsettings/types/Admin.java
similarity index 63%
rename from src/main/java/ChannelSettings/Types/Admin.java
rename to src/main/java/com/github/vaerys/channelsettings/types/Admin.java
index 933d152e..84c4ef4b 100644
--- a/src/main/java/ChannelSettings/Types/Admin.java
+++ b/src/main/java/com/github/vaerys/channelsettings/types/Admin.java
@@ -1,7 +1,7 @@
-package ChannelSettings.Types;
+package com.github.vaerys.channelsettings.types;
 
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
 
 /**
  * Created by Vaerys on 09/04/2017.
diff --git a/src/main/java/ChannelSettings/Types/AdminLog.java b/src/main/java/com/github/vaerys/channelsettings/types/AdminLog.java
similarity index 64%
rename from src/main/java/ChannelSettings/Types/AdminLog.java
rename to src/main/java/com/github/vaerys/channelsettings/types/AdminLog.java
index 7611ee55..f5409d95 100644
--- a/src/main/java/ChannelSettings/Types/AdminLog.java
+++ b/src/main/java/com/github/vaerys/channelsettings/types/AdminLog.java
@@ -1,7 +1,7 @@
-package ChannelSettings.Types;
+package com.github.vaerys.channelsettings.types;
 
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
 
 /**
  * Created by Vaerys on 09/04/2017.
diff --git a/src/main/java/ChannelSettings/Types/Art.java b/src/main/java/com/github/vaerys/channelsettings/types/Art.java
similarity index 63%
rename from src/main/java/ChannelSettings/Types/Art.java
rename to src/main/java/com/github/vaerys/channelsettings/types/Art.java
index 2e54e99b..8a050472 100644
--- a/src/main/java/ChannelSettings/Types/Art.java
+++ b/src/main/java/com/github/vaerys/channelsettings/types/Art.java
@@ -1,7 +1,7 @@
-package ChannelSettings.Types;
+package com.github.vaerys.channelsettings.types;
 
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
 
 /**
  * Created by Vaerys on 12/05/2017.
diff --git a/src/main/java/ChannelSettings/Types/General.java b/src/main/java/com/github/vaerys/channelsettings/types/General.java
similarity index 64%
rename from src/main/java/ChannelSettings/Types/General.java
rename to src/main/java/com/github/vaerys/channelsettings/types/General.java
index fc36c08c..a050b6a1 100644
--- a/src/main/java/ChannelSettings/Types/General.java
+++ b/src/main/java/com/github/vaerys/channelsettings/types/General.java
@@ -1,7 +1,7 @@
-package ChannelSettings.Types;
+package com.github.vaerys.channelsettings.types;
 
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
 
 /**
  * Created by Vaerys on 09/04/2017.
diff --git a/src/main/java/ChannelSettings/Types/Info.java b/src/main/java/com/github/vaerys/channelsettings/types/Info.java
similarity index 63%
rename from src/main/java/ChannelSettings/Types/Info.java
rename to src/main/java/com/github/vaerys/channelsettings/types/Info.java
index b6da30a3..492c59a5 100644
--- a/src/main/java/ChannelSettings/Types/Info.java
+++ b/src/main/java/com/github/vaerys/channelsettings/types/Info.java
@@ -1,7 +1,7 @@
-package ChannelSettings.Types;
+package com.github.vaerys.channelsettings.types;
 
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
 
 /**
  * Created by Vaerys on 09/04/2017.
diff --git a/src/main/java/ChannelSettings/Types/LevelUp.java b/src/main/java/com/github/vaerys/channelsettings/types/LevelUp.java
similarity index 64%
rename from src/main/java/ChannelSettings/Types/LevelUp.java
rename to src/main/java/com/github/vaerys/channelsettings/types/LevelUp.java
index 01d0caf4..8eba7a31 100644
--- a/src/main/java/ChannelSettings/Types/LevelUp.java
+++ b/src/main/java/com/github/vaerys/channelsettings/types/LevelUp.java
@@ -1,7 +1,7 @@
-package ChannelSettings.Types;
+package com.github.vaerys.channelsettings.types;
 
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
 
 /**
  * Created by Vaerys on 02/07/2017.
diff --git a/src/main/java/ChannelSettings/Types/ServerLog.java b/src/main/java/com/github/vaerys/channelsettings/types/ServerLog.java
similarity index 64%
rename from src/main/java/ChannelSettings/Types/ServerLog.java
rename to src/main/java/com/github/vaerys/channelsettings/types/ServerLog.java
index a2777cb4..08d53772 100644
--- a/src/main/java/ChannelSettings/Types/ServerLog.java
+++ b/src/main/java/com/github/vaerys/channelsettings/types/ServerLog.java
@@ -1,7 +1,7 @@
-package ChannelSettings.Types;
+package com.github.vaerys.channelsettings.types;
 
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
 
 /**
  * Created by Vaerys on 09/04/2017.
diff --git a/src/main/java/Commands/CommandInit.java b/src/main/java/com/github/vaerys/commands/CommandInit.java
similarity index 73%
rename from src/main/java/Commands/CommandInit.java
rename to src/main/java/com/github/vaerys/commands/CommandInit.java
index a6ee75f9..f60b5a0e 100644
--- a/src/main/java/Commands/CommandInit.java
+++ b/src/main/java/com/github/vaerys/commands/CommandInit.java
@@ -1,27 +1,30 @@
-package Commands;
+package com.github.vaerys.commands;
 
-import Commands.Admin.*;
-import Commands.CC.*;
-import Commands.Characters.*;
-import Commands.Competition.*;
-import Commands.Creator.*;
-import Commands.Creator.Shutdown;
-import Commands.DMCommands.*;
-import Commands.General.*;
-import Commands.Groups.ClearGroupUp;
-import Commands.Groups.GroupUp;
-import Commands.Help.*;
-import Commands.Help.GetGuildInfo;
-import Commands.Pixels.*;
-import Commands.RoleSelect.CosmeticRoles;
-import Commands.RoleSelect.ListModifs;
-import Commands.RoleSelect.ListRoles;
-import Commands.RoleSelect.ModifierRoles;
-import Commands.Servers.*;
-import Commands.Slash.*;
-import Interfaces.Command;
-import Interfaces.DMCommand;
-import Interfaces.SlashCommand;
+import com.github.vaerys.commands.admin.*;
+import com.github.vaerys.commands.cc.*;
+import com.github.vaerys.commands.characters.*;
+import com.github.vaerys.commands.competition.*;
+import com.github.vaerys.commands.creator.*;
+import com.github.vaerys.commands.creator.Shutdown;
+import com.github.vaerys.commands.creator.directmessages.*;
+import com.github.vaerys.commands.dmCommands.ClearReminderDM;
+import com.github.vaerys.commands.dmCommands.HelpDM;
+import com.github.vaerys.commands.dmCommands.InfoDM;
+import com.github.vaerys.commands.dmCommands.ReminderDM;
+import com.github.vaerys.commands.general.*;
+import com.github.vaerys.commands.groups.ClearGroupUp;
+import com.github.vaerys.commands.groups.GroupUp;
+import com.github.vaerys.commands.help.*;
+import com.github.vaerys.commands.help.GetGuildInfo;
+import com.github.vaerys.commands.pixels.*;
+import com.github.vaerys.commands.roleSelect.CosmeticRoles;
+import com.github.vaerys.commands.roleSelect.ListModifs;
+import com.github.vaerys.commands.roleSelect.ListRoles;
+import com.github.vaerys.commands.roleSelect.ModifierRoles;
+import com.github.vaerys.commands.servers.*;
+import com.github.vaerys.commands.slash.*;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.SlashCommand;
 
 import java.util.ArrayList;
 
@@ -33,19 +36,10 @@ public class CommandInit {
     public static ArrayList<Command> get() {
         ArrayList<Command> commands = new ArrayList<>();
 
-        //Creator Commands
-        commands.add(new Shutdown());
-        commands.add(new Sudo());
-        commands.add(new UpdateAvatar());
-        commands.add(new GetGlobalStats());
-        commands.add(new ResetPlayingStatus());
-        commands.add(new ToggleTypingStatus());
-        commands.add(new SetPlayingStatus());
-        commands.add(new DailyMsg());
         //Admin commands
         commands.add(new ChannelHere());
         commands.add(new ChannelStats());
-        commands.add(new MaxMessages());
+        commands.add(new SetRateLimit());
         commands.add(new Module());
         commands.add(new Mute());
         commands.add(new EditInfoFiles());
@@ -59,6 +53,7 @@ public static ArrayList<Command> get() {
         commands.add(new SetJoinMessage());
         commands.add(new PruneEmptyProfiles());
         commands.add(new DenyXpPrefix());
+        commands.add(new PurgeBannedData());
         //General commands
         commands.add(new GetAvatar());
         commands.add(new Hello());
@@ -67,10 +62,10 @@ public static ArrayList<Command> get() {
         commands.add(new SetQuote());
         commands.add(new Test());
         commands.add(new UserInfo());
-        commands.add(new SlashList());
         commands.add(new ClearReminder());
         commands.add(new EditLinks());
         commands.add(new Ping());
+        commands.add(new LastDailyMessage());
         //Help commands
         commands.add(new GetGuildInfo());
         commands.add(new Help());
@@ -110,6 +105,7 @@ public static ArrayList<Command> get() {
         commands.add(new NewCC());
         commands.add(new SearchCCs());
         commands.add(new TransferCC());
+        commands.add(new RandomCC());
         //Competition commands
         commands.add(new FinalTally());
         commands.add(new GetCompEntries());
@@ -123,7 +119,7 @@ public static ArrayList<Command> get() {
         commands.add(new Pixels());
         commands.add(new PixelHelp());
         commands.add(new DefaultLevelMode());
-        commands.add(new PixelSettings());
+        commands.add(new ProfileSettings());
         commands.add(new LevelUpMessage());
         commands.add(new ManagePixelRoles());
         commands.add(new TransferLevels());
@@ -134,33 +130,13 @@ public static ArrayList<Command> get() {
         commands.add(new TopUserForRole());
         commands.add(new Rank());
         commands.add(new TopTen());
-        commands.add(new FixLevelErrors());
         commands.add(new SetLevelUpReaction());
-
-        return commands;
-    }
-
-    public static ArrayList<DMCommand> getDM() {
-        ArrayList<DMCommand> commands = new ArrayList<>();
-
-        //DM commands
-        commands.add(new BlockUser());
-        commands.add(new GetGuildList());
-        commands.add(new Commands.DMCommands.GetGuildInfo());
-        commands.add(new Respond());
+        //Dm commands
         commands.add(new HelpDM());
         commands.add(new InfoDM());
         commands.add(new ReminderDM());
         commands.add(new ClearReminderDM());
-        commands.add(new ShutdownDM());
-        commands.add(new QuickRespond());
-        commands.add(new TestDM());
-        return commands;
-    }
-
-    public static ArrayList<SlashCommand> getSlashCommands() {
-        ArrayList<SlashCommand> commands = new ArrayList<>();
-
+        //slashCommands
         commands.add(new Disapproval());
         commands.add(new Lenny());
         commands.add(new TableFlip());
@@ -172,4 +148,33 @@ public static ArrayList<SlashCommand> getSlashCommands() {
 
         return commands;
     }
+
+    public static ArrayList<SlashCommand> getSlashCommands() {
+        ArrayList<SlashCommand> commands = new ArrayList<>();
+
+
+        return commands;
+    }
+
+    public static ArrayList<Command> getCreatorCommands() {
+        //Creator Commands
+        ArrayList<Command> commands = new ArrayList<>();
+        commands.add(new Shutdown());
+        commands.add(new Sudo());
+        commands.add(new UpdateAvatar());
+        commands.add(new GetGlobalStats());
+        commands.add(new ResetPlayingStatus());
+        commands.add(new ToggleTypingStatus());
+        commands.add(new SetPlayingStatus());
+        commands.add(new DailyMsg());
+        //DM Creator Commands
+        commands.add(new BlockUser());
+        commands.add(new GetGuildList());
+        commands.add(new GetGuildInfo());
+        commands.add(new Respond());
+        commands.add(new ShutdownDM());
+        commands.add(new QuickRespond());
+        commands.add(new TestDM());
+        return commands;
+    }
 }
diff --git a/src/main/java/com/github/vaerys/commands/CommandObject.java b/src/main/java/com/github/vaerys/commands/CommandObject.java
new file mode 100644
index 00000000..e157b129
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/CommandObject.java
@@ -0,0 +1,72 @@
+package com.github.vaerys.commands;
+
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.masterobjects.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sx.blah.discord.handle.obj.IChannel;
+import sx.blah.discord.handle.obj.IGuild;
+import sx.blah.discord.handle.obj.IMessage;
+import sx.blah.discord.handle.obj.IUser;
+
+
+/**
+ * Created by Vaerys on 29/01/2017.
+ */
+public class CommandObject {
+
+    //master objects
+    public GuildObject guild;
+    public UserObject user;
+    public MessageObject message;
+    public ChannelObject channel;
+    public ClientObject client;
+
+
+    final static Logger logger = LoggerFactory.getLogger(CommandObject.class);
+
+
+    public CommandObject(IMessage message) {
+        if (message.getGuild() == null) {
+            this.guild = new GuildObject();
+        } else {
+            this.guild = Globals.getGuildContent(message.getGuild().getLongID());
+        }
+        this.message = new MessageObject(message, guild);
+        this.channel = new ChannelObject(message.getChannel(), guild);
+        this.user = new UserObject(message.getAuthor(), guild);
+        this.client = new ClientObject(message.getClient(), guild);
+    }
+
+    public CommandObject(IMessage message, IGuild guild, IChannel channel, IUser author) {
+        if (guild == null) {
+            this.guild = new GuildObject();
+        } else {
+            this.guild = Globals.getGuildContent(guild.getLongID());
+        }
+        this.message = new MessageObject(message, this.guild);
+        this.channel = new ChannelObject(channel, this.guild);
+        this.user = new UserObject(author, this.guild);
+        this.client = new ClientObject(message.getClient(), this.guild);
+    }
+
+    public CommandObject setAuthor(IUser author) {
+        this.user = new UserObject(author, guild);
+        return this;
+    }
+
+    public CommandObject setChannel(IChannel channel) {
+        this.channel = new ChannelObject(channel, guild);
+        return this;
+    }
+
+    public CommandObject setGuild(IGuild guild) {
+        this.guild = Globals.getGuildContent(guild.getLongID());
+        return this;
+    }
+
+    public CommandObject setMessage(IMessage message) {
+        this.message = new MessageObject(message, guild);
+        return this;
+    }
+}
diff --git a/src/main/java/Commands/DMCommandObject.java b/src/main/java/com/github/vaerys/commands/DMCommandObject.java
similarity index 95%
rename from src/main/java/Commands/DMCommandObject.java
rename to src/main/java/com/github/vaerys/commands/DMCommandObject.java
index ff53c2ac..37a58d35 100644
--- a/src/main/java/Commands/DMCommandObject.java
+++ b/src/main/java/com/github/vaerys/commands/DMCommandObject.java
@@ -1,6 +1,6 @@
-package Commands;
+package com.github.vaerys.commands;
 
-import Main.Globals;
+import com.github.vaerys.main.Globals;
 import sx.blah.discord.api.IDiscordClient;
 import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IMessage;
diff --git a/src/main/java/Commands/Admin/ChannelHere.java b/src/main/java/com/github/vaerys/commands/admin/ChannelHere.java
similarity index 79%
rename from src/main/java/Commands/Admin/ChannelHere.java
rename to src/main/java/com/github/vaerys/commands/admin/ChannelHere.java
index 3d93fff7..c4b569ca 100644
--- a/src/main/java/Commands/Admin/ChannelHere.java
+++ b/src/main/java/com/github/vaerys/commands/admin/ChannelHere.java
@@ -1,10 +1,10 @@
-package Commands.Admin;
+package com.github.vaerys.commands.admin;
 
-import Commands.CommandObject;
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.XEmbedBuilder;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.util.ArrayList;
@@ -20,9 +20,9 @@ public class ChannelHere implements Command {
     public String execute(String args, CommandObject command) {
         String desc = "";
         if (!args.isEmpty()) {
-            for (ChannelSetting s : command.channelSettings) {
+            for (ChannelSetting s : command.guild.channelSettings) {
                 if (args.equalsIgnoreCase(s.type())) {
-                    return s.toggleSetting(command.guildConfig,command.channelSID);
+                    return s.toggleSetting(command.guild.config, command.channel.stringID);
                 }
 
             }
@@ -31,14 +31,14 @@ public String execute(String args, CommandObject command) {
         XEmbedBuilder embedBuilder = new XEmbedBuilder();
         String title = "> Here is a list of available Channel Types:\n";
 
-        ArrayList<ChannelSetting> channelSettings = command.channelSettings;
+        List<ChannelSetting> channelSettings = command.guild.channelSettings;
         List<String> types = channelSettings.stream().map(ChannelSetting::type).collect(Collectors.toList());
         Collections.sort(types);
         embedBuilder.withDesc(desc);
         Utility.listFormatterEmbed(title, embedBuilder, (ArrayList<String>) types, true);
         embedBuilder.appendField(spacer, Utility.getCommandInfo(this, command), false);
-        embedBuilder.withColor(Utility.getUsersColour(command.client.getOurUser(), command.guild));
-        Utility.sendEmbedMessage("", embedBuilder, command.channel);
+        embedBuilder.withColor(command.client.color);
+        Utility.sendEmbedMessage("", embedBuilder, command.channel.get());
         return null;
     }
 
diff --git a/src/main/java/Commands/Admin/ChannelStats.java b/src/main/java/com/github/vaerys/commands/admin/ChannelStats.java
similarity index 52%
rename from src/main/java/Commands/Admin/ChannelStats.java
rename to src/main/java/com/github/vaerys/commands/admin/ChannelStats.java
index 1fcc83d9..d93d8213 100644
--- a/src/main/java/Commands/Admin/ChannelStats.java
+++ b/src/main/java/com/github/vaerys/commands/admin/ChannelStats.java
@@ -1,12 +1,13 @@
-package Commands.Admin;
-
-import Commands.CommandObject;
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
-import Main.Globals;
-import Main.Utility;
-import Objects.ChannelSettingObject;
-import Objects.XEmbedBuilder;
+package com.github.vaerys.commands.admin;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.ChannelSettingObject;
+import com.github.vaerys.objects.XEmbedBuilder;
+import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.util.ArrayList;
@@ -18,12 +19,40 @@ public class ChannelStats implements Command {
     @Override
     public String execute(String args, CommandObject command) {
         XEmbedBuilder builder = new XEmbedBuilder();
-
+        builder.withTitle("Channel Stats");
+        builder.withColor(command.client.color);
         ArrayList<String> channelTypes = new ArrayList<>();
         ArrayList<String> channelSettings = new ArrayList<>();
 
-        for (ChannelSettingObject c : command.guildConfig.getChannelSettings()) {
-            if (c.getChannelIDs().contains(command.channelSID)) {
+        ArrayList<String> channelNames = new ArrayList<>();
+        if (args != null && !args.isEmpty()) {
+            for (ChannelSetting s : command.guild.channelSettings) {
+                if (s.type().equalsIgnoreCase(args)) {
+                    ArrayList<String> channelIDs = command.guild.config.getChannelIDsByType(s.type());
+                    if (channelIDs != null) {
+                        for (String cID : channelIDs) {
+                            IChannel channel = command.guild.get().getChannelByID(cID);
+                            if (channel != null) {
+                                channelNames.add(channel.mention());
+                            }
+                        }
+                        builder.appendField(s.type(), Utility.listFormatter(channelNames, true), false);
+                        Utility.sendEmbedMessage("", builder, command.channel.get());
+                        return null;
+                    } else {
+                        if (s.isSetting()) {
+                            return "> Could not find any channels with the **" + s.type() + "** setting enabled.";
+                        } else {
+                            return "> Could not find a channel with the **" + s.type() + "** type enabled.";
+                        }
+                    }
+                }
+            }
+            return "> Could not any channel settings with that name.";
+        }
+
+        for (ChannelSettingObject c : command.guild.config.getChannelSettings()) {
+            if (c.getChannelIDs().contains(command.channel.stringID)) {
                 for (ChannelSetting setting : Globals.getChannelSettings()) {
                     if (c.getType().equalsIgnoreCase(setting.type())) {
                         if (setting.isSetting()) {
@@ -36,10 +65,7 @@ public String execute(String args, CommandObject command) {
             }
         }
 
-
-        builder.withTitle("Channel Stats");
-        builder.withColor(Utility.getUsersColour(command.botUser,command.guild));
-        if (channelSettings.size() == 0 && channelTypes.size() == 0){
+        if (channelSettings.size() == 0 && channelTypes.size() == 0) {
             return "> I found nothing of value.";
         }
         if (channelTypes.size() != 0) {
@@ -48,7 +74,7 @@ public String execute(String args, CommandObject command) {
         if (channelSettings.size() != 0) {
             builder.appendField("Settings:", Utility.listFormatter(channelSettings, true), false);
         }
-        Utility.sendEmbedMessage("",builder,command.channel);
+        Utility.sendEmbedMessage("", builder, command.channel.get());
         return null;
     }
 
@@ -64,7 +90,7 @@ public String description() {
 
     @Override
     public String usage() {
-        return null;
+        return "(Channel setting/type)";
     }
 
     @Override
diff --git a/src/main/java/Commands/Admin/DenyXpPrefix.java b/src/main/java/com/github/vaerys/commands/admin/DenyXpPrefix.java
similarity index 86%
rename from src/main/java/Commands/Admin/DenyXpPrefix.java
rename to src/main/java/com/github/vaerys/commands/admin/DenyXpPrefix.java
index 2b2e6e5a..9f27e316 100644
--- a/src/main/java/Commands/Admin/DenyXpPrefix.java
+++ b/src/main/java/com/github/vaerys/commands/admin/DenyXpPrefix.java
@@ -1,8 +1,8 @@
-package Commands.Admin;
+package com.github.vaerys.commands.admin;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.util.ArrayList;
@@ -14,7 +14,7 @@ public class DenyXpPrefix implements Command {
     public String execute(String args, CommandObject command) {
         if (args.equalsIgnoreCase("list")) {
             return "> Here are all of the prefixes that are registered.\n```" +
-                    Utility.listFormatter(command.guildConfig.getXPDeniedPrefixes(), true) + "```";
+                    Utility.listFormatter(command.guild.config.getXPDeniedPrefixes(), true) + "```";
         }
         boolean isAlphanumeric = args.matches("[A-Za-z0-9]+");
         if (args.length() > 5) {
@@ -35,7 +35,7 @@ public String execute(String args, CommandObject command) {
         if (args.startsWith("@")) {
             return "> Prefix cannot start with a `@`.";
         }
-        ArrayList<String> prefixes = command.guildConfig.getXPDeniedPrefixes();
+        ArrayList<String> prefixes = command.guild.config.getXPDeniedPrefixes();
         ListIterator iterator = prefixes.listIterator();
         while (iterator.hasNext()) {
             String prefix = (String) iterator.next();
@@ -55,7 +55,7 @@ public String[] names() {
 
     @Override
     public String description() {
-        return "prefixes added to this list will stop commands starting with the prefix to stop xp gain.";
+        return "prefixes added to this list will stop commands starting with the prefix granting xp.";
     }
 
     @Override
diff --git a/src/main/java/Commands/Admin/EditInfoFiles.java b/src/main/java/com/github/vaerys/commands/admin/EditInfoFiles.java
similarity index 79%
rename from src/main/java/Commands/Admin/EditInfoFiles.java
rename to src/main/java/com/github/vaerys/commands/admin/EditInfoFiles.java
index a1898ca6..1c7a1786 100644
--- a/src/main/java/Commands/Admin/EditInfoFiles.java
+++ b/src/main/java/com/github/vaerys/commands/admin/EditInfoFiles.java
@@ -1,10 +1,10 @@
-package Commands.Admin;
+package com.github.vaerys.commands.admin;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Constants;
-import Main.Utility;
-import Objects.SplitFirstObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.SplitFirstObject;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -24,17 +24,17 @@ public String execute(String args, CommandObject command) {
         SplitFirstObject object = new SplitFirstObject(args);
         switch (object.getFirstWord().toLowerCase()) {
             case "uploadimage":
-                return InfoEditModes.uploadFile(command.message);
+                return InfoEditModes.uploadFile(command.message.get());
             case "removeimage":
-                return InfoEditModes.removeFile(object.getRest(), command.message);
+                return InfoEditModes.removeFile(object.getRest(), command.message.get());
             case "listimages":
-                return InfoEditModes.listFiles(command.message);
+                return InfoEditModes.listFiles(command.message.get());
             case "listfiles":
-                return InfoEditModes.listFiles(command.message);
+                return InfoEditModes.listFiles(command.message.get());
             case "uploadinfo":
-                return InfoEditModes.uploadInfo(command.message);
+                return InfoEditModes.uploadInfo(command.message.get());
             case "getinfofile": {
-                return InfoEditModes.getInfoFile(command.message);
+                return InfoEditModes.getInfoFile(command.message.get());
             }
             default:
                 return "Invalid Edit Mode.\n" + Utility.getCommandInfo(this, command);
diff --git a/src/main/java/Commands/Admin/InfoEditModes.java b/src/main/java/com/github/vaerys/commands/admin/InfoEditModes.java
similarity index 90%
rename from src/main/java/Commands/Admin/InfoEditModes.java
rename to src/main/java/com/github/vaerys/commands/admin/InfoEditModes.java
index 36ef7d23..23cb3544 100644
--- a/src/main/java/Commands/Admin/InfoEditModes.java
+++ b/src/main/java/com/github/vaerys/commands/admin/InfoEditModes.java
@@ -1,9 +1,9 @@
-package Commands.Admin;
+package com.github.vaerys.commands.admin;
 
-import Main.Constants;
-import Main.Globals;
-import Main.Utility;
-import Objects.XEmbedBuilder;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.IMessage;
 
 import java.io.File;
@@ -43,17 +43,20 @@ public static String uploadFile(IMessage message) {
                 if (file.exists()) {
                     file.delete();
                     Files.copy(stream, Paths.get(file.getPath()));
+                    stream.close();
                     return "> File **" + attachment.getFilename() + "** updated";
                 } else {
                     if (imageList.length >= 25) {
+                        stream.close();
                         return "> Max images already reached, you will need to remove an old image to upload a new one.";
                     } else {
                         Files.copy(stream, Paths.get(file.getPath()));
+                        stream.close();
                         return "> File **" + attachment.getFilename() + "** uploaded";
                     }
                 }
             } catch (IOException e) {
-                e.printStackTrace();
+                Utility.sendStack(e);
                 return "> An error occurred trying to upload your file.";
             }
         }
@@ -108,13 +111,15 @@ public static String uploadInfo(IMessage message) {
                 if (file.exists()) {
                     file.delete();
                     Files.copy(stream, Paths.get(file.getPath()));
+                    stream.close();
                     return "> Updated **" + Constants.FILE_INFO + "** file.";
                 } else {
                     Files.copy(stream, Paths.get(file.getPath()));
+                    stream.close();
                     return "> New **" + Constants.FILE_INFO + "** file uploaded.";
                 }
             } catch (IOException e) {
-                e.printStackTrace();
+                Utility.sendStack(e);
                 return "> An error occurred trying to upload your file.";
             }
         }
@@ -124,7 +129,7 @@ public static String getInfoFile(IMessage message) {
         String filePath = Utility.getFilePath(message.getGuild().getStringID(), Constants.FILE_INFO);
         File file = new File(filePath);
         if (file.exists()) {
-            Utility.sendFile("> Here is your **"+Constants.FILE_INFO+ "** file.", file, message.getChannel());
+            Utility.sendFile("> Here is your **" + Constants.FILE_INFO + "** file.", file, message.getChannel());
         } else {
             return "> Cannot send file, **" + Constants.FILE_INFO + "** file does not exist yet.";
         }
diff --git a/src/main/java/Commands/Admin/Module.java b/src/main/java/com/github/vaerys/commands/admin/Module.java
similarity index 83%
rename from src/main/java/Commands/Admin/Module.java
rename to src/main/java/com/github/vaerys/commands/admin/Module.java
index 6dc4a862..87396db8 100644
--- a/src/main/java/Commands/Admin/Module.java
+++ b/src/main/java/com/github/vaerys/commands/admin/Module.java
@@ -1,16 +1,9 @@
-package Commands.Admin;
+package com.github.vaerys.commands.admin;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Interfaces.GuildToggle;
-import Main.Utility;
-import Objects.XEmbedBuilder;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.stream.Collectors;
-
 /**
  * Created by Vaerys on 31/01/2017.
  */
diff --git a/src/main/java/com/github/vaerys/commands/admin/Mute.java b/src/main/java/com/github/vaerys/commands/admin/Mute.java
new file mode 100644
index 00000000..1dcf0607
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/admin/Mute.java
@@ -0,0 +1,130 @@
+package com.github.vaerys.commands.admin;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.SplitFirstObject;
+import sx.blah.discord.handle.obj.IRole;
+import sx.blah.discord.handle.obj.IUser;
+import sx.blah.discord.handle.obj.Permissions;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.Date;
+
+/**
+ * Created by Vaerys on 02/03/2017.
+ */
+public class Mute implements Command {
+
+    @Override
+    public String execute(String args, CommandObject command) {
+        SplitFirstObject userCall = new SplitFirstObject(args);
+        IRole mutedRole = command.client.get().getRoleByID(command.guild.config.getMutedRoleID());
+        if (mutedRole == null) {
+            return "> Cannot Mute/UnMute user. No mute role exists.";
+        }
+        if (userCall.getRest() == null) {
+            return "> Cannot Mute/UnMute user. No modifier specified.";
+        }
+        SplitFirstObject modifier = new SplitFirstObject(userCall.getRest());
+        UserObject muted = Utility.getUser(command, userCall.getFirstWord(), false);
+        if (muted == null) {
+            return "> Could not find user.";
+        }
+        if (!Utility.testUserHierarchy(command.client.bot, mutedRole, command.guild.get())) {
+            return "> Cannot Mute/UnMute user. **" + mutedRole.getName() + "** role has a higher hierarchy than me.";
+        }
+        if (muted.stringID.equals(command.user.stringID)) {
+            return "> Don't try to mute yourself you numpty.";
+        }
+        if (Utility.testModifier(modifier.getFirstWord()) == null) {
+            return "> Cannot Mute/UnMute user. Modifier Invalid. Must be either +/-/add/del";
+        }
+        if (!Utility.testUserHierarchy(command.user.get(), muted.get(), command.guild.get())) {
+            return "> Cannot Mute/UnMute user. User hierarchy higher than yours.";
+        }
+        if (!Utility.testUserHierarchy(command.client.bot, muted.get(), command.guild.get())) {
+            return "> Cannot Mute/UnMute user. My hierarchy level is too low.";
+        }
+        if (Utility.testModifier(modifier.getFirstWord())) {
+            SplitFirstObject time = new SplitFirstObject("");
+            long timeSecs = -1;
+            if (modifier.getRest() != null) {
+                time = new SplitFirstObject(modifier.getRest());
+                timeSecs = Utility.textToSeconds(time.getFirstWord());
+            }
+            command.guild.users.muteUser(muted.stringID, timeSecs, command.guild.longID);
+            if (time.getFirstWord() == null || timeSecs == -1) {
+                return "> " + muted.displayName + " was Muted.";
+            } else {
+                return "> " + muted.displayName + " was Muted for " + time.getFirstWord() + ".";
+            }
+        } else {
+            command.guild.users.unMuteUser(muted.stringID, command.guild.longID);
+            return "> " + muted.displayName + " was UnMuted.";
+        }
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"Mute"};
+    }
+
+    @Override
+    public String description() {
+        return "Allows for Users with ManageMessages to mute a user.";
+    }
+
+    @Override
+    public String usage() {
+        return "[@User] [+/-/add/del] (Time) (Reason)";
+    }
+
+    @Override
+    public String type() {
+        return TYPE_ADMIN;
+    }
+
+    @Override
+    public String channel() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] perms() {
+        return new Permissions[]{Permissions.MANAGE_MESSAGES};
+    }
+
+    @Override
+    public boolean requiresArgs() {
+        return true;
+    }
+
+    @Override
+    public boolean doAdminLogging() {
+        return true;
+    }
+
+    @Override
+    public String dualDescription() {
+        return null;
+    }
+
+    @Override
+    public String dualUsage() {
+        return null;
+    }
+
+    @Override
+    public String dualType() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] dualPerms() {
+        return new Permissions[0];
+    }
+}
diff --git a/src/main/java/Commands/Admin/PruneEmptyProfiles.java b/src/main/java/com/github/vaerys/commands/admin/PruneEmptyProfiles.java
similarity index 81%
rename from src/main/java/Commands/Admin/PruneEmptyProfiles.java
rename to src/main/java/com/github/vaerys/commands/admin/PruneEmptyProfiles.java
index 2fa4ecf3..239bbf9b 100644
--- a/src/main/java/Commands/Admin/PruneEmptyProfiles.java
+++ b/src/main/java/com/github/vaerys/commands/admin/PruneEmptyProfiles.java
@@ -1,8 +1,8 @@
-package Commands.Admin;
+package com.github.vaerys.commands.admin;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Objects.UserTypeObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.objects.ProfileObject;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.text.NumberFormat;
@@ -13,12 +13,12 @@ public class PruneEmptyProfiles implements Command {
 
     @Override
     public String execute(String args, CommandObject command) {
-        ArrayList<UserTypeObject> profiles = command.guildUsers.getUsers();
-        UserTypeObject defaultProfile = new UserTypeObject(null);
+        ArrayList<ProfileObject> profiles = command.guild.users.getProfiles();
+        ProfileObject defaultProfile = new ProfileObject(null);
         long profileCount = 0;
         ListIterator listIterator = profiles.listIterator();
         while (listIterator.hasNext()) {
-            UserTypeObject profile = (UserTypeObject) listIterator.next();
+            ProfileObject profile = (ProfileObject) listIterator.next();
             boolean noXP = profile.getXP() == 0;
             boolean noGender = defaultProfile.getGender().equals(profile.getGender());
             boolean noQuote = defaultProfile.getQuote().equals(profile.getQuote());
@@ -39,7 +39,7 @@ public String[] names() {
 
     @Override
     public String description() {
-        return "Prunes all of the empty users on the server.";
+        return "Prunes all of the empty profiles on the server.";
     }
 
     @Override
diff --git a/src/main/java/com/github/vaerys/commands/admin/PurgeBannedData.java b/src/main/java/com/github/vaerys/commands/admin/PurgeBannedData.java
new file mode 100644
index 00000000..f8e8a1de
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/admin/PurgeBannedData.java
@@ -0,0 +1,168 @@
+package com.github.vaerys.commands.admin;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.objects.*;
+import sx.blah.discord.handle.obj.IUser;
+import sx.blah.discord.handle.obj.Permissions;
+
+import java.util.ListIterator;
+
+public class PurgeBannedData implements Command {
+    long purgedProfiles = 0;
+    long purgedCCs = 0;
+    long purgedCharacters = 0;
+    long purgedServers = 0;
+    long purgedDailyMessages = 0;
+
+    @Override
+    public String execute(String args, CommandObject command) {
+        purgedProfiles = 0;
+        purgedCCs = 0;
+        purgedCharacters = 0;
+        purgedServers = 0;
+        purgedDailyMessages = 0;
+
+        long userId = -1;
+        String userStringID = null;
+        try {
+            userId = Long.parseLong(args);
+            userStringID = args;
+            if (userStringID.equalsIgnoreCase(Globals.creatorID)) {
+                return "> You cannot purge the bot owner's data, if you have found an error in their data please DM me with the details.";
+            }
+            if (userId == command.guild.get().getOwnerLongID()) {
+                return "> You cannot purge the servers owner's data, if you have found an error in their data please DM me with the details.";
+            }
+            IUser toTest = command.guild.get().getUserByID(userId);
+            if (toTest != null) {
+                if (toTest.getPermissionsForGuild(command.guild.get()).contains(Permissions.ADMINISTRATOR)) {
+                    return "> You cannot purge a user with the administrator permission, if you have found an error in their data please DM me with the details.";
+                }
+            }
+        } catch (NumberFormatException e) {
+            //do nothing
+        }
+        if (!command.client.bot.getPermissionsForGuild(command.guild.get()).contains(Permissions.BAN)) {
+            return "> I cant purge the data of banned profiles unless I get the ban permission.\n" +
+                    "Feel free to remove the permission after you purge the data as I don't need it.";
+        }
+        if (userId != -1 && userStringID != null) {
+            purgeData(userId, userStringID, command);
+        } else {
+            for (IUser user : command.guild.get().getBannedUsers()) {
+                purgeData(user.getLongID(), user.getStringID(), command);
+            }
+        }
+        return "> Purged Profiles: **" + purgedProfiles + "**." +
+                "\n> Purged CCs: **" + purgedCCs + "**." +
+                "\n> Purged Characters: **" + purgedCharacters + "**." +
+                "\n> Purged Server Listings: **" + purgedServers + "**." +
+                "\n> Purged Daily Messages: **" + purgedDailyMessages + "**.";
+    }
+
+    public void purgeData(long userID, String userStringID, CommandObject command) {
+        ListIterator iterator = command.guild.users.profiles.listIterator();
+        while (iterator.hasNext()) {
+            ProfileObject object = (ProfileObject) iterator.next();
+            if (userStringID.equalsIgnoreCase(object.getID())) {
+                iterator.remove();
+                purgedProfiles++;
+            }
+        }
+        iterator = command.guild.customCommands.getCommandList().listIterator();
+        while (iterator.hasNext()) {
+            CCommandObject ccObject = (CCommandObject) iterator.next();
+            if (userStringID.equalsIgnoreCase(ccObject.getUserID())) {
+                iterator.remove();
+                purgedCCs++;
+            }
+        }
+        iterator = command.guild.characters.getCharacters(command.guild.get()).listIterator();
+        while (iterator.hasNext()) {
+            CharacterObject charObject = (CharacterObject) iterator.next();
+            if (charObject.getUserID().equalsIgnoreCase(userStringID)) {
+                iterator.remove();
+                purgedCharacters++;
+            }
+        }
+        iterator = command.guild.servers.getServers().listIterator();
+        while (iterator.hasNext()) {
+            ServerObject serverObject = (ServerObject) iterator.next();
+            if (serverObject.getCreatorID().equalsIgnoreCase(userStringID)) {
+                iterator.remove();
+                purgedServers++;
+            }
+        }
+        iterator = Globals.getDailyMessages().getMessages().listIterator();
+        while (iterator.hasNext()) {
+            DailyUserMessageObject dailyObject = (DailyUserMessageObject) iterator.next();
+            if (dailyObject.getUserID() == userID) {
+                iterator.remove();
+                purgedDailyMessages++;
+            }
+        }
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"PurgeBannedData"};
+    }
+
+    @Override
+    public String description() {
+        return "Removes all data related to banned profiles from the server's data. or just the data from one user.\n\n" +
+                "***!!! WARNING: IF YOU USE A USER_ID YOU WILL PURGE ALL DATA FOR THAT USER REGARDLESS OF STATUS SO BE CAREFUL !!!***\n";
+    }
+
+    @Override
+    public String usage() {
+        return "(UserID)";
+    }
+
+    @Override
+    public String type() {
+        return TYPE_ADMIN;
+    }
+
+    @Override
+    public String channel() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] perms() {
+        return new Permissions[]{Permissions.ADMINISTRATOR, Permissions.BAN};
+    }
+
+    @Override
+    public boolean requiresArgs() {
+        return false;
+    }
+
+    @Override
+    public boolean doAdminLogging() {
+        return true;
+    }
+
+    @Override
+    public String dualDescription() {
+        return null;
+    }
+
+    @Override
+    public String dualUsage() {
+        return null;
+    }
+
+    @Override
+    public String dualType() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] dualPerms() {
+        return new Permissions[0];
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/Commands/Admin/RewardRole.java b/src/main/java/com/github/vaerys/commands/admin/RewardRole.java
similarity index 87%
rename from src/main/java/Commands/Admin/RewardRole.java
rename to src/main/java/com/github/vaerys/commands/admin/RewardRole.java
index 9d46d1be..d424efae 100644
--- a/src/main/java/Commands/Admin/RewardRole.java
+++ b/src/main/java/com/github/vaerys/commands/admin/RewardRole.java
@@ -1,8 +1,8 @@
-package Commands.Admin;
+package com.github.vaerys.commands.admin;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Objects.SplitFirstObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.objects.SplitFirstObject;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
diff --git a/src/main/java/Commands/Admin/SetAdminRole.java b/src/main/java/com/github/vaerys/commands/admin/SetAdminRole.java
similarity index 83%
rename from src/main/java/Commands/Admin/SetAdminRole.java
rename to src/main/java/com/github/vaerys/commands/admin/SetAdminRole.java
index 5a4f4d56..00cccad2 100644
--- a/src/main/java/Commands/Admin/SetAdminRole.java
+++ b/src/main/java/com/github/vaerys/commands/admin/SetAdminRole.java
@@ -1,9 +1,9 @@
-package Commands.Admin;
+package com.github.vaerys.commands.admin;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Constants;
-import Main.Utility;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Utility;
 import sx.blah.discord.handle.obj.IRole;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -14,14 +14,14 @@ public class SetAdminRole implements Command {
     @Override
     public String execute(String args, CommandObject command) {
         if (args.equalsIgnoreCase("Remove")) {
-            command.guildConfig.setRoleToMentionID(-1);
+            command.guild.config.setRoleToMentionID(-1);
             return "> Admin Role Removed.";
         }
-        IRole role = Utility.getRoleFromName(args, command.guild);
+        IRole role = Utility.getRoleFromName(args, command.guild.get());
         if (role == null) {
             return Constants.ERROR_ROLE_NOT_FOUND;
         } else {
-            command.guildConfig.setRoleToMentionID(role.getLongID());
+            command.guild.config.setRoleToMentionID(role.getLongID());
             return "> The role **" + role.getName() + "** Is now set as the admin role.";
         }
     }
diff --git a/src/main/java/Commands/Admin/SetJoinMessage.java b/src/main/java/com/github/vaerys/commands/admin/SetJoinMessage.java
similarity index 88%
rename from src/main/java/Commands/Admin/SetJoinMessage.java
rename to src/main/java/com/github/vaerys/commands/admin/SetJoinMessage.java
index 91b297f4..f98e63bd 100644
--- a/src/main/java/Commands/Admin/SetJoinMessage.java
+++ b/src/main/java/com/github/vaerys/commands/admin/SetJoinMessage.java
@@ -1,7 +1,7 @@
-package Commands.Admin;
+package com.github.vaerys.commands.admin;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -10,7 +10,7 @@
 public class SetJoinMessage implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        command.guildConfig.setJoinMessage(args);
+        command.guild.config.setJoinMessage(args);
         return "> New Join Message set.";
     }
 
diff --git a/src/main/java/Commands/Admin/SetMutedRole.java b/src/main/java/com/github/vaerys/commands/admin/SetMutedRole.java
similarity index 82%
rename from src/main/java/Commands/Admin/SetMutedRole.java
rename to src/main/java/com/github/vaerys/commands/admin/SetMutedRole.java
index 56d4d125..5eb610c9 100644
--- a/src/main/java/Commands/Admin/SetMutedRole.java
+++ b/src/main/java/com/github/vaerys/commands/admin/SetMutedRole.java
@@ -1,9 +1,9 @@
-package Commands.Admin;
+package com.github.vaerys.commands.admin;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Constants;
-import Main.Utility;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Utility;
 import sx.blah.discord.handle.obj.IRole;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -14,14 +14,14 @@ public class SetMutedRole implements Command{
     @Override
     public String execute(String args, CommandObject command) {
         if (args.equalsIgnoreCase("Remove")) {
-            command.guildConfig.setRoleToMentionID(-1);
+            command.guild.config.setRoleToMentionID(-1);
             return "> Muted Role Removed.";
         }
-        IRole role = Utility.getRoleFromName(args, command.guild);
+        IRole role = Utility.getRoleFromName(args, command.guild.get());
         if (role == null) {
             return Constants.ERROR_ROLE_NOT_FOUND;
         } else {
-            command.guildConfig.setMutedRoleID(role.getLongID());
+            command.guild.config.setMutedRoleID(role.getLongID());
             return "> The role **" + role.getName() + "** Is now set as the mute role.";
         }
     }
diff --git a/src/main/java/Commands/Admin/MaxMessages.java b/src/main/java/com/github/vaerys/commands/admin/SetRateLimit.java
similarity index 88%
rename from src/main/java/Commands/Admin/MaxMessages.java
rename to src/main/java/com/github/vaerys/commands/admin/SetRateLimit.java
index 7039f595..e153ee9a 100644
--- a/src/main/java/Commands/Admin/MaxMessages.java
+++ b/src/main/java/com/github/vaerys/commands/admin/SetRateLimit.java
@@ -1,13 +1,13 @@
-package Commands.Admin;
+package com.github.vaerys.commands.admin;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
  * Created by Vaerys on 21/02/2017.
  */
-public class MaxMessages implements Command {
+public class SetRateLimit implements Command {
 
     @Override
     public String execute(String args, CommandObject command) {
@@ -18,7 +18,7 @@ public String execute(String args, CommandObject command) {
             }else if (max > 10){
                 return "> That would be stopped by Discord's Rate Limit.";
             }else{
-                command.guildConfig.setRateLimit(max);
+                command.guild.config.setRateLimit(max);
                 return "> Guild Rate limit set to **" + max + "** messages per user every 10 seconds.";
             }
         }catch (NumberFormatException e){
diff --git a/src/main/java/Commands/Admin/SetTrustedRoles.java b/src/main/java/com/github/vaerys/commands/admin/SetTrustedRoles.java
similarity index 73%
rename from src/main/java/Commands/Admin/SetTrustedRoles.java
rename to src/main/java/com/github/vaerys/commands/admin/SetTrustedRoles.java
index f69e60c4..997fc231 100644
--- a/src/main/java/Commands/Admin/SetTrustedRoles.java
+++ b/src/main/java/com/github/vaerys/commands/admin/SetTrustedRoles.java
@@ -1,10 +1,10 @@
-package Commands.Admin;
+package com.github.vaerys.commands.admin;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Constants;
-import Main.Utility;
-import Objects.SplitFirstObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.SplitFirstObject;
 import sx.blah.discord.handle.obj.IRole;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -18,22 +18,22 @@ public class SetTrustedRoles implements Command {
     public String execute(String args, CommandObject command) {
         SplitFirstObject split = new SplitFirstObject(args);
 
-        IRole role = Utility.getRoleFromName(split.getRest(), command.guild);
+        IRole role = Utility.getRoleFromName(split.getRest(), command.guild.get());
         if (role == null) {
             return Constants.ERROR_ROLE_NOT_FOUND;
         }
-        if (Utility.testUserHierarchy(command.author, role, command.guild)) {
-            if (command.guildConfig.isRoleTrusted(role.getLongID())) {
-                ListIterator iterator = command.guildConfig.getTrustedRoleIDs().listIterator();
+        if (Utility.testUserHierarchy(command.user.get(), role, command.guild.get())) {
+            if (command.guild.config.isRoleTrusted(role.getLongID())) {
+                ListIterator iterator = command.guild.config.getTrustedRoleIDs().listIterator();
                 while (iterator.hasNext()) {
-                    IRole trustedRole = command.guild.getRoleByID((long) iterator.next());
+                    IRole trustedRole = command.guild.get().getRoleByID((long) iterator.next());
                     if (role.getLongID() == trustedRole.getLongID()) {
                         iterator.remove();
                     }
                 }
                 return "> The **" + role.getName() + "** is no longer trusted.";
             } else {
-                command.guildConfig.getTrustedRoleIDs().add(role.getLongID());
+                command.guild.config.getTrustedRoleIDs().add(role.getLongID());
                 return "> The **" + role.getName() + "** is now trusted.";
             }
         } else {
diff --git a/src/main/java/Commands/General/Test.java b/src/main/java/com/github/vaerys/commands/admin/Test.java
similarity index 63%
rename from src/main/java/Commands/General/Test.java
rename to src/main/java/com/github/vaerys/commands/admin/Test.java
index 62a43803..eead9693 100644
--- a/src/main/java/Commands/General/Test.java
+++ b/src/main/java/com/github/vaerys/commands/admin/Test.java
@@ -1,8 +1,11 @@
-package Commands.General;
+package com.github.vaerys.commands.admin;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
 import sx.blah.discord.handle.obj.Permissions;
+import sx.blah.discord.util.DiscordException;
 
 /**
  * Created by Vaerys on 30/01/2017.
@@ -16,7 +19,7 @@ public class Test implements Command {
      * //                IUser user = null;
      * //                SplitFirstObject mentionee = new SplitFirstObject(obe.getRest());
      * //                String toTest = Matcher.quoteReplacement(mentionee.getFirstWord()).replace("_", "[_| ]");
-     * //                for (IUser u : command.guild.getUsers()) {
+     * //                for (IUser u : command.guild.getProfiles()) {
      * //                    try {
      * //                        if ((u.getName() + "#" + u.getDiscriminator()).matches(toTest)) {
      * //                            user = u;
@@ -46,32 +49,31 @@ public class Test implements Command {
 
     @Override
     public String execute(String args, CommandObject command) {
-        try {
-            int test = Integer.parseInt(args);
-            if (test < 0) {
-                return "> Positive number pls";
-            } else if (test > 100) {
-                return "> number lower than 100 Please";
-            }
-            StringBuilder xpBar = new StringBuilder("-------------------");
-            int pos = (int) (test / 5);
-            if (pos < 0) {
-                pos = 0;
-            }
-            if (pos > xpBar.length()) {
-                pos = xpBar.length();
-            }
-            xpBar.replace(pos, pos, "**>**");
-            return "[" + xpBar.toString() + "]";
-
-        } catch (NumberFormatException e) {
-            return "> Invalid input";
-        }
-
-
+//        ProfileObject profile = command.guildUsers.getUserByID(command.authorSID);
+//        long userXp = profile.getXP();
+//        profile.setXp(20000);
+//        StringBuilder builder = new StringBuilder();
+//        builder.append("> Start test.");
+//        for (int i = 1; i < 41; i++) {
+//            XpHandler.doDeacyUser(profile, command.guildObject, i);
+//            String stats = "\nXp: **" + profile.getXP() + "**, Level: **" + profile.getCurrentLevel() + "**, Day: **" + i + "**, Role Count: **" + command.author.getRolesForGuild(command.guild).size() + "**.";
+//            if (builder.length() + stats.length() > 1800) {
+//                Utility.sendMessage(builder.toString(), command.channel);
+//                builder.delete(0, builder.length());
+//            }
+//            builder.append(stats);
+//        }
+//        builder.append("\n> Test Complete.");
+//        profile.setXp(userXp);
+//        profile.removeLevelFloor();
+//        XpHandler.checkUsersRoles(profile.getID(), command.guildObject);
+//        return builder.toString();
+//        return Utility.getCommandsByType(Globals.getAllCommands(), command, TYPE_DM, true).size() + "";
+        throw new DiscordException("Test Exception");
 //        return nothing;
     }
 
+
     @Override
     public String[] names() {
         return new String[]{"Test", "Testing"};
@@ -99,7 +101,7 @@ public String channel() {
 
     @Override
     public Permissions[] perms() {
-        return new Permissions[0];
+        return new Permissions[]{Permissions.ADMINISTRATOR};
     }
 
     @Override
diff --git a/src/main/java/Commands/Admin/Toggle.java b/src/main/java/com/github/vaerys/commands/admin/Toggle.java
similarity index 81%
rename from src/main/java/Commands/Admin/Toggle.java
rename to src/main/java/com/github/vaerys/commands/admin/Toggle.java
index d3903c31..b41511d4 100644
--- a/src/main/java/Commands/Admin/Toggle.java
+++ b/src/main/java/com/github/vaerys/commands/admin/Toggle.java
@@ -1,15 +1,14 @@
-package Commands.Admin;
+package com.github.vaerys.commands.admin;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Interfaces.GuildToggle;
-import Main.Utility;
-import Objects.XEmbedBuilder;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.stream.Collectors;
 
 /**
  * Created by Vaerys on 31/01/2017.
@@ -23,11 +22,12 @@ public String execute(String args, CommandObject command) {
     public String getContent(String args, CommandObject command, boolean isModule, Command classObject) {
         StringBuilder builder = new StringBuilder();
         if (!args.isEmpty()) {
-            for (GuildToggle t : command.guildToggles) {
+            for (GuildToggle t : command.guild.toggles) {
                 if (t.isModule() == isModule) {
                     if (args.equalsIgnoreCase(t.name())) {
-                        t.toggle(command.guildConfig);
-                        return "> **" + t.name() + "** is now **" + t.get(command.guildConfig) + "**.";
+                        t.toggle(command.guild.config);
+                        command.guild.loadCommandData();
+                        return "> **" + t.name() + "** is now **" + t.get(command.guild.config) + "**.";
                     }
                 }
             }
@@ -46,7 +46,7 @@ public String getContent(String args, CommandObject command, boolean isModule, C
             title = "> Here is a list of available Guild Toggles:\n";
         }
         ArrayList<String> types = new ArrayList<>();
-        for (GuildToggle t : command.guildToggles) {
+        for (GuildToggle t : command.guild.toggles) {
             if (t.isModule() == isModule) {
                 types.add(t.name());
             }
@@ -55,8 +55,9 @@ public String getContent(String args, CommandObject command, boolean isModule, C
         embedBuilder.withDesc(builder.toString());
         Utility.listFormatterEmbed(title, embedBuilder, types, true);
         embedBuilder.appendField(spacer, Utility.getCommandInfo(classObject, command), false);
-        embedBuilder.withColor(Utility.getUsersColour(command.client.getOurUser(), command.guild));
-        Utility.sendEmbedMessage("", embedBuilder, command.channel);
+        embedBuilder.withColor(command.client.color);
+        Utility.sendEmbedMessage("", embedBuilder, command.channel.get());
+        command.guild.loadCommandData();
         return null;
     }
 
diff --git a/src/main/java/Commands/Admin/UpdateInfo.java b/src/main/java/com/github/vaerys/commands/admin/UpdateInfo.java
similarity index 71%
rename from src/main/java/Commands/Admin/UpdateInfo.java
rename to src/main/java/com/github/vaerys/commands/admin/UpdateInfo.java
index f016918c..5722a677 100644
--- a/src/main/java/Commands/Admin/UpdateInfo.java
+++ b/src/main/java/com/github/vaerys/commands/admin/UpdateInfo.java
@@ -1,9 +1,9 @@
-package Commands.Admin;
+package com.github.vaerys.commands.admin;
 
-import Commands.CommandObject;
-import Handlers.InfoHandler;
-import Interfaces.Command;
-import Main.Utility;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.InfoHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -12,14 +12,14 @@
 public class UpdateInfo implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        if (command.guildConfig.getChannelIDsByType(Command.CHANNEL_INFO) == null) {
+        if (command.guild.config.getChannelIDsByType(Command.CHANNEL_INFO) == null) {
             return "> No Info channel set up yet, you need to set one up in order to run this command.\n" + Utility.getCommandInfo(this, command);
         } else {
-            if (command.guildConfig.getChannelIDsByType(Command.CHANNEL_INFO).contains(command.channelSID)) {
-                new InfoHandler(command.channel, command.guild);
+            if (command.guild.config.getChannelIDsByType(Command.CHANNEL_INFO).contains(command.channel.stringID)) {
+                new InfoHandler(command.channel.get(), command.guild.get());
                 return null;
             } else {
-                return "> Command must be performed in " + command.client.getChannelByID(command.guildConfig.getChannelIDsByType(CHANNEL_INFO).get(0)).mention() + ".";
+                return "> Command must be performed in " + command.client.get().getChannelByID(command.guild.config.getChannelIDsByType(CHANNEL_INFO).get(0)).mention() + ".";
             }
         }
     }
diff --git a/src/main/java/Commands/Admin/UpdateRolePerms.java b/src/main/java/com/github/vaerys/commands/admin/UpdateRolePerms.java
similarity index 69%
rename from src/main/java/Commands/Admin/UpdateRolePerms.java
rename to src/main/java/com/github/vaerys/commands/admin/UpdateRolePerms.java
index 091b9f41..f7dba227 100644
--- a/src/main/java/Commands/Admin/UpdateRolePerms.java
+++ b/src/main/java/com/github/vaerys/commands/admin/UpdateRolePerms.java
@@ -1,8 +1,9 @@
-package Commands.Admin;
+package com.github.vaerys.commands.admin;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.XRequestBuffer;
 import sx.blah.discord.handle.obj.IMessage;
 import sx.blah.discord.handle.obj.IRole;
 import sx.blah.discord.handle.obj.Permissions;
@@ -17,22 +18,20 @@
 public class UpdateRolePerms implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        List<IRole> parentRole = Utility.getRolesByName(command.guild, args);
-        EnumSet parentPerms = command.guild.getEveryoneRole().getPermissions();
+        List<IRole> parentRole = Utility.getRolesByName(command.guild.get(), args);
+        EnumSet parentPerms = command.guild.get().getEveryoneRole().getPermissions();
         ArrayList<String> permList = new ArrayList<>();
-        IMessage workingMsg = Utility.sendMessage("`Working...`", command.channel).get();
+        IMessage workingMsg = Utility.sendMessage("`Working...`", command.channel.get()).get();
         if (parentRole.size() != 0) {
-            parentPerms = parentRole.get(0).getPermissions();
+            if (command.guild.config.isRoleCosmetic(parentRole.get(0).getLongID())) {
+                parentPerms = parentRole.get(0).getPermissions();
+            }
         }
-        for (IRole r : command.guild.getRoles()) {
-            for (long to : command.guildConfig.getCosmeticRoleIDs()) {
-                if (r.getLongID() == to) {
-                    r.changePermissions(parentPerms);
-                    try {
-                        Thread.sleep(1000);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
+        for (IRole r : command.guild.get().getRoles()) {
+            if (command.guild.config.isRoleCosmetic(r.getLongID())) {
+                if (!r.getPermissions().containsAll(parentPerms)) {
+                    EnumSet finalParentPerms = parentPerms;
+                    XRequestBuffer.request(() -> r.changePermissions(finalParentPerms));
                 }
             }
         }
diff --git a/src/main/java/com/github/vaerys/commands/admin/UserSettings.java b/src/main/java/com/github/vaerys/commands/admin/UserSettings.java
new file mode 100644
index 00000000..ed866e9b
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/admin/UserSettings.java
@@ -0,0 +1,168 @@
+package com.github.vaerys.commands.admin;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.enums.EnumString;
+import com.github.vaerys.enums.UserSetting;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.SplitFirstObject;
+import com.github.vaerys.objects.XEmbedBuilder;
+import sx.blah.discord.handle.obj.IUser;
+import sx.blah.discord.handle.obj.Permissions;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+
+/**
+ * Created by Vaerys on 06/07/2017.
+ */
+public class UserSettings implements Command {
+    private String settings = "**Settings**\n" +
+            "> DeniedXp\n" +
+            "> DontShowRank\n" +
+            "> DenyMakeCC\n" +
+            "> DenyUseCCs\n" +
+            "> AutoShitpost\n" +
+            "> DenyAutoRole\n" +
+            "> List - `Shows the user's settings.`";
+
+    @Override
+    public String execute(String args, CommandObject command) {
+        SplitFirstObject split = new SplitFirstObject(args);
+        UserObject user = Utility.getUser(command, split.getFirstWord(), false);
+        if (user == null) {
+            return "> Could not find user.";
+        }
+        ProfileObject profile = user.getProfile(command.guild);
+        if (profile != null) {
+            String toTest = "";
+            if (split.getRest() != null) {
+                toTest = split.getRest().toLowerCase();
+            }
+            switch (toTest) {
+                case "deniedxp":
+                    return toggleSetting(profile, UserSetting.DENIED_XP,
+                            "> **" + user.displayName + "** will now gain xp again.",
+                            "> **" + user.displayName + "** will no longer gain XP.");
+                case "dontshowrank":
+                    return toggleSetting(profile, UserSetting.DONT_SHOW_LEADERBOARD,
+                            "> **" + user.displayName + "'s** rank is now visible.",
+                            "> **" + user.displayName + "** will no longer show their rank.");
+                case "denymakecc":
+                    return toggleSetting(profile, UserSetting.DENY_MAKE_CC,
+                            "> **" + user.displayName + "** can now make custom commands.",
+                            "> **" + user.displayName + "** can no longer make custom commands.");
+                case "denyuseccs":
+                    return toggleSetting(profile, UserSetting.DENY_USE_CCS,
+                            "> **" + user.displayName + "** can now use custom commands.",
+                            "> **" + user.displayName + "** can no longer use custom commands.");
+                case "autoshitpost":
+                    return toggleSetting(profile, UserSetting.AUTO_SHITPOST,
+                            "> **" + user.displayName + "** no longer has the shitpost tag automatically added to all of their new Custom Commands.",
+                            "> **" + user.displayName + "** now has the shitpost tag automatically added to all of their new Custom Commands.");
+                case "denyautorole":
+                    return toggleSetting(profile, UserSetting.DENY_AUTO_ROLE,
+                            "> **" + user.displayName + "** will no longer automatically be granted roles.",
+                            "> **" + user.displayName + "** will now automatically be granted roles.");
+                case "list":
+                    List<String> userSettings = new ArrayList<>();
+                    for (UserSetting s : profile.getSettings()) {
+                        userSettings.add(EnumString.get(s));
+                    }
+                    XEmbedBuilder builder = new XEmbedBuilder();
+                    builder.withTitle(user.displayName + "'s User settings:");
+                    if (userSettings.size() == 0) {
+                        return "> **" + user.displayName + "** has no settings on their profile.";
+                    } else {
+                        builder.withDesc("```\n" + Utility.listFormatter(userSettings, true) + "```");
+                    }
+                    builder.withColor(command.client.color);
+                    Utility.sendEmbedMessage("", builder, command.channel.get());
+                    return "";
+                default:
+                    return settings + "\n\n" + Utility.getCommandInfo(this, command);
+            }
+        } else {
+            return "> Invalid user.";
+        }
+    }
+
+    private String toggleSetting(ProfileObject user, UserSetting setting, String remove, String add) {
+        if (user.getSettings().contains(setting)) {
+            ListIterator iterator = user.getSettings().listIterator();
+            while (iterator.hasNext()) {
+                UserSetting s = (UserSetting) iterator.next();
+                if (s == setting) {
+                    iterator.remove();
+                }
+            }
+            return remove;
+        } else {
+            user.getSettings().add(setting);
+            return add;
+        }
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"UserSettings"};
+    }
+
+    @Override
+    public String description() {
+        return "allows setting of certain user settings.\n" + settings;
+    }
+
+    @Override
+    public String usage() {
+        return "[@User] [Setting]";
+    }
+
+    @Override
+    public String type() {
+        return TYPE_ADMIN;
+    }
+
+    @Override
+    public String channel() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] perms() {
+        return new Permissions[]{Permissions.MANAGE_SERVER};
+    }
+
+    @Override
+    public boolean requiresArgs() {
+        return true;
+    }
+
+    @Override
+    public boolean doAdminLogging() {
+        return true;
+    }
+
+    @Override
+    public String dualDescription() {
+        return null;
+    }
+
+    @Override
+    public String dualUsage() {
+        return null;
+    }
+
+    @Override
+    public String dualType() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] dualPerms() {
+        return new Permissions[0];
+    }
+}
diff --git a/src/main/java/Commands/CC/CCEditModes.java b/src/main/java/com/github/vaerys/commands/cc/CCEditModes.java
similarity index 90%
rename from src/main/java/Commands/CC/CCEditModes.java
rename to src/main/java/com/github/vaerys/commands/cc/CCEditModes.java
index c3beae3c..94e0d4bc 100644
--- a/src/main/java/Commands/CC/CCEditModes.java
+++ b/src/main/java/com/github/vaerys/commands/cc/CCEditModes.java
@@ -1,8 +1,8 @@
-package Commands.CC;
+package com.github.vaerys.commands.cc;
 
-import Commands.CommandObject;
-import Main.Utility;
-import Objects.CCommandObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.CCommandObject;
 import sx.blah.discord.handle.obj.IGuild;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
@@ -17,7 +17,7 @@ public static String lock(CCommandObject c, CommandObject command, IUser author,
             c.toggleLocked();
             return "> Lock for **" + c.getName() + "** is now " + c.isLocked() + ".";
         } else {
-            return command.notAllowed;
+            return command.user.notAllowed;
         }
     }
 
@@ -26,7 +26,7 @@ public static String shitPost(CCommandObject c, CommandObject command, IUser aut
             c.toggleShitPost();
             return "> Shitpost for **" + c.getName() + "** is now " + c.isShitPost() + ".";
         } else {
-            return command.notAllowed;
+            return command.user.notAllowed;
         }
     }
 
diff --git a/src/main/java/Commands/CC/DelCC.java b/src/main/java/com/github/vaerys/commands/cc/DelCC.java
similarity index 83%
rename from src/main/java/Commands/CC/DelCC.java
rename to src/main/java/com/github/vaerys/commands/cc/DelCC.java
index a7425bc5..26227571 100644
--- a/src/main/java/Commands/CC/DelCC.java
+++ b/src/main/java/com/github/vaerys/commands/cc/DelCC.java
@@ -1,7 +1,7 @@
-package Commands.CC;
+package com.github.vaerys.commands.cc;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -10,7 +10,7 @@
 public class DelCC implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        return command.customCommands.delCommand(args, command.author, command.guild);
+        return command.guild.customCommands.delCommand(args, command.user.get(), command.guild.get());
 
     }
 
diff --git a/src/main/java/Commands/CC/EditCC.java b/src/main/java/com/github/vaerys/commands/cc/EditCC.java
similarity index 79%
rename from src/main/java/Commands/CC/EditCC.java
rename to src/main/java/com/github/vaerys/commands/cc/EditCC.java
index b77ecaf8..98ab6c4b 100644
--- a/src/main/java/Commands/CC/EditCC.java
+++ b/src/main/java/com/github/vaerys/commands/cc/EditCC.java
@@ -1,12 +1,12 @@
-package Commands.CC;
-
-import Commands.CommandObject;
-import Enums.UserSetting;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.CCommandObject;
-import Objects.SplitFirstObject;
-import Objects.UserTypeObject;
+package com.github.vaerys.commands.cc;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.enums.UserSetting;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.CCommandObject;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.SplitFirstObject;
 import org.apache.commons.lang3.StringUtils;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -25,8 +25,8 @@ public class EditCC implements Command {
 
     @Override
     public String execute(String args, CommandObject command) {
-        UserTypeObject object = command.guildUsers.getUserByID(command.authorSID);
-        if (object != null && object.getSettings().contains(UserSetting.DENY_MAKE_CC)){
+        ProfileObject object = command.guild.users.getUserByID(command.user.stringID);
+        if (object != null && object.getSettings().contains(UserSetting.DENY_MAKE_CC)) {
             return "> You have been denied the modification of custom commands.";
         }
         SplitFirstObject getName = new SplitFirstObject(args);
@@ -36,15 +36,15 @@ public String execute(String args, CommandObject command) {
         SplitFirstObject getMode = new SplitFirstObject(getName.getRest());
         String mode = getMode.getFirstWord();
         String content = getMode.getRest();
-        for (CCommandObject c : command.customCommands.getCommandList()) {
+        for (CCommandObject c : command.guild.customCommands.getCommandList()) {
             if (c.getName().equalsIgnoreCase(getName.getFirstWord())) {
                 boolean canBypass = false;
-                canBypass = Utility.testForPerms(new Permissions[]{Permissions.MANAGE_MESSAGES}, command.author, command.guild);
+                canBypass = Utility.testForPerms(new Permissions[]{Permissions.MANAGE_MESSAGES}, command.user.get(), command.guild.get());
                 if (canBypass ||
-                        command.authorSID.equals(c.getUserID()) && !c.isLocked() ||
-                        Utility.canBypass(command.author, command.guild)) {
-                    if (command.customCommands.checkblackList(args) != null) {
-                        return command.customCommands.checkblackList(args);
+                        command.user.stringID.equals(c.getUserID()) && !c.isLocked() ||
+                        Utility.canBypass(command.user.get(), command.guild.get())) {
+                    if (command.guild.customCommands.checkblackList(args) != null) {
+                        return command.guild.customCommands.checkblackList(args);
                     }
                     if (StringUtils.countMatches(mode + " " + content, "#embedImage#{") > 1) {
                         return "> Custom Commands Cannot have multiple #embedImage# tags";
@@ -64,9 +64,9 @@ public String execute(String args, CommandObject command) {
                         case "delcall":
                             return CCEditModes.deleteTag(c);
                         case "shitpost":
-                            return CCEditModes.shitPost(c, command, command.author, command.guild);
+                            return CCEditModes.shitPost(c, command, command.user.get(), command.guild.get());
                         case "lock":
-                            return CCEditModes.lock(c, command, command.author, command.guild);
+                            return CCEditModes.lock(c, command, command.user.get(), command.guild.get());
                         default:
                             if (content == null || content.isEmpty()) {
                                 return CCEditModes.replace(c, mode);
diff --git a/src/main/java/Commands/CC/GetCCData.java b/src/main/java/com/github/vaerys/commands/cc/GetCCData.java
similarity index 75%
rename from src/main/java/Commands/CC/GetCCData.java
rename to src/main/java/com/github/vaerys/commands/cc/GetCCData.java
index 16fb66a2..b33ce6d0 100644
--- a/src/main/java/Commands/CC/GetCCData.java
+++ b/src/main/java/com/github/vaerys/commands/cc/GetCCData.java
@@ -1,11 +1,12 @@
-package Commands.CC;
+package com.github.vaerys.commands.cc;
 
-import Commands.CommandObject;
-import Handlers.FileHandler;
-import Interfaces.Command;
-import Main.Constants;
-import Main.Utility;
-import Objects.CCommandObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.FileHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.CCommandObject;
+import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.io.File;
@@ -16,20 +17,21 @@
 public class GetCCData implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        for (CCommandObject c : command.customCommands.getCommandList()) {
+        for (CCommandObject c : command.guild.customCommands.getCommandList()) {
             if (c.getName().equalsIgnoreCase(args)) {
                 StringBuilder content = new StringBuilder("Command Name: \"" + c.getName() + "\"");
-                content.append("\nCreated by: \"" + command.client.getUserByID(c.getUserID()).getDisplayName(command.guild) + "\"");
+                IUser createdBy = command.client.get().getUserByID(c.getUserID());
+                content.append("\nCreated by: \"" + createdBy.getName() + "#" + createdBy.getDiscriminator() + "\"");
                 content.append("\nTimes run: \"" + c.getTimesRun() + "\"");
                 content.append("\nContents: \"" + c.getContents(false) + "\"");
-                String filePath = Constants.DIRECTORY_TEMP + command.messageSID + ".txt";
+                String filePath = Constants.DIRECTORY_TEMP + command.message.stringID + ".txt";
                 FileHandler.writeToFile(filePath, content.toString(), false);
-                Utility.sendFile("> Here is the raw data for Custom Command: **" + c.getName() + "**", new File(filePath), command.channel);
+                Utility.sendFile("> Here is the raw data for Custom Command: **" + c.getName() + "**", new File(filePath), command.channel.get());
                 try {
                     Thread.sleep(4000);
                     new File(filePath).delete();
                 } catch (InterruptedException e) {
-                    e.printStackTrace();
+                    Utility.sendStack(e);
                 }
                 return "";
             }
diff --git a/src/main/java/Commands/CC/InfoCC.java b/src/main/java/com/github/vaerys/commands/cc/InfoCC.java
similarity index 81%
rename from src/main/java/Commands/CC/InfoCC.java
rename to src/main/java/com/github/vaerys/commands/cc/InfoCC.java
index 4cec98e5..0922e66f 100644
--- a/src/main/java/Commands/CC/InfoCC.java
+++ b/src/main/java/com/github/vaerys/commands/cc/InfoCC.java
@@ -1,12 +1,12 @@
-package Commands.CC;
+package com.github.vaerys.commands.cc;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Constants;
-import Main.Globals;
-import Main.Utility;
-import Objects.CCommandObject;
-import Objects.XEmbedBuilder;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.CCommandObject;
+import com.github.vaerys.objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -16,19 +16,19 @@
 public class InfoCC implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        for (CCommandObject c : command.customCommands.getCommandList()) {
+        for (CCommandObject c : command.guild.customCommands.getCommandList()) {
             if (c.getName().equalsIgnoreCase(args)) {
                 StringBuilder builder = new StringBuilder();
                 IUser author = Globals.getClient().getUserByID(c.getUserID());
                 XEmbedBuilder embedBuilder = new XEmbedBuilder();
-                embedBuilder.withColor(Utility.getUsersColour(command.client.getOurUser(),command.guild));
+                embedBuilder.withColor(command.client.color);
                 String title = "> Here is the information for command: **" + c.getName() + "**\n";
                 builder.append("Creator: **@" + author.getName() + "#" + author.getDiscriminator() + "**\n");
                 builder.append("Time Run: **" + c.getTimesRun() + "**\n");
                 builder.append("Is Locked: **" + c.isLocked() + "**\n");
                 builder.append("Is ShitPost: **" + c.isShitPost() + "**");
                 embedBuilder.appendField(title,builder.toString(),false);
-                Utility.sendEmbedMessage("",embedBuilder,command.channel);
+                Utility.sendEmbedMessage("",embedBuilder,command.channel.get());
                 return null;
             }
         }
diff --git a/src/main/java/Commands/CC/ListCCs.java b/src/main/java/com/github/vaerys/commands/cc/ListCCs.java
similarity index 65%
rename from src/main/java/Commands/CC/ListCCs.java
rename to src/main/java/com/github/vaerys/commands/cc/ListCCs.java
index b20cffd4..0d3dec84 100644
--- a/src/main/java/Commands/CC/ListCCs.java
+++ b/src/main/java/com/github/vaerys/commands/cc/ListCCs.java
@@ -1,12 +1,13 @@
-package Commands.CC;
-
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Constants;
-import Main.Globals;
-import Main.Utility;
-import Objects.CCommandObject;
-import Objects.XEmbedBuilder;
+package com.github.vaerys.commands.cc;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.CCommandObject;
+import com.github.vaerys.objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.IMessage;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
@@ -19,20 +20,11 @@
 public class ListCCs implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        IMessage message = command.message;
-        long uID;
-        IUser mentionedUser = null;
-        if (message.getMentions().size() > 0) {
-            return getUserCommands(command, command.message.getMentions().get(0).getLongID());
-        }
-        try {
-            uID = Long.parseLong(args);
-            mentionedUser = Globals.getClient().getUserByID(uID);
-        } catch (NumberFormatException e) {
-            //do nothing
-        }
-        if (mentionedUser != null) {
-            return getUserCommands(command, mentionedUser.getLongID());
+        if (args.length() > 3) {
+            UserObject user = Utility.getUser(command, args, true);
+            if (user != null) {
+                return getUserCommands(command, user.longID);
+            }
         }
         try {
             int page;
@@ -52,20 +44,20 @@ public String getUserCommands(CommandObject command, long userID) {
         IUser user = Globals.getClient().getUserByID(userID);
         int total = 0;
         command.setAuthor(user);
-        int max = command.customCommands.maxCCs(command);
+        int max = command.guild.customCommands.maxCCs(command.user, command.guild);
         XEmbedBuilder builder = new XEmbedBuilder();
         String title = "> Here are the custom commands for user: **@" + user.getName() + "#" + user.getDiscriminator() + "**.";
         ArrayList<String> list = new ArrayList<>();
-        for (CCommandObject c : command.customCommands.getCommandList()) {
+        for (CCommandObject c : command.guild.customCommands.getCommandList()) {
             if (c.getUserID().equals(userID + "")) {
-                list.add(command.guildConfig.getPrefixCC() + c.getName());
+                list.add(command.guild.config.getPrefixCC() + c.getName());
                 total++;
             }
         }
         Utility.listFormatterEmbed(title, builder, list, true);
-        builder.withColor(Utility.getUsersColour(command.client.getOurUser(), command.guild));
+        builder.withColor(command.client.color);
         builder.withFooterText("Total Custom commands: " + total + "/" + max + ".");
-        Utility.sendEmbedMessage("", builder, command.channel);
+        Utility.sendEmbedMessage("", builder, command.channel.get());
         return null;
     }
 
@@ -75,26 +67,24 @@ public String listCommands(int page, CommandObject command) {
         int totalCCs = 0;
         ArrayList<String> list = new ArrayList<>();
         XEmbedBuilder builder = new XEmbedBuilder();
-        builder.withColor(Utility.getUsersColour(command.client.getOurUser(), command.guild));
-
-        for (CCommandObject c : command.customCommands.getCommandList()) {
-//            if (command.guild.getUserByID(c.getUserID()) != null) {
-                if (counter > 15) {
-                    pages.add("`" + Utility.listFormatter(list, true) + "`");
-                    list.clear();
-                    counter = 0;
-                }
-                list.add(command.guildConfig.getPrefixCC() + c.getName());
-                totalCCs++;
-                counter++;
-//            }
+        builder.withColor(command.client.color);
+
+        for (CCommandObject c : command.guild.customCommands.getCommandList()) {
+            if (counter > 15) {
+                pages.add("```" + Utility.listFormatter(list, true) + "```");
+                list.clear();
+                counter = 0;
+            }
+            list.add(command.guild.config.getPrefixCC() + c.getName());
+            totalCCs++;
+            counter++;
         }
         pages.add("`" + Utility.listFormatter(list, true) + "`");
         try {
             String title = "> Here is Page **" + page + "/" + pages.size() + "** of Custom Commands:";
             builder.appendField(title, pages.get(page - 1), false);
             builder.withFooterText("Total Custom Commands stored on this Server: " + totalCCs);
-            Utility.sendEmbedMessage("", builder, command.channel);
+            Utility.sendEmbedMessage("", builder, command.channel.get());
             return null;
         } catch (IndexOutOfBoundsException e) {
             return "> That Page does not exist.";
@@ -113,7 +103,7 @@ public String description() {
 
     @Override
     public String usage() {
-        return "(Page Number/@User/UserID)";
+        return "(Page Number/@User)";
     }
 
     @Override
diff --git a/src/main/java/Commands/CC/NewCC.java b/src/main/java/com/github/vaerys/commands/cc/NewCC.java
similarity index 74%
rename from src/main/java/Commands/CC/NewCC.java
rename to src/main/java/com/github/vaerys/commands/cc/NewCC.java
index ac963eb0..5060a39f 100644
--- a/src/main/java/Commands/CC/NewCC.java
+++ b/src/main/java/com/github/vaerys/commands/cc/NewCC.java
@@ -1,11 +1,11 @@
-package Commands.CC;
+package com.github.vaerys.commands.cc;
 
-import Commands.CommandObject;
-import Enums.UserSetting;
-import Interfaces.Command;
-import Main.TagSystem;
-import Objects.SplitFirstObject;
-import Objects.UserTypeObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.enums.UserSetting;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.handlers.TagHandler;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.SplitFirstObject;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.util.List;
@@ -16,7 +16,7 @@
 public class NewCC implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        UserTypeObject object = command.guildUsers.getUserByID(command.authorSID);
+        ProfileObject object = command.guild.users.getUserByID(command.user.stringID);
         if (object != null && object.getSettings().contains(UserSetting.DENY_MAKE_CC)) {
             return "> You have been denied the creation of custom commands.";
         }
@@ -24,10 +24,10 @@ public String execute(String args, CommandObject command) {
         boolean isLocked = false;
         SplitFirstObject splitfirst = new SplitFirstObject(args);
         String newContent;
-        List<String> shitpostChannels = command.guildConfig.getChannelIDsByType(Command.CHANNEL_SHITPOST);
+        List<String> shitpostChannels = command.guild.config.getChannelIDsByType(Command.CHANNEL_SHITPOST);
         if (shitpostChannels != null) {
             for (String id : shitpostChannels) {
-                if (command.channelSID.equals(id)) {
+                if (command.channel.stringID.equals(id)) {
                     isShitpost = true;
                 }
             }
@@ -43,17 +43,17 @@ public String execute(String args, CommandObject command) {
             return "> Command name cannot contain Newlines.";
         }
         String content = splitfirst.getRest();
-        newContent = TagSystem.testForShit(content);
+        newContent = TagHandler.testForShit(content);
         if (!newContent.equals(content)) {
             isShitpost = true;
         }
         content = newContent;
-        newContent = TagSystem.testForLock(content, command.author, command.guild);
+        newContent = TagHandler.testForLock(content, command.user.get(), command.guild.get());
         if (!newContent.equals(content)) {
             isLocked = true;
         }
         content = newContent;
-        return command.customCommands.addCommand(isLocked, nameCC, content, isShitpost, command);
+        return command.guild.customCommands.addCommand(isLocked, nameCC, content, isShitpost, command);
     }
 
     @Override
diff --git a/src/main/java/com/github/vaerys/commands/cc/RandomCC.java b/src/main/java/com/github/vaerys/commands/cc/RandomCC.java
new file mode 100644
index 00000000..e31479cc
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/cc/RandomCC.java
@@ -0,0 +1,133 @@
+package com.github.vaerys.commands.cc;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.TagHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.CCommandObject;
+import org.apache.commons.lang3.StringUtils;
+import sx.blah.discord.handle.obj.Permissions;
+
+import java.util.List;
+import java.util.Random;
+import java.util.regex.Pattern;
+
+public class RandomCC implements Command {
+
+    @Override
+    public String execute(String args, CommandObject command) {
+        String prefixEmbedImage = "<embedImage>{";
+        String tagDeleteMessage = "<delCall>";
+        Random random = new Random();
+        int counter = 0;
+        List<CCommandObject> commands = command.guild.customCommands.getCommandList();
+        CCommandObject randCC = commands.get(random.nextInt(commands.size()));
+        while (!command.channel.settings.contains(CHANNEL_SHITPOST) && randCC.isShitPost() && command.guild.config.shitPostFiltering) {
+            if (counter > 25) {
+                return "> Your server has way to many shitpost commands, I couldn't find you a normal one.";
+            }
+            randCC = commands.get(random.nextInt(commands.size()));
+            try {
+                Thread.sleep(50);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            counter++;
+        }
+        String response = randCC.getContents(true);
+        int argsCount = StringUtils.countMatches(response, "<args>");
+        if (argsCount != 0) {
+            if (args.length() * argsCount > Globals.argsMax) {
+                return "> Args to large for this command. Max args size : " + Globals.argsMax;
+            }
+        }
+        response = TagHandler.tagSystem(response, command, args);
+        response = TagHandler.tagMentionRemover(response);
+        response = response.replace("<DELCALL>", "<delCall>");
+        response = response.replace("<EMBEDIMAGE>", "<embedImage>");
+        response = response + "\n`" + command.guild.config.getPrefixCC() + randCC.getName() + "`";
+        if (command.guild.customCommands.checkblackList(response) != null) {
+            return command.guild.customCommands.checkblackList(response);
+        }
+        if (response.contains(tagDeleteMessage)) {
+            response = response.replace(tagDeleteMessage, "");
+//            Utility.deleteMessage(command.message.get());
+        }
+        if (response.contains("<embedImage>{")) {
+            String imageURL = TagHandler.tagEmbedImage(response, prefixEmbedImage);
+            if (imageURL != null || !imageURL.isEmpty()) {
+                if (command.channel.get().getModifiedPermissions(command.user.get()).contains(Permissions.EMBED_LINKS)) {
+                    response = response.replaceFirst(Pattern.quote(prefixEmbedImage + imageURL + "}"), "");
+                    response = TagHandler.tagToCaps(response);
+                    Utility.sendFileURL(response, imageURL, command.channel.get(), true);
+                    return null;
+                } else {
+                    response = response.replaceFirst(Pattern.quote(prefixEmbedImage + imageURL + "}"), "<" + imageURL + ">");
+                    return response;
+                }
+            }
+        }
+        return response;
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"RandomCC","RandCC"};
+    }
+
+    @Override
+    public String description() {
+        return "Gives you a random cc";
+    }
+
+    @Override
+    public String usage() {
+        return "(args)";
+    }
+
+    @Override
+    public String type() {
+        return TYPE_CC;
+    }
+
+    @Override
+    public String channel() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] perms() {
+        return new Permissions[0];
+    }
+
+    @Override
+    public boolean requiresArgs() {
+        return false;
+    }
+
+    @Override
+    public boolean doAdminLogging() {
+        return false;
+    }
+
+    @Override
+    public String dualDescription() {
+        return null;
+    }
+
+    @Override
+    public String dualUsage() {
+        return null;
+    }
+
+    @Override
+    public String dualType() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] dualPerms() {
+        return new Permissions[0];
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/Commands/CC/SearchCCs.java b/src/main/java/com/github/vaerys/commands/cc/SearchCCs.java
similarity index 79%
rename from src/main/java/Commands/CC/SearchCCs.java
rename to src/main/java/com/github/vaerys/commands/cc/SearchCCs.java
index 3e08d3d2..90a6d676 100644
--- a/src/main/java/Commands/CC/SearchCCs.java
+++ b/src/main/java/com/github/vaerys/commands/cc/SearchCCs.java
@@ -1,12 +1,12 @@
-package Commands.CC;
+package com.github.vaerys.commands.cc;
 
-import Commands.CommandObject;
-import Handlers.FileHandler;
-import Interfaces.Command;
-import Main.Constants;
-import Main.Utility;
-import Objects.CCommandObject;
-import Objects.XEmbedBuilder;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.FileHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.CCommandObject;
+import com.github.vaerys.objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.io.File;
@@ -23,7 +23,7 @@ public class SearchCCs implements Command {
     public String execute(String args, CommandObject command) {
         ArrayList<CCommandObject> searched = new ArrayList<>();
         StringBuilder builder = new StringBuilder();
-        for (CCommandObject c : command.customCommands.getCommandList()) {
+        for (CCommandObject c : command.guild.customCommands.getCommandList()) {
             StringBuilder toSearch = new StringBuilder();
             toSearch.append(c.getName().toLowerCase());
             toSearch.append(c.getContents(false).toLowerCase());
@@ -40,26 +40,26 @@ public String execute(String args, CommandObject command) {
         String title = "> Here is your search:";
         ArrayList<String> list = new ArrayList<>();
         for (CCommandObject c : searched) {
-            list.add(command.guildConfig.getPrefixCC() + c.getName());
+            list.add(command.guild.config.getPrefixCC() + c.getName());
         }
         XEmbedBuilder embedBuilder = new XEmbedBuilder();
         Utility.listFormatterEmbed(title,embedBuilder,list,true);
-        embedBuilder.withColor(Utility.getUsersColour(command.client.getOurUser(),command.guild));
+        embedBuilder.withColor(command.client.color);
         if (searched.size() < 40) {
-            Utility.sendEmbedMessage("",embedBuilder,command.channel);
+            Utility.sendEmbedMessage("",embedBuilder,command.channel.get());
             return null;
         } else {
-            String path = Constants.DIRECTORY_TEMP + command.messageSID + ".txt";
+            String path = Constants.DIRECTORY_TEMP + command.message.stringID + ".txt";
             FileHandler.writeToFile(path, Utility.listFormatter(list,true),false);
             File file = new File(path);
-            Utility.sendFile(title, file, command.channel);
+            Utility.sendFile(title, file, command.channel.get());
             try {
                 Thread.sleep(4000);
                 Files.delete(Paths.get(path));
             } catch (IOException e) {
-                e.printStackTrace();
+                Utility.sendStack(e);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                Utility.sendStack(e);
             }
             return null;
         }
diff --git a/src/main/java/Commands/CC/TransferCC.java b/src/main/java/com/github/vaerys/commands/cc/TransferCC.java
similarity index 77%
rename from src/main/java/Commands/CC/TransferCC.java
rename to src/main/java/com/github/vaerys/commands/cc/TransferCC.java
index 6db7883f..17328554 100644
--- a/src/main/java/Commands/CC/TransferCC.java
+++ b/src/main/java/com/github/vaerys/commands/cc/TransferCC.java
@@ -1,14 +1,13 @@
-package Commands.CC;
-
-import Commands.CommandObject;
-import Handlers.FileHandler;
-import Interfaces.Command;
-import Main.Constants;
-import Main.Globals;
-import Main.Utility;
-import Objects.CCommandObject;
-import POGOs.CustomCommands;
-import POGOs.GuildConfig;
+package com.github.vaerys.commands.cc;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.FileHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.CCommandObject;
+import com.github.vaerys.pogos.CustomCommands;
 import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IGuild;
 import sx.blah.discord.handle.obj.IUser;
@@ -22,17 +21,16 @@
 public class TransferCC implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        String filePath = Constants.DIRECTORY_OLD_FILES + command.guildSID + "_CustomCommands.json";
-        IGuild guild = command.guild;
-        IUser author = command.author;
-        IChannel channel = command.channel;
-        GuildConfig guildConfig = command.guildConfig;
-        CustomCommands customCommands = command.customCommands;
+        String filePath = Constants.DIRECTORY_OLD_FILES + command.guild.stringID + "_CustomCommands.json";
+        IGuild guild = command.guild.get();
+        IUser author = command.user.get();
+        IChannel channel = command.channel.get();
+        CustomCommands customCommands = command.guild.customCommands;
 
         if (Paths.get(filePath).toFile().exists()) {
-            OldCode.CustomCommands oldCommands = null;
+            com.github.vaerys.oldcode.CustomCommands oldCommands = null;
             if (oldCommands == null) {
-                oldCommands = (OldCode.CustomCommands) FileHandler.readFromJson(filePath, OldCode.CustomCommands.class);
+                oldCommands = (com.github.vaerys.oldcode.CustomCommands) FileHandler.readFromJson(filePath, com.github.vaerys.oldcode.CustomCommands.class);
             }
             CCommandObject transfering = oldCommands.convertCommand(args);
             if (transfering == null) {
diff --git a/src/main/java/Commands/Characters/CharEditModes.java b/src/main/java/com/github/vaerys/commands/characters/CharEditModes.java
similarity index 93%
rename from src/main/java/Commands/Characters/CharEditModes.java
rename to src/main/java/com/github/vaerys/commands/characters/CharEditModes.java
index a9f58eef..9dc7b384 100644
--- a/src/main/java/Commands/Characters/CharEditModes.java
+++ b/src/main/java/com/github/vaerys/commands/characters/CharEditModes.java
@@ -1,7 +1,7 @@
-package Commands.Characters;
+package com.github.vaerys.commands.characters;
 
-import Main.Utility;
-import Objects.CharacterObject;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.CharacterObject;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/src/main/java/Commands/Characters/CharInfo.java b/src/main/java/com/github/vaerys/commands/characters/CharInfo.java
similarity index 76%
rename from src/main/java/Commands/Characters/CharInfo.java
rename to src/main/java/com/github/vaerys/commands/characters/CharInfo.java
index f471b208..6c43723b 100644
--- a/src/main/java/Commands/Characters/CharInfo.java
+++ b/src/main/java/com/github/vaerys/commands/characters/CharInfo.java
@@ -1,10 +1,10 @@
-package Commands.Characters;
+package com.github.vaerys.commands.characters;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.CharacterObject;
-import Objects.XEmbedBuilder;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.CharacterObject;
+import com.github.vaerys.objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.IRole;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -16,7 +16,7 @@
 public class CharInfo implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        for (CharacterObject object : command.characters.getCharacters(command.guild)) {
+        for (CharacterObject object : command.guild.characters.getCharacters(command.guild.get())) {
             if (object.getName().equalsIgnoreCase(args)) {
                 XEmbedBuilder builder = new XEmbedBuilder();
                 builder.withTitle(object.getNickname());
@@ -24,23 +24,23 @@ public String execute(String args, CommandObject command) {
                 ArrayList<IRole> roles = new ArrayList<>();
                 ArrayList<String> roleNames = new ArrayList<>();
                 for (Long roleId : object.getRoleIDs()) {
-                    if (command.client.getRoleByID(roleId) != null) {
-                        roles.add(command.client.getRoleByID(roleId));
-                        roleNames.add(command.client.getRoleByID(roleId).getName());
+                    if (command.client.get().getRoleByID(roleId) != null) {
+                        roles.add(command.client.get().getRoleByID(roleId));
+                        roleNames.add(command.client.get().getRoleByID(roleId).getName());
                     }
                 }
                 if (roles.size() != 0) {
-                    builder.withColor(Utility.getUsersColour(roles, command.guild));
+                    builder.withColor(Utility.getUsersColour(roles, command.guild.get()));
                 } else {
-                    builder.withColor(Utility.getUsersColour(command.client.getOurUser(), command.guild));
+                    builder.withColor(command.client.color);
                 }
 
                 StringBuilder description = new StringBuilder();
                 description.append("**Age:** " + object.getAge());
                 description.append("\n**Gender:** " + object.getGender());
                 if (roleNames.size() != 0) {
-                    if (command.characters.getRolePrefix() != null && !command.characters.getRolePrefix().isEmpty()) {
-                        description.append("\n" + command.characters.getRolePrefix() + " " + Utility.listFormatter(roleNames, true));
+                    if (command.guild.characters.getRolePrefix() != null && !command.guild.characters.getRolePrefix().isEmpty()) {
+                        description.append("\n" + command.guild.characters.getRolePrefix() + " " + Utility.listFormatter(roleNames, true));
                     } else {
                         description.append("\n" + Utility.listFormatter(roleNames, true));
                     }
@@ -56,7 +56,7 @@ public String execute(String args, CommandObject command) {
                     }
                     builder.withThumbnail(object.getAvatarURL());
                 }
-                Utility.sendEmbedMessage("", builder, command.channel);
+                Utility.sendEmbedMessage("", builder, command.channel.get());
                 return null;
             }
         }
diff --git a/src/main/java/Commands/Characters/DelChar.java b/src/main/java/com/github/vaerys/commands/characters/DelChar.java
similarity index 79%
rename from src/main/java/Commands/Characters/DelChar.java
rename to src/main/java/com/github/vaerys/commands/characters/DelChar.java
index f8b9bc1e..1678b352 100644
--- a/src/main/java/Commands/Characters/DelChar.java
+++ b/src/main/java/com/github/vaerys/commands/characters/DelChar.java
@@ -1,8 +1,8 @@
-package Commands.Characters;
+package com.github.vaerys.commands.characters;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -12,10 +12,10 @@ public class DelChar implements Command{
     @Override
     public String execute(String args, CommandObject command) {
         boolean bypass = false;
-        if (Utility.testForPerms(new Permissions[]{Permissions.MANAGE_ROLES}, command.author, command.guild)) {
+        if (Utility.testForPerms(new Permissions[]{Permissions.MANAGE_ROLES}, command.user.get(), command.guild.get())) {
             bypass = true;
         }
-        return command.characters.delChar(args.split(" ")[0], command.author, command.guild, bypass);
+        return command.guild.characters.delChar(args.split(" ")[0], command.user.get(), command.guild.get(), bypass);
     }
 
     @Override
diff --git a/src/main/java/Commands/Characters/EditChar.java b/src/main/java/com/github/vaerys/commands/characters/EditChar.java
similarity index 83%
rename from src/main/java/Commands/Characters/EditChar.java
rename to src/main/java/com/github/vaerys/commands/characters/EditChar.java
index 2e1648d4..f99ad774 100644
--- a/src/main/java/Commands/Characters/EditChar.java
+++ b/src/main/java/com/github/vaerys/commands/characters/EditChar.java
@@ -1,10 +1,10 @@
-package Commands.Characters;
+package com.github.vaerys.commands.characters;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.CharacterObject;
-import Objects.SplitFirstObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.CharacterObject;
+import com.github.vaerys.objects.SplitFirstObject;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -26,9 +26,9 @@ public String execute(String args, CommandObject command) {
             return "> Mode Not Specified";
         }
         SplitFirstObject mode = new SplitFirstObject(charName.getRest());
-        for (CharacterObject c : command.characters.getCharacters(command.guild)) {
+        for (CharacterObject c : command.guild.characters.getCharacters(command.guild.get())) {
             if (c.getName().equalsIgnoreCase(charName.getFirstWord())) {
-                if (c.getUserID().equals(command.authorSID) || Utility.canBypass(command.author, command.guild)) {
+                if (c.getUserID().equals(command.user.stringID) || Utility.canBypass(command.user.get(), command.guild.get())) {
                     if (mode.getRest() == null || mode.getRest().isEmpty()) {
                         return "> Missing Arguments for Editing.";
                     }
@@ -47,7 +47,7 @@ public String execute(String args, CommandObject command) {
                             return "> Mode not Valid.";
                     }
                 } else {
-                    return command.notAllowed;
+                    return command.user.notAllowed;
                 }
             }
         }
diff --git a/src/main/java/com/github/vaerys/commands/characters/ListChars.java b/src/main/java/com/github/vaerys/commands/characters/ListChars.java
new file mode 100644
index 00000000..b6b3a08f
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/characters/ListChars.java
@@ -0,0 +1,112 @@
+package com.github.vaerys.commands.characters;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.enums.UserSetting;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.CharacterObject;
+import com.github.vaerys.objects.XEmbedBuilder;
+import sx.blah.discord.handle.obj.IUser;
+import sx.blah.discord.handle.obj.Permissions;
+
+import java.util.ArrayList;
+
+/**
+ * Created by Vaerys on 31/01/2017.
+ */
+public class ListChars implements Command {
+    @Override
+    public String execute(String args, CommandObject command) {
+        XEmbedBuilder builder = new XEmbedBuilder();
+        UserObject user = command.user;
+        String title = "> Here are all of your characters.";
+        if (args != null && !args.isEmpty()) {
+            user = Utility.getUser(command, args, true);
+            if (user == null) {
+                return "> Could not find user.";
+            }
+            if (user.longID != command.user.longID) {
+                title = "> Here are all of **@" + user.displayName + "'s** Characters.";
+            }
+        }
+        if (user.isPrivateProfile(command.guild) && user.longID != command.user.longID) {
+            return "> User has set their profile to private.";
+        }
+        ArrayList<String> list = new ArrayList<>();
+        for (CharacterObject c : command.guild.characters.getCharacters(command.guild.get())) {
+            if (c.getUserID().equals(user.stringID)) {
+                list.add(c.getName());
+            }
+        }
+        Utility.listFormatterEmbed(title, builder, list, true);
+        builder.appendField(spacer, Utility.getCommandInfo(new CharInfo(), command), false);
+        builder.withColor(Utility.getUsersColour(command.client.bot, command.guild.get()));
+        if (user.getProfile(command.guild).getSettings().contains(UserSetting.PRIVATE_PROFILE)) {
+            Utility.sendEmbedMessage("", builder, command.user.get().getOrCreatePMChannel());
+            return "> Char list sent to your Direct messages.";
+        }
+        Utility.sendEmbedMessage("", builder, command.channel.get());
+        return null;
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"ListChars", "Chars", "CharList"};
+    }
+
+    @Override
+    public String description() {
+        return "Shows you all of your characters.";
+    }
+
+    @Override
+    public String usage() {
+        return "(@User)";
+    }
+
+    @Override
+    public String type() {
+        return TYPE_CHARACTER;
+    }
+
+    @Override
+    public String channel() {
+        return CHANNEL_BOT_COMMANDS;
+    }
+
+    @Override
+    public Permissions[] perms() {
+        return new Permissions[0];
+    }
+
+    @Override
+    public boolean requiresArgs() {
+        return false;
+    }
+
+    @Override
+    public boolean doAdminLogging() {
+        return false;
+    }
+
+    @Override
+    public String dualDescription() {
+        return null;
+    }
+
+    @Override
+    public String dualUsage() {
+        return null;
+    }
+
+    @Override
+    public String dualType() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] dualPerms() {
+        return new Permissions[0];
+    }
+}
diff --git a/src/main/java/Commands/Characters/SelectChar.java b/src/main/java/com/github/vaerys/commands/characters/SelectChar.java
similarity index 69%
rename from src/main/java/Commands/Characters/SelectChar.java
rename to src/main/java/com/github/vaerys/commands/characters/SelectChar.java
index 66e02980..01d73769 100644
--- a/src/main/java/Commands/Characters/SelectChar.java
+++ b/src/main/java/com/github/vaerys/commands/characters/SelectChar.java
@@ -1,10 +1,10 @@
-package Commands.Characters;
+package com.github.vaerys.commands.characters;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Constants;
-import Main.Utility;
-import Objects.CharacterObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.CharacterObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sx.blah.discord.handle.obj.IRole;
@@ -21,22 +21,22 @@ public class SelectChar implements Command {
 
     @Override
     public String execute(String args, CommandObject command) {
-        for (CharacterObject c : command.characters.getCharacters(command.guild)) {
+        for (CharacterObject c : command.guild.characters.getCharacters(command.guild.get())) {
             if (c.getName().equalsIgnoreCase(args)) {
-                if (c.getUserID().equals(command.authorSID)) {
-                    List<IRole> userRoles = command.guild.getRolesForUser(command.author);
+                if (c.getUserID().equals(command.user.stringID)) {
+                    List<IRole> userRoles = command.guild.get().getRolesForUser(command.user.get());
                     //resets User roles back to scratch.
                     for (int i = 0; i < userRoles.size(); i++) {
-                        if (command.guildConfig.isRoleCosmetic(userRoles.get(i).getLongID())) {
+                        if (command.guild.config.isRoleCosmetic(userRoles.get(i).getLongID())) {
                             userRoles.remove(i);
                         }
                     }
                     //loads new roles.
                     for (long r : c.getRoleIDs()) {
-                        userRoles.add(command.guild.getRoleByID(r));
+                        userRoles.add(command.guild.get().getRoleByID(r));
                     }
-                    Utility.roleManagement(command.author, command.guild, userRoles);
-                    Utility.updateUserNickName(command.author, command.guild, c.getNickname());
+                    Utility.roleManagement(command.user.get(), command.guild.get(), userRoles);
+                    Utility.updateUserNickName(command.user.get(), command.guild.get(), c.getNickname());
                     return "> Character " + c.getNickname() + " Loaded.";
                 } else {
                     return "> " + c.getName() + " is not your character.";
diff --git a/src/main/java/Commands/Characters/SetBioRolePrefix.java b/src/main/java/com/github/vaerys/commands/characters/SetBioRolePrefix.java
similarity index 85%
rename from src/main/java/Commands/Characters/SetBioRolePrefix.java
rename to src/main/java/com/github/vaerys/commands/characters/SetBioRolePrefix.java
index 74e24e6b..44efe74b 100644
--- a/src/main/java/Commands/Characters/SetBioRolePrefix.java
+++ b/src/main/java/com/github/vaerys/commands/characters/SetBioRolePrefix.java
@@ -1,7 +1,7 @@
-package Commands.Characters;
+package com.github.vaerys.commands.characters;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -11,11 +11,11 @@ public class SetBioRolePrefix implements Command {
     @Override
     public String execute(String args, CommandObject command) {
         if (args == null || args.isEmpty()){
-            command.characters.setRolePrefix("");
+            command.guild.characters.setRolePrefix("");
             return "> Role Prefix Removed.";
         }
         if (args.length() < 20) {
-            command.characters.setRolePrefix(args);
+            command.guild.characters.setRolePrefix(args);
             return "> Role Prefix Updated.";
         }else {
             return "> Role Prefix is too long.";
diff --git a/src/main/java/Commands/Characters/UpdateChar.java b/src/main/java/com/github/vaerys/commands/characters/UpdateChar.java
similarity index 75%
rename from src/main/java/Commands/Characters/UpdateChar.java
rename to src/main/java/com/github/vaerys/commands/characters/UpdateChar.java
index 8772aef4..7c67045d 100644
--- a/src/main/java/Commands/Characters/UpdateChar.java
+++ b/src/main/java/com/github/vaerys/commands/characters/UpdateChar.java
@@ -1,8 +1,8 @@
-package Commands.Characters;
+package com.github.vaerys.commands.characters;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Objects.CharacterObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.objects.CharacterObject;
 import sx.blah.discord.handle.obj.IRole;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -15,14 +15,14 @@ public class UpdateChar implements Command {
     @Override
     public String execute(String args, CommandObject command) {
         ArrayList<Long> charRoles = new ArrayList<>();
-        for (IRole r : command.authorRoles) {
-            for (long ro : command.guildConfig.getCosmeticRoleIDs()) {
+        for (IRole r : command.user.roles) {
+            for (long ro : command.guild.config.getCosmeticRoleIDs()) {
                 if (r.getLongID() == ro) {
                     charRoles.add(ro);
                 }
             }
         }
-        return command.characters.updateChar(new CharacterObject(args.split(" ")[0], command.authorSID, command.authorDisplayName, charRoles),command.guild);
+        return command.guild.characters.updateChar(new CharacterObject(args.split(" ")[0], command.user.stringID, command.user.displayName, charRoles), command.guild.get());
     }
 
     @Override
diff --git a/src/main/java/Commands/Competition/EnterComp.java b/src/main/java/com/github/vaerys/commands/competition/EnterComp.java
similarity index 78%
rename from src/main/java/Commands/Competition/EnterComp.java
rename to src/main/java/com/github/vaerys/commands/competition/EnterComp.java
index 484bd81e..e7b84165 100644
--- a/src/main/java/Commands/Competition/EnterComp.java
+++ b/src/main/java/com/github/vaerys/commands/competition/EnterComp.java
@@ -1,9 +1,9 @@
-package Commands.Competition;
+package com.github.vaerys.commands.competition;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Objects.CompObject;
-import POGOs.GuildConfig;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.objects.CompObject;
+import com.github.vaerys.pogos.GuildConfig;
 import sx.blah.discord.handle.obj.IMessage;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
@@ -19,11 +19,11 @@
 public class EnterComp implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        GuildConfig guildConfig = command.guildConfig;
-        IMessage message = command.message;
-        IUser author = command.author;
+        GuildConfig guildconfig = command.guild.config;
+        IMessage message = command.message.get();
+        IUser author = command.user.get();
 
-        if (guildConfig.compEntries) {
+        if (guildconfig.compEntries) {
             String fileName;
             String fileUrl;
             if (message.getAttachments().size() > 0) {
@@ -39,8 +39,8 @@ public String execute(String args, CommandObject command) {
             }
             DateFormat dateFormat = new SimpleDateFormat("dd/MM/yy - HH:mm:ss");
             Calendar cal = Calendar.getInstance();
-            command.competition.newEntry(new CompObject(author.getDisplayName(command.guild), author.getStringID(), fileName, fileUrl, dateFormat.format(cal.getTime())));
-            return "> Thank you " + author.getDisplayName(command.guild) + " For entering the Competition.";
+            command.guild.competition.newEntry(new CompObject(author.getDisplayName(command.guild.get()), author.getStringID(), fileName, fileUrl, dateFormat.format(cal.getTime())));
+            return "> Thank you " + author.getDisplayName(command.guild.get()) + " For entering the Competition.";
         } else {
             return "> Competition Entries are closed.";
         }
diff --git a/src/main/java/Commands/Competition/EnterVote.java b/src/main/java/com/github/vaerys/commands/competition/EnterVote.java
similarity index 82%
rename from src/main/java/Commands/Competition/EnterVote.java
rename to src/main/java/com/github/vaerys/commands/competition/EnterVote.java
index 325cbf3c..a57c52d7 100644
--- a/src/main/java/Commands/Competition/EnterVote.java
+++ b/src/main/java/com/github/vaerys/commands/competition/EnterVote.java
@@ -1,7 +1,7 @@
-package Commands.Competition;
+package com.github.vaerys.commands.competition;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -10,8 +10,8 @@
 public class EnterVote implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        if (command.guildConfig.compVoting) {
-            return command.competition.addVote(command.authorSID, args);
+        if (command.guild.config.compVoting) {
+            return command.guild.competition.addVote(command.user.stringID, args);
         } else {
             return "> Competition Voting is closed.";
         }
diff --git a/src/main/java/Commands/Competition/FinalTally.java b/src/main/java/com/github/vaerys/commands/competition/FinalTally.java
similarity index 84%
rename from src/main/java/Commands/Competition/FinalTally.java
rename to src/main/java/com/github/vaerys/commands/competition/FinalTally.java
index 76fc06db..de9b1a23 100644
--- a/src/main/java/Commands/Competition/FinalTally.java
+++ b/src/main/java/com/github/vaerys/commands/competition/FinalTally.java
@@ -1,7 +1,7 @@
-package Commands.Competition;
+package com.github.vaerys.commands.competition;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.util.ArrayList;
@@ -14,8 +14,8 @@ public class FinalTally implements Command {
     public String execute(String args, CommandObject command) {
         StringBuilder builder = new StringBuilder();
         builder.append("> tally being performed.\n");
-        ArrayList<String> votes = command.competition.getVotes();
-        int[] tally = new int[command.competition.getEntries().size()];
+        ArrayList<String> votes = command.guild.competition.getVotes();
+        int[] tally = new int[command.guild.competition.getEntries().size()];
         for (int i = 0; i < tally.length; i++) {
             tally[i] = 0;
         }
@@ -30,7 +30,7 @@ public String execute(String args, CommandObject command) {
                 totalVotes++;
             }
         }
-        builder.append("total of users that voted: " + userVoteClusters + "\n");
+        builder.append("total of profiles that voted: " + userVoteClusters + "\n");
         builder.append("total number of votes: " + totalVotes + "\n");
         int entry = 0;
         for (int i : tally) {
diff --git a/src/main/java/Commands/Competition/GetCompEntries.java b/src/main/java/com/github/vaerys/commands/competition/GetCompEntries.java
similarity index 76%
rename from src/main/java/Commands/Competition/GetCompEntries.java
rename to src/main/java/com/github/vaerys/commands/competition/GetCompEntries.java
index 99d95841..7a95c786 100644
--- a/src/main/java/Commands/Competition/GetCompEntries.java
+++ b/src/main/java/com/github/vaerys/commands/competition/GetCompEntries.java
@@ -1,9 +1,9 @@
-package Commands.Competition;
+package com.github.vaerys.commands.competition;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.CompObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.CompObject;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -13,13 +13,13 @@ public class GetCompEntries implements Command {
     @Override
     public String execute(String args, CommandObject command) {
         int i = 1;
-        for (CompObject p : command.competition.getEntries()) {
-            Utility.sendMessage("Entry " + i + " : " + command.guild.getUserByID(p.getUserID()).mention() + "\n" +
-                    p.getFileUrl(), command.channel);
+        for (CompObject p : command.guild.competition.getEntries()) {
+            Utility.sendMessage("Entry " + i + " : " + command.guild.get().getUserByID(p.getUserID()).mention() + "\n" +
+                    p.getFileUrl(), command.channel.get());
             try {
                 Thread.sleep(500);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                Utility.sendStack(e);
             }
             i++;
         }
diff --git a/src/main/java/Commands/Competition/PurgeComp.java b/src/main/java/com/github/vaerys/commands/competition/PurgeComp.java
similarity index 84%
rename from src/main/java/Commands/Competition/PurgeComp.java
rename to src/main/java/com/github/vaerys/commands/competition/PurgeComp.java
index 0b19f72b..b98a9588 100644
--- a/src/main/java/Commands/Competition/PurgeComp.java
+++ b/src/main/java/com/github/vaerys/commands/competition/PurgeComp.java
@@ -1,7 +1,7 @@
-package Commands.Competition;
+package com.github.vaerys.commands.competition;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -11,8 +11,8 @@ public class PurgeComp implements Command{
 
     @Override
     public String execute(String args, CommandObject command) {
-        command.competition.purgeEntries();
-        command.competition.purgeVotes();
+        command.guild.competition.purgeEntries();
+        command.guild.competition.purgeVotes();
         return "> Purge Complete.";
     }
 
diff --git a/src/main/java/Commands/Creator/DailyMsg.java b/src/main/java/com/github/vaerys/commands/creator/DailyMsg.java
similarity index 70%
rename from src/main/java/Commands/Creator/DailyMsg.java
rename to src/main/java/com/github/vaerys/commands/creator/DailyMsg.java
index cb04a62e..01ab0f1d 100644
--- a/src/main/java/Commands/Creator/DailyMsg.java
+++ b/src/main/java/com/github/vaerys/commands/creator/DailyMsg.java
@@ -1,15 +1,16 @@
-package Commands.Creator;
-
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Globals;
-import Main.Utility;
-import Objects.DailyUserMessageObject;
-import Objects.SplitFirstObject;
-import Objects.XEmbedBuilder;
+package com.github.vaerys.commands.creator;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.DailyUserMessageObject;
+import com.github.vaerys.objects.SplitFirstObject;
+import com.github.vaerys.objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
 
+import java.util.Formatter;
 import java.util.ListIterator;
 
 public class DailyMsg implements Command {
@@ -24,7 +25,7 @@ public String execute(String args, CommandObject command) {
         try {
             long uID = Long.parseLong(uIDString.getFirstWord());
             DailyUserMessageObject messageObject = null;
-            for (DailyUserMessageObject u : Globals.getGlobalData().getDailyMessages()) {
+            for (DailyUserMessageObject u : Globals.getDailyMessages().getMessages()) {
                 if (u.getUID() == uID) {
                     messageObject = u;
                 }
@@ -46,7 +47,7 @@ public String execute(String args, CommandObject command) {
                     messageObject.setContents(mode.getRest());
                     return "> Daily Message contents updated";
                 case "delete":
-                    ListIterator iterator = Globals.getGlobalData().getDailyMessages().listIterator();
+                    ListIterator iterator = Globals.getDailyMessages().getMessages().listIterator();
                     while (iterator.hasNext()) {
                         DailyUserMessageObject object = (DailyUserMessageObject) iterator.next();
                         if (object.getUID() == uID) {
@@ -55,10 +56,10 @@ public String execute(String args, CommandObject command) {
                     }
                     return "> Daily Message Deleted";
                 case "info":
-                    Utility.sendEmbedMessage("", getInfo(messageObject, command), command.channel);
+                    Utility.sendEmbedMessage("", getInfo(messageObject, command), command.channel.get());
                     return null;
                 default:
-                    Utility.sendEmbedMessage("", getInfo(messageObject, command), command.channel);
+                    Utility.sendEmbedMessage("", getInfo(messageObject, command), command.channel.get());
                     return null;
             }
         } catch (NumberFormatException e) {
@@ -66,16 +67,22 @@ public String execute(String args, CommandObject command) {
         }
     }
 
-    private XEmbedBuilder getInfo(DailyUserMessageObject messageObject, CommandObject command) {
+    public XEmbedBuilder getInfo(DailyUserMessageObject messageObject, CommandObject command) {
         XEmbedBuilder embedBuilder = new XEmbedBuilder();
-        embedBuilder.withColor(Utility.getUsersColour(command.botUser, command.guild));
-        IUser user = command.client.getUserByID(messageObject.getUserID());
+        embedBuilder.withColor(Utility.getUsersColour(command.client.bot, command.guild.get()));
+        IUser user = command.client.get().getUserByID(messageObject.getUserID());
         if (user != null) {
             embedBuilder.withAuthorName(user.getName() + "#" + user.getDiscriminator());
         }
         embedBuilder.withTitle(messageObject.getDay() + "");
-        embedBuilder.withDesc(messageObject.getContents());
-        embedBuilder.withFooterText(messageObject.getUID() + "");
+        String contents = messageObject.getContents(command.guild);
+        if (contents.matches("^(> |\\*> |\\*\\*> |\\*\\*\\*> |_> |__> |`> |```> ).*$") || contents.startsWith("> ")) {
+            embedBuilder.withDesc(contents);
+        } else {
+            embedBuilder.withDesc("> " + contents);
+        }
+        String formattedFooter = new Formatter().format("UID: %04d", messageObject.getUID()).toString();
+        embedBuilder.withFooterText(formattedFooter);
         return embedBuilder;
     }
 
diff --git a/src/main/java/Commands/Creator/GetGlobalStats.java b/src/main/java/com/github/vaerys/commands/creator/GetGlobalStats.java
similarity index 86%
rename from src/main/java/Commands/Creator/GetGlobalStats.java
rename to src/main/java/com/github/vaerys/commands/creator/GetGlobalStats.java
index 0563473b..9dc1c219 100644
--- a/src/main/java/Commands/Creator/GetGlobalStats.java
+++ b/src/main/java/com/github/vaerys/commands/creator/GetGlobalStats.java
@@ -1,13 +1,13 @@
-package Commands.Creator;
-
-import Commands.CommandObject;
-import Interfaces.Command;
-import Interfaces.GuildToggle;
-import Main.Globals;
-import Main.Utility;
-import Objects.GuildContentObject;
-import Objects.ToggleStatsObject;
-import Objects.UserTypeObject;
+package com.github.vaerys.commands.creator;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.ToggleStatsObject;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.util.ArrayList;
@@ -30,14 +30,14 @@ public String execute(String args, CommandObject command) {
 //        }
         long totalXpUsers = 0;
         long totalXP = 0;
-        for (GuildContentObject g : Globals.getGuildContentObjects()) {
-            CommandObject object = command.setGuild(command.client.getGuildByID(g.getGuildID()));
+        for (GuildObject g : Globals.getGuilds()) {
+            CommandObject object = command.setGuild(g.get());
             for (ToggleStatsObject s : toggleStats) {
-                for (GuildToggle t : object.guildToggles) {
+                for (GuildToggle t : object.guild.toggles) {
                     if (t.name().equalsIgnoreCase(s.getToggle())) {
                         if (t.isModule()) {
                             s.addOne();
-                        } else if (t.get(object.guildConfig) != t.getDefault()) {
+                        } else if (t.get(object.guild.config) != t.getDefault()) {
                             s.addOne();
                         }
                     }
@@ -52,8 +52,8 @@ public String execute(String args, CommandObject command) {
 //                    }
 //                }
 //            }
-            if (command.guildConfig.modulePixels) {
-                for (UserTypeObject o : command.guildUsers.getUsers()) {
+            if (command.guild.config.modulePixels) {
+                for (ProfileObject o : command.guild.users.getProfiles()) {
                     if (o.getXP() != 0) {
                         totalXP += o.getXP();
                         totalXpUsers++;
@@ -77,7 +77,7 @@ public String execute(String args, CommandObject command) {
         output.append(Utility.listFormatter(outModules, false));
         output.append("\n\n**[PIXEL STATS]**");
         output.append("\nAvg Pixels: " + totalXP / totalXpUsers);
-        Utility.sendDM(output.toString(), command.authorSID);
+        Utility.sendDM(output.toString(), command.user.longID);
         return "> Data sent to Your DMs";
 
 //        int totalGlobalUsers = 0;
@@ -92,7 +92,7 @@ public String execute(String args, CommandObject command) {
 //            String topUser = null;
 //            String bottomUser = null;
 //            GuildContentObject content = Globals.getGuildContent(guild.getStringID());
-//            for (UserTypeObject user : content.getGuildUsers().getUsers()) {
+//            for (UserTypeObject user : content.getGuildUsers().getProfiles()) {
 //                if (bottomGuild == 0) {
 //                    bottomGuild = user.getXP();
 //                    bottomUser = user.getID();
@@ -127,11 +127,11 @@ public String execute(String args, CommandObject command) {
 //            try {
 //                Thread.sleep(2000);
 //            } catch (InterruptedException e) {
-//                e.printStackTrace();
+//                Utility.sendStack(e);
 //            }
 //        }
 //        StringBuilder builder = new StringBuilder("**Global Stats**");
-//        builder.append("\nGlobal users = " + totalGlobalUsers);
+//        builder.append("\nGlobal profiles = " + totalGlobalUsers);
 //        builder.append("\nGlobal Avg = " + totalAvg / totalGlobalUsers);
 //        Utility.sendDM(builder.toString(), command.authorSID);
 //        return null;
diff --git a/src/main/java/Commands/Creator/ResetPlayingStatus.java b/src/main/java/com/github/vaerys/commands/creator/ResetPlayingStatus.java
similarity index 83%
rename from src/main/java/Commands/Creator/ResetPlayingStatus.java
rename to src/main/java/com/github/vaerys/commands/creator/ResetPlayingStatus.java
index a87fc0bb..26daf961 100644
--- a/src/main/java/Commands/Creator/ResetPlayingStatus.java
+++ b/src/main/java/com/github/vaerys/commands/creator/ResetPlayingStatus.java
@@ -1,8 +1,8 @@
-package Commands.Creator;
+package com.github.vaerys.commands.creator;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Globals;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Globals;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -11,7 +11,7 @@
 public class ResetPlayingStatus implements Command{
     @Override
     public String execute(String args, CommandObject command) {
-        command.client.changePlayingText(Globals.playing);
+        command.client.get().changePlayingText(Globals.playing);
         return "> Status reset.";
     }
 
diff --git a/src/main/java/Commands/Creator/SetPlayingStatus.java b/src/main/java/com/github/vaerys/commands/creator/SetPlayingStatus.java
similarity index 86%
rename from src/main/java/Commands/Creator/SetPlayingStatus.java
rename to src/main/java/com/github/vaerys/commands/creator/SetPlayingStatus.java
index fc33244c..326c8021 100644
--- a/src/main/java/Commands/Creator/SetPlayingStatus.java
+++ b/src/main/java/com/github/vaerys/commands/creator/SetPlayingStatus.java
@@ -1,7 +1,7 @@
-package Commands.Creator;
+package com.github.vaerys.commands.creator;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -10,7 +10,7 @@
 public class SetPlayingStatus implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        command.client.changePlayingText(args);
+        command.client.get().changePlayingText(args);
         return "> Status set to: " + args;
     }
 
diff --git a/src/main/java/Commands/Creator/Shutdown.java b/src/main/java/com/github/vaerys/commands/creator/Shutdown.java
similarity index 81%
rename from src/main/java/Commands/Creator/Shutdown.java
rename to src/main/java/com/github/vaerys/commands/creator/Shutdown.java
index 21a853b7..105a81c1 100644
--- a/src/main/java/Commands/Creator/Shutdown.java
+++ b/src/main/java/com/github/vaerys/commands/creator/Shutdown.java
@@ -1,9 +1,9 @@
-package Commands.Creator;
+package com.github.vaerys.commands.creator;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Globals;
-import Main.Utility;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
 import sx.blah.discord.handle.obj.Permissions;
 import sx.blah.discord.util.DiscordException;
 
@@ -13,16 +13,16 @@
 public class Shutdown implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        Utility.sendMessage("> Shutting Down.", command.channel);
+        Utility.sendMessage("> Shutting Down.", command.channel.get());
         Utility.sendGlobalAdminLogging(this, args, command);
         try {
             Thread.sleep(4000);
             Globals.getClient().logout();
             Runtime.getRuntime().exit(0);
         } catch (DiscordException e) {
-            e.printStackTrace();
+            Utility.sendStack(e);
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            Utility.sendStack(e);
         }
         return null;
     }
diff --git a/src/main/java/Commands/Creator/Sudo.java b/src/main/java/com/github/vaerys/commands/creator/Sudo.java
similarity index 60%
rename from src/main/java/Commands/Creator/Sudo.java
rename to src/main/java/com/github/vaerys/commands/creator/Sudo.java
index be85039b..a3111b5c 100644
--- a/src/main/java/Commands/Creator/Sudo.java
+++ b/src/main/java/com/github/vaerys/commands/creator/Sudo.java
@@ -1,9 +1,11 @@
-package Commands.Creator;
+package com.github.vaerys.commands.creator;
 
-import Commands.CommandObject;
-import Handlers.MessageHandler;
-import Interfaces.Command;
-import Objects.SplitFirstObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.MessageHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.SplitFirstObject;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -13,21 +15,16 @@ public class Sudo implements Command {
     @Override
     public String execute(String args, CommandObject command) {
         SplitFirstObject sudo = new SplitFirstObject(args);
-        String commandArgs = "";
-        if (command.message.getMentions().size() > 0) {
-            command.setAuthor(command.message.getMentions().get(0));
-            SplitFirstObject commandName = new SplitFirstObject(sudo.getRest());
-            if (commandName.getFirstWord() == null) {
-                return "> You need to specify some arguments.";
-            }
-            if (commandName.getRest() != null) {
-                commandArgs = commandName.getRest();
-            }
-            new MessageHandler(commandName.getFirstWord(), commandArgs, command);
-            return null;
-        } else {
-            return "> Error no user Specified.";
+        UserObject user = Utility.getUser(command, sudo.getFirstWord(), false);
+        if (user == null) {
+            return "> Could not find user.";
         }
+        command.setAuthor(user.get());
+        if (sudo.getRest() == null) {
+            return "> You need to specify some arguments.";
+        }
+        new MessageHandler(sudo.getRest(), command, false);
+        return null;
     }
 
     @Override
@@ -42,7 +39,7 @@ public String description() {
 
     @Override
     public String usage() {
-        return "[@user] [Command + args]";
+        return "[@User] [Command + args]";
     }
 
     @Override
diff --git a/src/main/java/Commands/Creator/ToggleTypingStatus.java b/src/main/java/com/github/vaerys/commands/creator/ToggleTypingStatus.java
similarity index 86%
rename from src/main/java/Commands/Creator/ToggleTypingStatus.java
rename to src/main/java/com/github/vaerys/commands/creator/ToggleTypingStatus.java
index d6e4a0b2..f2e667b5 100644
--- a/src/main/java/Commands/Creator/ToggleTypingStatus.java
+++ b/src/main/java/com/github/vaerys/commands/creator/ToggleTypingStatus.java
@@ -1,7 +1,7 @@
-package Commands.Creator;
+package com.github.vaerys.commands.creator;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -10,7 +10,7 @@
 public class ToggleTypingStatus implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        command.channel.toggleTypingStatus();
+//        command.channel.get().toggleTypingStatus();
         return null;
     }
 
diff --git a/src/main/java/Commands/Creator/UpdateAvatar.java b/src/main/java/com/github/vaerys/commands/creator/UpdateAvatar.java
similarity index 84%
rename from src/main/java/Commands/Creator/UpdateAvatar.java
rename to src/main/java/com/github/vaerys/commands/creator/UpdateAvatar.java
index 994edf63..60d89b9e 100644
--- a/src/main/java/Commands/Creator/UpdateAvatar.java
+++ b/src/main/java/com/github/vaerys/commands/creator/UpdateAvatar.java
@@ -1,11 +1,11 @@
-package Commands.Creator;
+package com.github.vaerys.commands.creator;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Constants;
-import Main.Globals;
-import Main.Utility;
-import Objects.DailyMessageObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.DailyMessageObject;
 import sx.blah.discord.handle.obj.Permissions;
 import sx.blah.discord.util.Image;
 
@@ -21,7 +21,7 @@ public class UpdateAvatar implements Command {
     public String execute(String args, CommandObject command) {
         ZonedDateTime nowUTC = ZonedDateTime.now(ZoneOffset.UTC);
         if (Globals.doDailyAvatars == true) {
-            for (DailyMessageObject d : Globals.dailyMessages) {
+            for (DailyMessageObject d : Globals.configDailyMessages) {
                 if (d.getDayOfWeek().equals(nowUTC.getDayOfWeek())) {
                     Image avatar = Image.forFile(new File(Constants.DIRECTORY_GLOBAL_IMAGES + d.getFileName()));
                     Utility.updateAvatar(avatar);
diff --git a/src/main/java/Commands/DMCommands/BlockUser.java b/src/main/java/com/github/vaerys/commands/creator/directmessages/BlockUser.java
similarity index 73%
rename from src/main/java/Commands/DMCommands/BlockUser.java
rename to src/main/java/com/github/vaerys/commands/creator/directmessages/BlockUser.java
index c1c8240b..6fb4c068 100644
--- a/src/main/java/Commands/DMCommands/BlockUser.java
+++ b/src/main/java/com/github/vaerys/commands/creator/directmessages/BlockUser.java
@@ -1,17 +1,17 @@
-package Commands.DMCommands;
+package com.github.vaerys.commands.creator.directmessages;
 
-import Commands.DMCommandObject;
-import Interfaces.DMCommand;
-import Main.Globals;
-import POGOs.GlobalData;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.DMCommand;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.pogos.GlobalData;
 
 /**
  * Created by Vaerys on 10/02/2017.
  */
 public class BlockUser implements DMCommand{
     @Override
-    public String execute(String args, DMCommandObject command) {
-        if (command.authorID.equals(Globals.creatorID)){
+    public String execute(String args, CommandObject command) {
+        if (command.user.stringID.equals(Globals.creatorID)){
             GlobalData globalData = Globals.getGlobalData();
             boolean worked = false;
             String userID = args.split(" ")[0];
@@ -27,7 +27,7 @@ public String execute(String args, DMCommandObject command) {
                 return "> An Error Occurred.";
             }
         }else {
-            return command.notAllowed;
+            return command.user.notAllowed;
         }
     }
 
diff --git a/src/main/java/Commands/DMCommands/GetGuildInfo.java b/src/main/java/com/github/vaerys/commands/creator/directmessages/GetGuildInfo.java
similarity index 59%
rename from src/main/java/Commands/DMCommands/GetGuildInfo.java
rename to src/main/java/com/github/vaerys/commands/creator/directmessages/GetGuildInfo.java
index d36551f4..8e7d2a8a 100644
--- a/src/main/java/Commands/DMCommands/GetGuildInfo.java
+++ b/src/main/java/com/github/vaerys/commands/creator/directmessages/GetGuildInfo.java
@@ -1,8 +1,7 @@
-package Commands.DMCommands;
+package com.github.vaerys.commands.creator.directmessages;
 
-import Commands.CommandObject;
-import Commands.DMCommandObject;
-import Interfaces.DMCommand;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.DMCommand;
 import sx.blah.discord.handle.obj.IGuild;
 
 /**
@@ -10,12 +9,10 @@
  */
 public class GetGuildInfo implements DMCommand {
     @Override
-    public String execute(String args, DMCommandObject command) {
-        IGuild guild = command.client.getGuildByID(args);
+    public String execute(String args, CommandObject command) {
+        IGuild guild = command.client.get().getGuildByID(args);
         if (guild != null) {
-            Commands.Help.GetGuildInfo getGuildInfo = new Commands.Help.GetGuildInfo();
-            CommandObject commandObject = new CommandObject(command.message, guild, command.channel, command.author);
-            getGuildInfo.execute(args, commandObject);
+            new GetGuildInfo().execute(args, command);
             return null;
         } else {
             return "> Guild ID Invalid";
diff --git a/src/main/java/Commands/DMCommands/GetGuildList.java b/src/main/java/com/github/vaerys/commands/creator/directmessages/GetGuildList.java
similarity index 68%
rename from src/main/java/Commands/DMCommands/GetGuildList.java
rename to src/main/java/com/github/vaerys/commands/creator/directmessages/GetGuildList.java
index f85fafdc..973ddc26 100644
--- a/src/main/java/Commands/DMCommands/GetGuildList.java
+++ b/src/main/java/com/github/vaerys/commands/creator/directmessages/GetGuildList.java
@@ -1,9 +1,9 @@
-package Commands.DMCommands;
+package com.github.vaerys.commands.creator.directmessages;
 
-import Commands.DMCommandObject;
-import Interfaces.DMCommand;
-import Main.Utility;
-import Objects.XEmbedBuilder;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.DMCommand;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.IGuild;
 
 import java.util.ArrayList;
@@ -13,14 +13,14 @@
  */
 public class GetGuildList implements DMCommand {
     @Override
-    public String execute(String args, DMCommandObject command) {
+    public String execute(String args, CommandObject command) {
         ArrayList<String> guilds = new ArrayList<>();
-        for (IGuild g: command.client.getGuilds()){
+        for (IGuild g: command.client.get().getGuilds()){
             guilds.add(g.getName() +": " + g.getStringID());
         }
         XEmbedBuilder builder = new XEmbedBuilder();
         Utility.listFormatterEmbed("List Of Guilds", builder, guilds, false);
-        Utility.sendDMEmbed("",builder,command.authorID);
+        Utility.sendDMEmbed("",builder,command.user.stringID);
         return null;
     }
 
diff --git a/src/main/java/Commands/DMCommands/QuickRespond.java b/src/main/java/com/github/vaerys/commands/creator/directmessages/QuickRespond.java
similarity index 69%
rename from src/main/java/Commands/DMCommands/QuickRespond.java
rename to src/main/java/com/github/vaerys/commands/creator/directmessages/QuickRespond.java
index 99a93d63..db21c5a4 100644
--- a/src/main/java/Commands/DMCommands/QuickRespond.java
+++ b/src/main/java/com/github/vaerys/commands/creator/directmessages/QuickRespond.java
@@ -1,8 +1,8 @@
-package Commands.DMCommands;
+package com.github.vaerys.commands.creator.directmessages;
 
-import Commands.DMCommandObject;
-import Interfaces.DMCommand;
-import Main.Globals;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.DMCommand;
+import com.github.vaerys.main.Globals;
 import sx.blah.discord.handle.obj.IUser;
 
 /**
@@ -11,8 +11,8 @@
 public class QuickRespond implements DMCommand {
 
     @Override
-    public String execute(String args, DMCommandObject command) {
-        IUser recipient = command.client.getUserByID(Globals.lastDmUserID);
+    public String execute(String args, CommandObject command) {
+        IUser recipient = command.client.get().getUserByID(Globals.lastDmUserID);
         if (recipient != null){
             return Respond.sendDM(args,command,recipient);
         }else {
diff --git a/src/main/java/Commands/DMCommands/Respond.java b/src/main/java/com/github/vaerys/commands/creator/directmessages/Respond.java
similarity index 58%
rename from src/main/java/Commands/DMCommands/Respond.java
rename to src/main/java/com/github/vaerys/commands/creator/directmessages/Respond.java
index 0d3ca661..23e7c13b 100644
--- a/src/main/java/Commands/DMCommands/Respond.java
+++ b/src/main/java/com/github/vaerys/commands/creator/directmessages/Respond.java
@@ -1,9 +1,10 @@
-package Commands.DMCommands;
+package com.github.vaerys.commands.creator.directmessages;
 
-import Commands.DMCommandObject;
-import Interfaces.DMCommand;
-import Main.Utility;
-import Objects.SplitFirstObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.DMCommand;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.SplitFirstObject;
+import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IUser;
 
 /**
@@ -12,21 +13,21 @@
 public class Respond implements DMCommand {
 
     @Override
-    public String execute(String args, DMCommandObject command) {
+    public String execute(String args, CommandObject command) {
         SplitFirstObject response = new SplitFirstObject(args);
-        IUser recipient = command.client.getUserByID(response.getFirstWord());
-        return sendDM(response.getRest(),command,recipient);
+        IUser recipient = command.client.get().getUserByID(response.getFirstWord());
+        return sendDM(response.getRest(), command, recipient);
     }
 
-    public static String sendDM(String args, DMCommandObject command,IUser recipient){
-
+    public static String sendDM(String args, CommandObject command, IUser recipient) {
         if (recipient == null) {
             return "> Could Not Send Response, UserID is invalid.";
         }
         if (args == null) {
             return "> Could Not Send Response, Contents cannot be empty.";
         }
-        if (Utility.sendDM(command.authorUserName + ": " + args, recipient.getStringID()).get()) {
+        IChannel channel = recipient.getOrCreatePMChannel();
+        if (Utility.sendMessage(command.user.username + ": " + args, channel).get() == null) {
             return "> An Error occurred while attempting to run this command.";
         } else {
             return "> Message Sent.";
diff --git a/src/main/java/Commands/DMCommands/ShutdownDM.java b/src/main/java/com/github/vaerys/commands/creator/directmessages/ShutdownDM.java
similarity index 60%
rename from src/main/java/Commands/DMCommands/ShutdownDM.java
rename to src/main/java/com/github/vaerys/commands/creator/directmessages/ShutdownDM.java
index 4d1d31b4..76c8b38b 100644
--- a/src/main/java/Commands/DMCommands/ShutdownDM.java
+++ b/src/main/java/com/github/vaerys/commands/creator/directmessages/ShutdownDM.java
@@ -1,9 +1,8 @@
-package Commands.DMCommands;
+package com.github.vaerys.commands.creator.directmessages;
 
-import Commands.CommandObject;
-import Commands.Creator.Shutdown;
-import Commands.DMCommandObject;
-import Interfaces.DMCommand;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.commands.creator.Shutdown;
+import com.github.vaerys.interfaces.DMCommand;
 
 
 /**
@@ -11,9 +10,8 @@
  */
 public class ShutdownDM implements DMCommand {
     @Override
-    public String execute(String args, DMCommandObject command) {
-        CommandObject commandObject = new CommandObject(command);
-        return new Shutdown().execute(args,commandObject);
+    public String execute(String args, CommandObject command) {
+        return new Shutdown().execute(args,command);
     }
 
     @Override
diff --git a/src/main/java/Commands/DMCommands/TestDM.java b/src/main/java/com/github/vaerys/commands/creator/directmessages/TestDM.java
similarity index 79%
rename from src/main/java/Commands/DMCommands/TestDM.java
rename to src/main/java/com/github/vaerys/commands/creator/directmessages/TestDM.java
index ac0983f0..ab482cbb 100644
--- a/src/main/java/Commands/DMCommands/TestDM.java
+++ b/src/main/java/com/github/vaerys/commands/creator/directmessages/TestDM.java
@@ -1,14 +1,14 @@
-package Commands.DMCommands;
+package com.github.vaerys.commands.creator.directmessages;
 
-import Commands.DMCommandObject;
-import Interfaces.DMCommand;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.DMCommand;
 
 /**
  * Created by Vaerys on 15/07/2017.
  */
 public class TestDM implements DMCommand {
     @Override
-    public String execute(String args, DMCommandObject command) {
+    public String execute(String args, CommandObject command) {
 //        for (IChannel c : command.client.getGuildByID(176434793674833920L).getChannels()) {
 //            if (("#" + c.getName()).equalsIgnoreCase(args)) {
 //                return c.getName();
diff --git a/src/main/java/Commands/DMCommands/ClearReminderDM.java b/src/main/java/com/github/vaerys/commands/dmCommands/ClearReminderDM.java
similarity index 62%
rename from src/main/java/Commands/DMCommands/ClearReminderDM.java
rename to src/main/java/com/github/vaerys/commands/dmCommands/ClearReminderDM.java
index 26ecc6bf..c4ed3036 100644
--- a/src/main/java/Commands/DMCommands/ClearReminderDM.java
+++ b/src/main/java/com/github/vaerys/commands/dmCommands/ClearReminderDM.java
@@ -1,18 +1,16 @@
-package Commands.DMCommands;
+package com.github.vaerys.commands.dmCommands;
 
-import Commands.CommandObject;
-import Commands.DMCommandObject;
-import Commands.General.ClearReminder;
-import Interfaces.DMCommand;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.commands.general.ClearReminder;
+import com.github.vaerys.interfaces.DMCommand;
 
 /**
  * Created by Vaerys on 19/04/2017.
  */
 public class ClearReminderDM implements DMCommand{
     @Override
-    public String execute(String args, DMCommandObject command) {
-        CommandObject object = new CommandObject(command);
-        return new ClearReminder().execute(args,object);
+    public String execute(String args, CommandObject command) {
+        return new ClearReminder().execute(args,command);
     }
 
     @Override
diff --git a/src/main/java/Commands/DMCommands/HelpDM.java b/src/main/java/com/github/vaerys/commands/dmCommands/HelpDM.java
similarity index 50%
rename from src/main/java/Commands/DMCommands/HelpDM.java
rename to src/main/java/com/github/vaerys/commands/dmCommands/HelpDM.java
index ca62a4be..5b98b6d9 100644
--- a/src/main/java/Commands/DMCommands/HelpDM.java
+++ b/src/main/java/com/github/vaerys/commands/dmCommands/HelpDM.java
@@ -1,28 +1,34 @@
-package Commands.DMCommands;
+package com.github.vaerys.commands.dmCommands;
 
-import Commands.DMCommandObject;
-import Interfaces.DMCommand;
-import Main.Globals;
-import Main.Utility;
-import Objects.XEmbedBuilder;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.DMCommand;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.XEmbedBuilder;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.stream.Collectors;
+import java.util.List;
 
 /**
  * Created by Vaerys on 05/02/2017.
  */
 public class HelpDM implements DMCommand {
     @Override
-    public String execute(String args, DMCommandObject command) {
+    public String execute(String args, CommandObject command) {
         XEmbedBuilder builder = new XEmbedBuilder();
-        ArrayList<String> list = (ArrayList) Globals.getCommandsDM().stream().map(c -> Globals.defaultPrefixCommand + c.names()[0]).collect(Collectors.toList());
+        builder.withColor(command.client.color);
+        List<Command> commands = Utility.getCommandsByType(Globals.getAllCommands(), command, TYPE_DM, true);
+        List<String> list = new ArrayList<>();
+        for (Command c : commands) {
+            list.add(c.getCommand(command));
+        }
         Collections.sort(list);
-        StringBuilder desc = new StringBuilder("**> Direct Message Commands.**```"  + Utility.listFormatter(list,false) + "```\n");
+        StringBuilder desc = new StringBuilder("**> Direct Message Commands.**```" + Utility.listFormatter(list, false) + "```\n");
         desc.append(Utility.getCommandInfo(new InfoDM()));
         builder.withDescription(desc.toString());
-        Utility.sendEmbedMessage("",builder,command.channel);
+        Utility.sendEmbedMessage("", builder, command.channel.get());
         return null;
     }
 
diff --git a/src/main/java/com/github/vaerys/commands/dmCommands/InfoDM.java b/src/main/java/com/github/vaerys/commands/dmCommands/InfoDM.java
new file mode 100644
index 00000000..5a97bf81
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/dmCommands/InfoDM.java
@@ -0,0 +1,94 @@
+package com.github.vaerys.commands.dmCommands;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.DMCommand;
+import com.github.vaerys.main.Utility;
+
+import java.util.List;
+
+/**
+ * Created by Vaerys on 05/02/2017.
+ */
+public class InfoDM implements DMCommand {
+    @Override
+    public String execute(String args, CommandObject command) {
+        List<Command> commands = command.guild.getAllCommands(command);
+
+        String error = "> Could not find information on any commands named **" + args + "**.";
+        for (Command c : commands) {
+            for (String s : c.names()) {
+                if (args.equalsIgnoreCase(s)) {
+//                    if (!Utility.testForPerms(c.perms(), command.user.get(), command.guild.get())) {
+//                        return error;
+//                    }
+                    Utility.sendEmbedMessage("", c.getCommandInfo(command), command.channel.get());
+                    return "";
+                }
+            }
+
+        }
+        return error;
+//        List<Command> commands = Utility.getCommandsByType(Globals.getAllCommands(), command, TYPE_DM, true);
+//
+//        for (Command c : commands) {
+//            for (String s : c.names()) {
+//                if (args.equalsIgnoreCase(s)) {
+//                    XEmbedBuilder infoEmbed = new XEmbedBuilder();
+//
+//                    //command info
+//                    StringBuilder builder = new StringBuilder();
+//                    builder.append("**" + Globals.defaultPrefixCommand + c.names()[0]);
+//                    if (c.usage() != null) {
+//                        builder.append(" " + c.usage());
+//                    }
+//                    builder.append("**\nDesc: **" + c.description() + "**\n");
+//                    builder.append("Type: **" + c.type() + "**\n");
+//                    if (c.type().equals(DMCommand.TYPE_CREATOR)) {
+//                        builder.append("**" + ownerOnly + "**");
+//                    }
+//                    infoEmbed.appendField("> Info - " + c.names()[0], builder.toString(), false);
+//
+//                    //aliases
+//                    if (c.names().length > 1) {
+//                        StringBuilder aliasBuilder = new StringBuilder();
+//                        for (int i = 1; i < c.names().length; i++) {
+//                            aliasBuilder.append(Globals.defaultPrefixCommand + c.names()[i] + ", ");
+//                        }
+//                        aliasBuilder.delete(aliasBuilder.length() - 2, aliasBuilder.length());
+//                        aliasBuilder.append(".\n");
+//                        infoEmbed.appendField("Aliases:", aliasBuilder.toString(), false);
+//                    }
+//                    Utility.sendEmbedMessage("", infoEmbed, command.channel.get());
+//                    return "";
+//                }
+//            }
+//        }
+//        return "> Command with the name " + args + " not found.";
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"Info"};
+    }
+
+    @Override
+    public String description() {
+        return "Tells you information about DM commands.";
+    }
+
+    @Override
+    public String usage() {
+        return "[Command Name]";
+    }
+
+    @Override
+    public String type() {
+        return TYPE_HELP;
+    }
+
+    @Override
+    public boolean requiresArgs() {
+        return true;
+    }
+}
diff --git a/src/main/java/Commands/DMCommands/ReminderDM.java b/src/main/java/com/github/vaerys/commands/dmCommands/ReminderDM.java
similarity index 62%
rename from src/main/java/Commands/DMCommands/ReminderDM.java
rename to src/main/java/com/github/vaerys/commands/dmCommands/ReminderDM.java
index 5cc559cb..7c8bf7c7 100644
--- a/src/main/java/Commands/DMCommands/ReminderDM.java
+++ b/src/main/java/com/github/vaerys/commands/dmCommands/ReminderDM.java
@@ -1,18 +1,16 @@
-package Commands.DMCommands;
+package com.github.vaerys.commands.dmCommands;
 
-import Commands.CommandObject;
-import Commands.DMCommandObject;
-import Commands.General.RemindMe;
-import Interfaces.DMCommand;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.commands.general.RemindMe;
+import com.github.vaerys.interfaces.DMCommand;
 
 /**
  * Created by Vaerys on 19/04/2017.
  */
 public class ReminderDM implements DMCommand{
     @Override
-    public String execute(String args, DMCommandObject command) {
-        CommandObject object = new CommandObject(command);
-        return new RemindMe().execute(args,object);
+    public String execute(String args, CommandObject command) {
+        return new RemindMe().execute(args,command);
     }
 
     @Override
diff --git a/src/main/java/Commands/General/ClearReminder.java b/src/main/java/com/github/vaerys/commands/general/ClearReminder.java
similarity index 82%
rename from src/main/java/Commands/General/ClearReminder.java
rename to src/main/java/com/github/vaerys/commands/general/ClearReminder.java
index 9c274629..bd6f0a7e 100644
--- a/src/main/java/Commands/General/ClearReminder.java
+++ b/src/main/java/com/github/vaerys/commands/general/ClearReminder.java
@@ -1,9 +1,9 @@
-package Commands.General;
+package com.github.vaerys.commands.general;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Globals;
-import Objects.ReminderObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.objects.ReminderObject;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -14,7 +14,7 @@ public class ClearReminder implements Command{
     public String execute(String args, CommandObject command) {
         boolean wasfound = false;
         for (ReminderObject r: Globals.getGlobalData().getReminders()){
-            if (r.getUserID().equals(command.authorSID)){
+            if (r.getUserID().equals(command.user.stringID)){
                 wasfound = true;
                 if (r.isSent()){
                     return "> I could not clear your reminder as it is about to be sent.";
@@ -22,7 +22,7 @@ public String execute(String args, CommandObject command) {
             }
         }
         if (wasfound) {
-            Globals.getGlobalData().removeReminder(command.authorSID);
+            Globals.getGlobalData().removeReminder(command.user.stringID);
             return "> Reminder cleared";
         }else {
             return "> You have no reminders set";
diff --git a/src/main/java/Commands/General/EditLinks.java b/src/main/java/com/github/vaerys/commands/general/EditLinks.java
similarity index 52%
rename from src/main/java/Commands/General/EditLinks.java
rename to src/main/java/com/github/vaerys/commands/general/EditLinks.java
index 0b74ac71..a04d38c5 100644
--- a/src/main/java/Commands/General/EditLinks.java
+++ b/src/main/java/com/github/vaerys/commands/general/EditLinks.java
@@ -1,11 +1,12 @@
-package Commands.General;
-
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.SplitFirstObject;
-import Objects.UserLinkObject;
-import Objects.UserTypeObject;
+package com.github.vaerys.commands.general;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.SplitFirstObject;
+import com.github.vaerys.objects.UserLinkObject;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -15,66 +16,68 @@
 /**
  * Created by Vaerys on 17/06/2017.
  */
-public class EditLinks implements Command{
+public class EditLinks implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        IUser user = command.author;
-        SplitFirstObject userID = new SplitFirstObject(args);
+        UserObject user = command.user;
+        SplitFirstObject userCall = new SplitFirstObject(args);
         boolean adminEdit = false;
-        if (Utility.testForPerms(dualPerms(), command.author, command.guild) || Utility.canBypass(command.author, command.guild)) {
-            try {
-                user = command.client.getUserByID(Long.parseLong(userID.getFirstWord()));
-                if (user != null) {
-                    adminEdit = true;
-                }
-            }catch (NumberFormatException e){
-                //do nothing
+        if (Utility.testForPerms(dualPerms(), command.user.get(), command.guild.get()) || Utility.canBypass(command.user.get(), command.guild.get())) {
+            user = Utility.getUser(command, userCall.getFirstWord(), false);
+            if (user != null && userCall.getRest() != null && user.getProfile(command.guild) != null) {
+                adminEdit = true;
+            } else {
+                user = command.user;
             }
         }
+
         SplitFirstObject linkName;
         if (adminEdit) {
-            linkName = new SplitFirstObject(userID.getRest());
-        }else {
+            linkName = new SplitFirstObject(userCall.getRest());
+        } else {
             linkName = new SplitFirstObject(args);
         }
-        UserTypeObject userObject = command.guildUsers.getUserByID(user.getStringID());
+        ProfileObject userObject = user.getProfile(command.guild);
+        if (userObject == null) {
+            return "> " + user.displayName + " Has not Spoken yet thus they have nothing to edit.";
+        }
         userObject.setLinks();
-        for (UserLinkObject link: userObject.getLinks()){
-            if (link.getName().equalsIgnoreCase(linkName.getFirstWord())){
+        for (UserLinkObject link : userObject.getLinks()) {
+            if (link.getName().equalsIgnoreCase(linkName.getFirstWord())) {
                 userObject.getLinks().remove(link);
-                if (adminEdit){
-                    return "> User's Link was removed.";
-                }else {
+                if (adminEdit) {
+                    return "> " + user.displayName + "'s Link was removed.";
+                } else {
                     return "> Link removed.";
                 }
             }
         }
-        if (linkName.getRest() == null){
+        if (linkName.getRest() == null) {
             return "> Cannot add link, Must specify a URL.";
-        }else {
-            if (userObject.getLinks().size() > 4){
-                if (adminEdit){
-                    return "> User already has 5 links, a link must be removed to add a new one.";
-                }else {
+        } else {
+            if (userObject.getLinks().size() > 4) {
+                if (adminEdit) {
+                    return "> " + user.displayName + " already has 5 links, a link must be removed to add a new one.";
+                } else {
                     return "> You already have 5 links, you must remove one to add a new one.";
                 }
             }
-            if (linkName.getFirstWord().length() > 15){
+            if (linkName.getFirstWord().length() > 15) {
                 return "> Link Name too long. (Max 15 chars)";
             }
-            if (Utility.checkURL(linkName.getRest())){
+            if (Utility.checkURL(linkName.getRest())) {
                 try {
                     new URL(linkName.getRest());
-                    userObject.getLinks().add(new UserLinkObject(linkName.getFirstWord(),linkName.getRest()));
-                    if (adminEdit){
-                        return "> New link added for User.";
-                    }else {
+                    userObject.getLinks().add(new UserLinkObject(linkName.getFirstWord(), linkName.getRest()));
+                    if (adminEdit) {
+                        return "> New link added for " + user.displayName + ".";
+                    } else {
                         return "> New link added.";
                     }
-                }catch (MalformedURLException e){
+                } catch (MalformedURLException e) {
                     return "> Cannot add link, Invalid URL.";
                 }
-            }else {
+            } else {
                 return "> Cannot add link, Invalid URL.";
             }
         }
@@ -82,7 +85,7 @@ public String execute(String args, CommandObject command) {
 
     @Override
     public String[] names() {
-        return new String[]{"EditLinks","NewLink"};
+        return new String[]{"EditLinks", "NewLink"};
     }
 
     @Override
@@ -127,7 +130,7 @@ public String dualDescription() {
 
     @Override
     public String dualUsage() {
-        return "[UserID] [Link Name] (Link)";
+        return "[@User] [Link Name] (Link)";
     }
 
     @Override
diff --git a/src/main/java/Commands/General/GetAvatar.java b/src/main/java/com/github/vaerys/commands/general/GetAvatar.java
similarity index 57%
rename from src/main/java/Commands/General/GetAvatar.java
rename to src/main/java/com/github/vaerys/commands/general/GetAvatar.java
index 4cef9cc8..a32a0f0a 100644
--- a/src/main/java/Commands/General/GetAvatar.java
+++ b/src/main/java/com/github/vaerys/commands/general/GetAvatar.java
@@ -1,8 +1,9 @@
-package Commands.General;
+package com.github.vaerys.commands.general;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.UserObject;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -14,15 +15,19 @@
 public class GetAvatar implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        List<IUser> mentions = command.message.getMentions();
-        StringBuilder builder = new StringBuilder();
-        for (IUser u : mentions) {
-            builder.append(u.getDisplayName(command.guild) + ": " + u.getAvatarURL() + "\n");
+        UserObject user = Utility.getUser(command, args, true);
+        if (user != null) {
+            String message = user.displayName + ":\n" + user.get().getAvatarURL();
+            if (user.isPrivateProfile(command.guild) && user.longID != command.user.longID) {
+                return "> User has set their profile to private.";
+            } else if (user.isPrivateProfile(command.guild) && user.longID == command.user.longID) {
+                Utility.sendMessage(message, user.get().getOrCreatePMChannel());
+                return "> Avatar sent to your direct messages.";
+            }
+            return message;
+        } else {
+            return "> Could not find user.";
         }
-        if (builder.length() == 0 || builder.toString().isEmpty()) {
-            return Utility.getCommandInfo(this, command);
-        }
-        return builder.toString();
     }
 
     @Override
@@ -37,7 +42,7 @@ public String description() {
 
     @Override
     public String usage() {
-        return "[@Users...]";
+        return "[@User]";
     }
 
     @Override
diff --git a/src/main/java/Commands/General/Hello.java b/src/main/java/com/github/vaerys/commands/general/Hello.java
similarity index 73%
rename from src/main/java/Commands/General/Hello.java
rename to src/main/java/com/github/vaerys/commands/general/Hello.java
index 81d9854b..ac5a8181 100644
--- a/src/main/java/Commands/General/Hello.java
+++ b/src/main/java/com/github/vaerys/commands/general/Hello.java
@@ -1,21 +1,24 @@
-package Commands.General;
+package com.github.vaerys.commands.general;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
  * Created by Vaerys on 30/01/2017.
  */
-public class Hello implements Command{
+public class Hello implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        return "> Hello " + command.author.getDisplayName(command.guild) + ".";
+        if (command.user.get().equals(command.client.creator)) {
+            return "> Hello Mum.";
+        }
+        return "> Hello " + command.user.displayName + ".";
     }
 
     @Override
     public String[] names() {
-        return new String[]{"Hello","Hi","Greetings"};
+        return new String[]{"Hello", "Hi", "Greetings"};
     }
 
     @Override
diff --git a/src/main/java/Commands/General/Ping.java b/src/main/java/com/github/vaerys/commands/general/LastDailyMessage.java
similarity index 53%
rename from src/main/java/Commands/General/Ping.java
rename to src/main/java/com/github/vaerys/commands/general/LastDailyMessage.java
index d7c1b480..deca0180 100644
--- a/src/main/java/Commands/General/Ping.java
+++ b/src/main/java/com/github/vaerys/commands/general/LastDailyMessage.java
@@ -1,39 +1,31 @@
-package Commands.General;
-
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
-import sx.blah.discord.handle.obj.IMessage;
+package com.github.vaerys.commands.general;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.commands.creator.DailyMsg;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.DailyUserMessageObject;
 import sx.blah.discord.handle.obj.Permissions;
 
-import java.text.NumberFormat;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-
-/**
- * Created by Vaerys on 12/07/2017.
- */
-public class Ping implements Command {
+public class LastDailyMessage implements Command {
 
     @Override
     public String execute(String args, CommandObject command) {
-        ZonedDateTime messageReceived = command.message.getTimestamp().atZone(ZoneOffset.UTC);
-        IMessage working = Utility.sendMessage("`Working...`", command.channel).get();
-        ZonedDateTime testPing = working.getTimestamp().atZone(ZoneOffset.UTC);
-        long ping = (testPing.toInstant().toEpochMilli() - messageReceived.toInstant().toEpochMilli());
-        Utility.sendMessage("Pong - " + NumberFormat.getInstance().format(ping) + "ms", command.channel);
-        Utility.deleteMessage(working);
+        DailyUserMessageObject messageObject;
+        messageObject = Globals.getDailyMessages().getMessageByUID(command.guild.config.lastDailyMessageID);
+        Utility.sendEmbedMessage("", new DailyMsg().getInfo(messageObject, command), command.channel.get());
         return null;
     }
 
     @Override
     public String[] names() {
-        return new String[]{"Ping"};
+        return new String[]{"LastDailyMessage", "LastDailyMsg"};
     }
 
     @Override
     public String description() {
-        return "Sends a ping.";
+        return "Gives the information of the last Daily message that was sent to this server.";
     }
 
     @Override
@@ -85,4 +77,4 @@ public String dualType() {
     public Permissions[] dualPerms() {
         return new Permissions[0];
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/Commands/General/NewDailyMessage.java b/src/main/java/com/github/vaerys/commands/general/NewDailyMessage.java
similarity index 78%
rename from src/main/java/Commands/General/NewDailyMessage.java
rename to src/main/java/com/github/vaerys/commands/general/NewDailyMessage.java
index d9c34a57..9891bd56 100644
--- a/src/main/java/Commands/General/NewDailyMessage.java
+++ b/src/main/java/com/github/vaerys/commands/general/NewDailyMessage.java
@@ -1,12 +1,12 @@
-package Commands.General;
-
-import Commands.CommandObject;
-import Handlers.QueueHandler;
-import Interfaces.Command;
-import Main.Constants;
-import Main.Globals;
-import Main.Utility;
-import Objects.SplitFirstObject;
+package com.github.vaerys.commands.general;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.QueueHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.SplitFirstObject;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.time.DayOfWeek;
@@ -32,17 +32,17 @@ public String execute(String args, CommandObject command) {
 
     public static void checkIsEnabled(boolean enabled) {
         boolean commandFound = false;
-        for (Command c : Globals.getCommands()) {
+        for (Command c : Globals.commands) {
             if (Arrays.equals(c.names(), new NewDailyMessage().names())) {
                 commandFound = true;
             }
         }
         if (!commandFound && enabled) {
-            Globals.getCommands().add(new NewDailyMessage());
+            Globals.commands.add(new NewDailyMessage());
         } else if (commandFound && !enabled) {
-            for (Command c : Globals.getCommands()) {
+            for (Command c : Globals.commands) {
                 if (Arrays.equals(c.names(), new NewDailyMessage().names())) {
-                    Globals.getCommands().remove(c);
+                    Globals.commands.remove(c);
                     return;
                 }
             }
@@ -58,7 +58,9 @@ public String[] names() {
 
     @Override
     public String description() {
-        return "Allows you to request a new Daily message to be added.";
+        return "Allows you to request a new Daily message to be added.\n" +
+                "**Available Tags:**\n" +
+                "<random>, <randEmote>, <randNum>.";
     }
 
     @Override
diff --git a/src/main/java/com/github/vaerys/commands/general/ProfileSettings.java b/src/main/java/com/github/vaerys/commands/general/ProfileSettings.java
new file mode 100644
index 00000000..c6d676fd
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/general/ProfileSettings.java
@@ -0,0 +1,169 @@
+package com.github.vaerys.commands.general;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.enums.EnumString;
+import com.github.vaerys.enums.UserSetting;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.ProfileObject;
+import sx.blah.discord.handle.obj.Permissions;
+
+import java.util.ListIterator;
+
+/**
+ * Created by Vaerys on 02/07/2017.
+ */
+public class ProfileSettings implements Command {
+    String settings = "**Settings:**\n" +
+            "> LevelChannel\n" +
+            "> CurrentChannel\n" +
+            "> DMs\n" +
+            "> NoLvLMessages - `Hides your Level up messages.`\n" +
+            "> NoXP - `Stops you from gaining pixels.`\n" +
+            "> HideRank - `Hides your rank on the server.`\n" +
+            "> NoLevelUpReactions - `Stops level up reactions.`\n" +
+            "> PrivateProfile - `Hides your profile from other users.`";
+
+    @Override
+    public String execute(String args, CommandObject command) {
+        String message = "> Your Level messages will now be sent to ";
+        ProfileObject userObject = command.guild.users.getUserByID(command.user.stringID);
+        StringBuilder builder = new StringBuilder();
+        for (String s : args.split(" ")) {
+            switch (s.toLowerCase()) {
+                case "levelchannel":
+                    removeLevelSettings(userObject);
+                    userObject.getSettings().add(UserSetting.SEND_LVLUP_RANK_CHANNEL);
+                    builder.append(message + "the server's level up channel.");
+                    break;
+                case "currentchannel":
+                    removeLevelSettings(userObject);
+                    userObject.getSettings().add(UserSetting.SEND_LVLUP_CURRENT_CHANNEL);
+                    builder.append(message + "the current channel.");
+                    break;
+                case "dms":
+                    removeLevelSettings(userObject);
+                    userObject.getSettings().add(UserSetting.SEND_LVLUP_DMS);
+                    builder.append(message + "your Direct messages.");
+                    break;
+                case "nolvlmessages":
+                    removeLevelSettings(userObject);
+                    userObject.getSettings().add(UserSetting.DONT_SEND_LVLUP);
+                    builder.append("> You will no longer see any level up messages.");
+                    break;
+                case "noxp":
+                    builder.append(toggleSetting(userObject, UserSetting.NO_XP_GAIN,
+                            "> You will now gain Xp again.",
+                            "> You will no longer gain XP"));
+                    break;
+                case "hiderank":
+                    builder.append(toggleSetting(userObject, UserSetting.HIDE_RANK,
+                            "> Your rank is now visible.",
+                            "> Your rank is now hidden."));
+                    break;
+                case "nolevelupreactions":
+                    builder.append(toggleSetting(userObject, UserSetting.NO_LEVEL_UP_REACTIONS,
+                            "> You will now get reactions added to the message that leveled you up.",
+                            "> You will no longer get reactions added to the message that leveled you up."));
+                    break;
+                case "privateprofile":
+                    builder.append(toggleSetting(userObject, UserSetting.PRIVATE_PROFILE,
+                            "> Your profile is now public.",
+                            "> Your profile is now private."));
+                default:
+                    if (builder.length() == 0) {
+                        return settings + "\n\nCurrent Guild Default: **" + EnumString.get(command.guild.config.getDefaultLevelMode()) + "**\n\n" +
+                                Utility.getCommandInfo(this, command);
+                    }
+                    break;
+            }
+            builder.append("\n");
+        }
+        return builder.toString();
+    }
+
+    private String toggleSetting(ProfileObject user, UserSetting setting, String remove, String add) {
+        if (user.getSettings().contains(setting)) {
+            ListIterator iterator = user.getSettings().listIterator();
+            while (iterator.hasNext()) {
+                UserSetting s = (UserSetting) iterator.next();
+                if (s == setting) {
+                    iterator.remove();
+                }
+            }
+            return remove;
+        } else {
+            user.getSettings().add(setting);
+            return add;
+        }
+    }
+
+    private static void removeLevelSettings(ProfileObject user) {
+        for (int i = 0; i < user.getSettings().size(); i++) {
+            if (Constants.levelUpStates.contains(user.getSettings().get(i))) {
+                user.getSettings().remove(i);
+            }
+        }
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"ProfileSettings", "PixelSettings"};
+    }
+
+    @Override
+    public String description() {
+        return "Allows you to set where your level up messages will be sent.\n" + settings;
+    }
+
+    @Override
+    public String usage() {
+        return "(Setting...)";
+    }
+
+    @Override
+    public String type() {
+        return TYPE_GENERAL;
+    }
+
+    @Override
+    public String channel() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] perms() {
+        return new Permissions[0];
+    }
+
+    @Override
+    public boolean requiresArgs() {
+        return false;
+    }
+
+    @Override
+    public boolean doAdminLogging() {
+        return false;
+    }
+
+    @Override
+    public String dualDescription() {
+        return null;
+    }
+
+    @Override
+    public String dualUsage() {
+        return null;
+    }
+
+    @Override
+    public String dualType() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] dualPerms() {
+        return new Permissions[0];
+    }
+}
diff --git a/src/main/java/Commands/General/RemindMe.java b/src/main/java/com/github/vaerys/commands/general/RemindMe.java
similarity index 81%
rename from src/main/java/Commands/General/RemindMe.java
rename to src/main/java/com/github/vaerys/commands/general/RemindMe.java
index 21d24c20..0f0f105a 100644
--- a/src/main/java/Commands/General/RemindMe.java
+++ b/src/main/java/com/github/vaerys/commands/general/RemindMe.java
@@ -1,9 +1,9 @@
-package Commands.General;
+package com.github.vaerys.commands.general;
 
-import Commands.CommandObject;
-import Handlers.EventHandler;
-import Interfaces.Command;
-import Main.Utility;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.EventHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.time.ZoneOffset;
@@ -15,23 +15,20 @@
 public class RemindMe implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        if (command.guild == null){
-            return "> Cannot set reminder, you are not connected to any of my servers.";
-        }
         String timeString = args.split(" ")[0];
         try {
             long timeMins = Long.parseLong(timeString);
             if (timeMins < 1) {
                 return "> Time can not be less than or equal to 0";
             }
-            if (timeMins > 60* 24* 365){
+            if (timeMins > 60 * 24 * 365) {
                 return "> What are you doing... that reminder is set for over a year from now... you cant do that.";
             }
             ZonedDateTime now = ZonedDateTime.now(ZoneOffset.UTC);
             now = now.plusMinutes(timeMins);
             StringBuilder builder = new StringBuilder(args);
-            builder.delete(0,(timeMins + "").length());
-            if (EventHandler.addReminder(command.author.getStringID(), command.channel.getStringID(), now.toEpochSecond(), builder.toString())) {
+            builder.delete(0, (timeMins + "").length());
+            if (EventHandler.addReminder(command.user.stringID, command.channel.stringID, now.toEpochSecond(), builder.toString())) {
                 return "> Reminder set for " + timeString + " Minute(s) from now.";
             } else {
                 return "> You already have a reminder set.";
diff --git a/src/main/java/Commands/General/SetGender.java b/src/main/java/com/github/vaerys/commands/general/SetGender.java
similarity index 53%
rename from src/main/java/Commands/General/SetGender.java
rename to src/main/java/com/github/vaerys/commands/general/SetGender.java
index 4126f996..a05a1414 100644
--- a/src/main/java/Commands/General/SetGender.java
+++ b/src/main/java/com/github/vaerys/commands/general/SetGender.java
@@ -1,10 +1,11 @@
-package Commands.General;
-
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.SplitFirstObject;
-import Objects.UserTypeObject;
+package com.github.vaerys.commands.general;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.SplitFirstObject;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -14,42 +15,36 @@
 public class SetGender implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        IUser user = command.author;
-        SplitFirstObject userID = new SplitFirstObject(args);
+        UserObject user = command.user;
+        SplitFirstObject userCall = new SplitFirstObject(args);
         boolean adminEdit = false;
-        if (Utility.testForPerms(dualPerms(), command.author, command.guild) || Utility.canBypass(command.author, command.guild)) {
-            try {
-                user = command.client.getUserByID(Long.parseLong(userID.getFirstWord()));
-                if (user != null) {
-                    adminEdit = true;
-                }
-            }catch (NumberFormatException e){
-                //do nothing
+        if (Utility.testForPerms(dualPerms(), command.user.get(), command.guild.get()) || Utility.canBypass(command.user.get(), command.guild.get())) {
+            user = Utility.getUser(command, userCall.getFirstWord(), false);
+            if (user != null && userCall.getRest() != null && user.getProfile(command.guild) != null) {
+                adminEdit = true;
+            } else {
+                user = command.user;
             }
         }
 
-        for (UserTypeObject u : command.guildUsers.getUsers()) {
-
+        ProfileObject u = user.getProfile(command.guild);
+        if (u == null) {
+            return "> " + user.displayName + " Has not Spoken yet thus they have nothing to edit.";
+        } else {
             if (adminEdit) {
-                if (userID.getRest().length() > 20){
-                    return "> User Gender's Length is too long...\n(Must be under 20 chars)";
-                }
-                if (u.getID().equals(user.getStringID())) {
-                    u.setGender(userID.getRest());
-                    return "> User's Gender Edited";
+                if (userCall.getRest().length() > 20) {
+                    return "> Gender's Length is too long...\n(Must be under 20 chars)";
                 }
+                u.setGender(userCall.getRest());
+                return "> " + user.displayName + "'s Gender Edited";
             } else {
                 if (args.length() > 20) {
                     return "> Your Gender's Length is too long...\n(Must be under 20 chars)";
                 }
-                if (u.getID().equals(command.authorSID)) {
-                    u.setGender(args);
-                    return "> Gender Edited";
-
-                }
+                u.setGender(args);
+                return "> Gender Edited";
             }
         }
-        return "> User Has not Spoken yet thus they have nothing to edit.";
     }
 
     @Override
@@ -99,7 +94,7 @@ public String dualDescription() {
 
     @Override
     public String dualUsage() {
-        return "[UserID] [User Gender]";
+        return "[@User] [Gender]";
     }
 
     @Override
diff --git a/src/main/java/Commands/General/SetQuote.java b/src/main/java/com/github/vaerys/commands/general/SetQuote.java
similarity index 53%
rename from src/main/java/Commands/General/SetQuote.java
rename to src/main/java/com/github/vaerys/commands/general/SetQuote.java
index d08fb7c0..89691bda 100644
--- a/src/main/java/Commands/General/SetQuote.java
+++ b/src/main/java/com/github/vaerys/commands/general/SetQuote.java
@@ -1,10 +1,11 @@
-package Commands.General;
+package com.github.vaerys.commands.general;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.SplitFirstObject;
-import Objects.UserTypeObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.SplitFirstObject;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -15,45 +16,41 @@ public class SetQuote implements Command {
 
     @Override
     public String execute(String args, CommandObject command) {
-        IUser user = command.author;
-        SplitFirstObject userID = new SplitFirstObject(args);
+        UserObject user = command.user;
+        SplitFirstObject userCall = new SplitFirstObject(args);
         boolean adminEdit = false;
-        if (Utility.testForPerms(dualPerms(), command.author, command.guild) || Utility.canBypass(command.author, command.guild)) {
-            try {
-                user = command.client.getUserByID(Long.parseLong(userID.getFirstWord()));
-                if (user != null) {
-                    adminEdit = true;
-                }
-            }catch (NumberFormatException e){
-                //do nothing
+        if (Utility.testForPerms(dualPerms(), command.user.get(), command.guild.get()) || Utility.canBypass(command.user.get(), command.guild.get())) {
+            user = Utility.getUser(command, userCall.getFirstWord(), false);
+            if (user != null && userCall.getRest() != null && user.getProfile(command.guild) != null) {
+                adminEdit = true;
+            } else {
+                user = command.user;
             }
         }
-        for (UserTypeObject u : command.guildUsers.getUsers()) {
+        ProfileObject u = user.getProfile(command.guild);
+        if (u == null) {
+            return "> " + user.displayName + " Has not Spoken yet thus they have nothing to edit.";
+        } else {
             args = Utility.removeFun(args);
-            for (String s: args.split(" ")){
-                if (!Utility.checkURL(s)){
+            for (String s : args.split(" ")) {
+                if (!Utility.checkURL(s)) {
                     return "> Cannot add quote. Malicious link found.";
                 }
             }
             if (adminEdit) {
-                if (userID.getRest().length() > 140){
-                    return "> User Quote is too long...\n(must be under 140 chars)";
-                }
-                if (u.getID().equals(user.getStringID())) {
-                    u.setQuote(userID.getRest());
-                    return "> User's Quote Edited.";
+                if (userCall.getRest().length() > 140) {
+                    return "> Quote is too long...\n(must be under 140 chars)";
                 }
-            }else {
+                u.setQuote(userCall.getRest());
+                return "> " + user.displayName + "'s Quote Edited.";
+            } else {
                 if (args.length() > 140) {
                     return "> Your Quote is too long...\n(must be under 140 chars)";
                 }
-                if (u.getID().equals(command.authorSID)) {
-                    u.setQuote(args);
-                    return "> Quote Edited.";
-                }
+                u.setQuote(args);
+                return "> Quote Edited.";
             }
         }
-        return "> User Has not Spoken yet thus they have nothing to edit.";
     }
 
     @Override
@@ -103,7 +100,7 @@ public String dualDescription() {
 
     @Override
     public String dualUsage() {
-        return "[UserID] [User Quote]";
+        return "[@User] [Quote]";
     }
 
     @Override
diff --git a/src/main/java/com/github/vaerys/commands/general/UserInfo.java b/src/main/java/com/github/vaerys/commands/general/UserInfo.java
new file mode 100644
index 00000000..8bee1bca
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/general/UserInfo.java
@@ -0,0 +1,189 @@
+package com.github.vaerys.commands.general;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.enums.UserSetting;
+import com.github.vaerys.handlers.XpHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.SplitFirstObject;
+import com.github.vaerys.objects.XEmbedBuilder;
+import sx.blah.discord.handle.obj.IRole;
+import sx.blah.discord.handle.obj.IUser;
+import sx.blah.discord.handle.obj.Permissions;
+import sx.blah.discord.handle.obj.StatusType;
+
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Created by Vaerys on 27/02/2017.
+ */
+public class UserInfo implements Command {
+
+    @Override
+    public String execute(String args, CommandObject command) {
+        UserObject user;
+        if (args == null || args.isEmpty()) {
+            user = command.user;
+        } else {
+            user = Utility.getUser(command, args, true);
+        }
+        if (user == null) {
+            return "> Could not find that user.";
+        }
+        ProfileObject profile = user.getProfile(command.guild);
+        if (profile == null && user.get().isBot()) {
+            if (user.get().getPresence().getStatus().equals(StatusType.OFFLINE) || user.get().getPresence().getStatus().equals(StatusType.UNKNOWN)) {
+                return "> Could not get a profile for this user.";
+            }
+            profile = new ProfileObject(user.stringID);
+            command.guild.users.addUser(profile);
+        } else if (profile == null) {
+            return "> Could not get a profile for this user.";
+        }
+        if (user.isPrivateProfile(command.guild) && user.longID != command.user.longID) {
+            return "> User has set their profile to private.";
+        }
+
+        //start of the profile builder.
+        XEmbedBuilder builder = new XEmbedBuilder();
+        List<IRole> roles = user.roles;
+        ArrayList<String> roleNames = new ArrayList<>();
+        ArrayList<String> links = new ArrayList<>();
+
+        //If user is a bot it will display the image below as the user avatar icon.
+        if (user.get().isBot()) {
+            builder.withAuthorIcon("http://i.imgur.com/aRJpAP4.png");
+        }
+        //sets title to user Display Name;
+        builder.withAuthorName(user.displayName);
+
+        //sets thumbnail to user Avatar.
+        builder.withThumbnail(user.get().getAvatarURL());
+
+        //gets the age of the account.
+        long nowUTC = ZonedDateTime.now(ZoneOffset.UTC).toEpochSecond();
+        ZonedDateTime creationDate = user.get().getCreationDate().atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneOffset.UTC);
+        long creationUTC = creationDate.toEpochSecond();
+
+        long difference = nowUTC - creationUTC;
+
+        //sets sidebar colour
+        builder.withColor(user.color);
+
+        //collect role names;
+        roleNames.addAll(roles.stream().filter(role -> !role.isEveryoneRole()).map(IRole::getName).collect(Collectors.toList()));
+
+        if (profile.getLinks() != null && profile.getLinks().size() > 0) {
+            links.addAll(profile.getLinks().stream().map(link -> "[" + link.getName() + "](" + link.getLink() + ")").collect(Collectors.toList()));
+        }
+
+        //builds desc
+        DateTimeFormatter formatter = DateTimeFormatter.RFC_1123_DATE_TIME;
+        StringBuilder desc = new StringBuilder();
+        if (command.guild.config.userInfoShowsDate) {
+            desc.append("**Account Created: **" + creationDate.format(formatter));
+        } else {
+            desc.append("**Account Created: **" + Utility.formatTimeDifference(difference));
+        }
+        desc.append("\n**Gender: **" + profile.getGender());
+
+        boolean showLevel = true;
+        boolean showCC = command.guild.config.moduleCC;
+
+        if (!command.guild.config.modulePixels || profile.getXP() == 0) {
+            showLevel = false;
+        }
+
+        if (showCC && !showLevel) {
+            desc.append("\n**Custom Commands: **" + command.guild.customCommands.getUserCommandCount(user, command.guild));
+        } else if (showLevel && !showCC) {
+            desc.append("\n**Level: **" + XpHandler.xpToLevel(profile.getXP()));
+        } else if (showLevel && showCC) {
+            desc.append("\n**Custom Commands: **" + command.guild.customCommands.getUserCommandCount(user, command.guild) +
+                    indent + indent + indent + "**Level: **" + XpHandler.xpToLevel(profile.getXP()));
+        }
+
+        desc.append("\n**Roles: **" + Utility.listFormatter(roleNames, true));
+        desc.append("\n\n*" + profile.getQuote() + "*");
+        desc.append("\n" + Utility.listFormatter(links, true));
+
+        builder.withDesc(desc.toString());
+        builder.withFooterText("User ID: " + profile.getID());
+
+        //sends Message
+        if (user.getProfile(command.guild).getSettings().contains(UserSetting.PRIVATE_PROFILE)) {
+            Utility.sendEmbedMessage("", builder, command.user.get().getOrCreatePMChannel());
+            return "> Profile sent to your Direct messages.";
+        }
+        Utility.sendEmbedMessage("", builder, command.channel.get());
+        return null;
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"Profile", "UserInfo", "Me"};
+    }
+
+    @Override
+    public String description() {
+        return "Lets you see some information about yourself or another user.";
+    }
+
+    @Override
+    public String usage() {
+        return "(@user)";
+    }
+
+    @Override
+    public String type() {
+        return TYPE_GENERAL;
+    }
+
+    @Override
+    public String channel() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] perms() {
+        return new Permissions[0];
+    }
+
+    @Override
+    public boolean requiresArgs() {
+        return false;
+    }
+
+    @Override
+    public boolean doAdminLogging() {
+        return false;
+    }
+
+    @Override
+    public String dualDescription() {
+        return null;
+    }
+
+    @Override
+    public String dualUsage() {
+        return null;
+    }
+
+    @Override
+    public String dualType() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] dualPerms() {
+        return new Permissions[0];
+    }
+}
diff --git a/src/main/java/Commands/Groups/ClearGroupUp.java b/src/main/java/com/github/vaerys/commands/groups/ClearGroupUp.java
similarity index 86%
rename from src/main/java/Commands/Groups/ClearGroupUp.java
rename to src/main/java/com/github/vaerys/commands/groups/ClearGroupUp.java
index e9eb73e2..eca40148 100644
--- a/src/main/java/Commands/Groups/ClearGroupUp.java
+++ b/src/main/java/com/github/vaerys/commands/groups/ClearGroupUp.java
@@ -1,7 +1,7 @@
-package Commands.Groups;
+package com.github.vaerys.commands.groups;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -10,7 +10,7 @@
 public class ClearGroupUp implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        command.channelData.getGroupUpObjects().clear();
+        command.guild.channelData.getGroupUpObjects().clear();
         return "> GroupUp list cleared.";
     }
 
diff --git a/src/main/java/Commands/Groups/GroupUp.java b/src/main/java/com/github/vaerys/commands/groups/GroupUp.java
similarity index 86%
rename from src/main/java/Commands/Groups/GroupUp.java
rename to src/main/java/com/github/vaerys/commands/groups/GroupUp.java
index 5c87a598..9a1bce3c 100644
--- a/src/main/java/Commands/Groups/GroupUp.java
+++ b/src/main/java/com/github/vaerys/commands/groups/GroupUp.java
@@ -1,9 +1,9 @@
-package Commands.Groups;
+package com.github.vaerys.commands.groups;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.GroupUpObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.GroupUpObject;
 import sx.blah.discord.handle.obj.IPresence;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
@@ -21,18 +21,18 @@ public String execute(String args, CommandObject command) {
         if (!args.isEmpty()) {
             presence = args;
         }
-        ArrayList<GroupUpObject> list = command.channelData.getGroupUpObjects();
+        ArrayList<GroupUpObject> list = command.guild.channelData.getGroupUpObjects();
         for (GroupUpObject g : list) {
-            if (command.authorID == g.getUserID()) {
+            if (command.user.longID == g.getUserID()) {
                 list.remove(g);
                 return "> You have been removed from the list.";
             }
         }
-        list.add(new GroupUpObject(presence, command.authorID));
+        list.add(new GroupUpObject(presence, command.user.longID));
         //person added to list :D
         ArrayList<String> completeList = new ArrayList<>();
         for (GroupUpObject g : list) {
-            IUser user = command.client.getUserByID(g.getUserID());
+            IUser user = command.client.get().getUserByID(g.getUserID());
             if (user != null) {
                 IPresence userPres = user.getPresence();
                 if (!userPres.getStatus().equals(StatusType.DND) && !userPres.getStatus().equals(StatusType.OFFLINE) && !userPres.getStatus().equals(StatusType.UNKNOWN)) {
diff --git a/src/main/java/Commands/Help/BotInfo.java b/src/main/java/com/github/vaerys/commands/help/BotInfo.java
similarity index 60%
rename from src/main/java/Commands/Help/BotInfo.java
rename to src/main/java/com/github/vaerys/commands/help/BotInfo.java
index 02446c3a..c4af3915 100644
--- a/src/main/java/Commands/Help/BotInfo.java
+++ b/src/main/java/com/github/vaerys/commands/help/BotInfo.java
@@ -1,11 +1,11 @@
-package Commands.Help;
+package com.github.vaerys.commands.help;
 
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Globals;
-import Main.Utility;
-import Objects.XEmbedBuilder;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -15,18 +15,21 @@ public class BotInfo implements Command {
     public String execute(String args, CommandObject command) {
         XEmbedBuilder builder = new XEmbedBuilder();
         StringBuilder response = new StringBuilder();
-        IUser creator = command.client.getUserByID(Globals.creatorID);
+        IUser creator = command.client.get().getUserByID(Globals.creatorID);
         builder.withTitle("Information about " + Globals.botName);
         response.append("Created by: **@" + creator.getName() + "#" + creator.getDiscriminator() + "**.");
         response.append("\nCreated entirely using Java 8 and the **[Discord4J Libraries](https://discord4j.com/)**.");
-        response.append("\nSupport Sail on **[Patreon](https://www.patreon.com/DawnFelstar)**.");
-        response.append("\nFind Sail on **[GitHub](https://github.com/Vaerys-Dawn/DiscordSailv2)**.");
+        response.append("\nSupport " + Globals.botName + " on **[Patreon](https://www.patreon.com/DawnFelstar)**.");
+        response.append("\nFind " + Globals.botName + " on **[GitHub](https://github.com/Vaerys-Dawn/DiscordSailv2)**.");
         response.append("\nBot's Support Discord: **https://discord.gg/XSyQQrR**.");
-        builder.withColor(Utility.getUsersColour(command.botUser, command.guild));
+        response.append("\n\nBy inviting " + Globals.botName + " to your server you are to understand that " + Globals.botName + " will only store data on user's request. " +
+                "The only exception to this is the bot's profile system which stores the user's Id after they send a messages to the server, " +
+                "this is so that " + Globals.botName + " can associate later user created data to that user.");
+        builder.withColor(command.client.color);
         builder.withDesc(response.toString());
-        builder.withThumbnail(command.botUser.getAvatarURL());
+        builder.withThumbnail(command.client.bot.getAvatarURL());
         builder.withFooterText("Bot Version: " + Globals.version);
-        Utility.sendEmbedMessage("", builder, command.channel);
+        Utility.sendEmbedMessage("", builder, command.channel.get());
         return null;
     }
 
diff --git a/src/main/java/Commands/Help/GetGuildInfo.java b/src/main/java/com/github/vaerys/commands/help/GetGuildInfo.java
similarity index 88%
rename from src/main/java/Commands/Help/GetGuildInfo.java
rename to src/main/java/com/github/vaerys/commands/help/GetGuildInfo.java
index 36308bd0..30040ae8 100644
--- a/src/main/java/Commands/Help/GetGuildInfo.java
+++ b/src/main/java/com/github/vaerys/commands/help/GetGuildInfo.java
@@ -1,12 +1,12 @@
-package Commands.Help;
-
-import Commands.CommandObject;
-import Interfaces.Command;
-import Interfaces.GuildToggle;
-import Main.Globals;
-import Main.Utility;
-import Objects.RoleStatsObject;
-import POGOs.GuildConfig;
+package com.github.vaerys.commands.help;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.RoleStatsObject;
+import com.github.vaerys.pogos.GuildConfig;
 import sx.blah.discord.handle.obj.*;
 
 import java.time.LocalDateTime;
@@ -25,9 +25,9 @@ public class GetGuildInfo implements Command{
 
     @Override
     public String execute(String args, CommandObject command) {
-        guild = command.guild;
-        author = command.author;
-        config = command.guildConfig;
+        guild = command.guild.get();
+        author = command.user.get();
+        config = command.guild.config;
         String guildName = guild.getName();
         LocalDateTime creationDate = guild.getCreationDate();
         IUser guildOwner = guild.getOwner();
@@ -44,8 +44,8 @@ public String execute(String args, CommandObject command) {
         boolean manageServer = Utility.testForPerms(new Permissions[]{Permissions.MANAGE_SERVER}, author, guild) || author.getStringID().equals(Globals.creatorID);
         boolean manageChannels = Utility.testForPerms(new Permissions[]{Permissions.MANAGE_CHANNELS}, author, guild) || author.getStringID().equals(Globals.creatorID);
 
-        Utility.sendMessage("> Info will be sent to you via Direct Message.",command.channel);
-        Utility.sendFileURL("",guild.getIconURL(),command.client.getOrCreatePMChannel(command.author),false);
+        Utility.sendMessage("> Info will be sent to you via Direct Message.",command.channel.get());
+        Utility.sendFileURL("",guild.getIconURL(),command.client.get().getOrCreatePMChannel(command.user.get()),false);
         builder.append("***[" + guildName.toUpperCase() + "]***");
         builder.append("\n\n> Guild ID : **" + guild.getLongID());
         builder.append("**\n> Creation Date : **" + creationDate.getYear() + " " + creationDate.getMonth() + " " + creationDate.getDayOfMonth() + " - " + creationDate.getHour() + ":" + creationDate.getMinute());
@@ -59,8 +59,8 @@ public String execute(String args, CommandObject command) {
         if (manageServer) {
             ArrayList<String> toggles = new ArrayList<>();
             ArrayList<String> modules = new ArrayList<>();
-            for (GuildToggle t : command.guildToggles){
-                String formatted = "\n> " + t.name() + " = **" + t.get(command.guildConfig) + "**";
+            for (GuildToggle t : command.guild.toggles){
+                String formatted = "\n> " + t.name() + " = **" + t.get(command.guild.config) + "**";
                 if (t.isModule()){
                     modules.add(formatted);
                 }else {
@@ -123,12 +123,12 @@ public String execute(String args, CommandObject command) {
                 try {
                     Thread.sleep(1000);
                 } catch (InterruptedException e) {
-                    e.printStackTrace();
+                    Utility.sendStack(e);
                 }
             }
             builder.append(s);
         }
-        builder.append("\n > Total users : \"**" + totalTrusted + "**\"");
+        builder.append("\n > Total profiles : \"**" + totalTrusted + "**\"");
         builder.append("\n\n**COSMETIC ROLES**");
         for (String s : cosmeticRoleStats) {
             if (builder.length() > 1800) {
@@ -137,12 +137,12 @@ public String execute(String args, CommandObject command) {
                 try {
                     Thread.sleep(1000);
                 } catch (InterruptedException e) {
-                    e.printStackTrace();
+                    Utility.sendStack(e);
                 }
             }
             builder.append(s);
         }
-        builder.append("\n > Total users : \"**" + totalCosmetic + "**\"");
+        builder.append("\n > Total profiles : \"**" + totalCosmetic + "**\"");
         builder.append("\n\n**MODIFIER ROLES**");
         for (String s : modifierRoleStats) {
             if (builder.length() > 1800) {
@@ -151,13 +151,13 @@ public String execute(String args, CommandObject command) {
                 try {
                     Thread.sleep(1000);
                 } catch (InterruptedException e) {
-                    e.printStackTrace();
+                    Utility.sendStack(e);
                 }
 
             }
             builder.append(s);
         }
-        builder.append("\n > Total users : \"**" + totalModified + "**\"");
+        builder.append("\n > Total profiles : \"**" + totalModified + "**\"");
         builder.append("\n\n------{END OF INFO}------");
         Utility.sendDM(builder.toString(), author.getStringID());
         return null;
diff --git a/src/main/java/com/github/vaerys/commands/help/Help.java b/src/main/java/com/github/vaerys/commands/help/Help.java
new file mode 100644
index 00000000..793b5d3a
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/help/Help.java
@@ -0,0 +1,138 @@
+package com.github.vaerys.commands.help;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.XEmbedBuilder;
+import sx.blah.discord.handle.obj.Permissions;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.ListIterator;
+
+/**
+ * Created by Vaerys on 29/01/2017.
+ */
+
+
+public class Help implements Command {
+
+    @Override
+    public String execute(String args, CommandObject command) {
+        XEmbedBuilder helpEmbed = new XEmbedBuilder();
+        List<String> types = new ArrayList<>(command.guild.getAllTypes(command));
+        List<Command> commands = new ArrayList<>(command.guild.getAllCommands(command));
+        String error = "> There are no commands with the type: **" + args + "**.\n\n" + Utility.getCommandInfo(this, command);
+        helpEmbed.withColor(command.client.color);
+        ListIterator iterator = types.listIterator();
+        while (iterator.hasNext()) {
+            String s = (String) iterator.next();
+            if (Utility.getCommandsByType(commands, command, s, true).size() == 0) {
+                iterator.remove();
+            }
+        }
+        Collections.sort(types);
+        if (args == null || args.isEmpty()) {
+            StringBuilder builder = new StringBuilder();
+            builder.append(codeBlock + "\n");
+            builder.append(Utility.listFormatter(types, false));
+            builder.append(codeBlock + "\n");
+            helpEmbed.withTitle("Here are the Command Types I have available for use:");
+            builder.append(Utility.getCommandInfo(this, command) + "\n");
+            helpEmbed.withDescription(builder.toString());
+            Utility.sendEmbedMessage("", helpEmbed, command.channel.get());
+            return null;
+        } else {
+            for (String s : types) {
+                if (s.equalsIgnoreCase(args)) {
+                    StringBuilder builder = new StringBuilder();
+                    String suffix = Utility.getCommandInfo(new Info(), command);
+                    helpEmbed.withTitle("> Here are all of the " + s + " Commands I have available.");
+                    if (args.equalsIgnoreCase(TYPE_DM)) {
+                        suffix = "**These commands can only be performed in DMs.**\n" +
+                                "> If you send a non command message to my DMs it will send it to my creator.\n\n" + suffix;
+                    } else if (args.equalsIgnoreCase(TYPE_CREATOR)) {
+                        suffix = "**Only the creator of this bot can run these commands.**\n\n" + suffix;
+                    }
+                    builder.append(codeBlock + "\n");
+                    List<String> commandNames = new ArrayList<>();
+                    for (Command c : Utility.getCommandsByType(commands, command, s, true)) {
+                        StringBuilder commandCall = new StringBuilder(c.getCommand(command));
+                        if (c.dualType() != null) {
+                            commandCall.append(indent + "*");
+                        }
+                        commandNames.add(commandCall.toString());
+                    }
+                    builder.append(Utility.listFormatter(commandNames, false));
+                    builder.append(codeBlock + "\n");
+                    builder.append(suffix);
+                    helpEmbed.withDescription(builder.toString());
+                    Utility.sendEmbedMessage("", helpEmbed, command.channel.get());
+                    return null;
+                }
+            }
+            return error;
+        }
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"Help"};
+    }
+
+    @Override
+    public String description() {
+        return "Lists the commands that profiles can run.";
+    }
+
+    @Override
+    public String usage() {
+        return "(Command Type)";
+    }
+
+    @Override
+    public String type() {
+        return TYPE_HELP;
+    }
+
+    @Override
+    public String channel() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] perms() {
+        return new Permissions[0];
+    }
+
+    @Override
+    public boolean requiresArgs() {
+        return false;
+    }
+
+    @Override
+    public boolean doAdminLogging() {
+        return false;
+    }
+
+    @Override
+    public String dualDescription() {
+        return null;
+    }
+
+    @Override
+    public String dualUsage() {
+        return null;
+    }
+
+    @Override
+    public String dualType() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] dualPerms() {
+        return new Permissions[0];
+    }
+}
diff --git a/src/main/java/Commands/Help/HelpTags.java b/src/main/java/com/github/vaerys/commands/help/HelpTags.java
similarity index 90%
rename from src/main/java/Commands/Help/HelpTags.java
rename to src/main/java/com/github/vaerys/commands/help/HelpTags.java
index 1b222132..9743a631 100644
--- a/src/main/java/Commands/Help/HelpTags.java
+++ b/src/main/java/com/github/vaerys/commands/help/HelpTags.java
@@ -1,7 +1,7 @@
-package Commands.Help;
+package com.github.vaerys.commands.help;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
diff --git a/src/main/java/com/github/vaerys/commands/help/Info.java b/src/main/java/com/github/vaerys/commands/help/Info.java
new file mode 100644
index 00000000..639615c9
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/help/Info.java
@@ -0,0 +1,96 @@
+package com.github.vaerys.commands.help;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import sx.blah.discord.handle.obj.Permissions;
+
+import java.util.List;
+
+/**
+ * Created by Vaerys on 29/01/2017.
+ */
+public class Info implements Command {
+
+    @Override
+    public String execute(String args, CommandObject command) {
+        List<Command> commands = command.guild.getAllCommands(command);
+
+        String error = "> Could not find information on any commands named **" + args + "**.";
+        for (Command c : commands) {
+            for (String s : c.names()) {
+                if (args.equalsIgnoreCase(s)) {
+                    if (!Utility.testForPerms(c.perms(), command.user.get(), command.guild.get())) {
+                        return error;
+                    }
+                    Utility.sendEmbedMessage("", c.getCommandInfo(command), command.channel.get());
+                    return "";
+                }
+            }
+
+        }
+        return error;
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"Info"};
+    }
+
+    @Override
+    public String description() {
+        return "Gives information about a command.";
+    }
+
+    @Override
+    public String usage() {
+        return "[Command Name]";
+    }
+
+    @Override
+    public String type() {
+        return TYPE_HELP;
+    }
+
+    @Override
+    public String channel() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] perms() {
+        return new Permissions[0];
+    }
+
+    @Override
+    public boolean requiresArgs() {
+        return true;
+    }
+
+    @Override
+    public boolean doAdminLogging() {
+        return false;
+    }
+
+    @Override
+    public String dualDescription() {
+        return null;
+    }
+
+    @Override
+    public String dualUsage() {
+        return null;
+    }
+
+    @Override
+    public String dualType() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] dualPerms() {
+        return new Permissions[0];
+    }
+
+
+}
diff --git a/src/main/java/Commands/Servers/Server.java b/src/main/java/com/github/vaerys/commands/help/Ping.java
similarity index 63%
rename from src/main/java/Commands/Servers/Server.java
rename to src/main/java/com/github/vaerys/commands/help/Ping.java
index 7c46c6c9..baacc6bc 100644
--- a/src/main/java/Commands/Servers/Server.java
+++ b/src/main/java/com/github/vaerys/commands/help/Ping.java
@@ -1,43 +1,44 @@
-package Commands.Servers;
+package com.github.vaerys.commands.help;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
+import java.text.NumberFormat;
+
 /**
- * Created by Vaerys on 31/01/2017.
+ * Created by Vaerys on 12/07/2017.
  */
-public class Server implements Command {
+public class Ping implements Command {
+
     @Override
     public String execute(String args, CommandObject command) {
-        Utility.sendDM(command.servers.getServer(args, command.guild),command.authorSID);
-        return "> Server info has been sent to your DMs";
+        return "Pong! " + NumberFormat.getInstance().format(command.client.get().getShards().get(0).getResponseTime()) + "ms";
     }
 
     @Override
     public String[] names() {
-        return new String[]{"Server"};
+        return new String[]{"Ping"};
     }
 
     @Override
     public String description() {
-        return "Lists the information about a specific server.";
+        return "Sends a ping.";
     }
 
     @Override
     public String usage() {
-        return "[Server Name]";
+        return null;
     }
 
     @Override
     public String type() {
-        return TYPE_SERVERS;
+        return TYPE_HELP;
     }
 
     @Override
     public String channel() {
-        return CHANNEL_SERVERS;
+        return null;
     }
 
     @Override
@@ -47,7 +48,7 @@ public Permissions[] perms() {
 
     @Override
     public boolean requiresArgs() {
-        return true;
+        return false;
     }
 
     @Override
diff --git a/src/main/java/Commands/Help/Report.java b/src/main/java/com/github/vaerys/commands/help/Report.java
similarity index 53%
rename from src/main/java/Commands/Help/Report.java
rename to src/main/java/com/github/vaerys/commands/help/Report.java
index 1760be90..4fd3e23d 100644
--- a/src/main/java/Commands/Help/Report.java
+++ b/src/main/java/com/github/vaerys/commands/help/Report.java
@@ -1,9 +1,12 @@
-package Commands.Help;
-
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.SplitFirstObject;
+package com.github.vaerys.commands.help;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.SplitFirstObject;
+import sx.blah.discord.handle.obj.IChannel;
+import sx.blah.discord.handle.obj.IMessage;
 import sx.blah.discord.handle.obj.IRole;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -18,27 +21,19 @@ public String execute(String args, CommandObject command) {
     }
 
     public static String report(String args, CommandObject command, boolean isSilent) {
-        String reported;
-        if (command.guildConfig.getChannelIDsByType(CHANNEL_ADMIN) != null) {
-            String channelID = command.guildConfig.getChannelIDsByType(CHANNEL_ADMIN).get(0);
-            SplitFirstObject user = new SplitFirstObject(args);
-            long uID = -1;
-            try {
-                uID = Long.parseLong(user.getFirstWord());
-            } catch (NumberFormatException e) {
-                //do nothing
+        if (command.guild.config.getChannelIDsByType(CHANNEL_ADMIN) != null) {
+            IChannel channel = command.guild.get().getChannelByID(command.guild.config.getChannelIDsByType(CHANNEL_ADMIN).get(0));
+            SplitFirstObject split = new SplitFirstObject(args);
+            UserObject reported = Utility.getUser(command, split.getFirstWord(), false);
+            if (reported == null) {
+                return "> Cannot send report. Could not find user.";
             }
-            if (uID != -1) {
-                reported = command.client.getUserByID(uID).mention();
-            } else if (command.message.getMentions().size() > 0) {
-                reported = command.message.getMentions().get(0).mention();
-            } else {
-                return "> User Report could not be sent as you did not specify a user.";
+            if (reported.longID == command.user.longID) {
+                return "> You can't report yourself.";
             }
-
-            if (channelID != null) {
+            if (channel != null) {
                 StringBuilder builder = new StringBuilder();
-                IRole roleToMention = command.guild.getRoleByID(command.guildConfig.getRoleToMentionID());
+                IRole roleToMention = command.guild.get().getRoleByID(command.guild.config.getRoleToMentionID());
                 if (roleToMention != null) {
                     builder.append(roleToMention.mention() + "\n");
                 }
@@ -47,11 +42,15 @@ public static String report(String args, CommandObject command, boolean isSilent
                 } else {
                     builder.append("**User Report**\n");
                 }
-                user.editRestReplace(user.getRest(), Utility.convertMentionToText(user.getRest()));
-                builder.append("Reporter: " + command.author.mention() + "\nReported: " + reported + "\nReason: `" + user.getRest() + "`");
-                builder.append("\n" + command.channel.mention());
-                Utility.sendMessage(builder.toString(), command.guild.getChannelByID(channelID));
-                return "> User Report sent.";
+                split.editRestReplace(split.getRest(), Utility.convertMentionToText(split.getRest()));
+                builder.append("Reporter: " + command.user.get().mention() + "\nReported: " + reported.get().mention() + "\nReason: `" + split.getRest() + "`");
+                builder.append("\n" + command.channel.get().mention());
+                IMessage message = Utility.sendMessage(builder.toString(), channel).get();
+                if (message == null) {
+                    return "> User report was not be sent. Looks like I can't send messages to " + channel.mention() + ".";
+                } else {
+                    return "> User Report sent.";
+                }
             }
             return "> Your report could not be sent as the server does not have an admin channel set up at this time.";
         } else {
@@ -71,7 +70,7 @@ public String description() {
 
     @Override
     public String usage() {
-        return "[@user]/[User ID] [Reason]";
+        return "[@User] [Reason]";
     }
 
     @Override
diff --git a/src/main/java/Commands/Help/SilentReport.java b/src/main/java/com/github/vaerys/commands/help/SilentReport.java
similarity index 54%
rename from src/main/java/Commands/Help/SilentReport.java
rename to src/main/java/com/github/vaerys/commands/help/SilentReport.java
index ca7bed9f..f00528fc 100644
--- a/src/main/java/Commands/Help/SilentReport.java
+++ b/src/main/java/com/github/vaerys/commands/help/SilentReport.java
@@ -1,8 +1,8 @@
-package Commands.Help;
+package com.github.vaerys.commands.help;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
 
 /**
  * Created by Vaerys on 30/01/2017.
@@ -11,8 +11,11 @@ public class SilentReport extends Report implements Command {
 
     @Override
     public String execute(String args, CommandObject command) {
-        Utility.deleteMessage(command.message);
-        Report.report(args,command,true);
+        if (command.channel.get().getTypingStatus()) {
+            command.channel.get().toggleTypingStatus();
+        }
+        Utility.deleteMessage(command.message.get());
+        Utility.sendMessage(Report.report(args, command, true), command.user.get().getOrCreatePMChannel());
         return null;
     }
 
@@ -29,6 +32,6 @@ public String description() {
 
     @Override
     public String usage() {
-        return "[@User]/[User ID] [Report]";
+        return "[@User] [Report]";
     }
 }
diff --git a/src/main/java/Commands/Help/StartUpGuide.java b/src/main/java/com/github/vaerys/commands/help/StartUpGuide.java
similarity index 90%
rename from src/main/java/Commands/Help/StartUpGuide.java
rename to src/main/java/com/github/vaerys/commands/help/StartUpGuide.java
index 2afac6b5..10a0d378 100644
--- a/src/main/java/Commands/Help/StartUpGuide.java
+++ b/src/main/java/com/github/vaerys/commands/help/StartUpGuide.java
@@ -1,7 +1,7 @@
-package Commands.Help;
+package com.github.vaerys.commands.help;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
diff --git a/src/main/java/Commands/Pixels/CheckPixelRoles.java b/src/main/java/com/github/vaerys/commands/pixels/CheckPixelRoles.java
similarity index 83%
rename from src/main/java/Commands/Pixels/CheckPixelRoles.java
rename to src/main/java/com/github/vaerys/commands/pixels/CheckPixelRoles.java
index fca747ba..5233e44d 100644
--- a/src/main/java/Commands/Pixels/CheckPixelRoles.java
+++ b/src/main/java/com/github/vaerys/commands/pixels/CheckPixelRoles.java
@@ -1,9 +1,9 @@
-package Commands.Pixels;
+package com.github.vaerys.commands.pixels;
 
-import Commands.CommandObject;
-import Handlers.XpHandler;
-import Interfaces.Command;
-import Main.Utility;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.XpHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
 import sx.blah.discord.handle.obj.IMessage;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
@@ -14,9 +14,9 @@
 public class CheckPixelRoles implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        IMessage working = Utility.sendMessage("`Working...`", command.channel).get();
-        for (IUser user : command.guild.getUsers()) {
-            XpHandler.checkUsersRoles(user.getStringID(), command.guildContent);
+        IMessage working = Utility.sendMessage("`Working...`", command.channel.get()).get();
+        for (IUser user : command.guild.get().getUsers()) {
+            XpHandler.checkUsersRoles(user.getStringID(), command.guild);
         }
         Utility.deleteMessage(working);
         return "> Done.";
diff --git a/src/main/java/Commands/Pixels/DefaultLevelMode.java b/src/main/java/com/github/vaerys/commands/pixels/DefaultLevelMode.java
similarity index 78%
rename from src/main/java/Commands/Pixels/DefaultLevelMode.java
rename to src/main/java/com/github/vaerys/commands/pixels/DefaultLevelMode.java
index 3c82b398..cd1be57f 100644
--- a/src/main/java/Commands/Pixels/DefaultLevelMode.java
+++ b/src/main/java/com/github/vaerys/commands/pixels/DefaultLevelMode.java
@@ -1,8 +1,8 @@
-package Commands.Pixels;
+package com.github.vaerys.commands.pixels;
 
-import Commands.CommandObject;
-import Enums.UserSetting;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.enums.UserSetting;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -20,16 +20,16 @@ public String execute(String args, CommandObject command) {
         String message = "> Level messages will now be sent to ";
         switch (args.toLowerCase()) {
             case "levelchannel":
-                command.guildConfig.setDefaultLevelMode(UserSetting.SEND_LVLUP_RANK_CHANNEL);
+                command.guild.config.setDefaultLevelMode(UserSetting.SEND_LVLUP_RANK_CHANNEL);
                 return message + "the server's level up channel.";
             case "currentchannel":
-                command.guildConfig.setDefaultLevelMode(UserSetting.SEND_LVLUP_CURRENT_CHANNEL);
+                command.guild.config.setDefaultLevelMode(UserSetting.SEND_LVLUP_CURRENT_CHANNEL);
                 return message + "the current channel.";
             case "dms":
-                command.guildConfig.setDefaultLevelMode(UserSetting.SEND_LVLUP_DMS);
+                command.guild.config.setDefaultLevelMode(UserSetting.SEND_LVLUP_DMS);
                 return message + "the user's Direct messages.";
             case "nomessage":
-                command.guildConfig.setDefaultLevelMode(UserSetting.DONT_SEND_LVLUP);
+                command.guild.config.setDefaultLevelMode(UserSetting.DONT_SEND_LVLUP);
                 return "> Now set to now send level up messages";
             default:
                 return "> Not a valid option.";
diff --git a/src/main/java/Commands/Pixels/LevelUpMessage.java b/src/main/java/com/github/vaerys/commands/pixels/LevelUpMessage.java
similarity index 84%
rename from src/main/java/Commands/Pixels/LevelUpMessage.java
rename to src/main/java/com/github/vaerys/commands/pixels/LevelUpMessage.java
index b704ccf7..446c711f 100644
--- a/src/main/java/Commands/Pixels/LevelUpMessage.java
+++ b/src/main/java/com/github/vaerys/commands/pixels/LevelUpMessage.java
@@ -1,7 +1,7 @@
-package Commands.Pixels;
+package com.github.vaerys.commands.pixels;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -16,7 +16,7 @@ public String execute(String args, CommandObject command) {
             if (!args.contains("<level>") || !args.contains("<user>")) {
                 return "> Missing <level> and/or <user> tags.";
             }
-            command.guildConfig.setLevelUpMessage(args);
+            command.guild.config.setLevelUpMessage(args);
             return "> New Level Up message set.";
         }
     }
@@ -28,7 +28,9 @@ public String[] names() {
 
     @Override
     public String description() {
-        return "Allows you to set the level up message for the server.";
+        return "Allows you to set the level up message for the server.\n" +
+                "**Available Tags:**" +
+                "<level>, <user>, <randEmote>.";
     }
 
     @Override
diff --git a/src/main/java/Commands/Pixels/ManagePixelRoles.java b/src/main/java/com/github/vaerys/commands/pixels/ManagePixelRoles.java
similarity index 76%
rename from src/main/java/Commands/Pixels/ManagePixelRoles.java
rename to src/main/java/com/github/vaerys/commands/pixels/ManagePixelRoles.java
index 653030ad..5289758f 100644
--- a/src/main/java/Commands/Pixels/ManagePixelRoles.java
+++ b/src/main/java/com/github/vaerys/commands/pixels/ManagePixelRoles.java
@@ -1,10 +1,10 @@
-package Commands.Pixels;
+package com.github.vaerys.commands.pixels;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.RewardRoleObject;
-import Objects.SplitFirstObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.RewardRoleObject;
+import com.github.vaerys.objects.SplitFirstObject;
 import sx.blah.discord.handle.obj.IRole;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -15,7 +15,7 @@ public class ManagePixelRoles implements Command {
     @Override
     public String execute(String args, CommandObject command) {
         SplitFirstObject mode = new SplitFirstObject(args);
-        IRole role = Utility.getRoleFromName(mode.getRest(), command.guild);
+        IRole role = Utility.getRoleFromName(mode.getRest(), command.guild.get());
         if (role == null) {
             return "> **" + mode.getRest() + "** is not a valid Role name.";
         }
@@ -24,7 +24,7 @@ public String execute(String args, CommandObject command) {
             if (level > 256 || level <= 0) {
                 return "> Level must be between 1-256.";
             }
-            for (RewardRoleObject r : command.guildConfig.getRewardRoles()) {
+            for (RewardRoleObject r : command.guild.config.getRewardRoles()) {
                 if (r.getLevel() == level) {
                     return "> That level already has a reward set.";
                 }
@@ -33,43 +33,43 @@ public String execute(String args, CommandObject command) {
                     return "> Level to obtain **" + role.getName() + "** is now set to level **" + level + "**.";
                 }
             }
-            command.guildConfig.getRewardRoles().add(new RewardRoleObject(role.getLongID(), level));
+            command.guild.config.getRewardRoles().add(new RewardRoleObject(role.getLongID(), level));
             return "> The role **" + role.getName() + "** will now be awarded at level **" + level + "**.";
         } catch (NumberFormatException e) {
             switch (mode.getFirstWord().toLowerCase()) {
                 case "xpdenied":
-                    for (RewardRoleObject r : command.guildConfig.getRewardRoles()) {
+                    for (RewardRoleObject r : command.guild.config.getRewardRoles()) {
                         if (r.getRoleID() == role.getLongID()) {
                             return "> **" + role.getName() + "** is already set as a reward role.";
                         }
                     }
-                    if (role.getLongID() == command.guildConfig.topTenRoleID) {
+                    if (role.getLongID() == command.guild.config.topTenRoleID) {
                         return "> **" + role.getName() + "** is already set as the server's TopTen role.";
                     }
-                    command.guildConfig.xpDeniedRoleID = role.getLongID();
+                    command.guild.config.xpDeniedRoleID = role.getLongID();
                     return "> **" + role.getName() + "** is now the server's XpDenied role.";
                 case "topten":
-                    for (RewardRoleObject r : command.guildConfig.getRewardRoles()) {
+                    for (RewardRoleObject r : command.guild.config.getRewardRoles()) {
                         if (r.getRoleID() == role.getLongID()) {
                             return "> **" + role.getName() + "** is already set as a reward role.";
                         }
                     }
-                    if (role.getLongID() == command.guildConfig.xpDeniedRoleID) {
+                    if (role.getLongID() == command.guild.config.xpDeniedRoleID) {
                         return "> **" + role.getName() + "** is already set as the server's xpDenied role.";
                     }
-                    command.guildConfig.topTenRoleID = role.getLongID();
+                    command.guild.config.topTenRoleID = role.getLongID();
                     return "> **" + role.getName() + "** is now the server's TopTen role.";
                 case "remove":
-                    if (role.getLongID() == command.guildConfig.xpDeniedRoleID) {
-                        command.guildConfig.xpDeniedRoleID = -1;
+                    if (role.getLongID() == command.guild.config.xpDeniedRoleID) {
+                        command.guild.config.xpDeniedRoleID = -1;
                         return "> **" + role.getName() + "** is no longer the server's xpDenied role.";
-                    } else if (role.getLongID() == command.guildConfig.topTenRoleID) {
-                        command.guildConfig.topTenRoleID = -1;
+                    } else if (role.getLongID() == command.guild.config.topTenRoleID) {
+                        command.guild.config.topTenRoleID = -1;
                         return "> **" + role.getName() + "** is no longer the server's Top Ten role.";
                     }
-                    for (RewardRoleObject r : command.guildConfig.getRewardRoles()) {
+                    for (RewardRoleObject r : command.guild.config.getRewardRoles()) {
                         if (r.getRoleID() == role.getLongID()) {
-                            command.guildConfig.getRewardRoles().remove(r);
+                            command.guild.config.getRewardRoles().remove(r);
                             return "> **" + role.getName() + "** is no longer set as a reward role.";
                         }
                     }
diff --git a/src/main/java/com/github/vaerys/commands/pixels/PixelHelp.java b/src/main/java/com/github/vaerys/commands/pixels/PixelHelp.java
new file mode 100644
index 00000000..455e1846
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/pixels/PixelHelp.java
@@ -0,0 +1,161 @@
+package com.github.vaerys.commands.pixels;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.XpHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.RewardRoleObject;
+import com.github.vaerys.objects.SplitFirstObject;
+import sx.blah.discord.handle.obj.IRole;
+import sx.blah.discord.handle.obj.Permissions;
+
+import java.text.NumberFormat;
+import java.util.List;
+
+/**
+ * Created by Vaerys on 01/07/2017.
+ */
+public class PixelHelp implements Command {
+
+    String modes = "\n**Modes:** \n> LevelToXp - `Gives the total pixels for that level.`\n" +
+            "`Aliases: level2xp, level->xp.`\n" +
+            "> XpToLevel - `Gives the level for that amount of pixels.`\n" +
+            "`Aliases: xp2level, xp->level.`";
+
+    @Override
+    public String execute(String args, CommandObject command) {
+        SplitFirstObject obe = new SplitFirstObject(args);
+        String mode = obe.getFirstWord();
+        switch (mode.toLowerCase()) {
+            case "leveltoxp":
+                return leveltoxp(obe.getRest());
+            case "level2xp":
+                return leveltoxp(obe.getRest());
+            case "level->xp":
+                return leveltoxp(obe.getRest());
+            case "xptolevel":
+                return xptolevel(obe.getRest());
+            case "xp2level":
+                return xptolevel(obe.getRest());
+            case "xp->level":
+                return xptolevel(obe.getRest());
+            default:
+                List<String> channelMentions = Utility.getChannelMentions(command.guild.config.getChannelIDsByType(CHANNEL_XP_DENIED), command);
+                StringBuilder builder = new StringBuilder();
+                builder.append("**The rules for gaining xp are:**\n");
+                if (channelMentions.size() != 0) {
+                    builder.append("> Cannot gain xp in any of these channels: \n**>> " + Utility.listFormatter(channelMentions, true) + " <<**\n");
+                }
+                builder.append("> Cannot gain xp if the message starts with a command prefix.\n" +
+                        "> Cannot gain xp if the message contains less than 10 chars.\n" +
+                        "> Cannot gain xp if your profile has NoXp or XpDenied on it.\n" +
+                        "> Can only gain xp once per min\n\n");
+                if (command.guild.config.getRewardRoles().size() != 0) {
+                    builder.append("**Reward Roles:**");
+                    for (RewardRoleObject r : command.guild.config.getRewardRoles()) {
+                        IRole reward = command.guild.get().getRoleByID(r.getRoleID());
+                        if (reward == null) {
+                            break;
+                        }
+                        builder.append("\n> **" + reward.getName() + "** -> Level: **" + r.getLevel() + "**");
+                    }
+                    builder.append("\n\n");
+                }
+                if (command.guild.config.xpModifier != 1) {
+                    builder.append("**Current Xp Modifier:**\n");
+                    builder.append("> **x" + command.guild.config.xpModifier + "**.\n\n");
+                }
+                return builder.toString() + Utility.getCommandInfo(this, command);
+        }
+    }
+
+    private String leveltoxp(String args) {
+        try {
+            long level = Long.parseLong(args);
+            if (level < 0) {
+                return "> Please use a positive number.";
+            }
+            if (level > 1000) {
+                return "> No, I don't want to calculate the total xp for level " + level + "!";
+            }
+            return "> Level: " + level + " = " + NumberFormat.getInstance().format(XpHandler.totalXPForLevel(level)) + " pixels.";
+        } catch (NumberFormatException e) {
+            return "> You must supply a valid number.";
+        }
+    }
+
+    private String xptolevel(String args) {
+        try {
+            long xp = Long.parseLong(args);
+            if (xp < 0) {
+                return "> Please use a positive number.";
+            }
+            if (xp > 1345412000) {
+                return "> Its something over level 1000, could you leave me alone.";
+            }
+            return "> " + xp + "XP = Level: " + XpHandler.xpToLevel(xp);
+        } catch (NumberFormatException e) {
+            return "> You must supply a valid number.";
+        }
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"PixelHelp", "HelpPixels"};
+    }
+
+    @Override
+    public String description() {
+        return "Gives you information about pixels." + modes;
+    }
+
+    @Override
+    public String usage() {
+        return ("(mode) (args)");
+    }
+
+    @Override
+    public String type() {
+        return TYPE_PIXEL;
+    }
+
+    @Override
+    public String channel() {
+        return CHANNEL_PIXELS;
+    }
+
+    @Override
+    public Permissions[] perms() {
+        return new Permissions[0];
+    }
+
+    @Override
+    public boolean requiresArgs() {
+        return false;
+    }
+
+    @Override
+    public boolean doAdminLogging() {
+        return false;
+    }
+
+    @Override
+    public String dualDescription() {
+        return null;
+    }
+
+    @Override
+    public String dualUsage() {
+        return null;
+    }
+
+    @Override
+    public String dualType() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] dualPerms() {
+        return new Permissions[0];
+    }
+}
diff --git a/src/main/java/Commands/Pixels/Pixels.java b/src/main/java/com/github/vaerys/commands/pixels/Pixels.java
similarity index 55%
rename from src/main/java/Commands/Pixels/Pixels.java
rename to src/main/java/com/github/vaerys/commands/pixels/Pixels.java
index 301d8313..4d61e254 100644
--- a/src/main/java/Commands/Pixels/Pixels.java
+++ b/src/main/java/com/github/vaerys/commands/pixels/Pixels.java
@@ -1,12 +1,14 @@
-package Commands.Pixels;
-
-import Commands.CommandObject;
-import Handlers.XpHandler;
-import Interfaces.Command;
-import Main.Globals;
-import Main.Utility;
-import Objects.UserTypeObject;
-import Objects.XEmbedBuilder;
+package com.github.vaerys.commands.pixels;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.enums.UserSetting;
+import com.github.vaerys.handlers.XpHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -19,27 +21,33 @@ public class Pixels implements Command {
     @Override
     public String execute(String args, CommandObject command) {
         XEmbedBuilder builder = new XEmbedBuilder();
-        IUser iUser = command.author;
-        if (command.message.getMentions().size() > 0) {
-            iUser = command.message.getMentions().get(0);
+        UserObject user = command.user;
+        if (args != null && !args.isEmpty()) {
+            user = Utility.getUser(command, args, true);
+            if (user == null) {
+                return "> Could not find user.";
+            }
         }
-        UserTypeObject user = command.guildUsers.getUserByID(iUser.getStringID());
+        if (user.isPrivateProfile(command.guild) && user.longID != command.user.longID) {
+            return "> User has set their profile to private.";
+        }
+        ProfileObject profile = command.guild.users.getUserByID(user.stringID);
         if (user == null) {
             return "> That user currently does not have a profile.";
         }
         String xpTitle = "Total Pixels: ";
-        String xpTotal = NumberFormat.getInstance().format(user.getXP());
+        String xpTotal = NumberFormat.getInstance().format(profile.getXP());
         String levelTitle = "Level Progress: ";
 
         String rankTitle = "Rank: ";
         String rankTotal;
-        if (XpHandler.rank(command.guildUsers, command.guild, user.getID()) != -1 && user.getXP() != 0) {
-            rankTotal = XpHandler.rank(command.guildUsers, command.guild, user.getID()) + "/" + XpHandler.totalRanked(command);
+        if (XpHandler.rank(command.guild.users, command.guild.get(), profile.getID()) != -1 && profile.getXP() != 0) {
+            rankTotal = XpHandler.rank(command.guild.users, command.guild.get(), profile.getID()) + "/" + XpHandler.totalRanked(command);
         } else {
             rankTotal = "N/a";
         }
-        long xpForNext = XpHandler.levelToXP(user.getCurrentLevel() + 1);
-        long xpTillNext = XpHandler.totalXPForLevel(user.getCurrentLevel() + 1) - user.getXP();
+        long xpForNext = XpHandler.levelToXP(profile.getCurrentLevel() + 1);
+        long xpTillNext = XpHandler.totalXPForLevel(profile.getCurrentLevel() + 1) - profile.getXP();
         long xpProgress = xpForNext - xpTillNext;
         long percentToLvl = (xpProgress * 100) / xpForNext;
         StringBuilder xpBar = new StringBuilder("-------------------");
@@ -51,19 +59,23 @@ public String execute(String args, CommandObject command) {
             pos = xpBar.length();
         }
         xpBar.replace(pos, pos, "**>**");
-        String levelTotal = "**" + user.getCurrentLevel() + "** [" + xpBar.toString() + "] **" + (user.getCurrentLevel() + 1) + "**";
+        String levelTotal = "**" + profile.getCurrentLevel() + "** [" + xpBar.toString() + "] **" + (profile.getCurrentLevel() + 1) + "**";
 
         builder.withColor(Globals.pixelColour); //colour of pixels
-        builder.withAuthorName(iUser.getDisplayName(command.guild) + "'s Pixel stats.");
+        builder.withAuthorName(user.displayName + "'s Pixel stats.");
         builder.withAuthorIcon("http://i.imgur.com/r5usgN7.png"); //pixel icon
         builder.appendField(xpTitle, xpTotal, true);
         builder.appendField(rankTitle, rankTotal, true);
-        if (user.getXP() != 0) {
+        if (profile.getXP() != 0) {
             builder.appendField(levelTitle, levelTotal, false);
         } else {
             builder.appendField(levelTitle, "N/a", false);
         }
-        Utility.sendEmbedMessage("", builder, command.channel);
+        if (user.getProfile(command.guild).getSettings().contains(UserSetting.PRIVATE_PROFILE)) {
+            Utility.sendEmbedMessage("", builder, command.user.get().getOrCreatePMChannel());
+            return "> Pixels sent to your Direct messages.";
+        }
+        Utility.sendEmbedMessage("", builder, command.channel.get());
         return null;
 
     }
diff --git a/src/main/java/Commands/Pixels/Rank.java b/src/main/java/com/github/vaerys/commands/pixels/Rank.java
similarity index 58%
rename from src/main/java/Commands/Pixels/Rank.java
rename to src/main/java/com/github/vaerys/commands/pixels/Rank.java
index f091fa07..cb8d6bbc 100644
--- a/src/main/java/Commands/Pixels/Rank.java
+++ b/src/main/java/com/github/vaerys/commands/pixels/Rank.java
@@ -1,11 +1,12 @@
-package Commands.Pixels;
-
-import Commands.CommandObject;
-import Handlers.XpHandler;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.UserTypeObject;
-import Objects.XEmbedBuilder;
+package com.github.vaerys.commands.pixels;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.XpHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -16,32 +17,42 @@ public class Rank implements Command {
 
     @Override
     public String execute(String args, CommandObject command) {
-        IUser user = command.author;
+        UserObject user = command.user;
         String error = "> Cannot get rank stats for this user.";
-        if (command.message.getMentions().size() > 0) {
-            user = command.message.getMentions().get(0);
+        if (args != null && !args.isEmpty()) {
+            UserObject userObject = Utility.getUser(command, args, true);
+            if (userObject != null) {
+                user = userObject;
+            } else {
+                return "> Could not find user.";
+            }
+        }
+        if (user.isPrivateProfile(command.guild) && user.longID != command.user.longID) {
+            return "> User has set their profile to private.";
+        } else if (user.isPrivateProfile(command.guild) && user.longID == command.user.longID) {
+            return "> You cannot see your ranking as you have set your profile to private.";
         }
         //grab a copy of the list
-        ArrayList<UserTypeObject> users = (ArrayList<UserTypeObject>) command.guildUsers.getUsers().clone();
-        //sort users by Xp in ascending order (lowest Xp to highest XP).
+        ArrayList<ProfileObject> users = (ArrayList<ProfileObject>) command.guild.users.getProfiles().clone();
+        //sort profiles by Xp in ascending order (lowest Xp to highest XP).
         Utility.sortUserObjects(users, true);
         //test to see if said user actually has rank stats.
-        if (XpHandler.rank(command.guildUsers, command.guild, user.getStringID()) == -1) {
+        if (XpHandler.rank(command.guild.users, command.guild.get(), user.stringID) == -1) {
             return error;
         }
         //build the Array of stats
         for (int i = 0; i < users.size(); i++) {
-            if (users.get(i).getID().equals(user.getStringID())) {
-                ArrayList<UserTypeObject> ranks = new ArrayList();
+            if (users.get(i).getID().equals(user.stringID)) {
+                ArrayList<ProfileObject> ranks = new ArrayList();
                 ArrayList<String> response = new ArrayList();
 
                 int addedTop = 0;
                 int addedBottom = 0;
                 int posTop = 0;
                 int posBottom = 0;
-                //add users above
+                //add profiles above
                 while (addedTop < 3 && i + posTop < users.size()) {
-                    if (!user.getStringID().equals(users.get(i + posTop).getID()) && XpHandler.rank(command.guildUsers, command.guild, users.get(i + posTop).getID()) != -1) {
+                    if (!user.stringID.equals(users.get(i + posTop).getID()) && XpHandler.rank(command.guild.users, command.guild.get(), users.get(i + posTop).getID()) != -1) {
                         addedTop++;
                         ranks.add(users.get(i + posTop));
                     }
@@ -51,31 +62,31 @@ public String execute(String args, CommandObject command) {
                 ranks.add(users.get(i));
                 //add user below
                 while (addedBottom < 3 && i + posBottom > 0) {
-                    if (!user.getStringID().equals(users.get(i + posBottom).getID()) && XpHandler.rank(command.guildUsers, command.guild, users.get(i + posBottom).getID()) != -1) {
+                    if (!user.stringID.equals(users.get(i + posBottom).getID()) && XpHandler.rank(command.guild.users, command.guild.get(), users.get(i + posBottom).getID()) != -1) {
                         addedBottom++;
                         ranks.add(users.get(i + posBottom));
                     }
                     posBottom--;
                 }
-                //sort ranked users
+                //sort ranked profiles
                 Utility.sortUserObjects(ranks, false);
                 //format rank stats
-                for (UserTypeObject r : ranks) {
-                    IUser ranked = command.guild.getUserByID(r.getID());
-                    String rankPos = "**" + XpHandler.rank(command.guildUsers, command.guild, r.getID()) + "** - ";
-                    String toFormat = ranked.getDisplayName(command.guild)
+                for (ProfileObject r : ranks) {
+                    IUser ranked = command.guild.get().getUserByID(r.getID());
+                    String rankPos = "**" + XpHandler.rank(command.guild.users, command.guild.get(), r.getID()) + "** - ";
+                    String toFormat = ranked.getDisplayName(command.guild.get())
                             + "\n " + indent + "`Level: " + r.getCurrentLevel() + ", Pixels: " + NumberFormat.getInstance().format(r.getXP()) + "`";
-                    if (r.getID().equals(user.getStringID())) {
+                    if (r.getID().equals(user.stringID)) {
                         response.add(rankPos + spacer + "**" + toFormat + "**");
                     } else {
                         response.add(rankPos + toFormat);
                     }
                 }
                 XEmbedBuilder builder = new XEmbedBuilder();
-                builder.withTitle("Rank stats for: " + user.getDisplayName(command.guild));
+                builder.withTitle("Rank stats for: " + user.displayName);
                 builder.withDesc(Utility.listFormatter(response, false));
-                builder.withColor(Utility.getUsersColour(command.botUser, command.guild));
-                Utility.sendEmbedMessage("", builder, command.channel);
+                builder.withColor(command.client.color);
+                Utility.sendEmbedMessage("", builder, command.channel.get());
                 return null;
             }
         }
diff --git a/src/main/java/Commands/Pixels/SetLevel.java b/src/main/java/com/github/vaerys/commands/pixels/SetLevel.java
similarity index 54%
rename from src/main/java/Commands/Pixels/SetLevel.java
rename to src/main/java/com/github/vaerys/commands/pixels/SetLevel.java
index 193f8b5c..e5579042 100644
--- a/src/main/java/Commands/Pixels/SetLevel.java
+++ b/src/main/java/com/github/vaerys/commands/pixels/SetLevel.java
@@ -1,11 +1,12 @@
-package Commands.Pixels;
+package com.github.vaerys.commands.pixels;
 
-import Commands.CommandObject;
-import Handlers.XpHandler;
-import Interfaces.Command;
-import Objects.RewardRoleObject;
-import Objects.SplitFirstObject;
-import Objects.UserTypeObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.XpHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.SplitFirstObject;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -16,27 +17,23 @@ public class SetLevel implements Command {
     @Override
     public String execute(String args, CommandObject command) {
         SplitFirstObject xpArgs = new SplitFirstObject(args);
+        UserObject user = Utility.getUser(command, xpArgs.getFirstWord(), false);
+        if (user == null) {
+            return "> Could not find user.";
+        }
         try {
-            long level = Long.parseLong(xpArgs.getFirstWord());
+            long level = Long.parseLong(xpArgs.getRest());
             long xp = XpHandler.totalXPForLevel(level);
-            if (command.message.getMentions().size() == 0) {
-                return "> no user found";
+            ProfileObject userObject = user.getProfile(command.guild);
+            if (userObject != null) {
+                userObject.setXp(xp);
+                userObject.removeLevelFloor();
+                XpHandler.checkUsersRoles(user.stringID, command.guild);
+                return "> " + user.displayName + "'s Level is now set to: **" + level + "**";
             } else {
-                IUser user = command.message.getMentions().get(0);
-                UserTypeObject userObject = command.guildUsers.getUserByID(user.getStringID());
-                if (userObject != null) {
-                    userObject.setXp(xp);
-                    RewardRoleObject reward = XpHandler.rewardForLevel(userObject.getCurrentLevel(),command);
-                    if (reward != null){
-                        userObject.setRewardID(reward.getRoleID());
-                        XpHandler.checkUsersRoles(user.getStringID(),command.guildContent);
-                    }
-                    return "> User's Level is now set to: **" + xpArgs.getFirstWord() + "**";
-                } else {
-                    return "> an error occurred.";
-                }
+                return "> User does not have a profile.";
             }
-        }catch(NumberFormatException e){
+        } catch (NumberFormatException e) {
             return "> Invalid number";
         }
     }
@@ -53,7 +50,7 @@ public String description() {
 
     @Override
     public String usage() {
-        return "[Level] [@User]";
+        return "[@User] [Level]";
     }
 
     @Override
diff --git a/src/main/java/Commands/Pixels/SetLevelUpReaction.java b/src/main/java/com/github/vaerys/commands/pixels/SetLevelUpReaction.java
similarity index 84%
rename from src/main/java/Commands/Pixels/SetLevelUpReaction.java
rename to src/main/java/com/github/vaerys/commands/pixels/SetLevelUpReaction.java
index 5bffa8f5..7c20cb5e 100644
--- a/src/main/java/Commands/Pixels/SetLevelUpReaction.java
+++ b/src/main/java/com/github/vaerys/commands/pixels/SetLevelUpReaction.java
@@ -1,11 +1,10 @@
-package Commands.Pixels;
+package com.github.vaerys.commands.pixels;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Objects.SplitFirstObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.objects.SplitFirstObject;
 import com.vdurmont.emoji.Emoji;
 import com.vdurmont.emoji.EmojiManager;
-import sx.blah.discord.handle.impl.obj.Guild;
 import sx.blah.discord.handle.obj.IEmoji;
 import sx.blah.discord.handle.obj.Permissions;
 import sx.blah.discord.util.MessageTokenizer;
@@ -14,11 +13,11 @@ public class SetLevelUpReaction implements Command {
 
     @Override
     public String execute(String args, CommandObject command) {
-        MessageTokenizer messageTokenizer = new MessageTokenizer(command.message);
+        MessageTokenizer messageTokenizer = new MessageTokenizer(command.message.get());
         Emoji emoji = EmojiManager.getByUnicode(new SplitFirstObject(args).getFirstWord());
         IEmoji customEmoji = null;
         if (args.equalsIgnoreCase("Remove")) {
-            command.guildConfig.levelUpReaction = "null";
+            command.guild.config.levelUpReaction = "null";
             return "> Level Up reaction was removed.";
         }
         if (messageTokenizer.hasNextEmoji()) {
@@ -27,10 +26,10 @@ public String execute(String args, CommandObject command) {
         if (emoji == null && customEmoji == null) {
             return "> Not a valid Emoji.";
         } else if (emoji != null) {
-            command.guildConfig.levelUpReaction = emoji.getUnicode();
+            command.guild.config.levelUpReaction = emoji.getUnicode();
             return "> The message a user sent to level up will now be reacted with " + emoji.getUnicode() + ".";
         } else {
-            command.guildConfig.levelUpReaction = customEmoji.getName();
+            command.guild.config.levelUpReaction = customEmoji.getStringID();
             return "> The message a user sent to level up will now be reacted with " + customEmoji.toString() + ".";
         }
     }
diff --git a/src/main/java/Commands/Pixels/SetPixelModifier.java b/src/main/java/com/github/vaerys/commands/pixels/SetPixelModifier.java
similarity index 89%
rename from src/main/java/Commands/Pixels/SetPixelModifier.java
rename to src/main/java/com/github/vaerys/commands/pixels/SetPixelModifier.java
index fb34d897..2d4304b0 100644
--- a/src/main/java/Commands/Pixels/SetPixelModifier.java
+++ b/src/main/java/com/github/vaerys/commands/pixels/SetPixelModifier.java
@@ -1,7 +1,7 @@
-package Commands.Pixels;
+package com.github.vaerys.commands.pixels;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -18,7 +18,7 @@ public String execute(String args, CommandObject command) {
             if (multiplier > 5){
                 return "> Cannot set a multiplier over 5x";
             }
-            command.guildConfig.xpModifier = multiplier;
+            command.guild.config.xpModifier = multiplier;
             return "> Pixel Multiplier is now set to **x" + multiplier + "**.";
         }catch (NumberFormatException e){
             return "> Not a valid Number.";
diff --git a/src/main/java/Commands/Pixels/SetXp.java b/src/main/java/com/github/vaerys/commands/pixels/SetXp.java
similarity index 54%
rename from src/main/java/Commands/Pixels/SetXp.java
rename to src/main/java/com/github/vaerys/commands/pixels/SetXp.java
index ef074c4e..e6229f0d 100644
--- a/src/main/java/Commands/Pixels/SetXp.java
+++ b/src/main/java/com/github/vaerys/commands/pixels/SetXp.java
@@ -1,11 +1,12 @@
-package Commands.Pixels;
+package com.github.vaerys.commands.pixels;
 
-import Commands.CommandObject;
-import Handlers.XpHandler;
-import Interfaces.Command;
-import Objects.RewardRoleObject;
-import Objects.SplitFirstObject;
-import Objects.UserTypeObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.XpHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.SplitFirstObject;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -16,26 +17,22 @@ public class SetXp implements Command {
     @Override
     public String execute(String args, CommandObject command) {
         SplitFirstObject xpArgs = new SplitFirstObject(args);
+        UserObject user = Utility.getUser(command, xpArgs.getFirstWord(), false);
+        if (user == null) {
+            return "> Could not find user.";
+        }
         try {
-            long xp = Long.parseLong(xpArgs.getFirstWord());
-            if (command.message.getMentions().size() == 0) {
-                return "> no user found";
+            long xp = Long.parseLong(xpArgs.getRest());
+            ProfileObject userObject = user.getProfile(command.guild);
+            if (userObject != null) {
+                userObject.setXp(xp);
+                userObject.removeLevelFloor();
+                XpHandler.checkUsersRoles(user.stringID, command.guild);
+                return "> " + user.displayName + "'s Pixels is now set to: **" + xp + "**";
             } else {
-                IUser user = command.message.getMentions().get(0);
-                UserTypeObject userObject = command.guildUsers.getUserByID(user.getStringID());
-                if (userObject != null) {
-                    userObject.setXp(xp);
-                    RewardRoleObject reward = XpHandler.rewardForLevel(userObject.getCurrentLevel(),command);
-                    if (reward != null){
-                        userObject.setRewardID(reward.getRoleID());
-                        XpHandler.checkUsersRoles(user.getStringID(),command.guildContent);
-                    }
-                    return "> User's XP is now set to: **" + xpArgs.getFirstWord() + "**";
-                } else {
-                    return "> an error occurred.";
-                }
+                return "> User does not have a profile.";
             }
-        }catch(NumberFormatException e){
+        } catch (NumberFormatException e) {
             return "> Invalid number";
         }
     }
@@ -52,7 +49,7 @@ public String description() {
 
     @Override
     public String usage() {
-        return "[xp] [@user]";
+        return "[@User] [Pixels]";
     }
 
     @Override
diff --git a/src/main/java/Commands/Pixels/TopTen.java b/src/main/java/com/github/vaerys/commands/pixels/TopTen.java
similarity index 64%
rename from src/main/java/Commands/Pixels/TopTen.java
rename to src/main/java/com/github/vaerys/commands/pixels/TopTen.java
index 5911c8ad..978f236a 100644
--- a/src/main/java/Commands/Pixels/TopTen.java
+++ b/src/main/java/com/github/vaerys/commands/pixels/TopTen.java
@@ -1,11 +1,11 @@
-package Commands.Pixels;
-
-import Commands.CommandObject;
-import Handlers.XpHandler;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.UserTypeObject;
-import Objects.XEmbedBuilder;
+package com.github.vaerys.commands.pixels;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.XpHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.IUser;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -16,11 +16,11 @@ public class TopTen implements Command {
 
     @Override
     public String execute(String args, CommandObject command) {
-        ArrayList<UserTypeObject> ranks = new ArrayList<>();
+        ArrayList<ProfileObject> ranks = new ArrayList<>();
         ArrayList<String> response = new ArrayList<>();
 
-        for (UserTypeObject u : command.guildUsers.getUsers()) {
-            long rank = XpHandler.rank(command.guildUsers, command.guild, u.getID());
+        for (ProfileObject u : command.guild.users.getProfiles()) {
+            long rank = XpHandler.rank(command.guild.users, command.guild.get(), u.getID());
             if (rank <= 10 && rank != -1) {
                 ranks.add(u);
             }
@@ -28,33 +28,33 @@ public String execute(String args, CommandObject command) {
 
         Utility.sortUserObjects(ranks, false);
         //format rank stats
-        for (UserTypeObject r : ranks) {
-            IUser ranked = command.guild.getUserByID(r.getID());
-            String rankPos = "**" + XpHandler.rank(command.guildUsers, command.guild, r.getID()) + "** - ";
-            StringBuilder toFormat = new StringBuilder(ranked.getDisplayName(command.guild));
+        for (ProfileObject r : ranks) {
+            IUser ranked = command.guild.get().getUserByID(r.getID());
+            String rankPos = "**" + XpHandler.rank(command.guild.users, command.guild.get(), r.getID()) + "** - ";
+            StringBuilder toFormat = new StringBuilder(ranked.getDisplayName(command.guild.get()));
             toFormat.append("\n " + indent + "`Level: " + r.getCurrentLevel() + ", Pixels: " + NumberFormat.getInstance().format(r.getXP()) + "`");
-            if (r.getID().equals(command.author.getStringID())) {
+            if (r.getID().equals(command.user.get().getStringID())) {
                 response.add(rankPos + spacer + "**" + toFormat + "**");
             } else {
                 response.add(rankPos + toFormat);
             }
         }
         XEmbedBuilder builder = new XEmbedBuilder();
-        builder.withTitle("Top Ten Users for the " + command.guild.getName() + " Server.");
+        builder.withTitle("Top Ten Users for the " + command.guild.get().getName() + " Server.");
         builder.withDesc(Utility.listFormatter(response, false));
-        builder.withColor(Utility.getUsersColour(command.botUser, command.guild));
-        Utility.sendEmbedMessage("", builder, command.channel);
+        builder.withColor(Utility.getUsersColour(command.client.bot, command.guild.get()));
+        Utility.sendEmbedMessage("", builder, command.channel.get());
         return null;
     }
 
     @Override
     public String[] names() {
-        return new String[]{"TopTen"};
+        return new String[]{"TopTen","Top10"};
     }
 
     @Override
     public String description() {
-        return "Gives a list of the top ten users on the server.";
+        return "Gives a list of the top ten profiles on the server.";
     }
 
     @Override
diff --git a/src/main/java/Commands/Pixels/TopUserForRole.java b/src/main/java/com/github/vaerys/commands/pixels/TopUserForRole.java
similarity index 57%
rename from src/main/java/Commands/Pixels/TopUserForRole.java
rename to src/main/java/com/github/vaerys/commands/pixels/TopUserForRole.java
index d848b5f5..68d26302 100644
--- a/src/main/java/Commands/Pixels/TopUserForRole.java
+++ b/src/main/java/com/github/vaerys/commands/pixels/TopUserForRole.java
@@ -1,10 +1,10 @@
-package Commands.Pixels;
+package com.github.vaerys.commands.pixels;
 
-import Commands.CommandObject;
-import Handlers.XpHandler;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.UserTypeObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.XpHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.ProfileObject;
 import sx.blah.discord.handle.obj.IMessage;
 import sx.blah.discord.handle.obj.IRole;
 import sx.blah.discord.handle.obj.IUser;
@@ -16,29 +16,29 @@ public class TopUserForRole implements Command {
 
     @Override
     public String execute(String args, CommandObject command) {
-        IRole role = Utility.getRoleFromName(args, command.guild);
+        IRole role = Utility.getRoleFromName(args, command.guild.get());
         if (role == null) {
             return "> Invalid Role.";
         }
-        IMessage working = Utility.sendMessage("`Working...`", command.channel).get();
+        IMessage working = Utility.sendMessage("`Working...`", command.channel.get()).get();
         IUser topUser = null;
-        UserTypeObject topUserObject;
-        UserTypeObject userTypeObject;
-        for (IUser user : command.guild.getUsers()) {
-            if (user.getRolesForGuild(command.guild).contains(role)) {
+        ProfileObject topUserObject;
+        ProfileObject userTypeObject;
+        for (IUser user : command.guild.get().getUsers()) {
+            if (user.getRolesForGuild(command.guild.get()).contains(role)) {
                 if (topUser == null) {
                     topUser = user;
-                    topUserObject = command.guildUsers.getUserByID(topUser.getStringID());
+                    topUserObject = command.guild.users.getUserByID(topUser.getStringID());
                     if (topUserObject == null) {
                         topUser = null;
-                    } else if (XpHandler.rank(command.guildUsers, command.guild, topUserObject.getID()) == -1) {
+                    } else if (XpHandler.rank(command.guild.users, command.guild.get(), topUserObject.getID()) == -1) {
                         topUser = null;
                     }
                 } else {
-                    userTypeObject = command.guildUsers.getUserByID(user.getStringID());
-                    topUserObject = command.guildUsers.getUserByID(topUser.getStringID());
+                    userTypeObject = command.guild.users.getUserByID(user.getStringID());
+                    topUserObject = command.guild.users.getUserByID(topUser.getStringID());
                     if (topUserObject != null && userTypeObject != null) {
-                        if (XpHandler.rank(command.guildUsers, command.guild, userTypeObject.getID()) != -1) {
+                        if (XpHandler.rank(command.guild.users, command.guild.get(), userTypeObject.getID()) != -1) {
                             if (topUserObject.getXP() < userTypeObject.getXP()) {
                                 topUser = user;
                             }
@@ -47,12 +47,16 @@ public String execute(String args, CommandObject command) {
                 }
             }
         }
-        topUserObject = command.guildUsers.getUserByID(topUser.getStringID());
-        Utility.deleteMessage(working);
-        if (topUserObject != null) {
-            return "> @" + topUser.getName() + "#" + topUser.getDiscriminator() + ", Pixels: " + NumberFormat.getInstance().format(topUserObject.getXP()) + ", Level: " + topUserObject.getCurrentLevel() + ", UserID: " + topUserObject.getID();
-        } else {
-            return "> User could not be found.";
+        try {
+            topUserObject = command.guild.users.getUserByID(topUser.getStringID());
+            Utility.deleteMessage(working);
+            if (topUserObject != null) {
+                return "> @" + topUser.getName() + "#" + topUser.getDiscriminator() + ", Pixels: " + NumberFormat.getInstance().format(topUserObject.getXP()) + ", Level: " + topUserObject.getCurrentLevel() + ", UserID: " + topUserObject.getID();
+            } else {
+                return "> User could not be found.";
+            }
+        } catch (NullPointerException e) {
+            return "> An error occurred.";
         }
     }
 
diff --git a/src/main/java/Commands/Pixels/TransferLevels.java b/src/main/java/com/github/vaerys/commands/pixels/TransferLevels.java
similarity index 69%
rename from src/main/java/Commands/Pixels/TransferLevels.java
rename to src/main/java/com/github/vaerys/commands/pixels/TransferLevels.java
index 0fe2a93b..80c71ca7 100644
--- a/src/main/java/Commands/Pixels/TransferLevels.java
+++ b/src/main/java/com/github/vaerys/commands/pixels/TransferLevels.java
@@ -1,11 +1,11 @@
-package Commands.Pixels;
-
-import Commands.CommandObject;
-import Handlers.XpHandler;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.RewardRoleObject;
-import Objects.UserTypeObject;
+package com.github.vaerys.commands.pixels;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.XpHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.RewardRoleObject;
 import sx.blah.discord.handle.obj.IMessage;
 import sx.blah.discord.handle.obj.IRole;
 import sx.blah.discord.handle.obj.IUser;
@@ -20,39 +20,40 @@
 public class TransferLevels implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        if (command.guildConfig.xpGain) {
+        if (command.guild.config.xpGain) {
             return "> Cannot transfer levels, xp gain enabled.";
         }
-        if (command.guildConfig.getRewardRoles().size() == 0) {
+        if (command.guild.config.getRewardRoles().size() == 0) {
             return "> No rewards available to grant. cannot transfer levels";
         }
-        IMessage message = Utility.sendMessage("`Working...`", command.channel).get();
+        IMessage message = Utility.sendMessage("`Working...`", command.channel.get()).get();
 
-        Utility.sortRewards(command.guildConfig.getRewardRoles());
-        for (IUser user : command.guild.getUsers()) {
+        Utility.sortRewards(command.guild.config.getRewardRoles());
+        for (IUser user : command.guild.get().getUsers()) {
             if (!user.isBot()) {
-                UserTypeObject uObject = command.guildUsers.getUserByID(user.getStringID());
+                ProfileObject uObject = command.guild.users.getUserByID(user.getStringID());
                 if (uObject == null) {
-                    uObject = new UserTypeObject(user.getStringID());
+                    uObject = new ProfileObject(user.getStringID());
                 }
                 uObject.lastTalked = ZonedDateTime.now(ZoneOffset.UTC).toEpochSecond();
-                uObject.setRewardID(-1);
+//                uObject.setRewardID(-1);
                 uObject.setXp(0);
                 uObject.setCurrentLevel(-1);
 
-                for (RewardRoleObject r : command.guildConfig.getRewardRoles()) {
-                    for (IRole uRole : user.getRolesForGuild(command.guild)) {
+                for (RewardRoleObject r : command.guild.config.getRewardRoles()) {
+                    for (IRole uRole : user.getRolesForGuild(command.guild.get())) {
                         if (r.getRoleID() == uRole.getLongID()) {
                             uObject.setXp(XpHandler.totalXPForLevel(r.getLevel()));
-                            uObject.setRewardID(r.getRoleID());
+//                            uObject.setRewardID(r.getRoleID());
                             uObject.setCurrentLevel(r.getLevel());
                         }
                     }
                 }
+                XpHandler.checkUsersRoles(uObject.getID(), command.guild);
             }
         }
         Utility.deleteMessage(message);
-        command.guildConfig.xpGain = true;
+        command.guild.config.xpGain = true;
         return "> Transfer Complete.";
     }
 
diff --git a/src/main/java/Commands/RoleSelect/CosmeticRoles.java b/src/main/java/com/github/vaerys/commands/roleSelect/CosmeticRoles.java
similarity index 82%
rename from src/main/java/Commands/RoleSelect/CosmeticRoles.java
rename to src/main/java/com/github/vaerys/commands/roleSelect/CosmeticRoles.java
index 21fe32b2..c4a2b779 100644
--- a/src/main/java/Commands/RoleSelect/CosmeticRoles.java
+++ b/src/main/java/com/github/vaerys/commands/roleSelect/CosmeticRoles.java
@@ -1,10 +1,10 @@
-package Commands.RoleSelect;
+package com.github.vaerys.commands.roleSelect;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Constants;
-import Main.Utility;
-import Objects.SplitFirstObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.SplitFirstObject;
 import sx.blah.discord.handle.obj.IRole;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -24,31 +24,31 @@ public String execute(String args, CommandObject command) {
         Boolean isAdding = Utility.testModifier(modif.getFirstWord());
         if (isAdding != null) {
             //test the permissions of the user to make sure they can modify the role list.
-            if (Utility.testForPerms(dualPerms(), command.author, command.guild)) {
-                IRole role = Utility.getRoleFromName(modif.getRest(), command.guild);
+            if (Utility.testForPerms(dualPerms(), command.user.get(), command.guild.get())) {
+                IRole role = Utility.getRoleFromName(modif.getRest(), command.guild.get());
                 if (role == null) {
                     return "> **" + args + "** is not a valid Role Name.";
                 } else {
                     //tests to see if the bot is allowed to mess with a role.
-                    if (!Utility.testUserHierarchy(command.botUser, role, command.guild)) {
+                    if (!Utility.testUserHierarchy(command.client.bot, role, command.guild.get())) {
                         return "> I do not have permission to modify the **" + role.getName() + "** role.";
                     }
                     //test the user's hierarchy to make sure that the are allowed to mess with that role.
-                    if (Utility.testUserHierarchy(command.author, role, command.guild)) {
+                    if (Utility.testUserHierarchy(command.user.get(), role, command.guild.get())) {
                         // do if modifier is true
                         if (isAdding) {
                             //check for the role and add if its not a cosmetic role.
-                            if (command.guildConfig.isRoleCosmetic(role.getLongID())) {
+                            if (command.guild.config.isRoleCosmetic(role.getLongID())) {
                                 return "> The **" + role.getName() + "** role is already listed as a cosmetic role.";
                             } else {
-                                command.guildConfig.getCosmeticRoleIDs().add(role.getLongID());
+                                command.guild.config.getCosmeticRoleIDs().add(role.getLongID());
                                 return "> The **" + role.getName() + "** role was added to the cosmetic role list.";
                             }
                             //do if modifier is false
                         } else {
                             //check for the role and remove if it is a cosmetic role.
-                            if (command.guildConfig.isRoleCosmetic(role.getLongID())) {
-                                Iterator iterator = command.guildConfig.getCosmeticRoleIDs().listIterator();
+                            if (command.guild.config.isRoleCosmetic(role.getLongID())) {
+                                Iterator iterator = command.guild.config.getCosmeticRoleIDs().listIterator();
                                 while (iterator.hasNext()) {
                                     long id = (long) iterator.next();
                                     if (role.getLongID() == id) {
@@ -65,7 +65,7 @@ public String execute(String args, CommandObject command) {
                     }
                 }
             } else {
-                return command.notAllowed;
+                return command.user.notAllowed;
             }
             //do user role modification
         } else {
@@ -74,12 +74,12 @@ public String execute(String args, CommandObject command) {
                 return Constants.ERROR_BRACKETS + "\n" + Utility.getCommandInfo(this, command);
             }
             if (args.toLowerCase().endsWith("/remove")) {
-                return "> Did you mean `" + command.guildConfig.getPrefixCommand() + names()[0] + " " + args.replaceAll("(?i)/remove", "") + "`?";
+                return "> Did you mean `" + command.guild.config.getPrefixCommand() + names()[0] + " " + args.replaceAll("(?i)/remove", "") + "`?";
             }
-            List<IRole> userRoles = command.authorRoles;
+            List<IRole> userRoles = command.user.roles;
             String response = Constants.ERROR_UPDATING_ROLE;
             //check if role is valid
-            IRole role = Utility.getRoleFromName(args, command.guild);
+            IRole role = Utility.getRoleFromName(args, command.guild.get());
             if (role == null && !args.equalsIgnoreCase("remove")) {
                 return "> **" + args + "** is not a valid Role Name.";
                 //if args = remove. remove the user's cosmetic role
@@ -88,7 +88,7 @@ public String execute(String args, CommandObject command) {
                 boolean removedSomething = false;
                 while (iterator.hasNext()) {
                     IRole userRole = (IRole) iterator.next();
-                    if (command.guildConfig.isRoleCosmetic(userRole.getLongID())) {
+                    if (command.guild.config.isRoleCosmetic(userRole.getLongID())) {
                         iterator.remove();
                         removedSomething = true;
                     }
@@ -101,9 +101,9 @@ public String execute(String args, CommandObject command) {
                 }
             } else {
                 //check if role is cosmetic
-                if (command.guildConfig.isRoleCosmetic(role.getLongID())) {
+                if (command.guild.config.isRoleCosmetic(role.getLongID())) {
                     //check to see if roles are toggles
-                    if (command.guildConfig.roleIsToggle) {
+                    if (command.guild.config.roleIsToggle) {
                         //if user has role, remove it.
                         if (userRoles.contains(role)) {
                             ListIterator iterator = userRoles.listIterator();
@@ -129,7 +129,7 @@ public String execute(String args, CommandObject command) {
                             ListIterator iterator = userRoles.listIterator();
                             while (iterator.hasNext()) {
                                 IRole userRole = (IRole) iterator.next();
-                                if (command.guildConfig.isRoleCosmetic(userRole.getLongID())) {
+                                if (command.guild.config.isRoleCosmetic(userRole.getLongID())) {
                                     iterator.remove();
                                 }
                             }
@@ -142,7 +142,7 @@ public String execute(String args, CommandObject command) {
                 }
             }
             // push the changes to the user's roles.
-            if (Utility.roleManagement(command.author, command.guild, userRoles).get()) {
+            if (Utility.roleManagement(command.user.get(), command.guild.get(), userRoles).get()) {
                 return response;
             } else {
                 return Constants.ERROR_UPDATING_ROLE;
diff --git a/src/main/java/Commands/RoleSelect/ListModifs.java b/src/main/java/com/github/vaerys/commands/roleSelect/ListModifs.java
similarity index 78%
rename from src/main/java/Commands/RoleSelect/ListModifs.java
rename to src/main/java/com/github/vaerys/commands/roleSelect/ListModifs.java
index 641c38c7..f5e03e63 100644
--- a/src/main/java/Commands/RoleSelect/ListModifs.java
+++ b/src/main/java/com/github/vaerys/commands/roleSelect/ListModifs.java
@@ -1,9 +1,9 @@
-package Commands.RoleSelect;
+package com.github.vaerys.commands.roleSelect;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.XEmbedBuilder;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.IRole;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -18,14 +18,14 @@ public String execute(String args, CommandObject command) {
         String title = "> Here are the **Modifier** roles you can choose from:\n";
         ArrayList<String> list = new ArrayList<>();
         XEmbedBuilder builder = new XEmbedBuilder();
-        for (long l : command.guildConfig.getModifierRoleIDs()) {
-            IRole role = command.guild.getRoleByID(l);
+        for (long l : command.guild.config.getModifierRoleIDs()) {
+            IRole role = command.guild.get().getRoleByID(l);
             list.add(role.getName());
         }
         Utility.listFormatterEmbed(title, builder, list, true);
         builder.appendField(spacer, Utility.getCommandInfo(new ModifierRoles(), command), false);
-        builder.withColor(Utility.getUsersColour(command.client.getOurUser(), command.guild));
-        Utility.sendEmbedMessage("", builder, command.channel);
+        builder.withColor(command.client.color);
+        Utility.sendEmbedMessage("", builder, command.channel.get());
         return null;
     }
 
diff --git a/src/main/java/Commands/RoleSelect/ListRoles.java b/src/main/java/com/github/vaerys/commands/roleSelect/ListRoles.java
similarity index 80%
rename from src/main/java/Commands/RoleSelect/ListRoles.java
rename to src/main/java/com/github/vaerys/commands/roleSelect/ListRoles.java
index 73a1edb6..05a54d15 100644
--- a/src/main/java/Commands/RoleSelect/ListRoles.java
+++ b/src/main/java/com/github/vaerys/commands/roleSelect/ListRoles.java
@@ -1,9 +1,9 @@
-package Commands.RoleSelect;
+package com.github.vaerys.commands.roleSelect;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.XEmbedBuilder;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.IRole;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -19,14 +19,14 @@ public String execute(String args, CommandObject command) {
         String title = "> Here are the **Cosmetic** roles you can choose from:\n";
         ArrayList<String> list = new ArrayList<>();
         XEmbedBuilder builder = new XEmbedBuilder();
-        for (long l : command.guildConfig.getCosmeticRoleIDs()) {
-            IRole role = command.guild.getRoleByID(l);
+        for (long l : command.guild.config.getCosmeticRoleIDs()) {
+            IRole role = command.guild.get().getRoleByID(l);
             list.add(role.getName());
         }
         Utility.listFormatterEmbed(title, builder, list, true);
         builder.appendField(spacer, Utility.getCommandInfo(new CosmeticRoles(), command), false);
-        builder.withColor(Utility.getUsersColour(command.client.getOurUser(), command.guild));
-        Utility.sendEmbedMessage("", builder, command.channel);
+        builder.withColor(Utility.getUsersColour(command.client.bot, command.guild.get()));
+        Utility.sendEmbedMessage("", builder, command.channel.get());
         return null;
     }
 
diff --git a/src/main/java/Commands/RoleSelect/ModifierRoles.java b/src/main/java/com/github/vaerys/commands/roleSelect/ModifierRoles.java
similarity index 81%
rename from src/main/java/Commands/RoleSelect/ModifierRoles.java
rename to src/main/java/com/github/vaerys/commands/roleSelect/ModifierRoles.java
index 5a96af0f..e392cd35 100644
--- a/src/main/java/Commands/RoleSelect/ModifierRoles.java
+++ b/src/main/java/com/github/vaerys/commands/roleSelect/ModifierRoles.java
@@ -1,10 +1,10 @@
-package Commands.RoleSelect;
+package com.github.vaerys.commands.roleSelect;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Constants;
-import Main.Utility;
-import Objects.SplitFirstObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.SplitFirstObject;
 import sx.blah.discord.handle.obj.IRole;
 import sx.blah.discord.handle.obj.Permissions;
 
@@ -24,31 +24,31 @@ public String execute(String args, CommandObject command) {
         Boolean isAdding = Utility.testModifier(modif.getFirstWord());
         if (isAdding != null) {
             //test the permissions of the user to make sure they can modify the role list.
-            if (Utility.testForPerms(dualPerms(), command.author, command.guild)) {
-                IRole role = Utility.getRoleFromName(modif.getRest(), command.guild);
+            if (Utility.testForPerms(dualPerms(), command.user.get(), command.guild.get())) {
+                IRole role = Utility.getRoleFromName(modif.getRest(), command.guild.get());
                 if (role == null) {
                     return "> **" + args + "** is not a valid Role Name.";
                 } else {
                     //tests to see if the bot is allowed to mess with a role.
-                    if (!Utility.testUserHierarchy(command.botUser,role,command.guild)){
+                    if (!Utility.testUserHierarchy(command.client.bot,role,command.guild.get())){
                         return "> I do not have permission to modify the **" + role.getName() + "** role.";
                     }
                     //test the user's hierarchy to make sure that the are allowed to mess with that role.
-                    if (Utility.testUserHierarchy(command.author, role, command.guild)) {
+                    if (Utility.testUserHierarchy(command.user.get(), role, command.guild.get())) {
                         // do if modifier is true
                         if (isAdding) {
                             //check for the role and add if its not a Modifier role.
-                            if (command.guildConfig.isRoleModifier(role.getLongID())) {
+                            if (command.guild.config.isRoleModifier(role.getLongID())) {
                                 return "> The **" + role.getName() + "** role is already listed as a modifier role.";
                             } else {
-                                command.guildConfig.getModifierRoleIDs().add(role.getLongID());
+                                command.guild.config.getModifierRoleIDs().add(role.getLongID());
                                 return "> The **" + role.getName() + "** role was added to the modifier role list.";
                             }
                             //do if modifier is false
                         } else {
                             //check for the role and remove if it is a Modifier role.
-                            if (command.guildConfig.isRoleModifier(role.getLongID())) {
-                                Iterator iterator = command.guildConfig.getModifierRoleIDs().listIterator();
+                            if (command.guild.config.isRoleModifier(role.getLongID())) {
+                                Iterator iterator = command.guild.config.getModifierRoleIDs().listIterator();
                                 while (iterator.hasNext()) {
                                     long id = (long) iterator.next();
                                     if (role.getLongID() == id) {
@@ -65,16 +65,16 @@ public String execute(String args, CommandObject command) {
                     }
                 }
             } else {
-                return command.notAllowed;
+                return command.user.notAllowed;
             }
         } else {
-            IRole role = Utility.getRoleFromName(args, command.guild);
-            List<IRole> userRoles = command.authorRoles;
+            IRole role = Utility.getRoleFromName(args, command.guild.get());
+            List<IRole> userRoles = command.user.roles;
             String response = Constants.ERROR_UPDATING_ROLE;
             if (role == null) {
                 return "> **" + args + "** is not a valid Role Name.";
             } else {
-                if (command.guildConfig.isRoleModifier(role.getLongID())) {
+                if (command.guild.config.isRoleModifier(role.getLongID())) {
                     //if user has role remove it
                     if (userRoles.contains(role)) {
                         ListIterator iterator = userRoles.listIterator();
@@ -91,7 +91,7 @@ public String execute(String args, CommandObject command) {
                         response = "> You have been granted the **" + role.getName() + "** role.";
                     }
                     //push changes
-                    if (Utility.roleManagement(command.author, command.guild, userRoles).get()) {
+                    if (Utility.roleManagement(command.user.get(), command.guild.get(), userRoles).get()) {
                         return response;
                     } else {
                         return Constants.ERROR_UPDATING_ROLE;
diff --git a/src/main/java/Commands/Servers/AddServer.java b/src/main/java/com/github/vaerys/commands/servers/AddServer.java
similarity index 86%
rename from src/main/java/Commands/Servers/AddServer.java
rename to src/main/java/com/github/vaerys/commands/servers/AddServer.java
index 425ac5be..0e741a7e 100644
--- a/src/main/java/Commands/Servers/AddServer.java
+++ b/src/main/java/com/github/vaerys/commands/servers/AddServer.java
@@ -1,7 +1,7 @@
-package Commands.Servers;
+package com.github.vaerys.commands.servers;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.util.ArrayList;
@@ -21,7 +21,7 @@ public String execute(String args, CommandObject command) {
         if (splitArgs.size() < 2) {
             return "> Cannot create server, Missing IP";
         }
-        return command.servers.addServer(command.authorSID, splitArgs.get(0), splitArgs.get(1), port);
+        return command.guild.servers.addServer(command.user.stringID, splitArgs.get(0), splitArgs.get(1), port);
     }
 
     @Override
diff --git a/src/main/java/Commands/Servers/DelServer.java b/src/main/java/com/github/vaerys/commands/servers/DelServer.java
similarity index 83%
rename from src/main/java/Commands/Servers/DelServer.java
rename to src/main/java/com/github/vaerys/commands/servers/DelServer.java
index 255dfdf7..9c20c43e 100644
--- a/src/main/java/Commands/Servers/DelServer.java
+++ b/src/main/java/com/github/vaerys/commands/servers/DelServer.java
@@ -1,7 +1,7 @@
-package Commands.Servers;
+package com.github.vaerys.commands.servers;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 /**
@@ -10,7 +10,7 @@
 public class DelServer implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        return command.servers.deleteServer(command.author.getStringID(), args, command.guild);
+        return command.guild.servers.deleteServer(command.user.get().getStringID(), args, command.guild.get());
     }
 
     @Override
diff --git a/src/main/java/Commands/Servers/EditServerDesc.java b/src/main/java/com/github/vaerys/commands/servers/EditServerDesc.java
similarity index 86%
rename from src/main/java/Commands/Servers/EditServerDesc.java
rename to src/main/java/com/github/vaerys/commands/servers/EditServerDesc.java
index e85d0cbe..7f625710 100644
--- a/src/main/java/Commands/Servers/EditServerDesc.java
+++ b/src/main/java/com/github/vaerys/commands/servers/EditServerDesc.java
@@ -1,7 +1,7 @@
-package Commands.Servers;
+package com.github.vaerys.commands.servers;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.util.ArrayList;
@@ -20,7 +20,7 @@ public String execute(String args, CommandObject command) {
             return "> Cannot edit server description, missing arguments.";
         }
         desc = args.replaceFirst(Pattern.quote(splitArgs.get(0) + " "), "");
-        return command.servers.editServerDesc(command.author.getStringID(), splitArgs.get(0), desc, command.guild);
+        return command.guild.servers.editServerDesc(command.user.get().getStringID(), splitArgs.get(0), desc, command.guild.get());
     }
 
     @Override
diff --git a/src/main/java/Commands/Servers/EditServerIP.java b/src/main/java/com/github/vaerys/commands/servers/EditServerIP.java
similarity index 85%
rename from src/main/java/Commands/Servers/EditServerIP.java
rename to src/main/java/com/github/vaerys/commands/servers/EditServerIP.java
index 0524ec33..72be23a2 100644
--- a/src/main/java/Commands/Servers/EditServerIP.java
+++ b/src/main/java/com/github/vaerys/commands/servers/EditServerIP.java
@@ -1,7 +1,7 @@
-package Commands.Servers;
+package com.github.vaerys.commands.servers;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.util.ArrayList;
@@ -21,7 +21,7 @@ public String execute(String args, CommandObject command) {
         if (splitArgs.size() < 2) {
             return "> Cannot edit server IP, missing arguments.";
         }
-        return command.servers.editIP(command.authorSID, splitArgs.get(0), splitArgs.get(1), port, command.guild);
+        return command.guild.servers.editIP(command.user.stringID, splitArgs.get(0), splitArgs.get(1), port, command.guild.get());
     }
 
     @Override
diff --git a/src/main/java/Commands/Servers/EditServerName.java b/src/main/java/com/github/vaerys/commands/servers/EditServerName.java
similarity index 84%
rename from src/main/java/Commands/Servers/EditServerName.java
rename to src/main/java/com/github/vaerys/commands/servers/EditServerName.java
index b7603257..9e1a1585 100644
--- a/src/main/java/Commands/Servers/EditServerName.java
+++ b/src/main/java/com/github/vaerys/commands/servers/EditServerName.java
@@ -1,7 +1,7 @@
-package Commands.Servers;
+package com.github.vaerys.commands.servers;
 
-import Commands.CommandObject;
-import Interfaces.Command;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.util.ArrayList;
@@ -17,7 +17,7 @@ public String execute(String args, CommandObject command) {
         if (splitArgs.size() < 2) {
             return "> Cannot Edit Server Name as no new name was specified.";
         }
-        return command.servers.editServerName(command.authorSID, splitArgs.get(0), splitArgs.get(1), command.guild);
+        return command.guild.servers.editServerName(command.user.stringID, splitArgs.get(0), splitArgs.get(1), command.guild.get());
     }
 
     @Override
diff --git a/src/main/java/Commands/Servers/ListServers.java b/src/main/java/com/github/vaerys/commands/servers/ListServers.java
similarity index 76%
rename from src/main/java/Commands/Servers/ListServers.java
rename to src/main/java/com/github/vaerys/commands/servers/ListServers.java
index 2ab8472f..39785874 100644
--- a/src/main/java/Commands/Servers/ListServers.java
+++ b/src/main/java/com/github/vaerys/commands/servers/ListServers.java
@@ -1,10 +1,10 @@
-package Commands.Servers;
+package com.github.vaerys.commands.servers;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
-import Objects.ServerObject;
-import Objects.XEmbedBuilder;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.ServerObject;
+import com.github.vaerys.objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.util.ArrayList;
@@ -20,12 +20,12 @@ public class ListServers implements Command {
     public String execute(String args, CommandObject command) {
         XEmbedBuilder builder = new XEmbedBuilder();
         String title = "> Here are the Servers I have Listed:";
-        ArrayList<String> serverNames = command.servers.getServers().stream().map(ServerObject::getName).collect(Collectors.toCollection(ArrayList::new));
+        ArrayList<String> serverNames = command.guild.servers.getServers().stream().map(ServerObject::getName).collect(Collectors.toCollection(ArrayList::new));
         Collections.sort(serverNames);
         String suffix = Utility.getCommandInfo(new Server(), command);
         Utility.listFormatterEmbed(title,builder,serverNames,false,suffix);
-        builder.withColor(Utility.getUsersColour(command.client.getOurUser(), command.guild));
-        Utility.sendEmbedMessage("",builder,command.channel);
+        builder.withColor(Utility.getUsersColour(command.client.bot, command.guild.get()));
+        Utility.sendEmbedMessage("",builder,command.channel.get());
         return null;
     }
 
diff --git a/src/main/java/com/github/vaerys/commands/servers/Server.java b/src/main/java/com/github/vaerys/commands/servers/Server.java
new file mode 100644
index 00000000..98bb290d
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/servers/Server.java
@@ -0,0 +1,88 @@
+package com.github.vaerys.commands.servers;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.ServerObject;
+import sx.blah.discord.handle.obj.Permissions;
+
+/**
+ * Created by Vaerys on 31/01/2017.
+ */
+public class Server implements Command {
+    @Override
+    public String execute(String args, CommandObject command) {
+        for (ServerObject s : command.guild.servers.getServers()) {
+            if (s.getName().equalsIgnoreCase(args)) {
+                StringBuilder builder = new StringBuilder();
+                builder.append("**" + s.getName() + "**\n");
+                builder.append("**IP:** " + s.getServerIP() + " **Port:** " + s.getServerPort() + "\n");
+                builder.append("**Listing Creator:** " + command.guild.get().getUserByID(s.getCreatorID()).getDisplayName(command.guild.get()) + "\n");
+                builder.append(s.getServerDesc());
+                Utility.sendDM(builder.toString(), command.user.longID);
+                return "> Server info has been sent to your DMs";
+            }
+        }
+        return "> Server with that name not found.";
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"Server"};
+    }
+
+    @Override
+    public String description() {
+        return "Lists the information about a specific server.";
+    }
+
+    @Override
+    public String usage() {
+        return "[Server Name]";
+    }
+
+    @Override
+    public String type() {
+        return TYPE_SERVERS;
+    }
+
+    @Override
+    public String channel() {
+        return CHANNEL_SERVERS;
+    }
+
+    @Override
+    public Permissions[] perms() {
+        return new Permissions[0];
+    }
+
+    @Override
+    public boolean requiresArgs() {
+        return true;
+    }
+
+    @Override
+    public boolean doAdminLogging() {
+        return false;
+    }
+
+    @Override
+    public String dualDescription() {
+        return null;
+    }
+
+    @Override
+    public String dualUsage() {
+        return null;
+    }
+
+    @Override
+    public String dualType() {
+        return null;
+    }
+
+    @Override
+    public Permissions[] dualPerms() {
+        return new Permissions[0];
+    }
+}
diff --git a/src/main/java/com/github/vaerys/commands/slash/DealWithIt.java b/src/main/java/com/github/vaerys/commands/slash/DealWithIt.java
new file mode 100644
index 00000000..b4f6c798
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/slash/DealWithIt.java
@@ -0,0 +1,20 @@
+package com.github.vaerys.commands.slash;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.SlashCommand;
+
+/**
+ * Created by Vaerys on 13/03/2017.
+ */
+public class DealWithIt implements SlashCommand {
+
+    @Override
+    public String execute(String args, CommandObject command) {
+        return "(•\\_•) ( •\\_•)>⌐■-■ (⌐■_■)";
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"DealWithIt"};
+    }
+}
diff --git a/src/main/java/com/github/vaerys/commands/slash/Disapproval.java b/src/main/java/com/github/vaerys/commands/slash/Disapproval.java
new file mode 100644
index 00000000..0f5128c6
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/slash/Disapproval.java
@@ -0,0 +1,19 @@
+package com.github.vaerys.commands.slash;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.SlashCommand;
+
+/**
+ * Created by Vaerys on 13/03/2017.
+ */
+public class Disapproval implements SlashCommand {
+    @Override
+    public String execute(String args, CommandObject command) {
+        return "ಠ_ಠ";
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"Disapprove"};
+    }
+}
diff --git a/src/main/java/com/github/vaerys/commands/slash/Fite.java b/src/main/java/com/github/vaerys/commands/slash/Fite.java
new file mode 100644
index 00000000..badbad4b
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/slash/Fite.java
@@ -0,0 +1,20 @@
+package com.github.vaerys.commands.slash;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.SlashCommand;
+
+/**
+ * Created by Vaerys on 13/03/2017.
+ */
+public class Fite implements SlashCommand {
+
+    @Override
+    public String execute(String args, CommandObject command) {
+        return "(ง'̀-'́)ง";
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"Fite"};
+    }
+}
diff --git a/src/main/java/com/github/vaerys/commands/slash/Gib.java b/src/main/java/com/github/vaerys/commands/slash/Gib.java
new file mode 100644
index 00000000..24d0a47c
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/slash/Gib.java
@@ -0,0 +1,19 @@
+package com.github.vaerys.commands.slash;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.SlashCommand;
+
+/**
+ * Created by Vaerys on 13/03/2017.
+ */
+public class Gib implements SlashCommand {
+    @Override
+    public String execute(String args, CommandObject command) {
+        return "༼ つ ◕_◕ ༽つ";
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"Gib"};
+    }
+}
diff --git a/src/main/java/com/github/vaerys/commands/slash/Lenny.java b/src/main/java/com/github/vaerys/commands/slash/Lenny.java
new file mode 100644
index 00000000..6afb6781
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/slash/Lenny.java
@@ -0,0 +1,20 @@
+package com.github.vaerys.commands.slash;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.SlashCommand;
+
+/**
+ * Created by Vaerys on 13/03/2017.
+ */
+public class Lenny implements SlashCommand {
+
+    @Override
+    public String execute(String args, CommandObject command) {
+        return "( ͡° ͜ʖ ͡°)";
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"Lenny"};
+    }
+}
diff --git a/src/main/java/com/github/vaerys/commands/slash/Shrug.java b/src/main/java/com/github/vaerys/commands/slash/Shrug.java
new file mode 100644
index 00000000..9639076f
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/slash/Shrug.java
@@ -0,0 +1,20 @@
+package com.github.vaerys.commands.slash;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.SlashCommand;
+
+/**
+ * Created by Vaerys on 13/03/2017.
+ */
+public class Shrug implements SlashCommand {
+
+    @Override
+    public String execute(String args, CommandObject command) {
+        return "¯\\_(ツ)_/¯";
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"Shrug"};
+    }
+}
diff --git a/src/main/java/com/github/vaerys/commands/slash/TableFlip.java b/src/main/java/com/github/vaerys/commands/slash/TableFlip.java
new file mode 100644
index 00000000..9f2fac85
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/slash/TableFlip.java
@@ -0,0 +1,20 @@
+package com.github.vaerys.commands.slash;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.SlashCommand;
+
+/**
+ * Created by Vaerys on 13/03/2017.
+ */
+public class TableFlip implements SlashCommand {
+
+    @Override
+    public String execute(String args, CommandObject command) {
+        return "(╯°□°）╯︵ ┻━┻";
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"TableFlip"};
+    }
+}
diff --git a/src/main/java/com/github/vaerys/commands/slash/UnFlip.java b/src/main/java/com/github/vaerys/commands/slash/UnFlip.java
new file mode 100644
index 00000000..4dcf6112
--- /dev/null
+++ b/src/main/java/com/github/vaerys/commands/slash/UnFlip.java
@@ -0,0 +1,20 @@
+package com.github.vaerys.commands.slash;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.SlashCommand;
+
+/**
+ * Created by Vaerys on 13/03/2017.
+ */
+public class UnFlip implements SlashCommand {
+
+    @Override
+    public String execute(String args, CommandObject command) {
+        return "┬─┬ ノ( ゜-゜ノ)";
+    }
+
+    @Override
+    public String[] names() {
+        return new String[]{"UnFlip"};
+    }
+}
diff --git a/src/main/java/Enums/EnumString.java b/src/main/java/com/github/vaerys/enums/EnumString.java
similarity index 77%
rename from src/main/java/Enums/EnumString.java
rename to src/main/java/com/github/vaerys/enums/EnumString.java
index 54f0e9d5..8e41a88c 100644
--- a/src/main/java/Enums/EnumString.java
+++ b/src/main/java/com/github/vaerys/enums/EnumString.java
@@ -1,4 +1,4 @@
-package Enums;
+package com.github.vaerys.enums;
 
 /**
  * Created by Vaerys on 02/07/2017.
@@ -14,7 +14,7 @@ public static String get(UserSetting setting) {
             case SEND_LVLUP_DMS:
                 return "DMs";
             case DONT_SEND_LVLUP:
-                return "NoMessage";
+                return "NoLevelMessage";
             case NO_XP_GAIN:
                 return "NoXP";
             case HIDE_RANK:
@@ -31,6 +31,12 @@ public static String get(UserSetting setting) {
                 return "DenyUseCCs";
             case HIT_LEVEL_FLOOR:
                 return "HitLevelFloor";
+            case NO_LEVEL_UP_REACTIONS:
+                return "NoLevelUpReactions";
+            case PRIVATE_PROFILE:
+                return "PrivateProfile";
+            case DENY_AUTO_ROLE:
+                return "DenyAutoRole";
             default:
                 return null;
         }
diff --git a/src/main/java/Enums/UserSetting.java b/src/main/java/com/github/vaerys/enums/UserSetting.java
similarity index 75%
rename from src/main/java/Enums/UserSetting.java
rename to src/main/java/com/github/vaerys/enums/UserSetting.java
index aae73207..9e36667e 100644
--- a/src/main/java/Enums/UserSetting.java
+++ b/src/main/java/com/github/vaerys/enums/UserSetting.java
@@ -1,4 +1,4 @@
-package Enums;
+package com.github.vaerys.enums;
 
 /**
  * Created by Vaerys on 14/06/2017.
@@ -13,16 +13,19 @@ public enum UserSetting {
     SEND_LVLUP_DMS, //Sends level up messages to Direct messages.
     DONT_SEND_LVLUP, //makes it so that you don't receive level up messages.
     HIDE_RANK, //allow the user to hide their rank
+    NO_LEVEL_UP_REACTIONS,
+    PRIVATE_PROFILE, //stops level up reactions from showing up on your posts.
 
     //Admin Only
     DENIED_XP, //Admin Settable. Denies all xp gain for the user.
     DONT_SHOW_LEADERBOARD, //Hides user on the server leader-board.
-    AUTO_SHITPOST, //Automatically sets all new commands made by this user to be shitpost locked.
+    AUTO_SHITPOST, //Automatically sets all new custom commands made by this user to be shitpost locked.
     DENY_MAKE_CC, //Removes the ability for the user to make custom commands.
     DENY_USE_CCS, //Removes the ability for the user to use custom commands.
+    DENY_AUTO_ROLE, //stops the automatic role allocation
 
     //bot assigned
     HIT_LEVEL_FLOOR, //added when the user reaches the xp floor of a reward, used to welcome
-    // users back when the level up again
+    // profiles back when the level up again
 }
 
diff --git a/src/main/java/GuildToggles/ToggleInit.java b/src/main/java/com/github/vaerys/guildtoggles/ToggleInit.java
similarity index 90%
rename from src/main/java/GuildToggles/ToggleInit.java
rename to src/main/java/com/github/vaerys/guildtoggles/ToggleInit.java
index f42316bb..cf88d54e 100644
--- a/src/main/java/GuildToggles/ToggleInit.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/ToggleInit.java
@@ -1,8 +1,8 @@
-package GuildToggles;
+package com.github.vaerys.guildtoggles;
 
-import GuildToggles.Modules.*;
-import GuildToggles.Toggles.*;
-import Interfaces.GuildToggle;
+import com.github.vaerys.guildtoggles.modules.*;
+import com.github.vaerys.guildtoggles.toggles.*;
+import com.github.vaerys.interfaces.GuildToggle;
 
 import java.util.ArrayList;
 
@@ -31,7 +31,7 @@ public static ArrayList<GuildToggle> get(){
         guildToggles.add(new RateLimiting());
         guildToggles.add(new RoleIsToggle());
         guildToggles.add(new ShitpostFiltering());
-        guildToggles.add(new SlashCommands());
+        guildToggles.add(new ModuleSlash());
         guildToggles.add(new UserRoleLogging());
         guildToggles.add(new UseTimeStamps());
         guildToggles.add(new Voting());
diff --git a/src/main/java/GuildToggles/Modules/ModuleArtPinning.java b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleArtPinning.java
similarity index 56%
rename from src/main/java/GuildToggles/Modules/ModuleArtPinning.java
rename to src/main/java/com/github/vaerys/guildtoggles/modules/ModuleArtPinning.java
index 6f1a7bfb..62bd6dbf 100644
--- a/src/main/java/GuildToggles/Modules/ModuleArtPinning.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleArtPinning.java
@@ -1,10 +1,10 @@
-package GuildToggles.Modules;
+package com.github.vaerys.guildtoggles.modules;
 
-import Commands.CommandObject;
-import GuildToggles.Toggles.AutoArtPinning;
-import Interfaces.Command;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.guildtoggles.toggles.AutoArtPinning;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 13/05/2017.
@@ -31,9 +31,9 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
-        command.removeChannel(Command.CHANNEL_ART);
-        command.removeToggle(new AutoArtPinning().name());
+    public void execute(GuildObject guild) {
+        guild.removeChannel(Command.CHANNEL_ART);
+        guild.removeToggle(new AutoArtPinning().name());
     }
 
     @Override
diff --git a/src/main/java/GuildToggles/Modules/ModuleCC.java b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleCC.java
similarity index 52%
rename from src/main/java/GuildToggles/Modules/ModuleCC.java
rename to src/main/java/com/github/vaerys/guildtoggles/modules/ModuleCC.java
index 2c2e4c02..62ebe082 100644
--- a/src/main/java/GuildToggles/Modules/ModuleCC.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleCC.java
@@ -1,10 +1,10 @@
-package GuildToggles.Modules;
+package com.github.vaerys.guildtoggles.modules;
 
-import Commands.CommandObject;
-import GuildToggles.Toggles.ShitpostFiltering;
-import Interfaces.Command;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.guildtoggles.toggles.ShitpostFiltering;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 02/03/2017.
@@ -32,10 +32,10 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
-        command.removeCommandsByType(Command.TYPE_CC);
-        command.removeChannel(Command.CHANNEL_SHITPOST);
-        command.removeToggle(new ShitpostFiltering().name());
+    public void execute(GuildObject guild) {
+        guild.removeCommandsByType(Command.TYPE_CC);
+        guild.removeChannel(Command.CHANNEL_SHITPOST);
+        guild.removeToggle(new ShitpostFiltering().name());
     }
 
     @Override
diff --git a/src/main/java/GuildToggles/Modules/ModuleChars.java b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleChars.java
similarity index 63%
rename from src/main/java/GuildToggles/Modules/ModuleChars.java
rename to src/main/java/com/github/vaerys/guildtoggles/modules/ModuleChars.java
index 62bf565e..15ebdb83 100644
--- a/src/main/java/GuildToggles/Modules/ModuleChars.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleChars.java
@@ -1,9 +1,9 @@
-package GuildToggles.Modules;
+package com.github.vaerys.guildtoggles.modules;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 20/02/2017.
@@ -31,8 +31,8 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
-        command.removeCommandsByType(Command.TYPE_CHARACTER);
+    public void execute(GuildObject guild) {
+        guild.removeCommandsByType(Command.TYPE_CHARACTER);
     }
 
     @Override
diff --git a/src/main/java/GuildToggles/Modules/ModuleComp.java b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleComp.java
similarity index 52%
rename from src/main/java/GuildToggles/Modules/ModuleComp.java
rename to src/main/java/com/github/vaerys/guildtoggles/modules/ModuleComp.java
index 723cbd19..538c57ae 100644
--- a/src/main/java/GuildToggles/Modules/ModuleComp.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleComp.java
@@ -1,11 +1,11 @@
-package GuildToggles.Modules;
+package com.github.vaerys.guildtoggles.modules;
 
-import Commands.CommandObject;
-import GuildToggles.Toggles.CompEntries;
-import GuildToggles.Toggles.Voting;
-import Interfaces.Command;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.guildtoggles.toggles.CompEntries;
+import com.github.vaerys.guildtoggles.toggles.Voting;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 20/02/2017.
@@ -35,10 +35,10 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
-        command.removeCommandsByType(Command.TYPE_COMPETITION);
-        command.removeToggle(new Voting().name());
-        command.removeToggle(new CompEntries().name());
+    public void execute(GuildObject guild) {
+        guild.removeCommandsByType(Command.TYPE_COMPETITION);
+        guild.removeToggle(new Voting().name());
+        guild.removeToggle(new CompEntries().name());
     }
 
     @Override
diff --git a/src/main/java/GuildToggles/Modules/ModuleGroups.java b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleGroups.java
similarity index 60%
rename from src/main/java/GuildToggles/Modules/ModuleGroups.java
rename to src/main/java/com/github/vaerys/guildtoggles/modules/ModuleGroups.java
index 40645bda..2ed1c769 100644
--- a/src/main/java/GuildToggles/Modules/ModuleGroups.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleGroups.java
@@ -1,9 +1,9 @@
-package GuildToggles.Modules;
+package com.github.vaerys.guildtoggles.modules;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 31/05/2017.
@@ -30,9 +30,9 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
-        command.removeCommandsByType(Command.TYPE_GROUPS);
-        command.removeChannel(Command.CHANNEL_GROUPS);
+    public void execute(GuildObject guild) {
+        guild.removeCommandsByType(Command.TYPE_GROUPS);
+        guild.removeChannel(Command.CHANNEL_GROUPS);
     }
 
     @Override
diff --git a/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleMe.java b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleMe.java
new file mode 100644
index 00000000..bd565c98
--- /dev/null
+++ b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleMe.java
@@ -0,0 +1,50 @@
+package com.github.vaerys.guildtoggles.modules;
+
+import com.github.vaerys.commands.general.EditLinks;
+import com.github.vaerys.commands.general.SetGender;
+import com.github.vaerys.commands.general.SetQuote;
+import com.github.vaerys.commands.general.UserInfo;
+import com.github.vaerys.guildtoggles.toggles.UserInfoShowsDate;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
+
+/**
+ * Created by Vaerys on 02/03/2017.
+ */
+public class ModuleMe implements GuildToggle {
+
+    @Override
+    public String name() {
+        return "UserInfo";
+    }
+
+    @Override
+    public boolean toggle(GuildConfig config) {
+        return config.moduleMe = !config.moduleMe;
+    }
+
+    @Override
+    public boolean get(GuildConfig config) {
+        return config.moduleMe;
+    }
+
+    @Override
+    public boolean getDefault() {
+        return new GuildConfig().moduleMe;
+    }
+
+    @Override
+    public void execute(GuildObject guild) {
+        guild.removeCommand(new UserInfo().names());
+        guild.removeCommand(new SetGender().names());
+        guild.removeCommand(new SetQuote().names());
+        guild.removeCommand(new EditLinks().names());
+        guild.removeToggle(new UserInfoShowsDate().name());
+    }
+
+    @Override
+    public boolean isModule() {
+        return true;
+    }
+}
diff --git a/src/main/java/GuildToggles/Modules/ModuleModMuting.java b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleModMuting.java
similarity index 64%
rename from src/main/java/GuildToggles/Modules/ModuleModMuting.java
rename to src/main/java/com/github/vaerys/guildtoggles/modules/ModuleModMuting.java
index eebd0aaf..fad9ea6e 100644
--- a/src/main/java/GuildToggles/Modules/ModuleModMuting.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleModMuting.java
@@ -1,9 +1,9 @@
-package GuildToggles.Modules;
+package com.github.vaerys.guildtoggles.modules;
 
-import Commands.Admin.Mute;
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.commands.admin.Mute;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 02/03/2017.
@@ -30,8 +30,8 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
-        command.removeCommand(new Mute().names());
+    public void execute(GuildObject guild) {
+        guild.removeCommand(new Mute().names());
     }
 
     @Override
diff --git a/src/main/java/com/github/vaerys/guildtoggles/modules/ModulePixels.java b/src/main/java/com/github/vaerys/guildtoggles/modules/ModulePixels.java
new file mode 100644
index 00000000..3b981c5a
--- /dev/null
+++ b/src/main/java/com/github/vaerys/guildtoggles/modules/ModulePixels.java
@@ -0,0 +1,51 @@
+package com.github.vaerys.guildtoggles.modules;
+
+import com.github.vaerys.commands.admin.DenyXpPrefix;
+import com.github.vaerys.guildtoggles.toggles.ReactToLevelUp;
+import com.github.vaerys.guildtoggles.toggles.SelfDestructLevelUps;
+import com.github.vaerys.guildtoggles.toggles.XpDecay;
+import com.github.vaerys.guildtoggles.toggles.XpGain;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
+
+/**
+ * Created by Vaerys on 04/07/2017.
+ */
+public class ModulePixels implements GuildToggle {
+    @Override
+    public String name() {
+        return "Pixels";
+    }
+
+    @Override
+    public boolean toggle(GuildConfig config) {
+        return config.modulePixels = !config.modulePixels;
+    }
+
+    @Override
+    public boolean get(GuildConfig config) {
+        return config.modulePixels;
+    }
+
+    @Override
+    public boolean getDefault() {
+        return new GuildConfig().modulePixels;
+    }
+
+    @Override
+    public void execute(GuildObject guild) {
+        guild.removeCommandsByType(Command.TYPE_PIXEL);
+        guild.removeCommand(new DenyXpPrefix().names());
+        guild.removeToggle(new XpDecay().name());
+        guild.removeToggle(new XpGain().name());
+        guild.removeToggle(new SelfDestructLevelUps().name());
+        guild.removeToggle(new ReactToLevelUp().name());
+    }
+
+    @Override
+    public boolean isModule() {
+        return true;
+    }
+}
diff --git a/src/main/java/GuildToggles/Modules/ModuleRoles.java b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleRoles.java
similarity index 63%
rename from src/main/java/GuildToggles/Modules/ModuleRoles.java
rename to src/main/java/com/github/vaerys/guildtoggles/modules/ModuleRoles.java
index 19a14831..6ef66558 100644
--- a/src/main/java/GuildToggles/Modules/ModuleRoles.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleRoles.java
@@ -1,9 +1,9 @@
-package GuildToggles.Modules;
+package com.github.vaerys.guildtoggles.modules;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 02/03/2017.
@@ -31,8 +31,8 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
-        command.removeCommandsByType(Command.TYPE_ROLE_SELECT);
+    public void execute(GuildObject guild) {
+        guild.removeCommandsByType(Command.TYPE_ROLE_SELECT);
     }
 
     @Override
diff --git a/src/main/java/GuildToggles/Modules/ModuleServers.java b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleServers.java
similarity index 60%
rename from src/main/java/GuildToggles/Modules/ModuleServers.java
rename to src/main/java/com/github/vaerys/guildtoggles/modules/ModuleServers.java
index d14c417f..90bc546d 100644
--- a/src/main/java/GuildToggles/Modules/ModuleServers.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleServers.java
@@ -1,9 +1,9 @@
-package GuildToggles.Modules;
+package com.github.vaerys.guildtoggles.modules;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 20/02/2017.
@@ -31,9 +31,9 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
-        command.removeCommandsByType(Command.TYPE_SERVERS);
-        command.removeChannel(Command.CHANNEL_SERVERS);
+    public void execute(GuildObject guild) {
+        guild.removeCommandsByType(Command.TYPE_SERVERS);
+        guild.removeChannel(Command.CHANNEL_SERVERS);
     }
 
     @Override
diff --git a/src/main/java/GuildToggles/Toggles/SlashCommands.java b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleSlash.java
similarity index 53%
rename from src/main/java/GuildToggles/Toggles/SlashCommands.java
rename to src/main/java/com/github/vaerys/guildtoggles/modules/ModuleSlash.java
index 3bac3cb4..4cbe3252 100644
--- a/src/main/java/GuildToggles/Toggles/SlashCommands.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/modules/ModuleSlash.java
@@ -1,17 +1,17 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.modules;
 
-import Commands.CommandObject;
-import Commands.General.SlashList;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 13/03/2017.
  */
-public class SlashCommands implements GuildToggle {
+public class ModuleSlash implements GuildToggle {
     @Override
     public String name() {
-        return "Commands/Slash";
+        return "SlashCommands";
     }
 
     @Override
@@ -30,12 +30,12 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
-        command.removeCommand(new SlashList().names());
+    public void execute(GuildObject guild) {
+        guild.removeCommandsByType(Command.TYPE_SLASH);
     }
 
     @Override
     public boolean isModule() {
-        return false;
+        return true;
     }
 }
diff --git a/src/main/java/GuildToggles/Toggles/AdminLogging.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/AdminLogging.java
similarity index 71%
rename from src/main/java/GuildToggles/Toggles/AdminLogging.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/AdminLogging.java
index 3b7164fe..3fdb6ee2 100644
--- a/src/main/java/GuildToggles/Toggles/AdminLogging.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/AdminLogging.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 20/02/2017.
@@ -30,7 +30,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/AutoArtPinning.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/AutoArtPinning.java
similarity index 72%
rename from src/main/java/GuildToggles/Toggles/AutoArtPinning.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/AutoArtPinning.java
index 8d512985..873ddccb 100644
--- a/src/main/java/GuildToggles/Toggles/AutoArtPinning.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/AutoArtPinning.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 13/05/2017.
@@ -29,7 +29,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/ChannelLogging.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/ChannelLogging.java
similarity index 72%
rename from src/main/java/GuildToggles/Toggles/ChannelLogging.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/ChannelLogging.java
index 67b1a34f..72e1cea3 100644
--- a/src/main/java/GuildToggles/Toggles/ChannelLogging.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/ChannelLogging.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 12/03/2017.
@@ -30,7 +30,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/CompEntries.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/CompEntries.java
similarity index 71%
rename from src/main/java/GuildToggles/Toggles/CompEntries.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/CompEntries.java
index 74287e74..bbd0d589 100644
--- a/src/main/java/GuildToggles/Toggles/CompEntries.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/CompEntries.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 20/02/2017.
@@ -30,7 +30,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/DailyMessage.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/DailyMessage.java
similarity index 62%
rename from src/main/java/GuildToggles/Toggles/DailyMessage.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/DailyMessage.java
index 46a01645..73a52b1b 100644
--- a/src/main/java/GuildToggles/Toggles/DailyMessage.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/DailyMessage.java
@@ -1,8 +1,9 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.commands.general.LastDailyMessage;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 20/02/2017.
@@ -30,8 +31,8 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
-
+    public void execute(GuildObject guild) {
+        guild.removeCommand(new LastDailyMessage().names());
     }
 
     @Override
diff --git a/src/main/java/GuildToggles/Toggles/DeleteLogging.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/DeleteLogging.java
similarity index 72%
rename from src/main/java/GuildToggles/Toggles/DeleteLogging.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/DeleteLogging.java
index 2de3984f..ea0296d8 100644
--- a/src/main/java/GuildToggles/Toggles/DeleteLogging.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/DeleteLogging.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 20/02/2017.
@@ -30,7 +30,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/DenyInvites.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/DenyInvites.java
similarity index 71%
rename from src/main/java/GuildToggles/Toggles/DenyInvites.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/DenyInvites.java
index 996b9295..ccf0b073 100644
--- a/src/main/java/GuildToggles/Toggles/DenyInvites.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/DenyInvites.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 20/02/2017.
@@ -30,7 +30,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/DontLogBot.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/DontLogBot.java
similarity index 71%
rename from src/main/java/GuildToggles/Toggles/DontLogBot.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/DontLogBot.java
index 093f7b81..ea1987d9 100644
--- a/src/main/java/GuildToggles/Toggles/DontLogBot.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/DontLogBot.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 09/04/2017.
@@ -30,7 +30,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/EditLogging.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/EditLogging.java
similarity index 67%
rename from src/main/java/GuildToggles/Toggles/EditLogging.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/EditLogging.java
index 9504a30a..eb52da28 100644
--- a/src/main/java/GuildToggles/Toggles/EditLogging.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/EditLogging.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 21/02/2017.
@@ -30,8 +30,8 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
-        command.removeToggle(new ExtendEditLog().name());
+    public void execute(GuildObject guild) {
+        guild.removeToggle(new ExtendEditLog().name());
     }
 
     @Override
diff --git a/src/main/java/GuildToggles/Toggles/ExtendEditLog.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/ExtendEditLog.java
similarity index 72%
rename from src/main/java/GuildToggles/Toggles/ExtendEditLog.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/ExtendEditLog.java
index e644851c..9bd71622 100644
--- a/src/main/java/GuildToggles/Toggles/ExtendEditLog.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/ExtendEditLog.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 12/03/2017.
@@ -30,7 +30,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/GeneralLogging.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/GeneralLogging.java
similarity index 72%
rename from src/main/java/GuildToggles/Toggles/GeneralLogging.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/GeneralLogging.java
index 8be58c75..4d14ccd1 100644
--- a/src/main/java/GuildToggles/Toggles/GeneralLogging.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/GeneralLogging.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 20/02/2017.
@@ -30,7 +30,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/JoinLeaveLgging.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/JoinLeaveLgging.java
similarity index 72%
rename from src/main/java/GuildToggles/Toggles/JoinLeaveLgging.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/JoinLeaveLgging.java
index 097f86c2..b6fbb447 100644
--- a/src/main/java/GuildToggles/Toggles/JoinLeaveLgging.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/JoinLeaveLgging.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 21/02/2017.
@@ -30,7 +30,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/JoinServerMessages.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/JoinServerMessages.java
similarity index 64%
rename from src/main/java/GuildToggles/Toggles/JoinServerMessages.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/JoinServerMessages.java
index 8c4f9b77..1ac0ffea 100644
--- a/src/main/java/GuildToggles/Toggles/JoinServerMessages.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/JoinServerMessages.java
@@ -1,9 +1,9 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.Admin.SetJoinMessage;
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.commands.admin.SetJoinMessage;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 07/07/2017.
@@ -30,8 +30,8 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
-        command.removeCommand(new SetJoinMessage().names());
+    public void execute(GuildObject guild) {
+        guild.removeCommand(new SetJoinMessage().names());
     }
 
     @Override
diff --git a/src/main/java/GuildToggles/Toggles/MentionSpam.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/MentionSpam.java
similarity index 71%
rename from src/main/java/GuildToggles/Toggles/MentionSpam.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/MentionSpam.java
index b55aaa21..8185508f 100644
--- a/src/main/java/GuildToggles/Toggles/MentionSpam.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/MentionSpam.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 20/02/2017.
@@ -30,7 +30,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/MuteRepeatOffender.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/MuteRepeatOffender.java
similarity index 73%
rename from src/main/java/GuildToggles/Toggles/MuteRepeatOffender.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/MuteRepeatOffender.java
index ef441a7e..4e04c914 100644
--- a/src/main/java/GuildToggles/Toggles/MuteRepeatOffender.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/MuteRepeatOffender.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 20/02/2017.
@@ -30,7 +30,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/RateLimiting.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/RateLimiting.java
similarity index 58%
rename from src/main/java/GuildToggles/Toggles/RateLimiting.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/RateLimiting.java
index 871358e3..7d9e2926 100644
--- a/src/main/java/GuildToggles/Toggles/RateLimiting.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/RateLimiting.java
@@ -1,13 +1,14 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.commands.admin.SetRateLimit;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 21/02/2017.
  */
-public class RateLimiting implements GuildToggle{
+public class RateLimiting implements GuildToggle {
 
     @Override
     public String name() {
@@ -30,8 +31,8 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
-
+    public void execute(GuildObject guild) {
+        guild.removeCommand(new SetRateLimit().names());
     }
 
     @Override
diff --git a/src/main/java/GuildToggles/Toggles/ReactToLevelUp.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/ReactToLevelUp.java
similarity index 70%
rename from src/main/java/GuildToggles/Toggles/ReactToLevelUp.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/ReactToLevelUp.java
index ad4fe17d..3d6de78d 100644
--- a/src/main/java/GuildToggles/Toggles/ReactToLevelUp.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/ReactToLevelUp.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 public class ReactToLevelUp implements GuildToggle {
     @Override
@@ -26,7 +26,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/RoleIsToggle.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/RoleIsToggle.java
similarity index 71%
rename from src/main/java/GuildToggles/Toggles/RoleIsToggle.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/RoleIsToggle.java
index 0d25da18..0aabe96a 100644
--- a/src/main/java/GuildToggles/Toggles/RoleIsToggle.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/RoleIsToggle.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 18/03/2017.
@@ -29,7 +29,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/SelfDestructLevelUps.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/SelfDestructLevelUps.java
similarity index 71%
rename from src/main/java/GuildToggles/Toggles/SelfDestructLevelUps.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/SelfDestructLevelUps.java
index ae7f05ba..1be3ee46 100644
--- a/src/main/java/GuildToggles/Toggles/SelfDestructLevelUps.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/SelfDestructLevelUps.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 public class SelfDestructLevelUps implements GuildToggle {
     @Override
@@ -26,7 +26,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/ShitpostFiltering.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/ShitpostFiltering.java
similarity index 72%
rename from src/main/java/GuildToggles/Toggles/ShitpostFiltering.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/ShitpostFiltering.java
index 83319085..29c9ec4f 100644
--- a/src/main/java/GuildToggles/Toggles/ShitpostFiltering.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/ShitpostFiltering.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 20/02/2017.
@@ -30,7 +30,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/UseTimeStamps.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/UseTimeStamps.java
similarity index 72%
rename from src/main/java/GuildToggles/Toggles/UseTimeStamps.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/UseTimeStamps.java
index f28704de..1fa43eba 100644
--- a/src/main/java/GuildToggles/Toggles/UseTimeStamps.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/UseTimeStamps.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 12/03/2017.
@@ -30,7 +30,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/UserInfoShowsDate.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/UserInfoShowsDate.java
similarity index 71%
rename from src/main/java/GuildToggles/Toggles/UserInfoShowsDate.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/UserInfoShowsDate.java
index ecf7b513..c55b9d82 100644
--- a/src/main/java/GuildToggles/Toggles/UserInfoShowsDate.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/UserInfoShowsDate.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 public class UserInfoShowsDate implements GuildToggle {
     @Override
@@ -26,7 +26,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/UserRoleLogging.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/UserRoleLogging.java
similarity index 72%
rename from src/main/java/GuildToggles/Toggles/UserRoleLogging.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/UserRoleLogging.java
index f753d4a1..cb2b638b 100644
--- a/src/main/java/GuildToggles/Toggles/UserRoleLogging.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/UserRoleLogging.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 21/02/2017.
@@ -30,7 +30,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/Voting.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/Voting.java
similarity index 71%
rename from src/main/java/GuildToggles/Toggles/Voting.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/Voting.java
index df11a840..5776c988 100644
--- a/src/main/java/GuildToggles/Toggles/Voting.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/Voting.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 20/02/2017.
@@ -30,7 +30,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/XpDecay.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/XpDecay.java
similarity index 70%
rename from src/main/java/GuildToggles/Toggles/XpDecay.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/XpDecay.java
index 344ab49a..06b8e25b 100644
--- a/src/main/java/GuildToggles/Toggles/XpDecay.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/XpDecay.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 04/07/2017.
@@ -29,7 +29,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/GuildToggles/Toggles/XpGain.java b/src/main/java/com/github/vaerys/guildtoggles/toggles/XpGain.java
similarity index 70%
rename from src/main/java/GuildToggles/Toggles/XpGain.java
rename to src/main/java/com/github/vaerys/guildtoggles/toggles/XpGain.java
index 61972a1a..36195f4a 100644
--- a/src/main/java/GuildToggles/Toggles/XpGain.java
+++ b/src/main/java/com/github/vaerys/guildtoggles/toggles/XpGain.java
@@ -1,8 +1,8 @@
-package GuildToggles.Toggles;
+package com.github.vaerys.guildtoggles.toggles;
 
-import Commands.CommandObject;
-import Interfaces.GuildToggle;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 04/07/2017.
@@ -29,7 +29,7 @@ public boolean getDefault() {
     }
 
     @Override
-    public void execute(CommandObject command) {
+    public void execute(GuildObject guild) {
 
     }
 
diff --git a/src/main/java/Handlers/ArtHandler.java b/src/main/java/com/github/vaerys/handlers/ArtHandler.java
similarity index 55%
rename from src/main/java/Handlers/ArtHandler.java
rename to src/main/java/com/github/vaerys/handlers/ArtHandler.java
index 71b0cb1f..04a05222 100644
--- a/src/main/java/Handlers/ArtHandler.java
+++ b/src/main/java/com/github/vaerys/handlers/ArtHandler.java
@@ -1,11 +1,11 @@
-package Handlers;
+package com.github.vaerys.handlers;
 
-import Commands.CommandObject;
-import Interfaces.Command;
-import Main.Utility;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.XRequestBuffer;
 import sx.blah.discord.handle.obj.IMessage;
 import sx.blah.discord.util.DiscordException;
-import sx.blah.discord.util.RequestBuffer;
 
 import java.util.ArrayList;
 
@@ -15,36 +15,36 @@
 public class ArtHandler {
 
     public ArtHandler(CommandObject command) {
-        if (command.author.isBot()) {
+        if (command.user.get().isBot()) {
             return;
         }
-        if (command.guildConfig.getChannelIDsByType(Command.CHANNEL_ART) == null) {
+        if (command.guild.config.getChannelIDsByType(Command.CHANNEL_ART) == null) {
             return;
         }
-        if (!command.guildConfig.getChannelIDsByType(Command.CHANNEL_ART).get(0).equals(command.channelSID)) {
+        if (!command.guild.config.getChannelIDsByType(Command.CHANNEL_ART).get(0).equals(command.channel.stringID)) {
             return;
         }
-        if (command.message.getAttachments().size() != 0) {
-            if (Utility.isImageLink(command.message.getAttachments().get(0).getUrl())) {
+        if (command.message.get().getAttachments().size() != 0) {
+            if (Utility.isImageLink(command.message.get().getAttachments().get(0).getUrl())) {
                 try {
-                    command.message.getChannel().pin(command.message);
+                    command.message.get().getChannel().pin(command.message.get());
                     checkList(command, true);
                     return;
                 } catch (DiscordException e) {
                     if (e.getErrorMessage().contains("already pinned")) {
                         return;
                     } else {
-                        e.printStackTrace();
+                        Utility.sendStack(e);
                     }
                 }
 
             }
         } else {
-            for (String nl : command.message.getContent().split("/n")) {
+            for (String nl : command.message.get().getContent().split("/n")) {
                 for (String s : nl.split(" ")) {
                     if (Utility.isImageLink(s) || isHostingWebsite(s)) {
                         try {
-                            command.message.getChannel().pin(command.message);
+                            command.message.get().getChannel().pin(command.message.get());
                             checkList(command, true);
                             return;
                         } catch (DiscordException e) {
@@ -58,20 +58,21 @@ public ArtHandler(CommandObject command) {
     }
 
     private void checkList(CommandObject command, boolean adding) {
-        ArrayList<Long> pinnedMessages = command.channelData.getPinnedMessages();
+        ArrayList<Long> pinnedMessages = command.guild.channelData.getPinnedMessages();
 
         //check for null'd pins
         for (int i = 0; i < pinnedMessages.size(); i++) {
-            if (command.channel.getMessageByID(pinnedMessages.get(i)) == null) {
+            if (command.channel.get().getMessageByID(pinnedMessages.get(i)) == null) {
                 pinnedMessages.remove(i);
-            } else if (!command.channel.getMessageByID(pinnedMessages.get(i)).isPinned()) {
+            } else if (!command.channel.get().getMessageByID(pinnedMessages.get(i)).isPinned()) {
                 pinnedMessages.remove(i);
             }
         }
 
         //remove unwanted pins
-        while (pinnedMessages.size() > 25) {
-            for (IMessage msg : command.channel.getPinnedMessages()) {
+        int tries = 0;
+        while (pinnedMessages.size() > 25 && tries < 25) {
+            for (IMessage msg : command.channel.get().getPinnedMessages()) {
                 if (pinnedMessages.get(0) == msg.getLongID()) {
                     unPin(msg, command);
                     if (!msg.isPinned()) {
@@ -79,17 +80,23 @@ private void checkList(CommandObject command, boolean adding) {
                     }
                 }
             }
+            tries++;
+            try {
+                Thread.sleep(200);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
         }
 
         //add new pin
         if (adding) {
-            pinnedMessages.add(command.messageID);
+            pinnedMessages.add(command.message.longID);
         }
     }
 
     private void unPin(IMessage message, CommandObject command) {
         if (message.isPinned()) {
-            RequestBuffer.request(() -> command.channel.unpin(message));
+            XRequestBuffer.request(() -> command.channel.get().unpin(message));
         }
     }
 
diff --git a/src/main/java/Handlers/CCHandler.java b/src/main/java/com/github/vaerys/handlers/CCHandler.java
similarity index 69%
rename from src/main/java/Handlers/CCHandler.java
rename to src/main/java/com/github/vaerys/handlers/CCHandler.java
index a75b299c..9757d03d 100644
--- a/src/main/java/Handlers/CCHandler.java
+++ b/src/main/java/com/github/vaerys/handlers/CCHandler.java
@@ -1,16 +1,16 @@
-package Handlers;
+package com.github.vaerys.handlers;
 
-import Commands.CommandObject;
-import Enums.UserSetting;
-import Interfaces.ChannelSetting;
-import Interfaces.Command;
-import Main.Globals;
-import Main.TagSystem;
-import Main.Utility;
-import Objects.CCommandObject;
-import Objects.UserTypeObject;
-import POGOs.CustomCommands;
-import POGOs.GuildConfig;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.enums.UserSetting;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.CCommandObject;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.SplitFirstObject;
+import com.github.vaerys.pogos.CustomCommands;
+import com.github.vaerys.pogos.GuildConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,25 +33,27 @@ public class CCHandler {
     private IChannel channel;
     private CommandObject commandObject;
     CustomCommands customCommands;
-    GuildConfig guildConfig;
+    GuildConfig guildconfig;
 
     private final static Logger logger = LoggerFactory.getLogger(CCHandler.class);
 
-    public CCHandler(String command, String args, CommandObject commandObject) {
-        this.message = commandObject.message;
-        this.command = command;
-        this.args = args;
+    public CCHandler(String args, CommandObject commandObject) {
+        SplitFirstObject commandName = new SplitFirstObject(args);
+        this.message = commandObject.message.get();
+        this.command = commandName.getFirstWord();
+        this.args = commandName.getRest();
+        if (this.args == null) this.args = "";
         this.commandObject = commandObject;
-        this.guild = commandObject.guild;
-        this.author = commandObject.author;
-        this.channel = commandObject.channel;
-        guildConfig = commandObject.guildConfig;
-        customCommands = commandObject.customCommands;
+        this.guild = commandObject.guild.get();
+        this.author = commandObject.user.get();
+        this.channel = commandObject.channel.get();
+        guildconfig = commandObject.guild.config;
+        customCommands = commandObject.guild.customCommands;
         handleCommand();
     }
 
     private void handleCommand() {
-        UserTypeObject object = commandObject.guildUsers.getUserByID(author.getStringID());
+        ProfileObject object = commandObject.guild.users.getUserByID(author.getStringID());
         if (object != null && object.getSettings().contains(UserSetting.DENY_USE_CCS)) {
             Utility.sendMessage("> Nothing interesting happens. `(ERROR: 401)`", channel);
             return;
@@ -60,25 +62,25 @@ private void handleCommand() {
         String prefixEmbedImage = "<embedImage>{";
         String tagDeleteMessage = "<delCall>";
         for (CCommandObject cc : customCommands.getCommandList()) {
-            if (command.equalsIgnoreCase(guildConfig.getPrefixCC() + cc.getName())) {
+            if (command.equalsIgnoreCase(guildconfig.getPrefixCC() + cc.getName())) {
 
                 //command logging
-                logger.debug(Utility.loggingFormatter("CUSTOM_COMMAND", command, args, commandObject));
+                logger.debug(Utility.loggingFormatter(commandObject, "CUSTOM_COMMAND"));
 
                 if (Utility.canBypass(author, guild)) ;
-                else if (cc.isShitPost() && guildConfig.shitPostFiltering) {
+                else if (cc.isShitPost() && guildconfig.shitPostFiltering) {
                     ArrayList<String> channelMentions = new ArrayList<>();
                     boolean isShitpost = false;
-                    if (guildConfig.getChannelIDsByType(Command.CHANNEL_SHITPOST) != null) {
-                        for (ChannelSetting c : commandObject.channelSettings) {
+                    if (guildconfig.getChannelIDsByType(Command.CHANNEL_SHITPOST) != null) {
+                        for (ChannelSetting c : commandObject.guild.channelSettings) {
                             if (c.type().equals(Command.CHANNEL_SHITPOST)) {
-                                for (String id : c.getIDs(commandObject.guildConfig)) {
-                                    if (commandObject.channelSID.equals(id)) {
+                                for (String id : c.getIDs(commandObject.guild.config)) {
+                                    if (commandObject.channel.stringID.equals(id)) {
                                         isShitpost = true;
                                     }
-                                    for (IChannel channel : commandObject.guild.getChannels()) {
+                                    for (IChannel channel : commandObject.guild.get().getChannels()) {
                                         if (id.equals(channel.getStringID())) {
-                                            EnumSet<Permissions> userPerms = channel.getModifiedPermissions(commandObject.author);
+                                            EnumSet<Permissions> userPerms = channel.getModifiedPermissions(commandObject.user.get());
                                             if (userPerms.contains(Permissions.SEND_MESSAGES) && userPerms.contains(Permissions.READ_MESSAGES)) {
                                                 channelMentions.add(channel.mention());
                                             }
@@ -102,9 +104,6 @@ else if (cc.isShitPost() && guildConfig.shitPostFiltering) {
                     }
 
                 }
-//                if (!channel.getTypingStatus()) {
-//                    channel.toggleTypingStatus();
-//                }
                 response = cc.getContents(true);
                 int argsCount = StringUtils.countMatches(response, "<args>");
                 if (argsCount != 0) {
@@ -113,7 +112,8 @@ else if (cc.isShitPost() && guildConfig.shitPostFiltering) {
                         return;
                     }
                 }
-                response = TagSystem.tagSystem(response, commandObject, args);
+                response = TagHandler.tagSystem(response, commandObject, args);
+                response = TagHandler.tagMentionRemover(response);
                 response = response.replace("<DELCALL>", "<delCall>");
                 response = response.replace("<EMBEDIMAGE>", "<embedImage>");
                 if (customCommands.checkblackList(response) != null) {
@@ -125,11 +125,11 @@ else if (cc.isShitPost() && guildConfig.shitPostFiltering) {
                     Utility.deleteMessage(message);
                 }
                 if (response.contains("<embedImage>{")) {
-                    String imageURL = TagSystem.tagEmbedImage(response, prefixEmbedImage);
+                    String imageURL = TagHandler.tagEmbedImage(response, prefixEmbedImage);
                     if (imageURL != null || !imageURL.isEmpty()) {
-                        if (commandObject.channel.getModifiedPermissions(author).contains(Permissions.EMBED_LINKS)) {
+                        if (commandObject.channel.get().getModifiedPermissions(author).contains(Permissions.EMBED_LINKS)) {
                             response = response.replaceFirst(Pattern.quote(prefixEmbedImage + imageURL + "}"), "");
-                            response = TagSystem.tagToCaps(response);
+                            response = TagHandler.tagToCaps(response);
                             Utility.sendFileURL(response, imageURL, channel, true);
                         } else {
                             response = response.replaceFirst(Pattern.quote(prefixEmbedImage + imageURL + "}"), "<" + imageURL + ">");
diff --git a/src/main/java/com/github/vaerys/handlers/CreatorHandler.java b/src/main/java/com/github/vaerys/handlers/CreatorHandler.java
new file mode 100644
index 00000000..ee5fd040
--- /dev/null
+++ b/src/main/java/com/github/vaerys/handlers/CreatorHandler.java
@@ -0,0 +1,38 @@
+package com.github.vaerys.handlers;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import sx.blah.discord.api.events.EventSubscriber;
+import sx.blah.discord.handle.impl.events.guild.channel.message.MessageReceivedEvent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CreatorHandler {
+
+    @EventSubscriber
+    public void creatorCommands(MessageReceivedEvent event) {
+        List<Command> commands;
+        CommandObject command = new CommandObject(event.getMessage());
+        if (event.getChannel().isPrivate()) {
+            commands = new ArrayList<>(Globals.getCreatorCommands(true));
+        } else {
+            commands = new ArrayList<>(Globals.getCreatorCommands(false));
+        }
+        if (!event.getAuthor().equals(command.client.creator)) {
+            return;
+        }
+        String message = event.getMessage().getContent();
+        for (Command c : commands) {
+            if (c.isCall(message, command)) {
+                String args = c.getArgs(message, command);
+                Utility.sendMessage(c.execute(args, command), command.channel.get());
+
+                MessageHandler.handleLogging(command,c,args);
+                return;
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/github/vaerys/handlers/DMHandler.java b/src/main/java/com/github/vaerys/handlers/DMHandler.java
new file mode 100644
index 00000000..59dd3f55
--- /dev/null
+++ b/src/main/java/com/github/vaerys/handlers/DMHandler.java
@@ -0,0 +1,43 @@
+package com.github.vaerys.handlers;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sx.blah.discord.handle.obj.IMessage;
+
+/**
+ * Created by Vaerys on 27/08/2016.
+ */
+public class DMHandler {
+
+    final static Logger logger = LoggerFactory.getLogger(DMHandler.class);
+
+    public DMHandler(CommandObject command) {
+        command.message.get().getTimestamp();
+        if (command.message.get().getAuthor().isBot()) {
+            return;
+        }
+        for (String blocked : Globals.getGlobalData().getBlockedFromDMS()) {
+            if (command.message.get().getAuthor().getStringID().equals(blocked)) {
+                Utility.sendDM("> You have been blocked from sending DMs to S.A.I.L by the Bot Creator.", blocked);
+                return;
+            }
+        }
+        if (!command.message.get().getAuthor().getStringID().equals(Globals.creatorID)) {
+            String logging = "[" + command.message.get().getAuthor().getStringID() + "] " + command.message.get().getAuthor().getName() + "#" + command.message.get().getAuthor().getDiscriminator() + ": " + command.message.get().toString();
+            logger.info(logging);
+            Globals.lastDmUserID = command.message.get().getAuthor().getLongID();
+            if (command.message.get().getAttachments().size() > 0) {
+                String attachmemts = "";
+                for (IMessage.Attachment a : command.message.get().getAttachments()) {
+                    attachmemts = "\n" + a.getUrl();
+                }
+                Utility.sendDM(logging + attachmemts, Globals.creatorID);
+            } else {
+                Utility.sendDM(logging, Globals.creatorID);
+            }
+        }
+    }
+}
diff --git a/src/main/java/Handlers/EventHandler.java b/src/main/java/com/github/vaerys/handlers/EventHandler.java
similarity index 77%
rename from src/main/java/Handlers/EventHandler.java
rename to src/main/java/com/github/vaerys/handlers/EventHandler.java
index aa688cc9..e0b1c375 100644
--- a/src/main/java/Handlers/EventHandler.java
+++ b/src/main/java/com/github/vaerys/handlers/EventHandler.java
@@ -1,11 +1,13 @@
-package Handlers;
+package com.github.vaerys.handlers;
 
-import Interfaces.Command;
-import Main.Constants;
-import Main.Globals;
-import Main.Utility;
-import Objects.*;
-import POGOs.GuildConfig;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.GuildFile;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.objects.*;
+import com.github.vaerys.pogos.GuildConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sx.blah.discord.handle.impl.events.ReadyEvent;
@@ -46,7 +48,7 @@ private void doEventMin() {
             @Override
             public void run() {
                 logger.trace("Reset speakers.");
-                for (GuildContentObject g : Globals.getGuildContentObjects()) {
+                for (GuildObject g : Globals.getGuilds()) {
                     g.getSpokenUsers().clear();
                 }
             }
@@ -71,24 +73,6 @@ public void run() {
         }, initialDelay * 1000);
     }
 
-    public static int getDoAdminMention(String guildID) {
-        for (GuildContentObject task : Globals.getGuildContentObjects()) {
-            if (task.getGuildID().equals(guildID)) {
-                return task.getDoAdminMention();
-            }
-        }
-        return -1;
-    }
-
-    public static void setDoAdminMention(String guildID, int i) {
-        for (GuildContentObject task : Globals.getGuildContentObjects()) {
-            if (task.getGuildID().equals(guildID)) {
-                task.setDoAdminMention(i);
-                return;
-            }
-        }
-    }
-
     private static void doEventDaily(ZonedDateTime nowUTC) {
         ZonedDateTime midnightUTC = ZonedDateTime.now(ZoneOffset.UTC);
         midnightUTC = midnightUTC.withHour(0).withSecond(0).withMinute(0).withNano(0).plusDays(1);
@@ -124,30 +108,27 @@ public void run() {
                 try {
                     Thread.sleep(3000);
                 } catch (InterruptedException e) {
-                    e.printStackTrace();
+                    Utility.sendStack(e);
                 }
                 //backups
                 Utility.backupConfigFile(Constants.FILE_CONFIG, Constants.FILE_CONFIG_BACKUP);
                 Utility.backupConfigFile(Constants.FILE_GLOBAL_DATA, Constants.FILE_GLOBAL_DATA_BACKUP);
-                for (GuildContentObject task : Globals.getGuildContentObjects()) {
-                    Utility.backupFile(task.getGuildID(), Constants.FILE_GUILD_CONFIG);
-                    Utility.backupFile(task.getGuildID(), Constants.FILE_CUSTOM);
-                    Utility.backupFile(task.getGuildID(), Constants.FILE_CHARACTERS);
-                    Utility.backupFile(task.getGuildID(), Constants.FILE_SERVERS);
-                    Utility.backupFile(task.getGuildID(), Constants.FILE_INFO);
-                    Utility.backupFile(task.getGuildID(), Constants.FILE_COMPETITION);
-                    Utility.backupFile(task.getGuildID(), Constants.FILE_GUILD_USERS);
-                    GuildConfig guildConfig = Globals.getGuildContent(task.getGuildID()).getGuildConfig();
+                Globals.getDailyMessages().backUp();
+                for (GuildObject task : Globals.getGuilds()) {
+                    for (GuildFile f : task.guildFiles) {
+                        f.backUp();
+                    }
+                    GuildConfig guildconfig = task.config;
 
-                    if (guildConfig.modulePixels && guildConfig.xpDecay) {
+                    if (guildconfig.modulePixels && guildconfig.xpDecay) {
                         XpHandler.doDecay(task, nowUTC);
                     }
 
                     //daily messages
-                    if (guildConfig.getChannelIDsByType(Command.CHANNEL_GENERAL) != null) {
-                        if (guildConfig.dailyMessage) {
-                            IChannel channel = Globals.getClient().getChannelByID(guildConfig.getChannelIDsByType(Command.CHANNEL_GENERAL).get(0));
-                            for (DailyMessageObject d : Globals.dailyMessages) {
+                    if (guildconfig.getChannelIDsByType(Command.CHANNEL_GENERAL) != null) {
+                        if (guildconfig.dailyMessage) {
+                            IChannel channel = Globals.getClient().getChannelByID(guildconfig.getChannelIDsByType(Command.CHANNEL_GENERAL).get(0));
+                            for (DailyMessageObject d : Globals.configDailyMessages) {
                                 if (day.equals(d.getDayOfWeek())) {
                                     if (timeNow.getDayOfMonth() == 25 && timeNow.getMonth().equals(Month.DECEMBER)) {
                                         Utility.sendMessage("> ***MERRY CHRISTMAS***", channel);
@@ -165,9 +146,20 @@ public void run() {
                                         }
                                         Utility.sendMessage("> Happy " + age + modifier + " Birthday Mum.", channel);
                                     } else {
-                                        ArrayList<DailyUserMessageObject> dailyMessages = Globals.getGlobalData().getDailyMessages(day);
-//                                        dailyMessages.add(new DailyUserMessageObject(d.getContents(), d.getDayOfWeek(), Globals.botName));
-                                        Utility.sendMessage(dailyMessages.get(random.nextInt(dailyMessages.size())).getContents(), channel);
+                                        ArrayList<DailyUserMessageObject> dailyMessages = Globals.getDailyMessages().getDailyMessages(day);
+                                        dailyMessages.add(new DailyUserMessageObject(d.getContents(), d.getDayOfWeek(), task.client.longID, 10000));
+                                        DailyUserMessageObject toSend = dailyMessages.get(random.nextInt(dailyMessages.size()));
+                                        if (toSend.getUserID() == task.client.longID) {
+                                            task.config.lastDailyMessageID = -1;
+                                        } else {
+                                            task.config.lastDailyMessageID = toSend.getUID();
+                                        }
+                                        String message = toSend.getContents(task);
+                                        if (message.matches("^(> |\\*> |\\*\\*> |\\*\\*\\*> |_> |__> |`> |```> ).*$")) {
+                                            Utility.sendMessage(message, channel);
+                                        } else {
+                                            Utility.sendMessage("> " + message, channel);
+                                        }
                                     }
                                 }
                             }
@@ -194,38 +186,21 @@ public static boolean addReminder(String userID, String channelID, long timeSecs
         return true;
     }
 
-    private static void doEventSec() {
-        Timer timer = new Timer();
-        timer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                for (GuildContentObject task : Globals.getGuildContentObjects()) {
-                    if (task.getDoAdminMention() > 0) {
-                        task.setDoAdminMention(task.getDoAdminMention() - 1);
-                        if (task.getDoAdminMention() == 0) {
-                            logger.debug("Admin mention cool down has worn off for guild with ID" + task.getGuildID());
-                        }
-                    }
-                }
-            }
-        }, 1000, 1000);
-    }
-
     private void doEventTenSec() {
         Timer timer = new Timer();
         timer.schedule(new TimerTask() {
             @Override
             public void run() {
-                for (GuildContentObject task : Globals.getGuildContentObjects()) {
+                for (GuildObject task : Globals.getGuilds()) {
                     task.resetRateLimit();
 
                     //Mutes.
-                    ArrayList<UserCountDown> mutedUsers = task.getGuildUsers().getMutedUsers();
+                    ArrayList<UserCountDown> mutedUsers = task.users.getMutedUsers();
                     for (int i = 0; i < mutedUsers.size(); i++) {
                         if (mutedUsers.get(i).getRemainderSecs() != -1) {
                             mutedUsers.get(i).tickDown(10);
                             if (mutedUsers.get(i).getRemainderSecs() == 0) {
-                                task.getGuildUsers().unMuteUser(mutedUsers.get(i).getID(), task.getGuildID());
+                                task.users.unMuteUser(mutedUsers.get(i).getID(), task.longID);
                             }
                         }
                     }
@@ -238,7 +213,7 @@ private static void doEventFiveMin(ZonedDateTime nowUTC) {
         try {
             Globals.client.getDispatcher().waitFor(ReadyEvent.class);
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            Utility.sendStack(e);
         }
         ZonedDateTime nextTimeUTC;
         long initialDelay;
@@ -256,7 +231,6 @@ private static void doEventFiveMin(ZonedDateTime nowUTC) {
             @Override
             public void run() {
                 ZonedDateTime now = ZonedDateTime.now(ZoneOffset.UTC);
-
                 for (ReminderObject object : Globals.getGlobalData().getReminders()) {
                     if (object.getExecuteTime() - now.toEpochSecond() < 350) {
                         if (!object.isSent()) {
@@ -273,8 +247,10 @@ public void run() {
                 //Sending isAlive Check.
                 try {
                     if (Globals.showSaveWarning) {
+                        logger.info("Total active threads: " + Thread.activeCount());
                         logger.info("Backup in 5 seconds do not restart.");
                     } else {
+                        logger.debug("Total active threads: " + Thread.activeCount());
                         logger.debug("Backup in 5 seconds do not restart.");
                     }
                     Thread.sleep(5000);
@@ -294,7 +270,7 @@ public void run() {
                         e1.printStackTrace();
                     }
                 } catch (InterruptedException e) {
-                    e.printStackTrace();
+                    Utility.sendStack(e);
                 }
                 randomPlayingStatus();
                 Globals.saveFiles();
diff --git a/src/main/java/Handlers/FileHandler.java b/src/main/java/com/github/vaerys/handlers/FileHandler.java
similarity index 91%
rename from src/main/java/Handlers/FileHandler.java
rename to src/main/java/com/github/vaerys/handlers/FileHandler.java
index 3a889634..1660beaf 100644
--- a/src/main/java/Handlers/FileHandler.java
+++ b/src/main/java/com/github/vaerys/handlers/FileHandler.java
@@ -1,4 +1,4 @@
-package Handlers;
+package com.github.vaerys.handlers;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -64,17 +64,17 @@ public static void writeToFile(String file, int line, String text) {
     /**
      * Writes to File using "file" as the path.
      */
-    public static void writeToFile(String file, String text,boolean overwrite) {
+    public static void writeToFile(String file, String text, boolean overwrite) {
         try {
             if (!Files.exists(Paths.get(file))) {
                 Files.createFile(Paths.get(file));
             }
-            if (overwrite){
+            if (overwrite) {
                 FileWriter fileWriter = new FileWriter(file, false);
                 fileWriter.write(text);
                 fileWriter.flush();
                 fileWriter.close();
-            }else {
+            } else {
                 FileWriter fileWriter = new FileWriter(file, true);
                 fileWriter.append(text + "\n");
                 fileWriter.flush();
@@ -110,14 +110,14 @@ public static void writeToJson(String file, Object object) {
         Gson gson = new GsonBuilder().setPrettyPrinting().create();
         try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8))) {
             gson.toJson(object, writer);
-            logger.trace("Saving Data to Json File: " + file);
+            logger.trace("Saving " + object.getClass().getName() + " to Json File: " + file);
             writer.close();
         } catch (IOException e) {
             logger.error(e.getCause().toString());
         }
     }
 
-    private static boolean exists(String path) {
+    public static boolean exists(String path) {
         return Files.exists(Paths.get(path));
     }
 
@@ -126,6 +126,6 @@ public static void initFile(String path, Object object) {
     }
 
     public static void initFile(String path) {
-        if (!exists(path)) writeToFile(path, "",false);
+        if (!exists(path)) writeToFile(path, "", false);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/vaerys/handlers/GuildCreateListener.java b/src/main/java/com/github/vaerys/handlers/GuildCreateListener.java
new file mode 100644
index 00000000..fe21fa8a
--- /dev/null
+++ b/src/main/java/com/github/vaerys/handlers/GuildCreateListener.java
@@ -0,0 +1,88 @@
+package com.github.vaerys.handlers;
+
+import com.github.vaerys.commands.general.NewDailyMessage;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.GuildObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sx.blah.discord.api.events.EventSubscriber;
+import sx.blah.discord.handle.impl.events.guild.GuildCreateEvent;
+import sx.blah.discord.handle.obj.IGuild;
+
+import java.io.File;
+
+public class GuildCreateListener {
+
+
+    final static Logger logger = LoggerFactory.getLogger(GuildCreateListener.class);
+
+    @EventSubscriber
+    public void onGuildCreateEvent(GuildCreateEvent event) {
+        IGuild guild = event.getGuild();
+        String guildID = guild.getStringID();
+        logger.debug("Starting Initialisation process for Guild with ID: " + guildID);
+
+        if (new File(Utility.getDirectory(guildID)).exists()) {
+            PatchHandler.guildPatches(guild);
+        }
+
+        FileHandler.createDirectory(Utility.getDirectory(guildID));
+        FileHandler.createDirectory(Utility.getDirectory(guildID, true));
+        FileHandler.createDirectory(Utility.getGuildImageDir(guildID));
+        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_INFO));
+
+        GuildObject guildObject = new GuildObject(guild);
+        Globals.initGuild(guildObject);
+        logger.info("Finished Initialising Guild With ID: " + guildID);
+
+//
+//        //Create POGO templates
+//        GuildConfig guildConfig = new GuildConfig();
+//        Servers servers = new Servers();
+//        CustomCommands customCommands = new CustomCommands();
+//        Characters characters = new Characters();
+//        Competition competition = new Competition();
+//        GuildUsers guildUsers = new GuildUsers();
+//        ChannelData channelData = new ChannelData();
+//
+//        //Preps Objects for initial load
+//        customCommands.initCustomCommands();
+//
+//        //null prevention code. unsure if needed still.
+//        guildConfig.setProperlyInit(true);
+//        servers.setProperlyInit(true);
+//        customCommands.setProperlyInit(true);
+//        characters.setProperlyInit(true);
+//        competition.setProperlyInit(true);
+//        guildUsers.setProperlyInit(true);
+//
+
+//
+//        //initial load of all files, creates files if they don't already exist
+//        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_GUILD_CONFIG), guildConfig);
+//        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_SERVERS), servers);
+//        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_CUSTOM), customCommands);
+//        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_CHARACTERS), characters);
+//        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_INFO));
+//        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_COMPETITION), competition);
+//        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_GUILD_USERS), guildUsers);
+//        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_CHANNEl_DATA), channelData);
+//
+//        //loads all Files for the guild;
+//        guildConfig = (GuildConfig) Utility.initFile(guildID, Constants.FILE_GUILD_CONFIG, GuildConfig.class);
+//        customCommands = (CustomCommands) Utility.initFile(guildID, Constants.FILE_CUSTOM, CustomCommands.class);
+//        servers = (Servers) Utility.initFile(guildID, Constants.FILE_SERVERS, Servers.class);
+//        characters = (Characters) Utility.initFile(guildID, Constants.FILE_CHARACTERS, Characters.class);
+//        competition = (Competition) Utility.initFile(guildID, Constants.FILE_COMPETITION, Competition.class);
+//        guildUsers = (GuildUsers) Utility.initFile(guildID, Constants.FILE_GUILD_USERS, GuildUsers.class);
+//        channelData = (ChannelData) Utility.initFile(guildID, Constants.FILE_CHANNEl_DATA, ChannelData.class);
+//        //sends com.github.vaerys.objects to globals
+//        Globals.initGuild(guildID, guildConfig, servers, customCommands, characters, competition, guildUsers, channelData);
+//        logger.info("Finished Initialising Guild With ID: " + guildID);
+
+        NewDailyMessage.checkIsEnabled(Globals.client.getChannelByID(Globals.queueChannelID) != null);
+    }
+}
+
diff --git a/src/main/java/Handlers/InfoHandler.java b/src/main/java/com/github/vaerys/handlers/InfoHandler.java
similarity index 88%
rename from src/main/java/Handlers/InfoHandler.java
rename to src/main/java/com/github/vaerys/handlers/InfoHandler.java
index 01b63225..0907dfde 100644
--- a/src/main/java/Handlers/InfoHandler.java
+++ b/src/main/java/com/github/vaerys/handlers/InfoHandler.java
@@ -1,8 +1,7 @@
-package Handlers;
+package com.github.vaerys.handlers;
 
-import Main.Constants;
-import Main.TagSystem;
-import Main.Utility;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Utility;
 import org.apache.commons.lang3.StringUtils;
 import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IGuild;
@@ -80,8 +79,8 @@ private void updateChannel() {
 
         //actual code.
         for (String contents : stringChunks){
-            contents = TagSystem.tagNoNL(contents); //noNL tag
-            contents = TagSystem.tagEmoji(contents,guild); //Emoji tag
+            contents = TagHandler.tagNoNL(contents); //noNL tag
+            contents = TagHandler.tagEmoji(contents,guild); //Emoji tag
             if (contents.contains(imagePrefix)){
                 image = StringUtils.substringBetween(contents, imagePrefix, imageSuffix);
                 File file = new File(Utility.getGuildImageDir(guild.getStringID()) + image);
@@ -92,16 +91,16 @@ private void updateChannel() {
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                Utility.sendStack(e);
             }
         }
     }
 
 
     private String doTextTags(String s) {
-        s = TagSystem.tagChannel(s); //links the channel
-        s = TagSystem.tagDisplayName(s, guild); //links a non ping displayname
-        s = TagSystem.tagSpacer(s); //spacer tag
+        s = TagHandler.tagChannel(s); //links the channel
+        s = TagHandler.tagDisplayName(s, guild); //links a non ping displayname
+        s = TagHandler.tagSpacer(s); //spacer tag
         return s;
     }
 
diff --git a/src/main/java/com/github/vaerys/handlers/MessageHandler.java b/src/main/java/com/github/vaerys/handlers/MessageHandler.java
new file mode 100644
index 00000000..f1029b5d
--- /dev/null
+++ b/src/main/java/com/github/vaerys/handlers/MessageHandler.java
@@ -0,0 +1,232 @@
+package com.github.vaerys.handlers;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.OffenderObject;
+import com.github.vaerys.pogos.GuildConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sx.blah.discord.handle.impl.events.guild.member.UserRoleUpdateEvent;
+import sx.blah.discord.handle.obj.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * This Class Handles all of the commands that the bot can run not including custom commands.
+ */
+
+
+@SuppressWarnings({"unused", "StringConcatenationInsideStringBufferAppend"})
+public class MessageHandler {
+
+    private FileHandler handler = new FileHandler();
+
+    private final static Logger logger = LoggerFactory.getLogger(MessageHandler.class);
+
+    public MessageHandler(String args, CommandObject command, boolean isPrivate) {
+        if (!isPrivate) {
+            if (checkForInvites(command)) return;
+            if (checkMentionCount(command)) return;
+            if (rateLimiting(command)) return;
+            XpHandler.grantXP(command);
+            if (command.guild.config.artPinning) {
+                if (command.guild.config.autoArtPinning) {
+                    new ArtHandler(command);
+                }
+            }
+            if (command.guild.config.moduleCC) {
+                if (args.toLowerCase().startsWith(command.guild.config.getPrefixCC().toLowerCase())) {
+                    new CCHandler(args, command);
+                }
+            }
+        }
+        // do the command stuff
+        if (handleCommand(command, args)) return;
+        if (isPrivate) {
+            new DMHandler(command);
+        }
+    }
+
+    //Command Handler
+    private boolean handleCommand(CommandObject command, String args) {
+        List<Command> commands = new ArrayList<>(command.guild.commands);
+        IChannel currentChannel = command.channel.get();
+        String commandArgs;
+        for (Command c : commands) {
+            if (c.isCall(args, command)) {
+                commandArgs = c.getArgs(args, command);
+                //log command
+                logger.debug(Utility.loggingFormatter(command, "COMMAND"));
+                //test if user has permissions
+                if (!Utility.testForPerms(c.perms(), command.user.get(), command.guild.get())) {
+                    Utility.sendMessage(command.user.notAllowed, currentChannel);
+                    return true;
+                }
+                //check if it is a valid channel
+                if (!currentChannel.isPrivate()) {
+                    if (c.channel() != null && !Utility.canBypass(command.user.get(), command.guild.get())) {
+                        List<IChannel> channels = command.guild.config.getChannelsByType(c.channel(), command.guild);
+                        if (!channels.contains(command.channel.get())) {
+                            List<String> list = Utility.getChannelMentions(Utility.getVisibleChannels(channels, command.user));
+                            if (list.size() == 0) {
+                                Utility.sendMessage("> You do not have access to any channels that you are able to run this command in.", currentChannel);
+                            } else if (list.size() > 1) {
+                                Utility.sendMessage("> Command must be performed in any of the following channels: \n" + Utility.listFormatter(list, true), currentChannel);
+                            } else {
+                                Utility.sendMessage("> Command must be performed in: " + list.get(0), currentChannel);
+                            }
+                            return true;
+                        }
+                    }
+                }
+                if (c.requiresArgs() && (commandArgs == null || commandArgs.isEmpty())) {
+                    Utility.sendMessage(Utility.getCommandInfo(c, command), currentChannel);
+                    return true;
+                }
+                //command logging
+                handleLogging(command, c, commandArgs);
+                if (!command.channel.get().getTypingStatus()) {
+                    command.channel.get().toggleTypingStatus();
+                }
+                Utility.sendMessage(c.execute(commandArgs, command), currentChannel);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static void handleLogging(CommandObject commandObject, Command command, String args) {
+        if (!command.doAdminLogging() && !commandObject.guild.config.adminLogging) {
+            return;
+        } else if (!commandObject.guild.config.generalLogging) {
+            return;
+        }
+        StringBuilder builder = new StringBuilder();
+        builder.append("> **@" + commandObject.user.username + "** Has Used Command `" + command.getCommand(commandObject) + "`");
+        if (args != null && !args.isEmpty()) {
+            builder.append(" with args: `" + args + "`");
+        }
+        builder.append(" in channel " + commandObject.channel.get().mention() + ".");
+        Utility.sendLog(builder.toString(), commandObject.guild.config, command.doAdminLogging());
+    }
+
+    private boolean checkMentionCount(CommandObject command) {
+        IMessage message = command.message.get();
+        GuildConfig guildconfig = command.guild.config;
+        IUser author = command.user.get();
+        List<IRole> oldRoles = command.user.roles;
+        IGuild guild = command.guild.get();
+
+        if (message.toString().contains("@everyone") || message.toString().contains("@here")) {
+            return false;
+        }
+        if (guildconfig.maxMentions) {
+            if (message.getMentions().size() > 8) {
+                Utility.deleteMessage(message);
+                int i = 0;
+                boolean offenderFound = false;
+                for (OffenderObject o : guildconfig.getRepeatOffenders()) {
+                    if (author.getStringID().equals(o.getID())) {
+                        guildconfig.addOffence(o.getID());
+                        offenderFound = true;
+                        i++;
+                        if (o.getCount() >= Globals.maxWarnings) {
+                            Utility.roleManagement(author, guild, guildconfig.getMutedRoleID(), true);
+                            command.client.get().getDispatcher().dispatch(new UserRoleUpdateEvent(guild, author, oldRoles, command.user.get().getRolesForGuild(guild)));
+                            Utility.sendMessage("> " + author.mention() + " Has been Muted for repeat offences of spamming Mentions.", command.channel.get());
+                        }
+                    }
+                }
+                if (!offenderFound) {
+                    guildconfig.addOffender(new OffenderObject(author.getStringID()));
+                }
+                String response = "> #mentionAdmin# " + author.mention() + "  has attempted to post more than " + guildconfig.getMaxMentionLimit() + " Mentions in a single message.";
+                IRole roleToMention = command.guild.get().getRoleByID(guildconfig.getRoleToMentionID());
+                if (roleToMention != null) {
+                    response = response.replaceAll("#mentionAdmin#", roleToMention.mention());
+                } else {
+                    response = response.replaceAll("#mentionAdmin#", "Admin");
+                }
+                Utility.sendMessage(response, command.channel.get());
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean rateLimiting(CommandObject command) {
+        if (Utility.testForPerms(new Permissions[]{Permissions.MANAGE_MESSAGES}, command.user.get(), command.guild.get()) ||
+                Utility.canBypass(command.user.get(), command.guild.get(), false)) {
+            return false;
+        }
+        if (command.guild.config.rateLimiting) {
+            if (command.guild.rateLimit(command.user.stringID)) {
+                List<IRole> oldRoles = command.user.roles;
+                command.message.get().delete();
+                Utility.sendDM("Your message was deleted because you are being rate limited.\nMax messages per 10 seconds : " + command.guild.config.messageLimit, command.user.longID);
+                if (command.guild.config.muteRepeatOffenders) {
+                    int rate = command.guild.getUserRate(command.user.stringID);
+                    if (rate - 3 > command.guild.config.messageLimit) {
+                        //mutes profiles if they abuse it.
+                        boolean failed = Utility.roleManagement(command.user.get(), command.guild.get(), command.guild.config.getMutedRoleID(), true).get();
+                        command.client.get().getDispatcher().dispatch(new UserRoleUpdateEvent(command.guild.get(), command.user.get(), oldRoles, command.user.roles));
+                        if (!failed) {
+                            IChannel adminChannel = null;
+                            if (command.guild.config.getChannelIDsByType(Command.CHANNEL_ADMIN) != null) {
+                                adminChannel = command.client.get().getChannelByID(command.guild.config.getChannelIDsByType(Command.CHANNEL_ADMIN).get(0));
+                            }
+                            if (adminChannel == null) {
+                                adminChannel = command.channel.get();
+                            }
+                            Utility.sendDM("You have been muted for abusing the Guild rate limit.", command.user.stringID);
+                            Utility.sendMessage("> " + command.user.get().mention() + " has been muted for repetitively abusing Guild rateLimit.", adminChannel);
+                        }
+                    }
+                }
+                if (command.guild.config.deleteLogging) {
+                    Utility.sendLog("> **@" + command.user.username + "** is being rate limited", command.guild.config, false);
+                }
+                return true;
+            }
+            return false;
+        } else {
+            return false;
+        }
+    }
+
+    //File com.github.vaerys.handlers
+
+    //BlackListed Phrase Remover
+    private boolean checkForInvites(CommandObject command) {
+        GuildConfig guildconfig = command.guild.config;
+        IMessage message = command.message.get();
+        IGuild guild = command.guild.get();
+        IUser author = command.user.get();
+        List<String> inviteformats = new ArrayList<String>() {{
+            add("discord.gg");
+            add("discordapp.com/Invite/");
+        }};
+
+        boolean inviteFound = false;
+        if (guildconfig.denyInvites) {
+            for (String s : inviteformats) {
+                if (message.toString().toLowerCase().contains(s.toLowerCase())) {
+                    if (guildconfig.testIsTrusted(author, guild)) {
+                        return false;
+                    }
+                    inviteFound = true;
+                }
+            }
+        }
+        if (inviteFound) {
+            String response = "> Please do not post Instant Invites.";
+            Utility.deleteMessage(message);
+            Utility.sendMessage(response, command.channel.get());
+        }
+        return inviteFound;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/Handlers/PatchHandler.java b/src/main/java/com/github/vaerys/handlers/PatchHandler.java
similarity index 83%
rename from src/main/java/Handlers/PatchHandler.java
rename to src/main/java/com/github/vaerys/handlers/PatchHandler.java
index e8f77d5e..25bcd31d 100644
--- a/src/main/java/Handlers/PatchHandler.java
+++ b/src/main/java/com/github/vaerys/handlers/PatchHandler.java
@@ -1,14 +1,13 @@
-package Handlers;
-
-import Main.Constants;
-import Main.Globals;
-import Main.Utility;
-import Objects.*;
-import OldCode.ChannelData;
-import OldCode.*;
-import POGOs.*;
-import POGOs.CustomCommands;
-import org.apache.commons.lang3.StringUtils;
+package com.github.vaerys.handlers;
+
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.*;
+import com.github.vaerys.oldcode.ChannelData;
+import com.github.vaerys.oldcode.*;
+import com.github.vaerys.pogos.*;
+import com.github.vaerys.pogos.CustomCommands;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sx.blah.discord.handle.obj.IGuild;
@@ -16,7 +15,6 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.stream.Collectors;
 
 /**
@@ -72,13 +70,13 @@ public static void guildPatches(IGuild guild) {
             //patch 2
             if (!exit && p.getPatchLevel().equals(Constants.PATCH_2)) {
                 ChannelData channelData = (ChannelData) Utility.initFile(guild.getStringID(), Constants.FILE_GUILD_CONFIG, ChannelData.class);
-                GuildConfig guildConfig = (GuildConfig) Utility.initFile(guild.getStringID(), Constants.FILE_GUILD_CONFIG, GuildConfig.class);
+                GuildConfig guildconfig = (GuildConfig) Utility.initFile(guild.getStringID(), Constants.FILE_GUILD_CONFIG, GuildConfig.class);
                 if (channelData != null) {
                     for (ChannelTypeObject c : channelData.getChannels()) {
-                        guildConfig.addChannelSetting(c.getType(), c.getID());
+                        guildconfig.addChannelSetting(c.getType(), c.getID());
                     }
                 }
-                FileHandler.writeToJson(Utility.getFilePath(guild.getStringID(), Constants.FILE_GUILD_CONFIG), guildConfig);
+                FileHandler.writeToJson(Utility.getFilePath(guild.getStringID(), Constants.FILE_GUILD_CONFIG), guildconfig);
                 p.getPatchedGuildIDs().add(guild.getStringID());
             }
             //patch 3 - rename all of the toggles to used <tag> instead of #tag# (lots of code that cant be simplified ;_;)
@@ -116,9 +114,9 @@ public static void guildPatches(IGuild guild) {
             if (!exit && p.getPatchLevel().equalsIgnoreCase(Constants.PATCH_4)) {
                 GuildUsers guildUsers = (GuildUsers) Utility.initFile(guild.getStringID(), Constants.FILE_GUILD_USERS, GuildUsers.class);
 
-                for (UserTypeObject u : guildUsers.getUsers()) {
+                for (ProfileObject u : guildUsers.getProfiles()) {
                     u.setXp(0);
-                    u.setRewardID(-1);
+//                    u.setRewardID(-1);
                 }
 
                 FileHandler.writeToJson(Utility.getFilePath(guild.getStringID(), Constants.FILE_GUILD_USERS), guildUsers);
@@ -126,29 +124,29 @@ public static void guildPatches(IGuild guild) {
             }
             if (!exit && p.getPatchLevel().equalsIgnoreCase(Constants.PATCH_5)) {
                 OldGuildConfig oldGuildConfig = (OldGuildConfig) Utility.initFile(guild.getStringID(), Constants.FILE_GUILD_CONFIG, OldGuildConfig.class);
-                GuildConfig guildConfig = (GuildConfig) Utility.initFile(guild.getStringID(), Constants.FILE_GUILD_CONFIG, GuildConfig.class);
+                GuildConfig guildconfig = (GuildConfig) Utility.initFile(guild.getStringID(), Constants.FILE_GUILD_CONFIG, GuildConfig.class);
                 OldCharacters oldCharacters = (OldCharacters) Utility.initFile(guild.getStringID(), Constants.FILE_CHARACTERS, OldCharacters.class);
                 Characters characters = (Characters) Utility.initFile(guild.getStringID(), Constants.FILE_CHARACTERS, Characters.class);
                 for (RoleTypeObject r : oldGuildConfig.getCosmeticRoles()) {
-                    guildConfig.getCosmeticRoleIDs().add(Long.parseLong(r.getRoleID()));
+                    guildconfig.getCosmeticRoleIDs().add(Long.parseLong(r.getRoleID()));
                 }
                 for (RoleTypeObject r : oldGuildConfig.getModifierRoles()) {
-                    guildConfig.getModifierRoleIDs().add(Long.parseLong(r.getRoleID()));
+                    guildconfig.getModifierRoleIDs().add(Long.parseLong(r.getRoleID()));
                 }
                 for (RoleTypeObject r : oldGuildConfig.getTrustedRoles()) {
-                    guildConfig.getTrustedRoleIDs().add(Long.parseLong(r.getRoleID()));
+                    guildconfig.getTrustedRoleIDs().add(Long.parseLong(r.getRoleID()));
                 }
                 try {
 
                     long newRoleToMention = Long.parseLong(oldGuildConfig.getRoleToMention().getRoleID());
 
-                    guildConfig.setRoleToMentionID(newRoleToMention);
+                    guildconfig.setRoleToMentionID(newRoleToMention);
                 } catch (NumberFormatException e) {
                     logger.info("Could not find valid role to mention role");
                 }
                 try {
                     long newMutedRole = Long.parseLong(oldGuildConfig.getMutedRole().getRoleID());
-                    guildConfig.setMutedRoleID(newMutedRole);
+                    guildconfig.setMutedRoleID(newMutedRole);
                 } catch (NumberFormatException e) {
                     logger.info("Could not find valid mute role");
                 }
@@ -163,7 +161,7 @@ public static void guildPatches(IGuild guild) {
                         }
                     }
                 }
-                Utility.flushFile(guild.getStringID(), Constants.FILE_GUILD_CONFIG, guildConfig, true);
+                Utility.flushFile(guild.getStringID(), Constants.FILE_GUILD_CONFIG, guildconfig, true);
                 Utility.flushFile(guild.getStringID(), Constants.FILE_CHARACTERS, characters, true);
                 p.getPatchedGuildIDs().add(guild.getStringID());
             }
@@ -182,14 +180,14 @@ public static void globalPatches() {
             logger.info("Performing patch : " + Constants.PATCH_GLOBAL_1 + ". Please wait...");
             //fix daily messages
             Config config = (Config) FileHandler.readFromJson(Constants.FILE_CONFIG, Config.class);
-            for (DailyMessageObject d : Globals.dailyMessages) {
+            for (DailyMessageObject d : Globals.configDailyMessages) {
                 StringBuilder content = new StringBuilder();
                 for (String s : d.getData()) {
                     content.append(s.replace("#random#", "<random>") + "\n");
                 }
                 d.setContents(content.toString());
             }
-            config.setDailyMessages(Globals.dailyMessages);
+            config.setDailyMessages(Globals.configDailyMessages);
             FileHandler.writeToJson(Constants.FILE_CONFIG, config);
             Globals.getGlobalData().getGlobalPatches().add(Constants.PATCH_GLOBAL_1);
         }
@@ -206,28 +204,10 @@ public static void globalPatches() {
 
     public static void globalDataPatch() {
         OldGlobalData oldData = (OldGlobalData) FileHandler.readFromJson(Constants.FILE_GLOBAL_DATA, OldGlobalData.class);
-        GlobalData globalData = (GlobalData) FileHandler.readFromJson(Constants.FILE_GLOBAL_DATA, GlobalData.class);
-        for (OldUserDailyMessageObject o : oldData.getObjects()) {
-            try {
-                String substring = StringUtils.substringBetween(o.getAuthor().split(" ")[0], "[", "]");
-                long userID = Long.parseLong(substring);
-                long uID = Utility.newDailyMsgUID(globalData);
-                globalData.getDailyMessages().add(new DailyUserMessageObject(o.getContent(), o.getDay(), userID, uID));
-            } catch (NumberFormatException e) {
-                //Skip this one.
-            }
-        }
-        globalData.getQueuedRequests().clear();
-        ListIterator iterator = globalData.getPatches().listIterator();
-        while (iterator.hasNext()) {
-            PatchObject object = (PatchObject) iterator.next();
-            if (object.getPatchLevel() != null) {
-                if (object.getPatchLevel().equalsIgnoreCase("SAVE_MY_BABY")) {
-                    iterator.remove();
-                }
-            }
-        }
-        FileHandler.writeToJson(Constants.FILE_GLOBAL_DATA, globalData);
+        DailyMessages dailyMessages = (DailyMessages) DailyMessages.create(DailyMessages.FILE_PATH, new DailyMessages());
+        dailyMessages.getMessages().addAll(oldData.getDailyMessages());
+        dailyMessages.getQueue().addAll(oldData.getQueuedRequests());
+        dailyMessages.flushFile();
     }
 
     private static String toNewSystem(String from) {
diff --git a/src/main/java/Handlers/QueueHandler.java b/src/main/java/com/github/vaerys/handlers/QueueHandler.java
similarity index 57%
rename from src/main/java/Handlers/QueueHandler.java
rename to src/main/java/com/github/vaerys/handlers/QueueHandler.java
index 3b794580..cdfd1b14 100644
--- a/src/main/java/Handlers/QueueHandler.java
+++ b/src/main/java/com/github/vaerys/handlers/QueueHandler.java
@@ -1,20 +1,19 @@
-package Handlers;
+package com.github.vaerys.handlers;
 
-import Commands.CommandObject;
-import Main.Constants;
-import Main.Globals;
-import Main.Utility;
-import Objects.DailyUserMessageObject;
-import Objects.QueueObject;
-import Objects.XEmbedBuilder;
-import POGOs.GlobalData;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.DailyUserMessageObject;
+import com.github.vaerys.objects.QueueObject;
+import com.github.vaerys.objects.XEmbedBuilder;
+import com.github.vaerys.objects.XRequestBuffer;
 import com.vdurmont.emoji.Emoji;
 import com.vdurmont.emoji.EmojiManager;
 import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IEmbed;
 import sx.blah.discord.handle.obj.IMessage;
 import sx.blah.discord.handle.obj.IReaction;
-import sx.blah.discord.util.RequestBuffer;
 
 import java.time.DayOfWeek;
 import java.util.ArrayList;
@@ -31,24 +30,24 @@ public class QueueHandler {
     public static void addToQueue(CommandObject object, String content, DayOfWeek dayOfWeek, String type) {
         Emoji thumbsUp = EmojiManager.getForAlias("thumbsup");
         Emoji thumbsDown = EmojiManager.getForAlias("thumbsdown");
-        IChannel channel = object.client.getChannelByID(Globals.queueChannelID);
+        IChannel channel = object.client.get().getChannelByID(Globals.queueChannelID);
 
         if (channel != null) {
             switch (type) {
                 case Constants.QUEUE_DAILY:
-                    long uID = Utility.newDailyMsgUID(Globals.getGlobalData());
+                    long uID = Utility.newDailyMsgUID(Globals.getDailyMessages());
                     XEmbedBuilder embedBuilder = new XEmbedBuilder();
-                    embedBuilder.withAuthorName("New Daily Message - " + object.guild.getName());
-                    embedBuilder.withFooterText(object.authorSID);
-                    embedBuilder.withTitle(object.authorUserName);
+                    embedBuilder.withAuthorName("New Daily Message - " + object.guild.get().getName());
+                    embedBuilder.withFooterText(object.user.stringID);
+                    embedBuilder.withTitle(object.user.username);
                     embedBuilder.withDesc(content);
                     embedBuilder.appendField(dowString, dayOfWeek + "", true);
                     embedBuilder.appendField(uIDString, uID + "", true);
-                    embedBuilder.withColor(Utility.getUsersColour(object.botUser,object.guild));
+                    embedBuilder.withColor(Utility.getUsersColour(object.client.bot, object.guild.get()));
                     IMessage message = Utility.sendEmbedMessage("", embedBuilder, channel).get();
-                    RequestBuffer.request(() -> message.addReaction(thumbsUp)).get();
-                    RequestBuffer.request(() -> message.addReaction(thumbsDown)).get();
-                    Globals.getGlobalData().getQueuedRequests().add(new QueueObject(message.getLongID(), uID, type));
+                    XRequestBuffer.request(() -> message.addReaction(thumbsUp)).get();
+                    XRequestBuffer.request(() -> message.addReaction(thumbsDown)).get();
+                    Globals.getDailyMessages().getQueue().add(new QueueObject(message.getLongID(), uID, type));
                     checkQueue();
                     return;
                 default:
@@ -58,14 +57,17 @@ public static void addToQueue(CommandObject object, String content, DayOfWeek da
     }
 
     public static void checkQueue() {
-        ArrayList<QueueObject> queuedMessages = Globals.getGlobalData().getQueuedRequests();
-        for (int i = 0; i < queuedMessages.size(); i++) {
-            if (queuedMessages == null || queuedMessages.size() == 0) return;
-            IMessage message = Globals.getClient().getMessageByID(queuedMessages.get(i).getMessageId());
-            if (message == null) {
-                if (message.getLongID() == queuedMessages.get(i).getMessageId()) {
-                    queuedMessages.remove(i);
-                }
+        ArrayList<QueueObject> queuedMessages = Globals.getDailyMessages().getQueue();
+        ListIterator iterator = queuedMessages.listIterator();
+        while (iterator.hasNext()) {
+            QueueObject object = (QueueObject) iterator.next();
+            if (Globals.client.getMessageByID(object.getMessageId()) == null) {
+                iterator.remove();
+            }
+            try {
+                Thread.sleep(200);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
             }
         }
     }
@@ -76,7 +78,7 @@ public static void addedReaction(IMessage message, IReaction reaction) {
         Emoji thumbsDown = EmojiManager.getForAlias("thumbsdown");
         Emoji ok = EmojiManager.getForAlias("white_check_mark");
         Emoji no = EmojiManager.getForAlias("no_entry_sign");
-        ArrayList<QueueObject> queuedMessages = Globals.getGlobalData().getQueuedRequests();
+        ArrayList<QueueObject> queuedMessages = Globals.getDailyMessages().getQueue();
 
         long messageId = message.getLongID();
         ListIterator iterator = queuedMessages.listIterator();
@@ -92,7 +94,7 @@ public static void addedReaction(IMessage message, IReaction reaction) {
                         case Constants.QUEUE_DAILY:
                             //if approved
                             if (reaction.getUnicodeEmoji().equals(thumbsUp)) {
-                                RequestBuffer.request(() -> message.removeAllReactions()).get();
+                                XRequestBuffer.request(() -> message.removeAllReactions()).get();
                                 try {
                                     long userID = Long.parseLong(embed.getFooter().getText());
                                     long uID = -1;
@@ -104,8 +106,9 @@ public static void addedReaction(IMessage message, IReaction reaction) {
                                             uID = Long.parseLong(f.getValue());
                                         }
                                     }
-                                    Globals.getGlobalData().getDailyMessages().add(new DailyUserMessageObject(embed.getDescription(), day, userID, uID));
-                                    RequestBuffer.request(() -> message.addReaction(ok)).get();
+                                    Utility.sendDM("> A daily message you sent was approved.", userID);
+                                    Globals.getDailyMessages().getMessages().add(new DailyUserMessageObject(embed.getDescription(), day, userID, uID));
+                                    XRequestBuffer.request(() -> message.addReaction(ok)).get();
                                     iterator.remove();
                                 } catch (NumberFormatException e) {
                                     iterator.remove();
@@ -114,8 +117,20 @@ public static void addedReaction(IMessage message, IReaction reaction) {
                                 }
                                 //if denied
                             } else if (reaction.getUnicodeEmoji().equals(thumbsDown)) {
-                                RequestBuffer.request(() -> message.removeAllReactions()).get();
-                                RequestBuffer.request(() -> message.addReaction(no)).get();
+                                try {
+                                    long userID = Long.parseLong(embed.getFooter().getText());
+                                    long uID = -1;
+                                    for (IEmbed.IEmbedField f : embed.getEmbedFields()) {
+                                        if (f.getName().equalsIgnoreCase(uIDString)) {
+                                            uID = Long.parseLong(f.getValue());
+                                        }
+                                    }
+                                    Utility.sendDM("> A daily message you sent was denied. **[" + uID + "]**", userID);
+                                } catch (NumberFormatException e) {
+                                    //do nothing
+                                }
+                                XRequestBuffer.request(() -> message.removeAllReactions()).get();
+                                XRequestBuffer.request(() -> message.addReaction(no)).get();
                                 iterator.remove();
                             }
                             break;
@@ -126,25 +141,11 @@ public static void addedReaction(IMessage message, IReaction reaction) {
                 }
             }
             checkQueue();
-//        for (int i = 0; i < queuedMessages.size(); i++) {
-//            if (messageId == queuedMessages.get(i).getMessageId()) {
-//                if (message.getEmbeds().size() > 0) {
-//                    IEmbed embed = message.getEmbeds().get(0);
-//                    DayOfWeek day = DayOfWeek.valueOf(embed.getFooter().getText());
-//                    embed.getDescription();
-//                    RequestBuffer.request(() -> message.removeAllReactions()).get();
-////                    if (reaction.getUnicodeEmoji().equals(thumbsUp)) {
-////                        Utility.newDailyMsgUID(Globals.getGlobalData());
-////                        Globals.getGlobalData().getDailyMessages().add(new DailyUserMessageObject(embed.getDescription(), day, embed.getTitle()));
-////                        RequestBuffer.request(() -> message.addReaction(ok)).get();
-////                    } else {
-////                        RequestBuffer.request(() -> message.addReaction(no)).get();
-////                    }
-//                    queuedMessages.remove(i);
-//                }
-//            }
-//        }
-//        checkQueue();
+            try {
+                Thread.sleep(200);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
         }
     }
 }
diff --git a/src/main/java/Main/TagSystem.java b/src/main/java/com/github/vaerys/handlers/TagHandler.java
similarity index 88%
rename from src/main/java/Main/TagSystem.java
rename to src/main/java/com/github/vaerys/handlers/TagHandler.java
index d5d5e427..a1473592 100644
--- a/src/main/java/Main/TagSystem.java
+++ b/src/main/java/com/github/vaerys/handlers/TagHandler.java
@@ -1,14 +1,20 @@
-package Main;
+package com.github.vaerys.handlers;
 
-import Annotations.TagAnnotation;
-import Commands.CommandObject;
-import Objects.ReplaceObject;
+import com.github.vaerys.annotations.TagAnnotation;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.ReplaceObject;
 import org.apache.commons.lang3.StringUtils;
 import sx.blah.discord.handle.obj.*;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Pattern;
@@ -16,7 +22,7 @@
 /**
  * Created by Vaerys on 22/10/2016.
  */
-public class TagSystem {
+public class TagHandler {
 
     // TODO: 12/11/2016 replace repetitive code for the IfTags
     // TODO: 15/01/2017 actually use the annotations
@@ -24,25 +30,45 @@ public class TagSystem {
     public static String tagSystem(String contents, CommandObject object, String args) {
         String response = contents;
         response = tagArgs(response, args);
-        response = tagNoNL(response);
-        response = tagGetAuthor(response, object.author, object.guild);
-        response = tagGetUsername(response, object.author);
         response = tagSpacer(response);
+        response = tagNoNL(response);
+        response = tagGetAuthor(response, object.user.get(), object.guild.get());
+        response = tagGetUsername(response, object.user.get());
         response = tagSpecialArgs(response, args);
         response = tagRandom(response);
-        response = tagIfRole(response, object.author,object.guild);
-        response = tagIfName(response, object.author,object.guild);
+        response = tagIfRole(response, object.user.get(), object.guild.get());
+        response = tagIfName(response, object.user.get(), object.guild.get());
         response = tagEmptyArgs(response, args);
         response = tagIfArgs(response, args);
         response = tagRegex(response, "<replace>{", "}", ";;");
         response = tagRegex(response, "<replace!>(", ")</r>", "::");
         response = tagRandNum(response);
+        response = tagRandEmote(response, object.guild);
         response = replaceError(response);
-        response = tagMentionRemover(response);
         response = tagToCaps(response);
         return response;
     }
 
+    private static String tagRandEmote(String from, GuildObject guild) {
+        String tagCall = "<randEmote>";
+        String lastAttempt;
+        if (from.contains(tagCall)) {
+            do {
+                lastAttempt = from;
+                Random rand = new Random();
+                List<IEmoji> emojis = guild.get().getEmojis();
+                if (emojis.size() == 0) {
+                    return from;
+                }
+                IEmoji randomEmoji = emojis.get(rand.nextInt(emojis.size()));
+                if (randomEmoji != null) {
+                    from = from.replaceFirst(tagCall, randomEmoji.toString());
+                }
+            } while (StringUtils.countMatches(from, tagCall) > 0 && (!lastAttempt.equals(from)));
+        }
+        return from;
+    }
+
     private static String replaceError(String from) {
         String tag;
         String prefix = "<repError>{";
@@ -62,7 +88,7 @@ private static String replaceError(String from) {
     }
 
     public static String getTagList(String type) {
-        Method[] methods = TagSystem.class.getMethods();
+        Method[] methods = TagHandler.class.getMethods();
         ArrayList<String> tags = new ArrayList<>();
         for (int i = 1; i < 11; i++) {
             for (Method m : methods) {
@@ -337,8 +363,8 @@ public static String tagRandNum(String from) {
     }
 
     public static String tagMentionRemover(String from) {
-        from = from.replace("@everyone", "**[REDACTED]**");
-        from = from.replace("@here", "**[REDACTED]**");
+        from = from.replaceAll("(?i)@everyone", "**[REDACTED]**");
+        from = from.replaceAll("(?i)@here", "**[REDACTED]**");
         return from;
     }
 
@@ -469,4 +495,20 @@ public static String tagToCaps(String from) {
         }
         return from;
     }
+
+    public static String prepDailyMessage(String content, GuildObject guild) {
+        content = tagRandEmote(content, guild);
+        content = tagSpacer(content);
+        content = tagRandom(content);
+        content = tagNoNL(content);
+        content = tagMentionRemover(content);
+        return content;
+    }
+
+    public static StringBuilder prepLevelUpMessage(StringBuilder levelUpMessage, GuildObject guild, UserObject user) {
+        levelUpMessage = new StringBuilder(levelUpMessage.toString().replace("<level>", user.getProfile(guild).getCurrentLevel() + ""));
+        levelUpMessage = new StringBuilder(levelUpMessage.toString().replace("<user>", user.get().mention()));
+        levelUpMessage = new StringBuilder(tagRandEmote(levelUpMessage.toString(), guild));
+        return levelUpMessage;
+    }
 }
diff --git a/src/main/java/Handlers/XpHandler.java b/src/main/java/com/github/vaerys/handlers/XpHandler.java
similarity index 53%
rename from src/main/java/Handlers/XpHandler.java
rename to src/main/java/com/github/vaerys/handlers/XpHandler.java
index 27887d63..beae7ee5 100644
--- a/src/main/java/Handlers/XpHandler.java
+++ b/src/main/java/com/github/vaerys/handlers/XpHandler.java
@@ -1,58 +1,68 @@
-package Handlers;
-
-import Commands.CommandObject;
-import Enums.UserSetting;
-import Interfaces.Command;
-import Main.Constants;
-import Main.Globals;
-import Main.Utility;
-import Objects.GuildContentObject;
-import Objects.RewardRoleObject;
-import Objects.UserTypeObject;
-import POGOs.GuildUsers;
+package com.github.vaerys.handlers;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.commands.general.ProfileSettings;
+import com.github.vaerys.enums.UserSetting;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.RewardRoleObject;
+import com.github.vaerys.objects.XRequestBuffer;
+import com.github.vaerys.pogos.GuildUsers;
 import com.vdurmont.emoji.Emoji;
 import com.vdurmont.emoji.EmojiManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import sx.blah.discord.handle.obj.*;
 import sx.blah.discord.util.DiscordException;
 import sx.blah.discord.util.MissingPermissionsException;
-import sx.blah.discord.util.RequestBuffer;
 
+import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.concurrent.TimeUnit;
 
-import static Enums.UserSetting.*;
+import static com.github.vaerys.enums.UserSetting.*;
 
 /**
  * Created by Vaerys on 29/06/2017.
  */
 public class XpHandler {
 
-    public static void doDecay(GuildContentObject content, ZonedDateTime nowUTC) {
-        for (UserTypeObject u : content.getGuildUsers().getUsers()) {
+    final static Logger logger = LoggerFactory.getLogger(XpHandler.class);
+
+    public static void doDecay(GuildObject content, ZonedDateTime nowUTC) {
+        for (ProfileObject u : content.users.getProfiles()) {
             if (u.getLastTalked() != -1) {
                 long diff = nowUTC.toEpochSecond() - u.getLastTalked();
                 long days = TimeUnit.DAYS.convert(diff, TimeUnit.SECONDS);
                 float temp = 0;
                 long decay;
+                u.setCurrentLevel(XpHandler.xpToLevel(u.getXP()));
                 //modifiable min and max decay days needs to be implemented.
                 if (days > 7 && days < 30) {
                     //normal xp decay formula
-                    temp = (days - 7) * (Globals.avgMessagesPerDay * content.getGuildConfig().xpRate * content.getGuildConfig().xpModifier) / 8;
+                    temp = (days - 7) * (Globals.avgMessagesPerDay * content.config.xpRate * content.config.xpModifier) / 8;
                 } else if (days > 15) {
                     //plateaued xp decay
-                    temp = (15 - 7) * (Globals.avgMessagesPerDay * content.getGuildConfig().xpRate * content.getGuildConfig().xpModifier) / 8;
+                    temp = (15 - 7) * (Globals.avgMessagesPerDay * content.config.xpRate * content.config.xpModifier) / 8;
                 }
                 decay = (long) temp;
                 //half decay if you turn you xp gain off but only if it is voluntary
                 if (u.getSettings().contains(UserSetting.NO_XP_GAIN)) {
                     decay = decay / 2;
                 }
-                if (u.getRewardID() != -1) {
-                    RewardRoleObject rewardRole = content.getGuildConfig().getRewardRole(u.getRewardID());
+                if (XpHandler.getRewardCount(content, u.getID()) != 0) {
+                    long pseudoLevel = xpToLevel(u.getXP() + 120);
+                    RewardRoleObject rewardRole = content.config.getCurrentReward(pseudoLevel);
                     if (rewardRole != null) {
+
                         long rewardFloor = rewardRole.getXp() - 100;
                         if (u.getXP() > rewardFloor) {
                             u.setXp(u.getXP() - decay);
@@ -60,10 +70,11 @@ public static void doDecay(GuildContentObject content, ZonedDateTime nowUTC) {
                             if (u.getXP() < 0) {
                                 u.setXp(0);
                             }
-                            //decay should never lower your total xp below the reward floor
+                            //decay should never lower your total xp below the reward floor.
                             if (u.getXP() < rewardFloor) {
                                 u.setXp(rewardFloor);
                             }
+                            //if user is at level floor add setting.
                             if (u.getXP() == rewardFloor && !u.getSettings().contains(HIT_LEVEL_FLOOR)) {
                                 u.getSettings().add(HIT_LEVEL_FLOOR);
                             }
@@ -71,10 +82,7 @@ public static void doDecay(GuildContentObject content, ZonedDateTime nowUTC) {
                         //if your days away is a multiple of 30 you should be checked if you are at the
                         //reward floor, if you are reward decay occurs
                         if (days % 30 == 0 && u.getXP() == rewardFloor) {
-                            RewardRoleObject lowerReward = content.getGuildConfig().getLowerReward(rewardRole);
-                            if (lowerReward != null) {
-                                u.setRewardID(lowerReward.getRoleID());
-                            }
+                            u.setXp(u.getXP() - 100);
                         }
                     }
                 }
@@ -84,27 +92,28 @@ public static void doDecay(GuildContentObject content, ZonedDateTime nowUTC) {
         }
     }
 
-    public static void doDeacyUser(UserTypeObject u, CommandObject object, ZonedDateTime nowUTC) {
+    //for testing purposes only
+    public static void doDeacyUser(ProfileObject u, GuildObject content, long days) {
         if (u.getLastTalked() != -1) {
-            long diff = nowUTC.toEpochSecond() - u.getLastTalked();
-            long days = TimeUnit.DAYS.convert(diff, TimeUnit.SECONDS);
             float temp = 0;
             long decay;
+            u.setCurrentLevel(XpHandler.xpToLevel(u.getXP()));
             //modifiable min and max decay days needs to be implemented.
             if (days > 7 && days < 30) {
                 //normal xp decay formula
-                temp = (days - 7) * (Globals.avgMessagesPerDay * object.guildConfig.xpRate * object.guildConfig.xpModifier) / 8;
-            } else if (days > 30) {
+                temp = (days - 7) * (Globals.avgMessagesPerDay * content.config.xpRate * content.config.xpModifier) / 8;
+            } else if (days > 15) {
                 //plateaued xp decay
-                temp = (30 - 7) * (Globals.avgMessagesPerDay * object.guildConfig.xpRate * object.guildConfig.xpModifier) / 8;
+                temp = (15 - 7) * (Globals.avgMessagesPerDay * content.config.xpRate * content.config.xpModifier) / 8;
             }
             decay = (long) temp;
-            //haf decay if you turn you xp gain off but only if it is voluntary
+            //half decay if you turn you xp gain off but only if it is voluntary
             if (u.getSettings().contains(UserSetting.NO_XP_GAIN)) {
                 decay = decay / 2;
             }
-            if (u.getRewardID() != -1) {
-                RewardRoleObject rewardRole = object.guildConfig.getRewardRole(u.getRewardID());
+            if (XpHandler.getRewardCount(content, u.getID()) != 0) {
+                long pseudoLevel = xpToLevel(u.getXP() + 120);
+                RewardRoleObject rewardRole = content.config.getCurrentReward(pseudoLevel);
                 if (rewardRole != null) {
                     long rewardFloor = rewardRole.getXp() - 100;
                     if (u.getXP() > rewardFloor) {
@@ -113,10 +122,11 @@ public static void doDeacyUser(UserTypeObject u, CommandObject object, ZonedDate
                         if (u.getXP() < 0) {
                             u.setXp(0);
                         }
-                        //decay should never lower your total xp below the reward floor
+                        //decay should never lower your total xp below the reward floor.
                         if (u.getXP() < rewardFloor) {
                             u.setXp(rewardFloor);
                         }
+                        //if user is at level floor add setting.
                         if (u.getXP() == rewardFloor && !u.getSettings().contains(HIT_LEVEL_FLOOR)) {
                             u.getSettings().add(HIT_LEVEL_FLOOR);
                         }
@@ -124,122 +134,113 @@ public static void doDeacyUser(UserTypeObject u, CommandObject object, ZonedDate
                     //if your days away is a multiple of 30 you should be checked if you are at the
                     //reward floor, if you are reward decay occurs
                     if (days % 30 == 0 && u.getXP() == rewardFloor) {
-                        RewardRoleObject lowerReward = object.guildConfig.getLowerReward(rewardRole);
-                        if (lowerReward != null) {
-                            u.setRewardID(lowerReward.getRoleID());
-                        }
+                        u.setXp(u.getXP() - 100);
                     }
                 }
             }
             //check user's roles and make sure that they have the right roles.
-            checkUsersRoles(u.getID(), object.guildContent);
         }
+        checkUsersRoles(u.getID(), content);
     }
 
-    public static void checkUsersRoles(String id, GuildContentObject content) {
+    public static void checkUsersRoles(String id, GuildObject content) {
         //do code.
-        UserTypeObject userObject = content.getGuildUsers().getUserByID(id);
+        ProfileObject userObject = content.users.getUserByID(id);
         if (userObject == null) {
             return;
         }
+        if (userObject.getSettings().contains(DENY_AUTO_ROLE)) return;
+
         IUser user = Globals.getClient().getUserByID(userObject.getID());
         if (user == null) {
             return;
         }
-        List<IRole> userRoles = user.getRolesForGuild(Globals.getClient().getGuildByID(content.getGuildID()));
-        //remove all rewardRoles to prep for checking
-        for (int i = 0; i < userRoles.size(); i++) {
-            for (RewardRoleObject r : content.getGuildConfig().getRewardRoles()) {
-                if (r.getRoleID() == userRoles.get(i).getLongID()) {
-                    userRoles.remove(i);
-                } else if (userRoles.get(i).getLongID() == content.getGuildConfig().topTenRoleID) {
-                    userRoles.remove(i);
-                }
+        List<IRole> userRoles = user.getRolesForGuild(content.get());
+        //remove all rewardRoles to prep for checking.
+        ListIterator iterator = userRoles.listIterator();
+        while (iterator.hasNext()) {
+            IRole role = (IRole) iterator.next();
+            if (content.config.isRoleReward(role.getLongID())) {
+                iterator.remove();
             }
-
         }
-        if (userObject.getRewardID() != -1) {
-            ArrayList<RewardRoleObject> allRewards = content.getGuildConfig().getAllRewards(userObject.getRewardID());
-            if (allRewards == null) {
-                return;
-            }
-            for (RewardRoleObject r : allRewards) {
-                IRole role = Globals.getClient().getRoleByID(r.getRoleID());
-                if (role != null) {
-                    userRoles.add(role);
-                }
-            }
+        //add all roles that the user should have.
+        ArrayList<RewardRoleObject> allRewards = content.config.getAllRewards(userObject.getCurrentLevel());
+        for (RewardRoleObject r : allRewards) {
+            userRoles.add(Globals.getClient().getRoleByID(r.getRoleID()));
         }
-        IRole topTenRole = Globals.client.getGuildByID(content.getGuildID()).getRoleByID(content.getGuildConfig().topTenRoleID);
+        //add the top ten role if they should have it.
+        IRole topTenRole = content.get().getRoleByID(content.config.topTenRoleID);
         if (topTenRole != null) {
-            long rank = XpHandler.rank(content.getGuildUsers(), Globals.client.getGuildByID(content.getGuildID()), user.getStringID());
+            long rank = XpHandler.rank(content.users, content.get(), user.getStringID());
             if (rank <= 10 && rank > 0) {
                 userRoles.add(topTenRole);
             }
         }
         //only do a role update if the role count changes
-        if (user.getRolesForGuild(Globals.getClient().getGuildByID(content.getGuildID())).size() != userRoles.size()) {
-            Utility.roleManagement(user, Globals.client.getGuildByID(content.getGuildID()), userRoles);
+        List<IRole> currentRoles = user.getRolesForGuild(content.get());
+        if (!currentRoles.containsAll(userRoles) || currentRoles.size() != userRoles.size()) {
+            Utility.roleManagement(user, content.get(), userRoles);
         }
     }
 
     public static void grantXP(CommandObject object) {
         //bots don't get XP
-        if (object.author.isBot()) return;
+        if (object.user.get().isBot()) return;
 
         //creates a profile for the user if they don't already have one.
-        UserTypeObject user = new UserTypeObject(object.authorSID);
-        if (object.guildUsers.getUserByID(object.authorSID) == null) {
-            object.guildUsers.getUsers().add(user);
+        ProfileObject user = new ProfileObject(object.user.stringID);
+        if (object.guild.users.getUserByID(object.user.stringID) == null) {
+            object.guild.users.getProfiles().add(user);
         } else {
-            user = object.guildUsers.getUserByID(object.authorSID);
+            user = object.guild.users.getUserByID(object.user.stringID);
         }
 
         //ony do xp checks if module is true
-        if (!object.guildConfig.modulePixels) return;
-        if (!object.guildConfig.xpGain) return;
+        if (!object.guild.config.modulePixels) return;
+        if (!object.guild.config.xpGain) return;
 
-        user.lastTalked = ZonedDateTime.now(ZoneOffset.UTC).toEpochSecond();
+        user.lastTalked = object.message.get().getTimestamp().atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneOffset.UTC).toEpochSecond();
 
         //user setting no xp gain
         if (user.getSettings().contains(NO_XP_GAIN)) return;
 
         //deny xp if they have the xp denied role.
-        for (IRole r : object.authorRoles) {
-            if (r.getLongID() == object.guildConfig.xpDeniedRoleID) {
+        for (IRole r : object.user.roles) {
+            if (r.getLongID() == object.guild.config.xpDeniedRoleID) {
                 return;
             }
         }
 
         //you can only gain xp once per min
-        if (object.guildContent.getSpokenUsers().contains(object.authorID)) return;
+        if (object.guild.getSpokenUsers().contains(object.user.longID)) return;
 
         //messages that might be considered commands should be ignored.
-        ArrayList<String> deniedPrefixes = (ArrayList<String>) object.guildConfig.getXPDeniedPrefixes().clone();
-        deniedPrefixes.add(object.guildConfig.getPrefixCommand());
-        deniedPrefixes.add(object.guildConfig.getPrefixCC());
-        for (String s: deniedPrefixes){
-            if (object.message.getContent().startsWith(s)){
+        ArrayList<String> deniedPrefixes = (ArrayList<String>) object.guild.config.getXPDeniedPrefixes().clone();
+        deniedPrefixes.add(object.guild.config.getPrefixCommand());
+        deniedPrefixes.add(object.guild.config.getPrefixCC());
+        for (String s : deniedPrefixes) {
+            if (object.message.get().getContent().startsWith(s)) {
                 return;
             }
         }
 
         //you must have typed at least 10 chars to gain xp
-        if (object.message.getContent().length() < 10) return;
+        if (object.message.get().getContent().length() < 10) return;
 
         //you cannot gain xp in an xpDenied channel
-        ArrayList<String> xpChannels = object.guildConfig.getChannelIDsByType(Command.CHANNEL_XP_DENIED);
+        ArrayList<String> xpChannels = object.guild.config.getChannelIDsByType(Command.CHANNEL_XP_DENIED);
         if (xpChannels != null && xpChannels.size() > 0) {
-            if (xpChannels.contains(object.channelSID)) return;
+            if (xpChannels.contains(object.channel.stringID)) return;
         }
 
         //gives them their xp.
-        user.addXP(object.guildConfig);
-        object.guildContent.getSpokenUsers().add(object.authorID);
+        user.addXP(object.guild.config);
+        object.guild.getSpokenUsers().add(object.user.longID);
         checkIfLevelUp(user, object);
     }
 
-    private static void checkIfLevelUp(UserTypeObject user, CommandObject object) {
+    private static void checkIfLevelUp(ProfileObject user, CommandObject object) {
         // TODO: 29/07/2017 comment the steps for this code
         boolean leveledUp;
         boolean rankedup = false;
@@ -248,82 +249,67 @@ private static void checkIfLevelUp(UserTypeObject user, CommandObject object) {
             user.setCurrentLevel(xpToLevel(user.getXP()));
             return;
         }
-        if (xpToLevel(user.getXP()) >= user.getCurrentLevel() + 1) {
+        long newLevel = xpToLevel(user.getXP());
+        long nextLevel = user.getCurrentLevel() + 1;
+        if (newLevel >= nextLevel) {
             //react to message that leveled them up
-            if (object.guildConfig.reactToLevelUp) {
-                if (!object.guildConfig.getChannelIDsByType(Command.CHANNEL_LEVEL_UP_DENIED).contains(object.channelSID)) {
-                    IEmoji customEmoji = null;
-                    Emoji emoji = EmojiManager.getByUnicode(object.guildConfig.levelUpReaction);
-                    boolean foundEmoji = false;
-                    for (IGuild g : object.client.getGuilds()) {
-                        IEmoji test = g.getEmojiByName(object.guildConfig.levelUpReaction);
-                        if (!foundEmoji && test != null) {
-                            customEmoji = test;
-                            foundEmoji = true;
-                        }
-                    }
-                    try {
-                        if (emoji != null) {
-                            RequestBuffer.request(() -> object.message.addReaction(emoji));
-                        } else if (customEmoji != null) {
-                            IEmoji finalCustomEmoji = customEmoji;
-                            RequestBuffer.request(() -> object.message.addReaction(finalCustomEmoji));
-                        }
-                    } catch (DiscordException e) {
-                        //do nothing
-                    } catch (MissingPermissionsException e) {
-                        //also do nothing
-                    }
-                }
-            }
+            reactTolevelUp(object);
 
             // level the user up
-            user.setCurrentLevel(user.getCurrentLevel() + 1);
+            user.setCurrentLevel(xpToLevel(user.getXP()));
             UserSetting userOverride = user.getLevelState();
-            StringBuilder levelUpMessage = new StringBuilder(object.guildConfig.levelUpMessage);
+            StringBuilder levelUpMessage = new StringBuilder(object.guild.config.levelUpMessage);
+
+            levelUpMessage = TagHandler.prepLevelUpMessage(levelUpMessage, object.guild, object.user);
 
-            levelUpMessage = new StringBuilder(levelUpMessage.toString().replace("<level>", user.getCurrentLevel() + ""));
-            levelUpMessage = new StringBuilder(levelUpMessage.toString().replace("<user>", object.author.mention()));
             //adds a special message if a reward is added.
-            for (RewardRoleObject r : object.guildConfig.getRewardRoles()) {
+            for (RewardRoleObject r : object.guild.config.getRewardRoles()) {
                 if (r.getLevel() == user.getCurrentLevel()) {
+                    if (user.getSettings().contains(DENY_AUTO_ROLE)) {
+                        break;
+                    }
                     if (user.getSettings().contains(HIT_LEVEL_FLOOR)) {
                         for (int i = 0; i < user.getSettings().size(); i++) {
                             if (user.getSettings().get(i) == HIT_LEVEL_FLOOR) {
                                 user.getSettings().remove(i);
                             }
                         }
-                        levelUpMessage = new StringBuilder("Welcome Back.\n" + levelUpMessage + "\nYour **" + object.guild.getRoleByID(r.getRoleID()) + "** role has been returned to you.");
+                        levelUpMessage = new StringBuilder("Welcome Back.\n" + levelUpMessage + "\nYour **" + object.guild.get().getRoleByID(r.getRoleID()) + "** role has been returned to you.");
                     } else {
-                        levelUpMessage.append("\nYou have been granted the **" + object.guild.getRoleByID(r.getRoleID()) + "** role for reaching this level.");
+                        levelUpMessage.append("\nYou have been granted the **" + object.guild.get().getRoleByID(r.getRoleID()) + "** role for reaching this level.");
                     }
                     rankedup = true;
                 }
             }
+            //if the user only just reached level 1 send them a message telling them about the pixelSettings command.
+            if (user.getCurrentLevel() == 1) {
+                levelUpMessage.append("\n\n> If you want to change where these messages are sent or want to remove them completely you can change that with `" + new ProfileSettings().getUsage(object) + "`.");
+            }
+
             if (userOverride != null) {
-                if (object.guildConfig.getDefaultLevelMode() == DONT_SEND_LVLUP && userOverride != SEND_LVLUP_DMS) {
+                if (object.guild.config.getDefaultLevelMode() == DONT_SEND_LVLUP && userOverride != SEND_LVLUP_DMS) {
                     userOverride = DONT_SEND_LVLUP;
                 }
             } else {
-                userOverride = object.guildConfig.defaultLevelMode;
+                userOverride = object.guild.config.defaultLevelMode;
             }
-            List<String> levelDenied = object.guildConfig.getChannelIDsByType(Command.CHANNEL_LEVEL_UP_DENIED);
-            if (levelDenied != null && levelDenied.contains(object.channelSID)) {
-                if (userOverride != SEND_LVLUP_DMS || (userOverride != SEND_LVLUP_RANK_CHANNEL && object.guildConfig.getChannelIDsByType(Command.CHANNEL_PIXELS).get(0) != null)) {
+            List<String> levelDenied = object.guild.config.getChannelIDsByType(Command.CHANNEL_LEVEL_UP_DENIED);
+            if (levelDenied != null && levelDenied.contains(object.channel.stringID)) {
+                if (userOverride != SEND_LVLUP_DMS || (userOverride != SEND_LVLUP_RANK_CHANNEL && object.guild.config.getChannelIDsByType(Command.CHANNEL_PIXELS).get(0) != null)) {
                     userOverride = DONT_SEND_LVLUP;
                 }
             }
             switch (userOverride) {
                 case SEND_LVLUP_CURRENT_CHANNEL:
-                    selfDestruct = Utility.sendMessage(levelUpMessage.toString(), object.channel).get();
+                    selfDestruct = Utility.sendMessage(levelUpMessage.toString(), object.channel.get()).get();
                     break;
                 case SEND_LVLUP_RANK_CHANNEL:
                     IChannel channel = null;
-                    if (object.guildConfig.getChannelIDsByType(Command.CHANNEL_LEVEL_UP) != null) {
-                        channel = object.guild.getChannelByID(object.guildConfig.getChannelIDsByType(Command.CHANNEL_LEVEL_UP).get(0));
+                    if (object.guild.config.getChannelIDsByType(Command.CHANNEL_LEVEL_UP) != null) {
+                        channel = object.guild.get().getChannelByID(object.guild.config.getChannelIDsByType(Command.CHANNEL_LEVEL_UP).get(0));
                     }
                     if (channel != null) {
-                        if (channel.getModifiedPermissions(object.botUser).contains(Permissions.ATTACH_FILES)) {
+                        if (channel.getModifiedPermissions(object.client.bot).contains(Permissions.ATTACH_FILES)) {
                             if (rankedup) {
                                 Utility.sendFileURL(levelUpMessage.toString(), Constants.RANK_UP_IMAGE_URL, channel, false);
                             } else {
@@ -333,14 +319,14 @@ private static void checkIfLevelUp(UserTypeObject user, CommandObject object) {
                             Utility.sendMessage(levelUpMessage.toString(), channel).get();
                         }
                     } else {
-                        selfDestruct = Utility.sendMessage(levelUpMessage.toString(), object.channel).get();
+                        selfDestruct = Utility.sendMessage(levelUpMessage.toString(), object.channel.get()).get();
                     }
                     break;
                 case SEND_LVLUP_DMS:
                     if (rankedup) {
-                        Utility.sendFileURL(levelUpMessage.toString(), Constants.RANK_UP_IMAGE_URL, object.author.getOrCreatePMChannel(), false);
+                        Utility.sendFileURL(levelUpMessage.toString(), Constants.RANK_UP_IMAGE_URL, object.user.get().getOrCreatePMChannel(), false);
                     } else {
-                        Utility.sendFileURL(levelUpMessage.toString(), Constants.LEVEL_UP_IMAGE_URL, object.author.getOrCreatePMChannel(), false);
+                        Utility.sendFileURL(levelUpMessage.toString(), Constants.LEVEL_UP_IMAGE_URL, object.user.get().getOrCreatePMChannel(), false);
                     }
                     break;
                 case DONT_SEND_LVLUP:
@@ -352,41 +338,76 @@ private static void checkIfLevelUp(UserTypeObject user, CommandObject object) {
         } else {
             leveledUp = false;
         }
-        handleRankUp(object, user);
         if (leveledUp) {
-            checkUsersRoles(user.getID(), object.guildContent);
+            checkUsersRoles(user.getID(), object.guild);
         }
-        if (object.guildConfig.selfDestructLevelUps && selfDestruct != null && !rankedup) {
+        if (object.guild.config.selfDestructLevelUps && selfDestruct != null && !rankedup) {
             try {
-                //sef destruct messages after 1 min.
+                //keep the message around just a little longer for their first level up.
+                if (user.getCurrentLevel() == 1) {
+                    Thread.sleep(60 * 1000);
+                }
+                //self destruct messages after 1 min.
                 Thread.sleep(60 * 1000);
                 Utility.deleteMessage(selfDestruct);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                Utility.sendStack(e);
             }
         }
+
     }
 
-    private static void handleRankUp(CommandObject object, UserTypeObject user) {
-        if (object.guildConfig.getRewardRoles().size() == 0) {
-            return;
-        }
-        RewardRoleObject nextReward;
-        if (user.getRewardID() == -1) {
-            nextReward = object.guildConfig.lowestReward();
-        } else {
-            nextReward = object.guildConfig.getNextReward(object.guildConfig.getRewardRole(user.getRewardID()));
-        }
-        if (user.getCurrentLevel() == nextReward.getLevel()) {
-            user.setRewardID(nextReward.getRoleID());
-            Utility.roleManagement(object.author, object.guild, nextReward.getRoleID(), true);
+    private static void reactTolevelUp(CommandObject object) {
+        if (object.guild.config.reactToLevelUp) {
+            ProfileObject user = object.guild.users.getUserByID(object.user.stringID);
+            if (user != null && user.getSettings().contains(UserSetting.NO_LEVEL_UP_REACTIONS)) {
+                return;
+            }
+            IEmoji customEmoji = null;
+            Emoji emoji = EmojiManager.getByUnicode(object.guild.config.levelUpReaction);
+            for (IGuild g : object.client.get().getGuilds()) {
+                IEmoji test = null;
+                try {
+                    long emojiId = Long.parseLong(object.guild.config.levelUpReaction);
+                    test = g.getEmojiByID(emojiId);
+                    if (test != null) {
+                        customEmoji = test;
+                        break;
+                    }
+                } catch (NumberFormatException e) {
+                    test = g.getEmojiByName(object.guild.config.levelUpReaction);
+                    if (test != null) {
+                        customEmoji = test;
+                        break;
+                    }
+                }
+            }
+            IEmoji finalCustomEmoji = customEmoji;
+            XRequestBuffer.request(() -> {
+                try {
+                    if (emoji != null) {
+                        object.message.get().addReaction(emoji);
+                    } else if (finalCustomEmoji != null) {
+                        object.message.get().addReaction(finalCustomEmoji);
+                    }
+                } catch (DiscordException e) {
+                    logger.error("Discord didn't like the custom emoji that guild with id: " + object.guild.stringID + " chose for a levelUp react.");
+                    if (emoji != null) {
+                        logger.error(emoji.getUnicode());
+                    } else if (finalCustomEmoji != null) {
+                        logger.error(finalCustomEmoji.toString());
+                    }
+                    //do nothing
+                } catch (MissingPermissionsException e) {
+                    //also do nothing
+                }
+            });
         }
-        return;
     }
 
     public static long levelToXP(long level) {
-        long nextLvl = level++;
-        long xp = (((level) * 20) + (nextLvl * nextLvl) * 4 + 40);
+        long nextLvl = level + 1;
+        long xp = (((nextLvl) * 20) + (level * level) * 4 + 40);
         if ((xp + "").endsWith("4")) {
             xp += 16;
         } else if ((xp + "").endsWith("6")) {
@@ -414,7 +435,7 @@ public static long totalXPForLevel(long level) {
     }
 
     public static long rank(GuildUsers guildUsers, IGuild guild, String userID) {
-        UserTypeObject user = guildUsers.getUserByID(userID);
+        ProfileObject user = guildUsers.getUserByID(userID);
         for (UserSetting s : user.getSettings()) {
             for (UserSetting test : Constants.dontLogStates) {
                 if (s == test) {
@@ -429,7 +450,7 @@ public static long rank(GuildUsers guildUsers, IGuild guild, String userID) {
             return -1;
         }
         long rank = 0;
-        ArrayList<UserTypeObject> users = (ArrayList<UserTypeObject>) guildUsers.getUsers().clone();
+        ArrayList<ProfileObject> users = (ArrayList<ProfileObject>) guildUsers.getProfiles().clone();
         Utility.sortUserObjects(users, false);
         for (int i = 0; i < users.size(); i++) {
             if (users.get(i).getID().equals(userID)) {
@@ -453,7 +474,7 @@ public static long rank(GuildUsers guildUsers, IGuild guild, String userID) {
 
     public static long totalRanked(CommandObject command) {
         long totalRanked = 0;
-        for (UserTypeObject u : command.guildUsers.getUsers()) {
+        for (ProfileObject u : command.guild.users.getProfiles()) {
             boolean hiderank = false;
             for (UserSetting s : u.getSettings()) {
                 for (UserSetting test : Constants.dontLogStates) {
@@ -462,7 +483,7 @@ public static long totalRanked(CommandObject command) {
                     }
                 }
             }
-            if (command.guild.getUserByID(u.getID()) != null) {
+            if (command.guild.get().getUserByID(u.getID()) != null) {
                 if (u.getXP() != 0) {
                     if (!hiderank) {
                         totalRanked++;
@@ -473,10 +494,10 @@ public static long totalRanked(CommandObject command) {
         return totalRanked;
     }
 
-    public static int getRewardCount(CommandObject object, IUser user) {
-        UserTypeObject userObject = object.guildUsers.getUserByID(user.getStringID());
-        ArrayList<RewardRoleObject> allRewards = object.guildConfig.getAllRewards(userObject.getRewardID());
-        if (allRewards == null) {
+    public static int getRewardCount(GuildObject object, String userID) {
+        ProfileObject userObject = object.users.getUserByID(userID);
+        ArrayList<RewardRoleObject> allRewards = object.config.getAllRewards(userObject.getCurrentLevel());
+        if (allRewards.size() == 0) {
             return 0;
         } else {
             if (allRewards.size() > 4) {
@@ -488,9 +509,9 @@ public static int getRewardCount(CommandObject object, IUser user) {
     }
 
     public static RewardRoleObject rewardForLevel(long currentLevel, CommandObject object) {
-        Utility.sortRewards(object.guildConfig.getRewardRoles());
+        Utility.sortRewards(object.guild.config.getRewardRoles());
         RewardRoleObject reward = null;
-        for (RewardRoleObject r : object.guildConfig.getRewardRoles()) {
+        for (RewardRoleObject r : object.guild.config.getRewardRoles()) {
             if (reward == null) {
                 reward = r;
                 if (reward.getLevel() > currentLevel) {
diff --git a/src/main/java/Interfaces/ChannelSetting.java b/src/main/java/com/github/vaerys/interfaces/ChannelSetting.java
similarity index 94%
rename from src/main/java/Interfaces/ChannelSetting.java
rename to src/main/java/com/github/vaerys/interfaces/ChannelSetting.java
index f88c26d1..aad471e0 100644
--- a/src/main/java/Interfaces/ChannelSetting.java
+++ b/src/main/java/com/github/vaerys/interfaces/ChannelSetting.java
@@ -1,8 +1,8 @@
-package Interfaces;
+package com.github.vaerys.interfaces;
 
-import Main.Globals;
-import Objects.ChannelSettingObject;
-import POGOs.GuildConfig;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.objects.ChannelSettingObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/github/vaerys/interfaces/Command.java b/src/main/java/com/github/vaerys/interfaces/Command.java
new file mode 100644
index 00000000..ed4b81c8
--- /dev/null
+++ b/src/main/java/com/github/vaerys/interfaces/Command.java
@@ -0,0 +1,258 @@
+package com.github.vaerys.interfaces;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.SplitFirstObject;
+import com.github.vaerys.objects.XEmbedBuilder;
+import org.apache.commons.lang3.ArrayUtils;
+import sx.blah.discord.handle.obj.IChannel;
+import sx.blah.discord.handle.obj.Permissions;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.EnumSet;
+
+
+/**
+ * Created by Vaerys on 29/01/2017.
+ */
+public interface Command {
+    //Type Constants
+    String TYPE_GENERAL = "General";
+    String TYPE_ADMIN = "Admin";
+    String TYPE_ROLE_SELECT = "Role";
+    String TYPE_CHARACTER = "Characters";
+    String TYPE_SERVERS = "Servers";
+    String TYPE_CC = "CC";
+    String TYPE_HELP = "Help";
+    String TYPE_COMPETITION = "Competition";
+    String TYPE_DM = "DM";
+    String TYPE_CREATOR = "Creator";
+    String TYPE_PIXEL = "Pixels";
+    String TYPE_GROUPS = "Groups";
+    String TYPE_SLASH = "Slash";
+
+    //Channel Constants
+    String CHANNEL_GENERAL = "General";
+    String CHANNEL_SERVERS = "Servers";
+    String CHANNEL_BOT_COMMANDS = "BotCommands";
+    String CHANNEL_SERVER_LOG = "ServerLog";
+    String CHANNEL_ADMIN_LOG = "AdminLog";
+    String CHANNEL_ADMIN = "Admin";
+    String CHANNEL_INFO = "Info";
+    String CHANNEL_SHITPOST = "ShitPost";
+    String CHANNEL_DONT_LOG = "DontLog";
+    String CHANNEL_ART = "Art";
+    String CHANNEL_GROUPS = "Groups";
+    String CHANNEL_XP_DENIED = "XpDenied";
+    String CHANNEL_PIXELS = "Pixels";
+    String CHANNEL_LEVEL_UP = "LevelUp";
+    String CHANNEL_LEVEL_UP_DENIED = "LevelUpDenied";
+    String CHANNEL_DM = "DirectMessages";
+
+    String spacer = "\u200B";
+    String indent = "    ";
+    String codeBlock = "```";
+    String ownerOnly = ">> ONLY THE BOT'S OWNER CAN RUN THIS <<";
+
+
+    String execute(String args, CommandObject command);
+
+    //descriptors
+    String[] names();
+
+    String description();
+
+    String usage();
+
+    String type();
+
+    String channel();
+
+    Permissions[] perms();
+
+    boolean requiresArgs();
+
+    boolean doAdminLogging();
+
+    String dualDescription();
+
+    String dualUsage();
+
+    String dualType();
+
+    Permissions[] dualPerms();
+
+    default String getCommand(CommandObject command) {
+        return command.guild.config.getPrefixCommand() + names()[0];
+    }
+
+    default String getUsage(CommandObject command) {
+        if (usage() == null || usage().isEmpty()) {
+            return command.guild.config.getPrefixCommand() + names()[0];
+        } else {
+            return command.guild.config.getPrefixCommand() + names()[0] + " " + usage();
+        }
+    }
+
+    default String getDualUsage(CommandObject command) {
+        if (dualUsage() == null || dualUsage().isEmpty()) {
+            return getUsage(command);
+        } else {
+            return command.guild.config.getPrefixCommand() + names()[0] + " " + dualUsage();
+        }
+    }
+
+    default String missingArgs(CommandObject command) {
+        return ">> **" + getUsage(command) + "** <<";
+    }
+
+    default boolean isCall(String args, CommandObject command) {
+        SplitFirstObject call = new SplitFirstObject(args);
+        for (String s : names()) {
+            if ((command.guild.config.getPrefixCommand() + s).equalsIgnoreCase(call.getFirstWord())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    default String getArgs(String args, CommandObject command) {
+        SplitFirstObject call = new SplitFirstObject(args);
+        if (call.getRest() == null) {
+            return "";
+        }
+        return call.getRest();
+    }
+
+    default XEmbedBuilder getCommandInfo(CommandObject command) {
+        XEmbedBuilder infoEmbed = new XEmbedBuilder();
+        Color color = command.client.color;
+        if (color != null) {
+            infoEmbed.withColor(color);
+        }
+
+        //command info
+        StringBuilder builder = new StringBuilder();
+        builder.append("**" + getUsage(command) + "**\n");
+        builder.append("**Desc: **" + description() + "\n");
+        builder.append("**Type: **" + type() + "\n");
+        if (perms().length != 0) {
+            builder.append("**Perms: **");
+            ArrayList<String> permList = new ArrayList<>();
+            for (Permissions p : perms()) {
+                permList.add(p.toString());
+            }
+            builder.append(Utility.listFormatter(permList, true));
+        }
+        //dual command info
+        if (dualType() != null && Utility.testForPerms(dualPerms(), command.user.get(), command.guild.get())) {
+            builder.append("\n**" + getDualUsage(command) + "**\n");
+            builder.append("**Desc: **" + dualDescription() + "\n");
+            builder.append("**Type: **" + dualType() + "\n");
+            if (perms().length != 0 || dualPerms().length != 0) {
+                Permissions[] perms;
+                perms = ArrayUtils.addAll(dualPerms(), perms());
+                builder.append("**Perms: **");
+                ArrayList<String> permList = new ArrayList<>();
+                for (Permissions p : perms) {
+                    permList.add(p.toString());
+                }
+                builder.append(Utility.listFormatter(permList, true));
+            }
+        }
+        infoEmbed.appendField("> Info - " + names()[0], builder.toString(), false);
+
+        //Handle channels
+        ArrayList<String> channelIDs = command.guild.config.getChannelIDsByType(channel());
+        ArrayList<String> channelMentions = new ArrayList<>();
+
+        if (channelIDs != null) {
+            for (String id : channelIDs) {
+                IChannel temp = command.guild.get().getChannelByID(id);
+                if (temp != null) {
+                    EnumSet<Permissions> userPerms = temp.getModifiedPermissions(command.user.get());
+                    if (userPerms.contains(Permissions.SEND_MESSAGES) && userPerms.contains(Permissions.READ_MESSAGES)) {
+                        channelMentions.add(temp.mention());
+                    }
+                }
+            }
+            builder.append("\n" + Utility.listFormatter(channelMentions, true));
+        }
+
+        //channel
+        if (channelMentions.size() > 0) {
+            if (channelMentions.size() == 1) {
+                infoEmbed.appendField("Channel ", Utility.listFormatter(channelMentions, true), false);
+            } else {
+                infoEmbed.appendField("Channels ", Utility.listFormatter(channelMentions, true), false);
+            }
+        }
+
+        //aliases
+        if (names().length > 1) {
+            StringBuilder aliasBuilder = new StringBuilder();
+            for (int i = 1; i < names().length; i++) {
+                aliasBuilder.append(command.guild.config.getPrefixCommand() + names()[i] + ", ");
+            }
+            aliasBuilder.delete(aliasBuilder.length() - 2, aliasBuilder.length());
+            aliasBuilder.append(".\n");
+            infoEmbed.appendField("Aliases", aliasBuilder.toString(), false);
+        }
+        return infoEmbed;
+    }
+
+    default String validate() {
+        StringBuilder response = new StringBuilder();
+        boolean isErrored = false;
+        response.append("\n>> Begin Error Report: " + this.getClass().getName() + " <<\n");
+        if (names().length == 0 || names()[0].isEmpty()) {
+            response.append("> NAME IS EMPTY.\n");
+            isErrored = true;
+        }
+        if (description() == null || description().isEmpty()) {
+            response.append("> DESCRIPTION IS EMPTY.\n");
+            isErrored = true;
+        }
+        if (type() == null || type().isEmpty()) {
+            response.append("> TYPE IS EMPTY.\n");
+            isErrored = true;
+        }
+        if (requiresArgs() && (usage() == null || usage().isEmpty())) {
+            response.append("> USAGE IS NULL WHEN REQUIRES_ARGS IS TRUE.\n");
+            isErrored = true;
+        }
+        if (dualDescription() != null || dualType() != null) {
+            if (dualType() == null || dualType().isEmpty()) {
+                response.append("> DUAL TYPE IS EMPTY.\n");
+                isErrored = true;
+            }
+            if (dualType().equalsIgnoreCase(type())) {
+                response.append("> DUAL TYPE IS EQUAL TO TYPE.\n");
+                isErrored = true;
+            }
+            if (dualDescription() == null || dualDescription().isEmpty()) {
+                response.append("> DUAL DESCRIPTION IS EMPTY.\n");
+                isErrored = true;
+            }
+            if (dualDescription().equalsIgnoreCase(description())) {
+                response.append("> DUAL DESCRIPTION IS EQUAL TO DESCRIPTION.\n");
+                isErrored = true;
+            }
+            if (dualUsage() == null || dualUsage().isEmpty()) {
+                response.append("> DUAL USAGE IS EMPTY.\n");
+                isErrored = true;
+            }
+            if (usage() != null && usage().equalsIgnoreCase(dualUsage())) {
+                response.append("> DUAL USAGE IS EQUAL TO USAGE.\n");
+                isErrored = true;
+            }
+        }
+        response.append(">> End Error Report <<");
+        if (isErrored) {
+            return response.toString();
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/src/main/java/com/github/vaerys/interfaces/DMCommand.java b/src/main/java/com/github/vaerys/interfaces/DMCommand.java
new file mode 100644
index 00000000..479c0b20
--- /dev/null
+++ b/src/main/java/com/github/vaerys/interfaces/DMCommand.java
@@ -0,0 +1,40 @@
+package com.github.vaerys.interfaces;
+
+import sx.blah.discord.handle.obj.Permissions;
+
+/**
+ * Created by Vaerys on 05/02/2017.
+ */
+public interface DMCommand extends Command {
+
+    //Channel Constants
+
+    @Override
+    default String channel() {
+        return CHANNEL_DM;
+    }
+
+    default Permissions[] perms() {
+        return new Permissions[0];
+    }
+
+    default boolean doAdminLogging() {
+        return false;
+    }
+
+    default String dualDescription() {
+        return null;
+    }
+
+    default String dualUsage() {
+        return null;
+    }
+
+    default String dualType() {
+        return null;
+    }
+
+    default Permissions[] dualPerms() {
+        return new Permissions[0];
+    }
+}
diff --git a/src/main/java/com/github/vaerys/interfaces/GlobalFile.java b/src/main/java/com/github/vaerys/interfaces/GlobalFile.java
new file mode 100644
index 00000000..de9a8b2d
--- /dev/null
+++ b/src/main/java/com/github/vaerys/interfaces/GlobalFile.java
@@ -0,0 +1,59 @@
+package com.github.vaerys.interfaces;
+
+import com.github.vaerys.handlers.FileHandler;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Utility;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+
+public class GlobalFile {
+    public static String storageDir = Constants.DIRECTORY_STORAGE;
+    public static String backupDir = Constants.DIRECTORY_BACKUPS;
+    public String path;
+    public String backupPath;
+
+    final static Logger logger = LoggerFactory.getLogger(GlobalFile.class);
+
+    public static Object create(String newPath, GlobalFile object) {
+        String path = storageDir + newPath;
+        if (!FileHandler.exists(path)) {
+            FileHandler.writeToJson(path, object);
+        } else {
+            object = (GlobalFile) FileHandler.readFromJson(path, object.getClass());
+        }
+        object.setPath(newPath);
+        return object;
+    }
+
+    public void flushFile() {
+        FileHandler.writeToJson(path, this);
+    }
+
+    public void backUp() {
+        try {
+            File backup1 = new File(backupPath + 1);
+            File backup2 = new File(backupPath + 2);
+            File backup3 = new File(backupPath + 3);
+            File toBackup = new File(path);
+            if (backup3.exists()) backup3.delete();
+            if (backup2.exists()) backup2.renameTo(backup3);
+            if (backup1.exists()) backup1.renameTo(backup2);
+            if (toBackup.exists())
+                Files.copy(Paths.get(toBackup.getPath()), backup1.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            logger.trace(this.getClass().getName() + " - File Backed up.");
+        } catch (IOException e) {
+            Utility.sendStack(e);
+        }
+    }
+
+    public void setPath(String newPath) {
+        path = storageDir + newPath;
+        backupPath = backupDir + newPath;
+    }
+}
diff --git a/src/main/java/com/github/vaerys/interfaces/GuildFile.java b/src/main/java/com/github/vaerys/interfaces/GuildFile.java
new file mode 100644
index 00000000..ef32cb83
--- /dev/null
+++ b/src/main/java/com/github/vaerys/interfaces/GuildFile.java
@@ -0,0 +1,17 @@
+package com.github.vaerys.interfaces;
+
+import com.github.vaerys.handlers.FileHandler;
+
+public class GuildFile extends GlobalFile {
+
+    public static Object create(String newPath, long guildID, GuildFile object) {
+        String path = storageDir + guildID + "/" + newPath;
+        if (!FileHandler.exists(path)) {
+            FileHandler.writeToJson(path, object);
+        } else {
+            object = (GuildFile) FileHandler.readFromJson(path, object.getClass());
+        }
+        object.setPath(guildID + "/" + newPath);
+        return object;
+    }
+}
diff --git a/src/main/java/Interfaces/GuildToggle.java b/src/main/java/com/github/vaerys/interfaces/GuildToggle.java
similarity index 56%
rename from src/main/java/Interfaces/GuildToggle.java
rename to src/main/java/com/github/vaerys/interfaces/GuildToggle.java
index cad982ad..d14d575e 100644
--- a/src/main/java/Interfaces/GuildToggle.java
+++ b/src/main/java/com/github/vaerys/interfaces/GuildToggle.java
@@ -1,7 +1,7 @@
-package Interfaces;
+package com.github.vaerys.interfaces;
 
-import Commands.CommandObject;
-import POGOs.GuildConfig;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.pogos.GuildConfig;
 
 /**
  * Created by Vaerys on 20/02/2017.
@@ -11,6 +11,6 @@ public interface GuildToggle {
     boolean toggle(GuildConfig config);
     boolean get(GuildConfig config);
     boolean getDefault();
-    void execute(CommandObject command);
+    void execute(GuildObject guild);
     boolean isModule();
 }
diff --git a/src/main/java/com/github/vaerys/interfaces/SlashCommand.java b/src/main/java/com/github/vaerys/interfaces/SlashCommand.java
new file mode 100644
index 00000000..613596af
--- /dev/null
+++ b/src/main/java/com/github/vaerys/interfaces/SlashCommand.java
@@ -0,0 +1,124 @@
+package com.github.vaerys.interfaces;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.objects.SplitFirstObject;
+import com.github.vaerys.objects.XEmbedBuilder;
+import sx.blah.discord.handle.obj.Permissions;
+
+/**
+ * Created by Vaerys on 13/03/2017.
+ */
+public interface SlashCommand extends Command {
+
+    @Override
+    default String description() {
+        return "Returns with " + execute(null, null) + ".";
+    }
+
+    @Override
+    default String usage() {
+        return null;
+    }
+
+    @Override
+    default String type() {
+        return TYPE_SLASH;
+    }
+
+    @Override
+    default String channel() {
+        return null;
+    }
+
+    @Override
+    default Permissions[] perms() {
+        return new Permissions[0];
+    }
+
+    @Override
+    default boolean requiresArgs() {
+        return false;
+    }
+
+    @Override
+    default boolean doAdminLogging() {
+        return false;
+    }
+
+    @Override
+    default String dualDescription() {
+        return null;
+    }
+
+    @Override
+    default String dualUsage() {
+        return null;
+    }
+
+    @Override
+    default String dualType() {
+        return null;
+    }
+
+    @Override
+    default Permissions[] dualPerms() {
+        return new Permissions[0];
+    }
+
+    @Override
+    default String getCommand(CommandObject command) {
+        return "/" + names()[0];
+    }
+
+    @Override
+    default String getUsage(CommandObject command) {
+        return getCommand(command);
+    }
+
+    @Override
+    default String getDualUsage(CommandObject command) {
+        return getCommand(command);
+    }
+
+    @Override
+    default String missingArgs(CommandObject command) {
+        return null;
+    }
+
+    @Override
+    default boolean isCall(String args, CommandObject command) {
+        SplitFirstObject object = new SplitFirstObject(args);
+        return object.getFirstWord().equalsIgnoreCase(getCommand(command));
+    }
+
+    @Override
+    default String getArgs(String args, CommandObject command) {
+        return null;
+    }
+
+    @Override
+    default XEmbedBuilder getCommandInfo(CommandObject command) {
+        XEmbedBuilder builder = new XEmbedBuilder();
+        builder.withColor(command.client.color);
+        builder.withTitle(getCommand(command));
+        builder.withDescription(description());
+        return builder;
+    }
+
+    @Override
+    default String validate() {
+        StringBuilder response = new StringBuilder();
+        boolean isErrored = false;
+        response.append("\n>> Begin Error Report: " + this.getClass().getName() + " <<\n");
+        if (names().length == 0 || names()[0].isEmpty()) {
+            response.append("> NAME IS EMPTY.\n");
+            isErrored = true;
+        }
+        response.append(">> End Error Report <<");
+        if (isErrored) {
+            return response.toString();
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/src/main/java/Main/AnnotationListener.java b/src/main/java/com/github/vaerys/main/AnnotationListener.java
similarity index 59%
rename from src/main/java/Main/AnnotationListener.java
rename to src/main/java/com/github/vaerys/main/AnnotationListener.java
index 3c46a6cf..8d8871f3 100644
--- a/src/main/java/Main/AnnotationListener.java
+++ b/src/main/java/com/github/vaerys/main/AnnotationListener.java
@@ -1,24 +1,27 @@
-package Main;
-
-import Commands.CommandObject;
-import Commands.General.NewDailyMessage;
-import Handlers.*;
-import Interfaces.Command;
-import Objects.GuildContentObject;
-import Objects.SplitFirstObject;
-import POGOs.*;
+package com.github.vaerys.main;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.ArtHandler;
+import com.github.vaerys.handlers.MessageHandler;
+import com.github.vaerys.handlers.QueueHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.objects.SplitFirstObject;
+import com.github.vaerys.pogos.GuildConfig;
 import com.vdurmont.emoji.Emoji;
 import com.vdurmont.emoji.EmojiManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sx.blah.discord.api.events.EventSubscriber;
 import sx.blah.discord.handle.impl.events.ReadyEvent;
-import sx.blah.discord.handle.impl.events.guild.GuildCreateEvent;
 import sx.blah.discord.handle.impl.events.guild.GuildLeaveEvent;
 import sx.blah.discord.handle.impl.events.guild.channel.ChannelCreateEvent;
 import sx.blah.discord.handle.impl.events.guild.channel.ChannelDeleteEvent;
 import sx.blah.discord.handle.impl.events.guild.channel.ChannelUpdateEvent;
-import sx.blah.discord.handle.impl.events.guild.channel.message.*;
+import sx.blah.discord.handle.impl.events.guild.channel.message.MentionEvent;
+import sx.blah.discord.handle.impl.events.guild.channel.message.MessageDeleteEvent;
+import sx.blah.discord.handle.impl.events.guild.channel.message.MessageReceivedEvent;
+import sx.blah.discord.handle.impl.events.guild.channel.message.MessageUpdateEvent;
 import sx.blah.discord.handle.impl.events.guild.channel.message.reaction.ReactionAddEvent;
 import sx.blah.discord.handle.impl.events.guild.member.GuildMemberEvent;
 import sx.blah.discord.handle.impl.events.guild.member.UserJoinEvent;
@@ -28,7 +31,6 @@
 import sx.blah.discord.handle.impl.events.guild.role.RoleUpdateEvent;
 import sx.blah.discord.handle.obj.*;
 
-import java.io.File;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
@@ -47,70 +49,10 @@ public class AnnotationListener {
     /**
      * Sets up the relevant files for each guild.
      */
-    @EventSubscriber
-    public void onGuildCreateEvent(GuildCreateEvent event) {
-        IGuild guild = event.getGuild();
-        String guildID = guild.getStringID();
-        logger.debug("Starting Initialisation process for Guild with ID: " + guildID);
-
-        if (new File(Utility.getDirectory(guildID)).exists()) {
-            PatchHandler.guildPatches(guild);
-        }
-
-        //Create POGO templates
-        GuildConfig guildConfig = new GuildConfig();
-        Servers servers = new Servers();
-        CustomCommands customCommands = new CustomCommands();
-        Characters characters = new Characters();
-        Competition competition = new Competition();
-        GuildUsers guildUsers = new GuildUsers();
-        ChannelData channelData = new ChannelData();
-
-        //Preps Objects for initial load
-        guildConfig.initConfig();
-        customCommands.initCustomCommands();
-
-        //null prevention code. unsure if needed still.
-        guildConfig.setProperlyInit(true);
-        servers.setProperlyInit(true);
-        customCommands.setProperlyInit(true);
-        characters.setProperlyInit(true);
-        competition.setProperlyInit(true);
-        guildUsers.setProperlyInit(true);
-
-        FileHandler.createDirectory(Utility.getDirectory(guildID));
-        FileHandler.createDirectory(Utility.getDirectory(guildID, true));
-        FileHandler.createDirectory(Utility.getGuildImageDir(guildID));
-
-        //initial load of all files, creates files if they don't already exist
-        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_GUILD_CONFIG), guildConfig);
-        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_SERVERS), servers);
-        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_CUSTOM), customCommands);
-        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_CHARACTERS), characters);
-        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_INFO));
-        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_COMPETITION), competition);
-        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_GUILD_USERS), guildUsers);
-        FileHandler.initFile(Utility.getFilePath(guildID, Constants.FILE_CHANNEl_DATA), channelData);
-
-        //loads all Files for the guild;
-        guildConfig = (GuildConfig) Utility.initFile(guildID, Constants.FILE_GUILD_CONFIG, GuildConfig.class);
-        customCommands = (CustomCommands) Utility.initFile(guildID, Constants.FILE_CUSTOM, CustomCommands.class);
-        servers = (Servers) Utility.initFile(guildID, Constants.FILE_SERVERS, Servers.class);
-        characters = (Characters) Utility.initFile(guildID, Constants.FILE_CHARACTERS, Characters.class);
-        competition = (Competition) Utility.initFile(guildID, Constants.FILE_COMPETITION, Competition.class);
-        guildUsers = (GuildUsers) Utility.initFile(guildID, Constants.FILE_GUILD_USERS, GuildUsers.class);
-        channelData = (ChannelData) Utility.initFile(guildID, Constants.FILE_CHANNEl_DATA, ChannelData.class);
-        //sends objects to globals
-        Globals.initGuild(guildID, guildConfig, servers, customCommands, characters, competition, guildUsers, channelData);
-        updateVariables(guild);
-        logger.info("Finished Initialising Guild With ID: " + guildID);
-
-        NewDailyMessage.checkIsEnabled(Globals.client.getChannelByID(Globals.queueChannelID) != null);
-    }
 
     @EventSubscriber
     public void onGuildLeaveEvent(GuildLeaveEvent event) {
-        Globals.unloadGuild(event.getGuild().getStringID());
+        Globals.unloadGuild(event.getGuild().getLongID());
     }
 
     @EventSubscriber
@@ -122,48 +64,44 @@ public void onReadyEvent(ReadyEvent event) {
 
     @EventSubscriber
     public void onMessageReceivedEvent(MessageReceivedEvent event) {
-        if (event.getAuthor().isBot()) {
-            return;
-        }
-        if (event.getMessage().getChannel().isPrivate()) {
-            new DMHandler(event.getMessage());
+        try {
+            if (event.getAuthor().isBot()) {
+                return;
+            }
+            CommandObject command = new CommandObject(event.getMessage());
+            //Set Console Response Channel.
+            if (command.user.get().equals(command.client.creator)) {
+                Globals.consoleMessageCID = command.channel.stringID;
+            }
+            //message and command handling
+            new MessageHandler(command.message.get().getContent(), command, event.getChannel().isPrivate());
+        } catch (Exception e) {
+            String errorPos = "";
+            for (StackTraceElement s : e.getStackTrace()) {
+                if (s.toString().contains("com.github.vaerys")) {
+                    errorPos = s.toString();
+                    break;
+                }
+            }
+            StringBuilder builder = new StringBuilder();
+            builder.append("> I caught an Error, Please send this Error message and the message that caused this error " +
+                    "to my **Direct Messages** so my developer can look at it and try to solve the issue.\n```\n");
+            builder.append(e.getClass().getName());
+            builder.append(": " + e.getMessage());
+            if (!errorPos.isEmpty()) {
+                builder.append("\n" + Constants.PREFIX_INDENT + "at " + errorPos);
+            }
+            builder.append("```");
+            Utility.sendMessage(builder.toString(), event.getChannel());
+            Utility.sendStack(e);
             return;
         }
-        IMessage message = event.getMessage();
-        IGuild guild = message.getGuild();
-        IChannel channel = message.getChannel();
-        IUser author = message.getAuthor();
-        String messageLC = message.toString().toLowerCase();
-        String args = "";
-        String command = "";
-        if (Globals.getGuildContent(guild.getStringID()) == null) return;
-        GuildConfig guildConfig = Globals.getGuildContent(guild.getStringID()).getGuildConfig();
-
-
-        //Set Console Response Channel.
-        if (author.getStringID().equals(Globals.creatorID)) {
-            Globals.consoleMessageCID = channel.getStringID();
-        }
-
-        if (messageLC.startsWith(guildConfig.getPrefixCommand().toLowerCase()) || messageLC.startsWith(guildConfig.getPrefixCC().toLowerCase())) {
-            String[] splitMessage = message.toString().split(" ");
-            command = splitMessage[0];
-            StringBuilder getArgs = new StringBuilder();
-            getArgs.append(message.toString());
-            getArgs.delete(0, splitMessage[0].length() + 1);
-            args = getArgs.toString();
-        }
-
-        //message and command handling
-        CommandObject commandObject = new CommandObject(message);
-        new MessageHandler(command, args, commandObject);
     }
 
     @EventSubscriber
     public void onMentionEvent(MentionEvent event) {
         IChannel channel = event.getMessage().getChannel();
         if (channel.isPrivate()) {
-            new DMHandler(event.getMessage());
             return;
         }
         IGuild guild = event.getMessage().getGuild();
@@ -188,8 +126,8 @@ public void onMentionEvent(MentionEvent event) {
             SplitFirstObject getArgs = new SplitFirstObject(mentionSplit.getRest());
             if (mentionSplit.getFirstWord() != null) {
                 if (mentionSplit.getFirstWord().equals(sailMention) || mentionSplit.getFirstWord().equals(sailMentionNick)) {
-                    String guildID = guild.getStringID();
-                    GuildConfig guildConfig = Globals.getGuildContent(guildID).getGuildConfig();
+                    long guildID = guild.getLongID();
+                    GuildConfig guildConfig = Globals.getGuildContent(guildID).config;
                     if (getArgs.getRest() != null && !getArgs.getRest().contains(" ") && !getArgs.getRest().contains("\n")) {
                         prefix = getArgs.getRest();
                         if (getArgs.getFirstWord() != null && getArgs.getFirstWord().equalsIgnoreCase("setCommandPrefix")) {
@@ -224,26 +162,26 @@ public void onChannelUpdateEvent(ChannelUpdateEvent event) {
         }
         updateVariables(event.getNewChannel().getGuild());
 
-        GuildContentObject content = Globals.getGuildContent(event.getGuild().getStringID());
-        if (content.getGuildConfig().channelLogging) {
+        GuildObject content = Globals.getGuildContent(event.getGuild().getLongID());
+        if (content.config.channelLogging) {
             if (!event.getOldChannel().getName().equalsIgnoreCase(event.getNewChannel().getName())) {
                 String log = "> Channel " + event.getNewChannel().mention() + "'s name was changed.\nOld name : #" + event.getOldChannel().getName() + ".";
-                Utility.sendLog(log, content.getGuildConfig(), false);
+                Utility.sendLog(log, content.config, false);
             } else if ((event.getOldChannel().getTopic() == null || event.getOldChannel().getTopic().isEmpty()) && (event.getNewChannel().getTopic() == null || event.getNewChannel().getTopic().isEmpty())) {
                 //do nothing
             } else if ((event.getOldChannel().getTopic() == null || event.getOldChannel().getTopic().isEmpty()) && (event.getNewChannel().getTopic() != null || !event.getNewChannel().getTopic().isEmpty())) {
                 StringBuilder log = new StringBuilder("> Channel " + event.getNewChannel().mention() + "'s Channel topic was added.\n");
                 log.append("**New Topic**: " + event.getNewChannel().getTopic());
-                Utility.sendLog(log.toString(), content.getGuildConfig(), false);
+                Utility.sendLog(log.toString(), content.config, false);
             } else if ((event.getOldChannel().getTopic() != null || !event.getOldChannel().getTopic().isEmpty()) && (event.getNewChannel().getTopic() == null || event.getNewChannel().getTopic().isEmpty())) {
                 StringBuilder log = new StringBuilder("> Channel " + event.getNewChannel().mention() + "'s Channel topic was removed.\n");
                 log.append("**Old Topic**: " + event.getOldChannel().getTopic());
-                Utility.sendLog(log.toString(), content.getGuildConfig(), false);
+                Utility.sendLog(log.toString(), content.config, false);
             } else if (!event.getOldChannel().getTopic().equalsIgnoreCase(event.getNewChannel().getTopic())) {
                 StringBuilder log = new StringBuilder("> Channel " + event.getNewChannel().mention() + "'s Channel topic was changed.");
                 log.append("\n**Old Topic**: " + event.getOldChannel().getTopic());
                 log.append("\n**New Topic**: " + event.getNewChannel().getTopic());
-                Utility.sendLog(log.toString(), content.getGuildConfig(), false);
+                Utility.sendLog(log.toString(), content.config, false);
             }
         }
     }
@@ -253,68 +191,95 @@ public void onChannelDeleteEvent(ChannelDeleteEvent event) {
         if (event.getChannel().isPrivate()) {
             return;
         }
-        GuildContentObject content = Globals.getGuildContent(event.getGuild().getStringID());
-        if (content.getGuildConfig().channelLogging) {
+        GuildObject content = Globals.getGuildContent(event.getGuild().getLongID());
+        if (content.config.channelLogging) {
             String log = "> Channel #" + event.getChannel().getName() + " was deleted.";
-            Utility.sendLog(log, content.getGuildConfig(), false);
+            Utility.sendLog(log, content.config, false);
         }
         updateVariables(event.getChannel().getGuild());
     }
 
     @EventSubscriber
     public void onChannelCreateEvent(ChannelCreateEvent event) {
-        GuildContentObject content = Globals.getGuildContent(event.getGuild().getStringID());
-        if (content.getGuildConfig().channelLogging) {
+        GuildObject content = Globals.getGuildContent(event.getGuild().getLongID());
+        if (content.config.channelLogging) {
             String log = "> Channel " + event.getChannel().mention() + " was created.";
-            Utility.sendLog(log, content.getGuildConfig(), false);
+            Utility.sendLog(log, content.config, false);
         }
     }
 
-    private void updateVariables(IGuild guild) {
-        String guildID = guild.getStringID();
-        GuildConfig guildConfig = Globals.getGuildContent(guildID).getGuildConfig();
+    public static void updateVariables(IGuild guild) {
+        long guildID = guild.getLongID();
+        GuildConfig guildConfig = Globals.getGuildContent(guildID).config;
         guildConfig.updateVariables(guild);
     }
 
     @EventSubscriber
     public void onReactionAddEvent(ReactionAddEvent event) {
+        if (event.getUser().isBot()) {
+            return;
+        }
         Emoji x = EmojiManager.getForAlias("x");
         Emoji pin = EmojiManager.getForAlias("pushpin");
         Emoji thumbsUp = EmojiManager.getForAlias("thumbsup");
         Emoji thumbsDown = EmojiManager.getForAlias("thumbsdown");
+        IEmoji customEmoji = null;
+        Emoji emoji = null;
+
         if (event.getReaction().isCustomEmoji()) {
+            customEmoji = event.getReaction().getCustomEmoji();
+        } else {
+            emoji = event.getReaction().getUnicodeEmoji();
+        }
+
+        if (customEmoji == null && emoji == null) {
             return;
         }
+
+        //do only on server channels
         if (!event.getChannel().isPrivate()) {
             CommandObject object = new CommandObject(event.getMessage());
-            if (object.guildConfig.artPinning) {
-                if (event.getReaction().getUnicodeEmoji().equals(pin)) {
-                    new ArtHandler(object.setAuthor(event.getUser()));
+            if (customEmoji != null) {
+                return;
+            } else {
+                //if is pushpin
+                if (object.guild.config.artPinning) {
+                    if (event.getReaction().getUnicodeEmoji().equals(pin)) {
+                        new ArtHandler(object.setAuthor(event.getUser()));
+                    }
                 }
-            }
-            if (Utility.testForPerms(new Permissions[]{Permissions.MANAGE_MESSAGES}, event.getUser(), event.getGuild())) {
-                if (event.getReaction().getUnicodeEmoji().equals(x)) {
-                    if (event.getMessage().getAuthor().getStringID().equals(Globals.getClient().getOurUser().getStringID())) {
-                        Utility.deleteMessage(event.getMessage());
-                        return;
+                //if is x and can bypass
+                if (Utility.testForPerms(new Permissions[]{Permissions.MANAGE_MESSAGES}, event.getUser(), event.getGuild())) {
+                    if (event.getReaction().getUnicodeEmoji().equals(x)) {
+                        if (event.getMessage().getAuthor().getStringID().equals(Globals.getClient().getOurUser().getStringID())) {
+                            Utility.deleteMessage(event.getMessage());
+                            return;
+                        }
                     }
                 }
-            }
-            if (event.getChannel().getLongID() == Globals.queueChannelID) {
-                if (!event.getReaction().isCustomEmoji()) {
-                    if (event.getReaction().getUnicodeEmoji().equals(thumbsUp) || event.getReaction().getUnicodeEmoji().equals(thumbsDown)) {
-                        IUser owner = Globals.getClient().getUserByID(Globals.creatorID);
-                        if (event.getReaction().getUserReacted(owner)) {
-                            QueueHandler.addedReaction(event.getMessage(), event.getReaction());
+                //if is thumbsup or thumbs down and is creator.
+                if (event.getChannel().getLongID() == Globals.queueChannelID) {
+                    if (!event.getReaction().isCustomEmoji()) {
+                        if (event.getReaction().getUnicodeEmoji().equals(thumbsUp) || event.getReaction().getUnicodeEmoji().equals(thumbsDown)) {
+                            IUser owner = Globals.getClient().getUserByID(Globals.creatorID);
+                            if (event.getReaction().getUserReacted(owner)) {
+                                QueueHandler.addedReaction(event.getMessage(), event.getReaction());
+                            }
                         }
                     }
                 }
             }
+            //do only within Direct messages
         } else {
-            if (event.getReaction().getUnicodeEmoji().equals(x)) {
-                if (event.getMessage().getAuthor().getStringID().equals(Globals.getClient().getOurUser().getStringID())) {
-                    Utility.deleteMessage(event.getMessage());
-                    return;
+            if (customEmoji != null) {
+                return;
+            } else {
+                //if anyone uses x
+                if (event.getReaction().getUnicodeEmoji().equals(x)) {
+                    if (event.getMessage().getAuthor().getStringID().equals(Globals.getClient().getOurUser().getStringID())) {
+                        Utility.deleteMessage(event.getMessage());
+                        return;
+                    }
                 }
             }
         }
@@ -327,69 +292,69 @@ public void onMessageDeleteEvent(MessageDeleteEvent event) {
         }
         CommandObject command = new CommandObject(event.getMessage());
         String content;
-        IUser ourUser = command.client.getOurUser();
+        IUser ourUser = command.client.bot;
 
-        List<String> infoID = command.guildConfig.getChannelIDsByType(Command.CHANNEL_INFO);
-        List<String> serverLogID = command.guildConfig.getChannelIDsByType(Command.CHANNEL_SERVER_LOG);
-        List<String> adminLogID = command.guildConfig.getChannelIDsByType(Command.CHANNEL_ADMIN_LOG);
-        List<String> dontLog = command.guildConfig.getChannelIDsByType(Command.CHANNEL_DONT_LOG);
+        List<String> infoID = command.guild.config.getChannelIDsByType(Command.CHANNEL_INFO);
+        List<String> serverLogID = command.guild.config.getChannelIDsByType(Command.CHANNEL_SERVER_LOG);
+        List<String> adminLogID = command.guild.config.getChannelIDsByType(Command.CHANNEL_ADMIN_LOG);
+        List<String> dontLog = command.guild.config.getChannelIDsByType(Command.CHANNEL_DONT_LOG);
         if (dontLog != null) {
             for (String id : dontLog) {
-                if (command.channelSID.equals(id)) {
+                if (command.channel.stringID.equals(id)) {
                     return;
                 }
             }
         }
-        if (command.guildConfig.dontLogBot && command.author.isBot()) {
+        if (command.guild.config.dontLogBot && command.user.get().isBot()) {
             return;
         }
         if (event.getMessage() == null) {
             return;
         }
-        if (serverLogID != null && serverLogID.get(0).equals(command.channelSID) && ourUser.getStringID().equals(command.authorSID)) {
+        if (serverLogID != null && serverLogID.get(0).equals(command.channel.stringID) && ourUser.getStringID().equals(command.user.stringID)) {
             return;
         }
-        if (infoID != null && infoID.get(0).equals(command.channelSID) && ourUser.getStringID().equals(command.authorSID)) {
+        if (infoID != null && infoID.get(0).equals(command.channel.stringID) && ourUser.getStringID().equals(command.user.stringID)) {
             return;
         }
-        if (adminLogID != null && adminLogID.get(0).equals(command.channelSID) && ourUser.getStringID().equals(command.authorSID)) {
+        if (adminLogID != null && adminLogID.get(0).equals(command.channel.stringID) && ourUser.getStringID().equals(command.user.stringID)) {
             return;
         }
-        if (command.guildConfig.deleteLogging) {
-            if (command.message.getContent() == null) {
+        if (command.guild.config.deleteLogging) {
+            if (command.message.get().getContent() == null) {
                 return;
             }
-            if (command.message.getContent().isEmpty()) {
+            if (command.message.get().getContent().isEmpty()) {
                 return;
             }
             int charLimit = 1800;
-            if (command.message.getContent().length() > charLimit) {
-                content = Utility.unFormatMentions(command.message).substring(0, 1800);
+            if (command.message.get().getContent().length() > charLimit) {
+                content = Utility.unFormatMentions(command.message.get()).substring(0, 1800) + "...";
             } else {
-                content = Utility.unFormatMentions(command.message);
+                content = Utility.unFormatMentions(command.message.get());
             }
-            if ((content.equals("`Loading...`") || content.equals("`Working...`")) && command.authorSID.equals(command.client.getOurUser().getStringID())) {
+            if ((content.equals("`Loading...`") || content.equals("`Working...`")) && command.user.stringID.equals(command.client.stringID)) {
                 return;
             }
             long difference = ZonedDateTime.now(ZoneOffset.UTC).toEpochSecond() - event.getMessage().getTimestamp().atZone(ZoneOffset.UTC).toEpochSecond();
             String formatted;
-            if (command.guildConfig.useTimeStamps) {
+            if (command.guild.config.useTimeStamps) {
                 formatted = "at `" + Utility.formatTimestamp(event.getMessage().getTimestamp().atZone(ZoneOffset.UTC)) + " - UTC`";
             } else {
                 formatted = "from " + Utility.formatTimeDifference(difference);
             }
-            Utility.sendLog("> **@" + command.authorUserName + "'s** Message " + formatted + " was **Deleted** in channel: " + command.channel.mention() + " with contents:\n" + content, command.guildConfig, false);
+            Utility.sendLog("> **@" + command.user.username + "'s** Message " + formatted + " was **Deleted** in channel: " + command.channel.get().mention() + " with contents:\n" + content, command.guild.config, false);
         }
     }
 
     @EventSubscriber
     public void onUserJoinEvent(UserJoinEvent event) {
-        GuildContentObject content = Globals.getGuildContent(event.getGuild().getStringID());
-        if (content.getGuildConfig().joinsServerMessages) {
-            String message = content.getGuildConfig().getJoinMessage();
+        GuildObject content = Globals.getGuildContent(event.getGuild().getLongID());
+        if (content.config.joinsServerMessages) {
+            String message = content.config.getJoinMessage();
             message = message.replace("<server>", event.getGuild().getName());
             message = message.replace("<user>", event.getUser().getName());
-            Utility.sendDM(message, event.getUser().getStringID());
+            Utility.sendDM(message, event.getUser().getLongID());
         }
         joinLeaveLogging(event, true);
     }
@@ -401,12 +366,12 @@ public void onUserLeaveEvent(UserLeaveEvent event) {
 
     public void joinLeaveLogging(GuildMemberEvent event, boolean joining) {
         IGuild guild = event.getGuild();
-        GuildContentObject content = Globals.getGuildContent(guild.getStringID());
-        if (content.getGuildConfig().joinLeaveLogging) {
+        GuildObject content = Globals.getGuildContent(guild.getLongID());
+        if (content.config.joinLeaveLogging) {
             if (joining) {
-                Utility.sendLog("> **@" + event.getUser().getName() + "#" + event.getUser().getDiscriminator() + "** has **Joined** the server.", content.getGuildConfig(), false);
+                Utility.sendLog("> **@" + event.getUser().getName() + "#" + event.getUser().getDiscriminator() + "** has **Joined** the server.", content.config, false);
             } else {
-                Utility.sendLog("> **@" + event.getUser().getName() + "#" + event.getUser().getDiscriminator() + "** has **Left** the server.", content.getGuildConfig(), false);
+                Utility.sendLog("> **@" + event.getUser().getName() + "#" + event.getUser().getDiscriminator() + "** has **Left** the server.", content.config, false);
             }
         }
     }
@@ -426,12 +391,12 @@ public void onMessageUpdateEvent(MessageUpdateEvent event) {
             return;
         }
         CommandObject command = new CommandObject(event.getMessage());
-        IUser ourUser = command.client.getOurUser();
-        List<String> logID = command.guildConfig.getChannelIDsByType(Command.CHANNEL_SERVER_LOG);
-        List<String> dontLog = command.guildConfig.getChannelIDsByType(Command.CHANNEL_DONT_LOG);
+        IUser ourUser = command.client.bot;
+        List<String> logID = command.guild.config.getChannelIDsByType(Command.CHANNEL_SERVER_LOG);
+        List<String> dontLog = command.guild.config.getChannelIDsByType(Command.CHANNEL_DONT_LOG);
         if (dontLog != null) {
             for (String id : dontLog) {
-                if (command.channelSID.equals(id)) {
+                if (command.channel.stringID.equals(id)) {
                     return;
                 }
             }
@@ -439,16 +404,16 @@ public void onMessageUpdateEvent(MessageUpdateEvent event) {
         if (logID != null) {
             String serverLogID = logID.get(0);
 
-            if (command.guildConfig.dontLogBot && command.author.isBot()) {
+            if (command.guild.config.dontLogBot && command.user.get().isBot()) {
                 return;
             }
             if (event.getMessage() == null) {
                 return;
             }
-            if (serverLogID != null && serverLogID.equals(command.channelSID) && ourUser.getStringID().equals(command.authorSID)) {
+            if (serverLogID != null && serverLogID.equals(command.channel.stringID) && ourUser.getStringID().equals(command.user.stringID)) {
                 return;
             }
-            if (command.guildConfig.editLogging) {
+            if (command.guild.config.editLogging) {
                 //formats how long ago this was.
                 String formatted;
                 String oldContent;
@@ -458,17 +423,17 @@ public void onMessageUpdateEvent(MessageUpdateEvent event) {
                 ZonedDateTime newMessageTime = event.getNewMessage().getEditedTimestamp().get().atZone(ZoneOffset.UTC);
                 int charLimit;
                 long difference = newMessageTime.toEpochSecond() - oldMessageTime.toEpochSecond();
-                if (command.guildConfig.useTimeStamps) {
+                if (command.guild.config.useTimeStamps) {
                     formatted = "at `" + Utility.formatTimestamp(oldMessageTime) + " - UTC`";
                 } else {
                     formatted = "from " + Utility.formatTimeDifference(difference);
                 }
-                response.append("> **@" + command.authorUserName + "'s** Message " + formatted + " was **Edited** in channel: " + command.channel.mention() + ". ");
+                response.append("> **@" + command.user.username + "'s** Message " + formatted + " was **Edited** in channel: " + command.channel.get().mention() + ". ");
                 //remove excess text that would cause a max char limit error.
-                if (command.message.getContent().isEmpty()) {
+                if (command.message.get().getContent().isEmpty()) {
                     return;
                 }
-                if (command.guildConfig.extendEditLog) {
+                if (command.guild.config.extendEditLog) {
                     charLimit = 900;
                 } else {
                     charLimit = 1800;
@@ -484,10 +449,10 @@ public void onMessageUpdateEvent(MessageUpdateEvent event) {
                     newContent = Utility.unFormatMentions(event.getNewMessage());
                 }
                 response.append("**\nMessage's Old Contents:**\n" + oldContent);
-                if (command.guildConfig.extendEditLog) {
+                if (command.guild.config.extendEditLog) {
                     response.append("\n**Message's New Contents:**\n" + newContent);
                 }
-                Utility.sendLog(response.toString(), command.guildConfig, false);
+                Utility.sendLog(response.toString(), command.guild.config, false);
             }
         }
     }
@@ -495,8 +460,8 @@ public void onMessageUpdateEvent(MessageUpdateEvent event) {
     @EventSubscriber
     public void onUserRoleUpdateEvent(UserRoleUpdateEvent event) {
         IGuild guild = event.getGuild();
-        GuildContentObject content = Globals.getGuildContent(guild.getStringID());
-        if (content.getGuildConfig().userRoleLogging) {
+        GuildObject content = Globals.getGuildContent(guild.getLongID());
+        if (content.config.userRoleLogging) {
             ArrayList<String> oldRoles = new ArrayList<>();
             ArrayList<String> newRoles = new ArrayList<>();
             oldRoles.addAll(event.getOldRoles().stream().filter(r -> !r.isEveryoneRole()).map(IRole::getName).collect(Collectors.toList()));
@@ -514,12 +479,7 @@ public void onUserRoleUpdateEvent(UserRoleUpdateEvent event) {
             logger.debug("New Roles:");
             logger.debug(newRoleList.toString());
             String prefix = "> **@" + event.getUser().getName() + "#" + event.getUser().getDiscriminator() + "'s** Role have been Updated.";
-            Utility.sendLog(prefix + "\nOld Roles: " + Utility.listFormatter(oldRoles, true) + "\nNew Roles: " + Utility.listFormatter(newRoles, true), content.getGuildConfig(), false);
+            Utility.sendLog(prefix + "\nOld Roles: " + Utility.listFormatter(oldRoles, true) + "\nNew Roles: " + Utility.listFormatter(newRoles, true), content.config, false);
         }
     }
-
-    @EventSubscriber
-    public void onMessagePinEvent(MessagePinEvent event) {
-        // do stuff
-    }
 }
diff --git a/src/main/java/Main/Client.java b/src/main/java/com/github/vaerys/main/Client.java
similarity index 95%
rename from src/main/java/Main/Client.java
rename to src/main/java/com/github/vaerys/main/Client.java
index f396e7ac..1b877ffb 100644
--- a/src/main/java/Main/Client.java
+++ b/src/main/java/com/github/vaerys/main/Client.java
@@ -1,4 +1,4 @@
-package Main;
+package com.github.vaerys.main;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/Main/Constants.java b/src/main/java/com/github/vaerys/main/Constants.java
similarity index 97%
rename from src/main/java/Main/Constants.java
rename to src/main/java/com/github/vaerys/main/Constants.java
index 27d37352..ecba60c8 100644
--- a/src/main/java/Main/Constants.java
+++ b/src/main/java/com/github/vaerys/main/Constants.java
@@ -1,7 +1,6 @@
-package Main;
+package com.github.vaerys.main;
 
-import Enums.UserSetting;
-import Objects.QueueObject;
+import com.github.vaerys.enums.UserSetting;
 
 import java.util.ArrayList;
 
@@ -65,7 +64,7 @@ public class Constants {
     public static final String DIRECTORY_OLD_FILES = DIRECTORY_STORAGE + "Old_Files/";
     public static final String DIRECTORY_ERROR = DIRECTORY_STORAGE + "Error/";
     public static final String DIRECTORY_WIKI = "DiscordSailv2.wiki/";
-    public static final String DIRECTORY_WIKI_COMMANDS = DIRECTORY_WIKI + "Commands/";
+    public static final String DIRECTORY_WIKI_COMMANDS = DIRECTORY_WIKI + "com/github/vaerys/commands/";
 
     //Files
     public static final String FILE_TOKEN = DIRECTORY_STORAGE + "Token.txt";
@@ -108,6 +107,7 @@ public class Constants {
         add(UserSetting.DONT_SHOW_LEADERBOARD);
         add(UserSetting.HIDE_RANK);
         add(UserSetting.HIT_LEVEL_FLOOR);
+        add(UserSetting.PRIVATE_PROFILE);
     }};
 
     //Special Messages
diff --git a/src/main/java/Main/Globals.java b/src/main/java/com/github/vaerys/main/Globals.java
similarity index 61%
rename from src/main/java/Main/Globals.java
rename to src/main/java/com/github/vaerys/main/Globals.java
index 8c718182..3f168855 100644
--- a/src/main/java/Main/Globals.java
+++ b/src/main/java/com/github/vaerys/main/Globals.java
@@ -1,29 +1,28 @@
-package Main;
-
-import ChannelSettings.InitChannels;
-import Commands.Admin.ChannelHere;
-import Commands.CommandInit;
-import GuildToggles.ToggleInit;
-import Handlers.FileHandler;
-import Interfaces.*;
-import Objects.DailyMessageObject;
-import Objects.GuildContentObject;
-import Objects.RandomStatusObject;
-import POGOs.*;
+package com.github.vaerys.main;
+
+import com.github.vaerys.channelsettings.InitChannels;
+import com.github.vaerys.commands.CommandInit;
+import com.github.vaerys.commands.admin.ChannelHere;
+import com.github.vaerys.guildtoggles.ToggleInit;
+import com.github.vaerys.handlers.FileHandler;
+import com.github.vaerys.interfaces.*;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.objects.DailyMessageObject;
+import com.github.vaerys.objects.RandomStatusObject;
+import com.github.vaerys.pogos.Config;
+import com.github.vaerys.pogos.DailyMessages;
+import com.github.vaerys.pogos.GlobalData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sx.blah.discord.api.IDiscordClient;
-import sx.blah.discord.handle.obj.IGuild;
 import sx.blah.discord.handle.obj.IUser;
 
 import java.awt.*;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.ArrayList;
+import java.util.*;
 import java.util.List;
-import java.util.Collections;
-import java.util.Properties;
 
 /**
  * Created by Vaerys on 14/08/2016.
@@ -46,13 +45,13 @@ public class Globals {
     public static boolean isReady = false;
     public static String version;
     public static String consoleMessageCID = null;
-    public static ArrayList<DailyMessageObject> dailyMessages = new ArrayList<>();
+    public static ArrayList<DailyMessageObject> configDailyMessages = new ArrayList<>();
     public static IDiscordClient client;
-    public static boolean isModifingFiles = false;
     public static boolean showSaveWarning = false;
-    private static ArrayList<GuildContentObject> guildContentObjects = new ArrayList<>();
-    private static ArrayList<Command> commands = new ArrayList<>();
-    private static ArrayList<DMCommand> commandsDM = new ArrayList<>();
+    //    private static ArrayList<GuildContentObject> guildContentObjects = new ArrayList<>();
+    private static List<GuildObject> guilds = new ArrayList<>();
+    public static List<Command> commands = new ArrayList<>();
+    //    private static List<Command> commandsDM = new ArrayList<>();
     private static ArrayList<String> commandTypes = new ArrayList<>();
     private static ArrayList<ChannelSetting> channelSettings = new ArrayList<>();
     private static ArrayList<GuildToggle> guildGuildToggles = new ArrayList<>();
@@ -63,10 +62,12 @@ public class Globals {
 
     final static Logger logger = LoggerFactory.getLogger(Globals.class);
     private static GlobalData globalData;
+    private static DailyMessages dailyMessages;
     public static int baseXPModifier;
     public static int xpForLevelOne;
     public static long lastDmUserID = -1;
     public static Color pixelColour = new Color(226, 218, 117);
+    private static ArrayList<Command> creatorCommands = new ArrayList<>();
 
     public static void initConfig(IDiscordClient ourClient, Config config, GlobalData newGlobalData) {
         if (newGlobalData != null) {
@@ -83,7 +84,7 @@ public static void initConfig(IDiscordClient ourClient, Config config, GlobalDat
         playing = config.playing;
         argsMax = config.argsMax;
         maxWarnings = config.maxWarnings;
-        dailyMessages = config.dailyMessages;
+        configDailyMessages = config.dailyMessages;
         baseXPModifier = config.baseXpModifier;
         xpForLevelOne = config.xpForLevelOne;
         avgMessagesPerDay = config.avgMessagesPerDay;
@@ -92,6 +93,7 @@ public static void initConfig(IDiscordClient ourClient, Config config, GlobalDat
         randomStatuses = config.randomStatuses;
         queueChannelID = config.queueChannelID;
         blacklistedURls = FileHandler.readFromFile("website.blacklist");
+        dailyMessages = (DailyMessages) DailyMessages.create(DailyMessages.FILE_PATH, new DailyMessages());
         initCommands();
     }
 
@@ -99,7 +101,7 @@ private static void initCommands() {
         //Load Commands
         commands = CommandInit.get();
         //Load DM Commands
-        commandsDM = CommandInit.getDM();
+//        commandsDM = CommandInit.getDM();
         //Load Guild Toggles
         guildGuildToggles = ToggleInit.get();
 
@@ -107,12 +109,11 @@ private static void initCommands() {
 
         channelSettings = InitChannels.get();
 
+        creatorCommands = CommandInit.getCreatorCommands();
+
         //validate commands
         validate();
 
-        //getSlashCommands Command Types
-        commandTypes.add(Command.TYPE_DM);
-
         //auto remover code for Commands.Admin.ChannelHere, will remove if channels are not in use.
         if (channelSettings.size() == 0) {
             for (int i = 0; i < commands.size(); i++) {
@@ -137,49 +138,37 @@ private static void initCommands() {
         Collections.sort(commandTypes);
 
         logger.info(commands.size() + " Commands Loaded.");
-        logger.info(commandsDM.size() + " DM Commands Loaded.");
         logger.info(commandTypes.size() + " Command Types Loaded.");
         logger.info(channelSettings.size() + " Channel Types Loaded.");
         logger.info(guildGuildToggles.size() + " Guild Toggles Loaded.");
-        logger.info(slashCommands.size() + " Slash Commands Loaded.");
+        logger.info(creatorCommands.size() + " Creator Commands Loaded.");
     }
 
     private static void validate() throws IllegalArgumentException {
         for (Command c : commands) {
             logger.trace("Validating Command: " + c.getClass().getName());
-            if (c.names().length == 0)
-                throw new IllegalArgumentException(c.getClass().getName() + " Command Name cannot be null.");
-            if (c.type() == null || c.type().isEmpty())
-                throw new IllegalArgumentException(c.getClass().getName() + " Command Type cannot be null.");
-            if (c.description() == null || c.description().isEmpty())
-                throw new IllegalArgumentException(c.getClass().getName() + " Command Desc cannot be null.");
-            if (c.requiresArgs() && (c.usage() == null || c.usage().isEmpty()))
-                throw new IllegalArgumentException(c.getClass().getName() + " Command Usage cannot be null if RequiresArgs is true.");
-            if (c.dualDescription() != null || c.dualType() != null) {
-                if (c.dualType() == null || c.dualType().isEmpty())
-                    throw new IllegalArgumentException(c.getClass().getName() + " Command Dual Type cannot be null.");
-                if (c.dualType().equalsIgnoreCase(c.type()))
-                    throw new IllegalArgumentException(c.getClass().getName() + " Command Type cannot be equal to Dual Type.");
-                if (c.dualDescription() == null || c.dualDescription().isEmpty())
-                    throw new IllegalArgumentException(c.getClass().getName() + " Command Dual Desc cannot be null.");
-                if (c.dualDescription().equalsIgnoreCase(c.description()))
-                    throw new IllegalArgumentException(c.getClass().getName() + " Command Desc cannot be equal to Dual Desc.");
-                if (c.usage() != null && c.usage().equalsIgnoreCase(c.dualUsage()))
-                    throw new IllegalArgumentException(c.getClass().getName() + " Command Usage cannot be equal to Dual Usage.");
+            String errorReport = c.validate();
+            if (errorReport != null) {
+                logger.error(errorReport);
+                System.exit(-1);
+            }
+        }
+        for (Command c : creatorCommands) {
+            logger.trace("Validating Command: " + c.getClass().getName());
+            String errorReport = c.validate();
+            if (errorReport != null) {
+                logger.error(errorReport);
+                System.exit(-1);
             }
         }
-        for (DMCommand c : commandsDM) {
-            logger.trace("Validating DM Command: " + c.getClass().getName());
-            if (c.names().length == 0)
-                throw new IllegalArgumentException(c.getClass().getName() + " Command Name cannot be null");
-            if (c.description() == null || c.description().isEmpty())
-                throw new IllegalArgumentException(c.getClass().getName() + " Command Desc cannot be null.");
-            if (c.type() == null || c.type().isEmpty())
-                throw new IllegalArgumentException(c.getClass().getName() + " Command Type cannot be null.");
-            if (c.requiresArgs() && (c.usage() == null || c.usage().isEmpty()))
-                throw new IllegalArgumentException(c.getClass().getName() + " Command Usage cannot be null if RequiresArgs is true.");
+        for (Command c : slashCommands) {
+            logger.trace("Validating Command: " + c.getClass().getName());
+            String errorReport = c.validate();
+            if (errorReport != null) {
+                logger.error(errorReport);
+                System.exit(-1);
+            }
         }
-
         for (GuildToggle g : guildGuildToggles) {
             logger.trace("Validating Toggle: " + g.getClass().getName());
             if (g.name() == null || g.name().isEmpty())
@@ -189,15 +178,6 @@ private static void validate() throws IllegalArgumentException {
             if (g.name().contains("\n"))
                 throw new IllegalArgumentException(g.getClass().getName() + "Toggle Name cannot contain Newlines.");
         }
-        for (SlashCommand s : slashCommands) {
-            if (s.call() == null || s.call().isEmpty())
-                throw new IllegalArgumentException(s.getClass().getName() + " Slash Command Call must not be null.");
-            if (s.response() == null || s.response().isEmpty())
-                throw new IllegalArgumentException(s.getClass().getName() + " Slash Command Response must not be null.");
-            if (!s.call().startsWith("/"))
-                throw new IllegalArgumentException(s.getClass().getName() + " Slash Command call must Start with \"/\"");
-        }
-
         for (ChannelSetting s : channelSettings) {
             if (s.type() == null || s.type().isEmpty()) {
                 throw new IllegalArgumentException(s.getClass().getName() + " Channel Type cannot be null.");
@@ -230,7 +210,7 @@ public static void validateConfig() throws IllegalArgumentException {
         if (doDailyAvatars) {
             if (!dailyAvatarName.contains("#day#"))
                 throw new IllegalArgumentException("dailyAvatarName must contain #day# for the feature to work as intended.");
-            for (DailyMessageObject d : dailyMessages) {
+            for (DailyMessageObject d : configDailyMessages) {
                 if (!Files.exists(Paths.get(Constants.DIRECTORY_GLOBAL_IMAGES + d.getFileName())))
                     throw new IllegalArgumentException("File " + Constants.DIRECTORY_GLOBAL_IMAGES + d.getFileName() + " does not exist.");
                 else if (!Files.exists(Paths.get(Constants.DIRECTORY_GLOBAL_IMAGES + defaultAvatarFile)))
@@ -246,18 +226,14 @@ else if (!Files.exists(Paths.get(Constants.DIRECTORY_GLOBAL_IMAGES + defaultAvat
         }
     }
 
-    public static void initGuild(String guildID, GuildConfig guildConfig, Servers servers, CustomCommands customCommands, Characters characters, Competition competition, GuildUsers guildUsers, ChannelData channelData) {
-        for (GuildContentObject contentObject : guildContentObjects) {
-            if (guildID.equals(contentObject.getGuildID())) {
+    public static void initGuild(GuildObject guild) {
+        for (GuildObject g : guilds) {
+            if (g.longID == guild.longID) {
                 return;
             }
         }
-
-        IGuild guild = client.getGuildByID(guildID);
-        guildConfig.updateVariables(guild);
-
-        GuildContentObject guildContentObject = new GuildContentObject(guildID, guildConfig, customCommands, servers, characters, competition, guildUsers, channelData);
-        guildContentObjects.add(guildContentObject);
+        guild.config.updateVariables(guild.get());
+        guilds.add(guild);
     }
 
     public static void setVersion() {
@@ -267,7 +243,7 @@ public static void setVersion() {
             version = properties.getProperty("version");
             logger.info("Bot version : " + version);
         } catch (IOException e) {
-            e.printStackTrace();
+            Utility.sendStack(e);
         }
     }
 
@@ -275,41 +251,58 @@ public static IDiscordClient getClient() {
         return client;
     }
 
-    public static GuildContentObject getGuildContent(String guildID) {
-        if (guildContentObjects == null) {
-            return null;
-        }
-        for (GuildContentObject storage : guildContentObjects) {
-            if (storage.getGuildID() != null && storage.getGuildID().equals(guildID)) {
-                return storage;
+    public static GuildObject getGuildContent(long guildID) {
+        for (GuildObject g : guilds) {
+            if (g.longID == guildID) {
+                return g;
             }
         }
-        return null;
+        return new GuildObject();
     }
 
-    public static ArrayList<GuildContentObject> getGuildContentObjects() {
-        return guildContentObjects;
+    public static List<GuildObject> getGuilds() {
+        return guilds;
     }
 
     public static void saveFiles() {
         logger.debug("Saving Files.");
-        Globals.isModifingFiles = true;
-        Globals.getGuildContentObjects().forEach(GuildContentObject::saveFiles);
+        dailyMessages.flushFile();
+        for (GuildObject g : guilds) {
+            for (GuildFile file : g.guildFiles) {
+                file.flushFile();
+            }
+        }
         FileHandler.writeToJson(Constants.FILE_GLOBAL_DATA, getGlobalData());
-        Globals.isModifingFiles = false;
     }
 
-    public static void unloadGuild(String id) {
-        for (int i = 0; i < guildContentObjects.size(); i++) {
-            if (guildContentObjects.get(i).getGuildID().equals(id)) {
-                logger.info("> Disconnected from Guild with ID : " + id);
-                guildContentObjects.remove(i);
+    public static void unloadGuild(long id) {
+        ListIterator iterator = guilds.listIterator();
+        while (iterator.hasNext()) {
+            GuildObject guild = (GuildObject) iterator.next();
+            if (guild.longID == id) {
+                logger.trace("Guild: " + guild.get().getName() + " unloaded.");
+                iterator.remove();
             }
         }
     }
 
-    public static ArrayList<Command> getCommands() {
-        return commands;
+    public static List<Command> getCommands(boolean isDm) {
+        List<Command> getCommands = new ArrayList<>();
+        for (Command c : commands) {
+            if (isDm) {
+                if (c.channel() != null && c.channel().equalsIgnoreCase(Command.CHANNEL_DM)) getCommands.add(c);
+            } else {
+                if (c.channel() == null || !c.channel().equalsIgnoreCase(Command.CHANNEL_DM)) getCommands.add(c);
+
+            }
+        }
+        return getCommands;
+    }
+
+    public static List<Command> getAllCommands() {
+        List<Command> allCommands = new ArrayList<>(commands);
+        allCommands.addAll(creatorCommands);
+        return allCommands;
     }
 
     public static GlobalData getGlobalData() {
@@ -320,9 +313,9 @@ public static GlobalData getGlobalData() {
         }
     }
 
-    public static ArrayList<DMCommand> getCommandsDM() {
-        return commandsDM;
-    }
+//    public static List<Command> getCommandsDM() {
+//        return commandsDM;
+//    }
 
     public static ArrayList<String> getCommandTypes() {
         return commandTypes;
@@ -347,4 +340,25 @@ public static ArrayList<RandomStatusObject> getRandomStatuses() {
     public static List<String> getBlacklistedURls() {
         return blacklistedURls;
     }
+
+    public static DailyMessages getDailyMessages() {
+        return dailyMessages;
+    }
+
+    public static List<Command> getCreatorCommands(boolean isDm) {
+        List<Command> getCommands = new ArrayList<>();
+        for (Command c : creatorCommands) {
+            if (isDm) {
+                if (c.channel() != null && c.channel().equalsIgnoreCase(Command.CHANNEL_DM)) getCommands.add(c);
+            } else {
+                if (c.channel() == null || !c.channel().equalsIgnoreCase(Command.CHANNEL_DM)) getCommands.add(c);
+
+            }
+        }
+        return getCommands;
+    }
+
+    public static List<Command> getALLCreatorCommands() {
+        return creatorCommands;
+    }
 }
diff --git a/src/main/java/Main/InitEvent.java b/src/main/java/com/github/vaerys/main/InitEvent.java
similarity index 95%
rename from src/main/java/Main/InitEvent.java
rename to src/main/java/com/github/vaerys/main/InitEvent.java
index 71c36ef4..aaf6d0d0 100644
--- a/src/main/java/Main/InitEvent.java
+++ b/src/main/java/com/github/vaerys/main/InitEvent.java
@@ -1,4 +1,4 @@
-package Main;
+package com.github.vaerys.main;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/Main/Main.java b/src/main/java/com/github/vaerys/main/Main.java
similarity index 74%
rename from src/main/java/Main/Main.java
rename to src/main/java/com/github/vaerys/main/Main.java
index 3eec7df9..b790b221 100644
--- a/src/main/java/Main/Main.java
+++ b/src/main/java/com/github/vaerys/main/Main.java
@@ -1,10 +1,8 @@
-package Main;
+package com.github.vaerys.main;
 
-import Handlers.EventHandler;
-import Handlers.FileHandler;
-import Handlers.PatchHandler;
-import POGOs.Config;
-import POGOs.GlobalData;
+import com.github.vaerys.handlers.*;
+import com.github.vaerys.pogos.Config;
+import com.github.vaerys.pogos.GlobalData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sx.blah.discord.Discord4J;
@@ -18,6 +16,10 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Scanner;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Created by Vaerys on 19/05/2016.
@@ -41,6 +43,7 @@ public void run() {
             }
         });
 
+
         String token;
         // you need to set a token in Token/Token.txt for the bot to run
         try {
@@ -81,11 +84,27 @@ public void run() {
             PatchHandler.globalPatches();
 
 
+            ThreadGroup group = new ThreadGroup("GuildCreateGroup");
+            final int[] count = new int[]{0};
+
             //login + register listener.
+            client.login();
+            ExecutorService guildService = new ThreadPoolExecutor(2, 50, 1,
+                    TimeUnit.MINUTES, new ArrayBlockingQueue<>(1000),
+                    r -> new Thread(group, r, group.getName() + "-Thread-" + ++count[0]));
+            ExecutorService commandService = new ThreadPoolExecutor(2, 50, 1,
+                    TimeUnit.MINUTES, new ArrayBlockingQueue<>(1000),
+                    r -> new Thread(group, r, group.getName() + "-Thread-" + ++count[0]));
+            ExecutorService creatorService = new ThreadPoolExecutor(2, 50, 1,
+                    TimeUnit.MINUTES, new ArrayBlockingQueue<>(1000),
+                    r -> new Thread(group, r, group.getName() + "-Thread-" + ++count[0]));
+
             EventDispatcher dispatcher = client.getDispatcher();
-            dispatcher.registerListener(new AnnotationListener());
+            dispatcher.registerListener(guildService, new GuildCreateListener());
+            dispatcher.registerListener(commandService, new AnnotationListener());
+            dispatcher.registerListener(creatorService, new CreatorHandler());
             dispatcher.registerTemporaryListener(new InitEvent());
-            client.login();
+
 
             //Init Patch system.
 
@@ -97,7 +116,7 @@ public void run() {
         } catch (DiscordException ex) {
             logger.error(ex.getErrorMessage());
         } catch (RateLimitException e) {
-            e.printStackTrace();
+            Utility.sendStack(e);
         }
     }
 
diff --git a/src/main/java/Main/Utility.java b/src/main/java/com/github/vaerys/main/Utility.java
similarity index 68%
rename from src/main/java/Main/Utility.java
rename to src/main/java/com/github/vaerys/main/Utility.java
index ffdbdad0..0569810e 100644
--- a/src/main/java/Main/Utility.java
+++ b/src/main/java/com/github/vaerys/main/Utility.java
@@ -1,13 +1,14 @@
-package Main;
-
-import Commands.CommandObject;
-import Commands.DMCommandObject;
-import Handlers.FileHandler;
-import Interfaces.Command;
-import Interfaces.DMCommand;
-import Objects.*;
-import POGOs.GlobalData;
-import POGOs.GuildConfig;
+package com.github.vaerys.main;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.enums.UserSetting;
+import com.github.vaerys.handlers.FileHandler;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.*;
+import com.github.vaerys.pogos.DailyMessages;
+import com.github.vaerys.pogos.GuildConfig;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -20,7 +21,6 @@
 
 import java.awt.*;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
@@ -29,10 +29,13 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.PatternSyntaxException;
 import java.util.stream.Collectors;
 
 /**
@@ -57,12 +60,18 @@ public static IRole getRoleFromName(String roleName, IGuild guild) {
     }
 
     public static boolean testForPerms(Permissions[] perms, IUser user, IGuild guild) {
+        if (perms.length == 0) {
+            return true;
+        }
+        if (guild == null) {
+            return true;
+        }
         if (user.getStringID().equals(Globals.creatorID)) {
-            logger.trace("User is Creator, BYPASSING.");
+//            logger.trace("User is Creator, BYPASSING.");
             return true;
         }
         if (user.getLongID() == guild.getOwnerLongID()) {
-            logger.trace("User is Guild Owner, GUILD : \"" + guild.getStringID() + "\", BYPASSING.");
+//            logger.trace("User is Guild Owner, GUILD : \"" + guild.getStringID() + "\", BYPASSING.");
             return true;
         }
         if (user.getPermissionsForGuild(guild).contains(Permissions.ADMINISTRATOR)) {
@@ -71,24 +80,24 @@ public static boolean testForPerms(Permissions[] perms, IUser user, IGuild guild
         EnumSet<Permissions> toMatch = EnumSet.noneOf(Permissions.class);
         toMatch.addAll(Arrays.asList(perms));
         //Debug code.
-        ArrayList<String> toMatchList = new ArrayList<String>() {{
+        List<String> toMatchList = new ArrayList<String>() {{
             addAll(toMatch.stream().map(Enum::toString).collect(Collectors.toList()));
         }};
-        ArrayList<String> userList = new ArrayList<String>() {{
+        List<String> userList = new ArrayList<String>() {{
             addAll(user.getPermissionsForGuild(guild).stream().map(Enum::toString).collect(Collectors.toList()));
         }};
-        if (true) {
-            logger.trace("To Match : " + Utility.listFormatter(toMatchList, true));
-            logger.trace("User Perms : " + Utility.listFormatter(userList, true));
-            logger.trace("Result : " + user.getPermissionsForGuild(guild).containsAll(toMatch));
-        }
+//        if (true) {
+//            logger.trace("To Match : " + Utility.listFormatter(toMatchList, true));
+//            logger.trace("User Perms : " + Utility.listFormatter(userList, true));
+//            logger.trace("Result : " + user.getPermissionsForGuild(guild).containsAll(toMatch));
+//        }
         //end Debug
         return user.getPermissionsForGuild(guild).containsAll(toMatch);
     }
 
     //Command Utils
     public static String getCommandInfo(Command command, CommandObject commandObject) {
-        StringBuilder response = new StringBuilder(">> **" + commandObject.guildConfig.getPrefixCommand() + command.names()[0]);
+        StringBuilder response = new StringBuilder(">> **" + commandObject.guild.config.getPrefixCommand() + command.names()[0]);
         if (command.usage() != null) {
             response.append(" " + command.usage());
         }
@@ -96,7 +105,7 @@ public static String getCommandInfo(Command command, CommandObject commandObject
         return response.toString();
     }
 
-    public static String getCommandInfo(DMCommand command) {
+    public static String getCommandInfo(Command command) {
         StringBuilder response = new StringBuilder(">> **" + Globals.defaultPrefixCommand + command.names()[0]);
         if (command.usage() != null) {
             response.append(" " + command.usage());
@@ -105,7 +114,7 @@ public static String getCommandInfo(DMCommand command) {
         return response.toString();
     }
 
-    public static String checkBlacklist(String message, ArrayList<BlackListObject> blacklist) {
+    public static String checkBlacklist(String message, List<BlackListObject> blacklist) {
         for (BlackListObject b : blacklist) {
             if (message.toLowerCase().contains(b.getPhrase().toLowerCase())) {
                 return b.getReason();
@@ -149,7 +158,7 @@ public static Object initFile(String guildID, String filePath, Class<?> objClass
             try {
                 Thread.sleep(100);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                sendStack(e);
             }
         }
         if (counter > 1) {
@@ -177,7 +186,7 @@ public static void backupFile(String guildID, String type) {
             if (toBackup.exists())
                 Files.copy(Paths.get(toBackup.getPath()), backup1.toPath(), StandardCopyOption.REPLACE_EXISTING);
         } catch (IOException e) {
-            e.printStackTrace();
+            sendStack(e);
         }
     }
 
@@ -193,19 +202,22 @@ public static void backupConfigFile(String file, String fileBackup) {
             if (toBackup.exists())
                 Files.copy(Paths.get(toBackup.getPath()), backup1.toPath(), StandardCopyOption.REPLACE_EXISTING);
         } catch (IOException e) {
-            e.printStackTrace();
+            sendStack(e);
         }
     }
 
     //Discord Request Processors
-    public static RequestBuffer.RequestFuture<IMessage> sendMessage(String message, IChannel channel) {
-        return RequestBuffer.request(() -> {
+    public static XRequestBuffer.RequestFuture<IMessage> sendMessage(String message, IChannel channel) {
+        return XRequestBuffer.request(() -> {
             IMessage error = null;
             if (message == null) {
                 return error;
             }
             if (message.length() < 2000) {
                 try {
+                    if (channel == null) {
+                        return error;
+                    }
                     if (StringUtils.containsOnly(message, "\n")) {
                         return error;
                     }
@@ -220,7 +232,7 @@ public static RequestBuffer.RequestFuture<IMessage> sendMessage(String message,
                     if (e.getMessage().contains("CloudFlare")) {
                         return sendMessage(message, channel).get();
                     } else {
-                        e.printStackTrace();
+                        sendStack(e);
                         logger.error(message);
                         return error;
                     }
@@ -234,8 +246,8 @@ public static RequestBuffer.RequestFuture<IMessage> sendMessage(String message,
         });
     }
 
-    public static RequestBuffer.RequestFuture<Boolean> sendFile(String message, File file, IChannel channel) {
-        return RequestBuffer.request(() -> {
+    public static XRequestBuffer.RequestFuture<Boolean> sendFile(String message, File file, IChannel channel) {
+        return XRequestBuffer.request(() -> {
             try {
                 if (StringUtils.containsOnly(message, "\n") || (message == null) || message.equals("")) {
                     if (file != null) {
@@ -257,11 +269,11 @@ public static RequestBuffer.RequestFuture<Boolean> sendFile(String message, File
                 if (e.getMessage().contains("CloudFlare")) {
                     sendFile(message, file, channel);
                 } else {
-                    e.printStackTrace();
+                    sendStack(e);
                     return true;
                 }
             } catch (IOException e) {
-                e.printStackTrace();
+                sendStack(e);
             } catch (MissingPermissionsException e) {
                 sendMessage("> Could not send File, missing permissions.", channel);
                 logger.debug("Error sending File to channel with id: " + channel.getStringID() + " on guild with id: " + channel.getGuild().getStringID() +
@@ -272,62 +284,67 @@ public static RequestBuffer.RequestFuture<Boolean> sendFile(String message, File
         });
     }
 
-    public static boolean sendFileURL(String message, String imageURL, IChannel channel, boolean loadMessage) {
+    public static IMessage sendFileURL(String message, String imageURL, IChannel channel, boolean loadMessage) {
         IMessage toDelete = null;
         if (loadMessage) {
             toDelete = sendMessage("`Loading...`", channel).get();
         }
-        boolean failed = RequestBuffer.request(() -> {
-            try {
-                //setup for the stream
-                final HttpURLConnection connection = (HttpURLConnection) new URL(imageURL).openConnection();
-                connection.setRequestProperty("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) " + "AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31");
-                InputStream stream = connection.getInputStream();
-
-                //set up the file name
-                URL url = new URL(imageURL);
-                String filename = FilenameUtils.getName(url.getPath());
-
-                //checks if url is valid
-                if (!isImageLink(filename)) {
-                    sendMessage(message + " " + imageURL, channel);
-                    return true;
-                }
-
-                //sends message/files
-                if (StringUtils.containsOnly(message, "\n") || (message == null) || message.equals("") && imageURL != null) {
-                    channel.sendFile("", stream, filename);
-                } else if (message != null && !message.isEmpty() && imageURL != null) {
-                    channel.sendFile(removeMentions(message), false, stream, filename);
-                } else {
+        IMessage sentMessage = null;
+        try {
+            //setup for the stream
+            final HttpURLConnection connection = (HttpURLConnection) new URL(imageURL).openConnection();
+            connection.setRequestProperty("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) " + "AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.65 Safari/537.31");
+            InputStream stream = connection.getInputStream();
+            sentMessage = (IMessage) XRequestBuffer.request(() -> {
+                try {
+                    //set up the file name
+                    URL url = new URL(imageURL);
+                    String filename = FilenameUtils.getName(url.getPath());
+                    if (filename.equalsIgnoreCase("giphy.gif")) {
+                        return sendMessage(message + " " + imageURL, channel).get();
+                    }
+                    //checks if url is valid
+                    if (!isImageLink(filename)) {
+                        return sendMessage(message + " " + imageURL, channel).get();
+                    }
+                    //sends message/files
+                    if (StringUtils.containsOnly(message, "\n") || (message == null) || message.equals("") && imageURL != null) {
+                        return channel.sendFile("", stream, filename);
+                    } else if (message != null && !message.isEmpty() && imageURL != null) {
+                        return channel.sendFile(removeMentions(message), false, stream, filename);
+                    } else {
+                        logger.debug("Error sending File to channel with id: " + channel.getStringID() + " on guild with id: " + channel.getGuild().getStringID() +
+                                ".\n" + Constants.PREFIX_EDT_LOGGER_INDENT + "Reason: No file to send");
+                        return null;
+                    }
+                } catch (DiscordException e) {
+                    if (e.getMessage().contains("CloudFlare")) {
+                        return sendFileURL(message, imageURL, channel, false);
+                    } else {
+                        sendStack(e);
+                        return null;
+                    }
+                } catch (MalformedURLException e) {
+                    return sendMessage(message + " " + imageURL, channel).get();
+                } catch (IOException e) {
+                    sendStack(e);
+                    return null;
+                } catch (MissingPermissionsException e) {
                     logger.debug("Error sending File to channel with id: " + channel.getStringID() + " on guild with id: " + channel.getGuild().getStringID() +
-                            ".\n" + Constants.PREFIX_EDT_LOGGER_INDENT + "Reason: No file to send");
-                }
-            } catch (DiscordException e) {
-                if (e.getMessage().contains("CloudFlare")) {
-                    return sendFileURL(message, imageURL, channel, false);
-                } else {
-                    e.printStackTrace();
-                    return true;
+                            ".\n" + Constants.PREFIX_EDT_LOGGER_INDENT + "Reason: Missing permissions.");
+                    return sendMessage(message + " <" + imageURL + ">", channel).get();
                 }
-            } catch (MalformedURLException e) {
-                sendMessage(message + " " + imageURL, channel);
-            } catch (FileNotFoundException e) {
-                Utility.sendMessage("> Image Not Found : " + imageURL, channel);
-            } catch (IOException e) {
-                e.printStackTrace();
-                return true;
-            } catch (MissingPermissionsException e) {
-                sendMessage(message + " <" + imageURL + ">", channel);
-                logger.debug("Error sending File to channel with id: " + channel.getStringID() + " on guild with id: " + channel.getGuild().getStringID() +
-                        ".\n" + Constants.PREFIX_EDT_LOGGER_INDENT + "Reason: Missing permissions.");
-            }
-            return false;
-        }).get();
+            }).get();
+            stream.close();
+        } catch (MalformedURLException e) {
+            sendStack(e);
+        } catch (IOException e) {
+            sendStack(e);
+        }
         if (loadMessage && toDelete != null) {
             deleteMessage(toDelete);
         }
-        return failed;
+        return sentMessage;
     }
 
     public static IMessage sendDMEmbed(String message, XEmbedBuilder embed, String userID) {
@@ -339,11 +356,11 @@ public static IMessage sendDMEmbed(String message, XEmbedBuilder embed, String u
         }
     }
 
-    public static RequestBuffer.RequestFuture<IMessage> sendEmbedMessage(String message, XEmbedBuilder builder, IChannel channel) {
+    public static XRequestBuffer.RequestFuture<IMessage> sendEmbedMessage(String message, XEmbedBuilder builder, IChannel channel) {
 
         //removal of @everyone and @here Mentions.
         EmbedObject embed = builder.build();
-        return RequestBuffer.request(() -> {
+        return XRequestBuffer.request(() -> {
             try {
                 String iMessage = message;
                 if (iMessage == null) {
@@ -354,7 +371,7 @@ public static RequestBuffer.RequestFuture<IMessage> sendEmbedMessage(String mess
                 if (e.getMessage().contains("CloudFlare")) {
                     sendEmbedMessage(message, builder, channel);
                 } else {
-                    e.printStackTrace();
+                    sendStack(e);
                     return null;
                 }
             } catch (MissingPermissionsException e) {
@@ -382,31 +399,38 @@ public static String removeMentions(String from) {
     }
 
 
-    public static RequestBuffer.RequestFuture<Boolean> sendDM(String message, String userID) {
-        return RequestBuffer.request(() -> {
+    public static XRequestBuffer.RequestFuture<IMessage> sendDM(String message, long userID) {
+        return XRequestBuffer.request(() -> {
             try {
                 IChannel channel = Globals.getClient().getOrCreatePMChannel(Globals.getClient().getUserByID(userID));
                 if (message == null || message.isEmpty()) {
-                    return true;
+                    return null;
                 }
-                sendMessage(message, channel);
+                return sendMessage(message, channel).get();
             } catch (DiscordException e) {
                 if (e.getMessage().contains("CloudFlare")) {
-                    sendDM(message, userID);
+                    return sendDM(message, userID).get();
                 } else {
-                    e.printStackTrace();
-                    return true;
+                    sendStack(e);
+                    return null;
                 }
             } catch (NullPointerException e) {
                 logger.debug("[sendDM] " + e.getMessage());
-                return true;
+                return null;
             }
-            return false;
         });
     }
 
-    public static RequestBuffer.RequestFuture<Boolean> sendFileDM(String message, File attatchment, String userID) {
-        return RequestBuffer.request(() -> {
+    public static IMessage sendDM(String message, String userID) {
+        try {
+            return sendDM(message, Long.parseLong(userID)).get();
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+
+    public static XRequestBuffer.RequestFuture<Boolean> sendFileDM(String message, File attatchment, String userID) {
+        return XRequestBuffer.request(() -> {
             try {
                 IChannel channel = Globals.getClient().getOrCreatePMChannel(Globals.getClient().getUserByID(userID));
                 if (message == null || message.isEmpty()) {
@@ -417,7 +441,7 @@ public static RequestBuffer.RequestFuture<Boolean> sendFileDM(String message, Fi
                 if (e.getMessage().contains("CloudFlare")) {
                     sendFileDM(message, attatchment, userID);
                 } else {
-                    e.printStackTrace();
+                    sendStack(e);
                     return true;
                 }
             } catch (NullPointerException e) {
@@ -428,9 +452,9 @@ public static RequestBuffer.RequestFuture<Boolean> sendFileDM(String message, Fi
         });
     }
 
-    public static RequestBuffer.RequestFuture<Boolean> roleManagement(IUser author, IGuild guild, long newRoleID,
-                                                                      boolean isAdding) {
-        return RequestBuffer.request(() -> {
+    public static XRequestBuffer.RequestFuture<Boolean> roleManagement(IUser author, IGuild guild, long newRoleID,
+                                                                       boolean isAdding) {
+        return XRequestBuffer.request(() -> {
             try {
                 if (isAdding) {
                     if (guild.getRoleByID(newRoleID) != null) {
@@ -451,14 +475,14 @@ public static RequestBuffer.RequestFuture<Boolean> roleManagement(IUser author,
                             ".\n" + Constants.PREFIX_EDT_LOGGER_INDENT + "Reason: Edited roles hierarchy is too high.");
                     return true;
                 } else {
-                    e.printStackTrace();
+                    sendStack(e);
                     return true;
                 }
             } catch (DiscordException e) {
                 if (e.getMessage().contains("CloudFlare")) {
                     roleManagement(author, guild, newRoleID, isAdding);
                 } else {
-                    e.printStackTrace();
+                    sendStack(e);
                     return true;
                 }
             }
@@ -466,9 +490,9 @@ public static RequestBuffer.RequestFuture<Boolean> roleManagement(IUser author,
         });
     }
 
-    public static RequestBuffer.RequestFuture<Boolean> roleManagement(IUser author, IGuild
+    public static XRequestBuffer.RequestFuture<Boolean> roleManagement(IUser author, IGuild
             guild, List<IRole> userRoles) {
-        return RequestBuffer.request(() -> {
+        return XRequestBuffer.request(() -> {
             try {
                 IRole[] roles = new IRole[userRoles.size()];
                 int i = 0;
@@ -487,29 +511,29 @@ public static RequestBuffer.RequestFuture<Boolean> roleManagement(IUser author,
                             ".\n" + Constants.PREFIX_EDT_LOGGER_INDENT + "Reason: Edited roles hierarchy is too high.");
                     return false;
                 } else {
-                    e.printStackTrace();
+                    sendStack(e);
                     return false;
                 }
             } catch (DiscordException e) {
                 if (e.getMessage().contains("CloudFlare")) {
                     return roleManagement(author, guild, userRoles).get();
                 } else {
-                    e.printStackTrace();
+                    sendStack(e);
                     return false;
                 }
             }
         });
     }
 
-    public static RequestBuffer.RequestFuture<Boolean> updateAvatar(Image avatar) {
-        return RequestBuffer.request(() -> {
+    public static XRequestBuffer.RequestFuture<Boolean> updateAvatar(Image avatar) {
+        return XRequestBuffer.request(() -> {
             try {
                 Globals.getClient().changeAvatar(avatar);
             } catch (DiscordException e) {
                 if (e.getMessage().contains("CloudFlare")) {
                     updateAvatar(avatar);
                 } else {
-                    e.printStackTrace();
+                    sendStack(e);
                     return true;
                 }
             }
@@ -517,15 +541,15 @@ public static RequestBuffer.RequestFuture<Boolean> updateAvatar(Image avatar) {
         });
     }
 
-    public static RequestBuffer.RequestFuture<Boolean> updateUsername(String botName) {
-        return RequestBuffer.request(() -> {
+    public static XRequestBuffer.RequestFuture<Boolean> updateUsername(String botName) {
+        return XRequestBuffer.request(() -> {
             try {
                 Globals.getClient().changeUsername(botName);
             } catch (DiscordException e) {
                 if (e.getMessage().contains("CloudFlare")) {
                     updateUsername(botName);
                 } else {
-                    e.printStackTrace();
+                    sendStack(e);
                     return true;
                 }
             }
@@ -533,18 +557,18 @@ public static RequestBuffer.RequestFuture<Boolean> updateUsername(String botName
         });
     }
 
-    public static RequestBuffer.RequestFuture<Boolean> deleteMessage(IMessage message) {
-        return RequestBuffer.request(() -> {
+    public static XRequestBuffer.RequestFuture<Boolean> deleteMessage(IMessage message) {
+        return XRequestBuffer.request(() -> {
             try {
                 message.delete();
             } catch (MissingPermissionsException e) {
-                e.printStackTrace();
+                sendStack(e);
                 return true;
             } catch (DiscordException e) {
                 if (e.getMessage().contains("CloudFlare")) {
                     deleteMessage(message);
                 } else {
-                    e.printStackTrace();
+                    sendStack(e);
                     return true;
                 }
             }
@@ -552,18 +576,18 @@ public static RequestBuffer.RequestFuture<Boolean> deleteMessage(IMessage messag
         });
     }
 
-    public static RequestBuffer.RequestFuture<Boolean> deleteMessage(MessageHistory messages) {
-        return RequestBuffer.request(() -> {
+    public static XRequestBuffer.RequestFuture<Boolean> deleteMessage(MessageHistory messages) {
+        return XRequestBuffer.request(() -> {
             try {
                 messages.bulkDelete();
             } catch (MissingPermissionsException e) {
-                e.printStackTrace();
+                sendStack(e);
                 return true;
             } catch (DiscordException e) {
                 if (e.getMessage().contains("CloudFlare")) {
                     deleteMessage(messages);
                 } else {
-                    e.printStackTrace();
+                    sendStack(e);
                     return true;
                 }
             }
@@ -571,22 +595,22 @@ public static RequestBuffer.RequestFuture<Boolean> deleteMessage(MessageHistory
         });
     }
 
-    public static RequestBuffer.RequestFuture<Boolean> updateUserNickName(IUser author, IGuild guild, String nickname) {
-        return RequestBuffer.request(() -> {
+    public static XRequestBuffer.RequestFuture<Boolean> updateUserNickName(IUser author, IGuild guild, String nickname) {
+        return XRequestBuffer.request(() -> {
             try {
                 guild.setUserNickname(author, nickname);
             } catch (MissingPermissionsException e) {
                 if (e.getMessage().toLowerCase().contains("hierarchy")) {
                     logger.debug("Could not Update Nickname. User's position in hierarchy is higher than mine.");
                 } else {
-                    e.printStackTrace();
+                    sendStack(e);
                 }
                 return true;
             } catch (DiscordException e) {
                 if (e.getMessage().contains("CloudFlare")) {
                     updateUserNickName(author, guild, nickname);
                 } else {
-                    e.printStackTrace();
+                    sendStack(e);
                     return true;
                 }
             }
@@ -615,7 +639,7 @@ public static Color getUsersColour(IUser user, IGuild guild) {
         return null;
     }
 
-    public static Color getUsersColour(ArrayList<IRole> userRoles, IGuild guild) {
+    public static Color getUsersColour(List<IRole> userRoles, IGuild guild) {
         IRole topColour = null;
         String defaultColour = "0,0,0";
         for (IRole role : userRoles) {
@@ -666,6 +690,9 @@ public static boolean canBypass(IUser author, IGuild guild, boolean logging) {
             }
             return true;
         }
+        if (guild == null) {
+            return false;
+        }
         if (author.getStringID().equals(guild.getOwnerID())) {
             if (logging) {
                 logger.trace("User is Guild Owner, GUILD : \"" + guild.getStringID() + "\", BYPASSING.");
@@ -715,7 +742,7 @@ public static String convertMentionToText(String from) {
         return from;
     }
 
-    public static void listFormatterEmbed(String title, XEmbedBuilder builder, ArrayList<String> list,
+    public static void listFormatterEmbed(String title, XEmbedBuilder builder, List<String> list,
                                           boolean horizontal) {
         String formattedList = listFormatter(list, horizontal);
         if (title == null || title.isEmpty()) {
@@ -732,7 +759,7 @@ public static void listFormatterEmbed(String title, XEmbedBuilder builder, Array
         }
     }
 
-    public static void listFormatterEmbed(String title, EmbedBuilder builder, ArrayList<String> list,
+    public static void listFormatterEmbed(String title, EmbedBuilder builder, List<String> list,
                                           boolean horizontal, String suffix) {
         String formattedList = listFormatter(list, horizontal);
         if (title == null || title.isEmpty()) {
@@ -749,7 +776,7 @@ public static void listFormatterEmbed(String title, EmbedBuilder builder, ArrayL
         }
     }
 
-    public static String listFormatter(ArrayList<String> list, boolean horizontal) {
+    public static String listFormatter(List<String> list, boolean horizontal) {
         StringBuilder formattedList = new StringBuilder();
         if (list.size() == 0) {
             return "";
@@ -774,37 +801,26 @@ public static List<IRole> getRolesByName(IGuild guild, String name) {
         return roles;
     }
 
-    public static String loggingFormatter(String type, String command, String args, CommandObject commandObject) {
-        return type + " : \"" + command +
-                "\", ARGS : \"" + args +
-                "\", GUILD : \"" + commandObject.guildSID +
-                "\", CHANNEL : \"" + commandObject.channelSID +
-                "\", USER : \"" + commandObject.authorSID +
-                "\", MESSAGE : \"" + commandObject.messageSID +
-                "\".";
-    }
-
-    public static String loggingFormatter(String command, String args, DMCommandObject commandObject) {
-        return "DM_COMMAND : \"" + command +
-                "\", ARGS : \"" + args +
-                "\", CHANNEL : \"" + commandObject.channelID +
-                "\", USER : \"" + commandObject.authorID +
-                "\", MESSAGE : \"" + commandObject.messageID +
+    public static String loggingFormatter(CommandObject commandObject, String type) {
+        return "TYPE: \"" + type + "\", GUILD : \"" + commandObject.guild.stringID +
+                "\", CHANNEL : \"" + commandObject.channel.stringID +
+                "\", USER : \"" + commandObject.user.stringID +
+                "\", MESSAGE : \"" + commandObject.message.stringID +
                 "\".";
     }
 
     public static void sendGlobalAdminLogging(Command command, String args, CommandObject commandObject) {
-        for (GuildContentObject c : Globals.getGuildContentObjects()) {
-            StringBuilder message = new StringBuilder("***GLOBAL LOGGING***\n> **@" + commandObject.authorUserName + "** Has Used Command `" + command.names()[0] + "`");
+        for (GuildObject c : Globals.getGuilds()) {
+            StringBuilder message = new StringBuilder("***GLOBAL LOGGING***\n> **@" + commandObject.user.username + "** Has Used Command `" + command.names()[0] + "`");
             IChannel channel = null;
             if (!(args == null || args.isEmpty())) {
                 message.append(" with args: `" + args + "`");
             }
-            if (c.getGuildConfig().getChannelIDsByType(Command.CHANNEL_SERVER_LOG) != null) {
-                channel = commandObject.client.getChannelByID(c.getGuildConfig().getChannelIDsByType(Command.CHANNEL_SERVER_LOG).get(0));
+            if (c.config.getChannelIDsByType(Command.CHANNEL_SERVER_LOG) != null) {
+                channel = commandObject.client.get().getChannelByID(c.config.getChannelIDsByType(Command.CHANNEL_SERVER_LOG).get(0));
             }
-            if (c.getGuildConfig().getChannelIDsByType(Command.CHANNEL_ADMIN_LOG) != null) {
-                channel = commandObject.client.getChannelByID(c.getGuildConfig().getChannelIDsByType(Command.CHANNEL_ADMIN_LOG).get(0));
+            if (c.config.getChannelIDsByType(Command.CHANNEL_ADMIN_LOG) != null) {
+                channel = commandObject.client.get().getChannelByID(c.config.getChannelIDsByType(Command.CHANNEL_ADMIN_LOG).get(0));
             }
             if (channel != null) {
                 sendMessage(message.toString(), channel);
@@ -837,7 +853,7 @@ public static String formatTimeDifference(long difference) {
             }
             if (mins > 1) {
                 formatted = formatted + mins + " minutes ago";
-            } else {
+            } else if (mins != 0) {
                 formatted = formatted + mins + " minute ago";
             }
             if (difference < 60) {
@@ -901,7 +917,7 @@ public static boolean isImageLink(String link) {
         if (!checkURL(link)) {
             return false;
         }
-        ArrayList<String> suffixes = new ArrayList<String>() {{
+        List<String> suffixes = new ArrayList<String>() {{
             add(".png");
             add(".gif");
             add(".jpg");
@@ -918,11 +934,11 @@ public static boolean isImageLink(String link) {
         return false;
     }
 
-    public static boolean muteUser(String guildID, String userID, boolean isMuting) {
-        GuildContentObject content = Globals.getGuildContent(guildID);
+    public static boolean muteUser(long guildID, String userID, boolean isMuting) {
+        GuildObject content = Globals.getGuildContent(guildID);
         IUser user = Globals.getClient().getUserByID(userID);
         IGuild guild = Globals.getClient().getGuildByID(guildID);
-        IRole mutedRole = Globals.client.getRoleByID(content.getGuildConfig().getMutedRoleID());
+        IRole mutedRole = Globals.client.getRoleByID(content.config.getMutedRoleID());
         List<IRole> oldRoles = user.getRolesForGuild(guild);
         if (mutedRole != null) {
             roleManagement(Globals.getClient().getUserByID(userID), Globals.client.getGuildByID(guildID), mutedRole.getLongID(), isMuting);
@@ -933,12 +949,12 @@ public static boolean muteUser(String guildID, String userID, boolean isMuting)
         return false;
     }
 
-    public static boolean testUserHierarchy(IUser author, IUser toTest, IGuild guild) {
-        List<IRole> userRoles = author.getRolesForGuild(guild);
-        List<IRole> testRoles = toTest.getRolesForGuild(guild);
+    public static boolean testUserHierarchy(IUser higherUser, IUser lowerUser, IGuild guild) {
+        List<IRole> lowerRoles = lowerUser.getRolesForGuild(guild);
+        List<IRole> higherRoles = higherUser.getRolesForGuild(guild);
         IRole topRole = null;
         int topRolePos = 0;
-        for (IRole role : userRoles) {
+        for (IRole role : higherRoles) {
             if (topRole == null) {
                 topRole = role;
                 topRolePos = role.getPosition();
@@ -949,7 +965,7 @@ public static boolean testUserHierarchy(IUser author, IUser toTest, IGuild guild
                 }
             }
         }
-        for (IRole role : testRoles) {
+        for (IRole role : lowerRoles) {
             if (role.getPosition() > topRolePos) {
                 return false;
             }
@@ -971,12 +987,14 @@ public static long textToSeconds(String time) {
         try {
             String sub = time.substring(0, time.length() - 1);
             long timeSecs = Long.parseLong(sub);
-            if (time.endsWith("s")) {
+            if (time.toLowerCase().endsWith("s")) {
                 return timeSecs;
-            } else if (time.endsWith("m")) {
+            } else if (time.toLowerCase().endsWith("m")) {
                 return timeSecs * 60;
-            } else if (time.endsWith("d")) {
-                return timeSecs * 60 * 24;
+            } else if (time.toLowerCase().endsWith("h")) {
+                return timeSecs * 60 * 60;
+            } else if (time.toLowerCase().endsWith("d")) {
+                return timeSecs * 60 * 60 * 24;
             } else {
                 timeSecs = Long.parseLong(time);
                 return timeSecs;
@@ -1009,6 +1027,9 @@ public static void sendLog(String content, GuildConfig config, boolean isAdmin)
     public static String unFormatMentions(IMessage message) {
         String from = message.getContent();
         for (IUser user : message.getMentions()) {
+            if (user == null) {
+                break;
+            }
             String mention = "<@" + user.getStringID() + ">";
             String mentionNic = "<@!" + user.getStringID() + ">";
             from = from.replace(mention, "__@" + user.getDisplayName(message.getGuild()) + "__");
@@ -1047,7 +1068,7 @@ public static boolean checkURL(String args) {
         return true;
     }
 
-    public static void sortRewards(ArrayList<RewardRoleObject> rewardRoles) {
+    public static void sortRewards(List<RewardRoleObject> rewardRoles) {
         Collections.sort(rewardRoles, (o1, o2) -> {
             if (o1.getLevel() < o2.getLevel()) {
                 return -1;
@@ -1059,7 +1080,7 @@ public static void sortRewards(ArrayList<RewardRoleObject> rewardRoles) {
         });
     }
 
-    public static void sortUserObjects(ArrayList<UserTypeObject> users, boolean sortAsc) {
+    public static void sortUserObjects(List<ProfileObject> users, boolean sortAsc) {
         if (sortAsc) {
             Collections.sort(users, (o1, o2) -> {
                 if (o1.getXP() < o2.getXP()) {
@@ -1083,16 +1104,16 @@ public static void sortUserObjects(ArrayList<UserTypeObject> users, boolean sort
         }
     }
 
-    public static long newDailyMsgUID(GlobalData data) {
+    public static long newDailyMsgUID(DailyMessages data) {
         long result;
         Random random = new Random();
-        ArrayList<Long> uIDs = new ArrayList<>();
-        for (DailyUserMessageObject d : data.getDailyMessages()) {
+        List<Long> uIDs = new ArrayList<>();
+        for (DailyUserMessageObject d : data.getMessages()) {
             if (d.getUID() != -1) {
                 uIDs.add(d.getUID());
             }
         }
-        for (QueueObject o : data.getQueuedRequests()) {
+        for (QueueObject o : data.getQueue()) {
             uIDs.add(o.getuID());
         }
         result = random.nextInt(9000) + 1000;
@@ -1101,4 +1122,146 @@ public static long newDailyMsgUID(GlobalData data) {
         }
         return result;
     }
+
+    public static List<String> getChannelMentions(ArrayList<String> channelIDs, CommandObject command) {
+        List<String> channelNames = new ArrayList<>();
+        if (channelIDs != null) {
+            for (String s : channelIDs) {
+                IChannel channel = command.guild.get().getChannelByID(s);
+                if (channel != null) {
+                    channelNames.add(channel.mention());
+                }
+            }
+        }
+        return channelNames;
+    }
+
+    public static void sendStack(Exception e) {
+        ZonedDateTime now = ZonedDateTime.now(ZoneOffset.UTC);
+        System.err.printf("%02d:%02d:%02d.%03d ", now.getHour(), now.getMinute(), now.getSecond(), now.getNano() / 1000000);
+        System.err.print("[" + Thread.currentThread().getName() + "] ERROR ");
+        e.printStackTrace();
+    }
+
+    public static List<Command> getCommandsByType(List<Command> commands, CommandObject commandObject, String type, boolean testPerms) {
+        List<Command> toReturn = new ArrayList<>();
+        for (Command c : commands) {
+            String ctype = c.type();
+            if (c.channel() != null && c.channel().equalsIgnoreCase(Command.CHANNEL_DM)) {
+                ctype = Command.TYPE_DM;
+            }
+            boolean isDualType = false;
+            if (c.dualType() != null && c.dualType().equalsIgnoreCase(type)) {
+                isDualType = true;
+            }
+            if (ctype.equalsIgnoreCase(type) || isDualType) {
+                if (testPerms) {
+                    if (c.type().equalsIgnoreCase(Command.TYPE_CREATOR) && !commandObject.user.get().equals(commandObject.client.creator)) {
+                        //do nothing
+                    } else if (isDualType && testForPerms(c.dualPerms(), commandObject.user.get(), commandObject.guild.get())) {
+                        toReturn.add(c);
+                    } else if (testForPerms(c.perms(), commandObject.user.get(), commandObject.guild.get())) {
+                        toReturn.add(c);
+                    }
+                } else {
+                    toReturn.add(c);
+                }
+            }
+        }
+        toReturn.sort(Comparator.comparing(o -> o.names()[0]));
+        return toReturn;
+    }
+
+    public static List<IChannel> getVisibleChannels(List<IChannel> channels, UserObject user) {
+        List<IChannel> newSet = new ArrayList<>();
+        for (IChannel c : channels) {
+            if (c.getModifiedPermissions(user.get()).contains(Permissions.READ_MESSAGES)
+                    && c.getModifiedPermissions(user.get()).contains(Permissions.SEND_MESSAGES)) {
+                newSet.add(c);
+            }
+        }
+        return newSet;
+    }
+
+    public static List<String> getChannelMentions(List<IChannel> channels) {
+        List<String> mentions = new ArrayList<>();
+        for (IChannel c : channels) {
+            mentions.add(c.mention());
+        }
+        return mentions;
+    }
+
+    public static UserObject getUser(CommandObject command, String args, boolean doContains) {
+        if (args != null && !args.isEmpty()) {
+            IUser user = null;
+            IUser conUser = null;
+            String toTest;
+            if (args.split(" ").length != 1) {
+                toTest = escapeRegex(args);
+            } else {
+                toTest = escapeRegex(args).replace("_", "[_| ]");
+            }
+            for (IUser u : command.guild.get().getUsers()) {
+                if (user != null) {
+                    break;
+                }
+                try {
+                    if ((u.getName() + "#" + u.getDiscriminator()).matches("(?i)" + toTest)) {
+                        user = u;
+                    }
+                    if (u.getName().matches("(?i)" + toTest)) {
+                        user = u;
+                    }
+                    String displayName = u.getDisplayName(command.guild.get());
+                    if (displayName.matches("(?i)" + toTest)) {
+                        user = u;
+                    }
+                    if (doContains && conUser == null) {
+                        if (u.getName().matches("(?i).*" + toTest + ".*")) {
+                            conUser = u;
+                        }
+                        if (displayName.matches("(?i).*" + toTest + ".*")) {
+                            conUser = u;
+                        }
+                    }
+                } catch (PatternSyntaxException e) {
+                    //continue.
+                }
+            }
+            try {
+                long uID = Long.parseLong(args);
+                user = command.client.get().getUserByID(uID);
+            } catch (NumberFormatException e) {
+                if (command.message.get().getMentions().size() > 0) {
+                    user = command.message.get().getMentions().get(0);
+                }
+            }
+            if (user == null && doContains) {
+                user = conUser;
+            }
+            if (user != null) {
+                UserObject userObject = new UserObject(user, command.guild);
+                return userObject;
+            }
+        }
+        return null;
+    }
+
+    private static String escapeRegex(String args) {
+        //[\^$.|?*+(){}
+        args = args.replace("\\", "\\u005C");
+        args = args.replace("[", "\\u005B");
+        args = args.replace("^", "\\u005E");
+        args = args.replace("$", "\\u0024");
+        args = args.replace(".", "\\u002E");
+        args = args.replace("|", "\\u007C");
+        args = args.replace("?", "\\u003F");
+        args = args.replace("*", "\\u002A");
+        args = args.replace("+", "\\u002B");
+        args = args.replace("(", "\\u0028");
+        args = args.replace(")", "\\u0029");
+        args = args.replace("{", "\\u007B");
+        args = args.replace("}", "\\u007D");
+        return args;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/vaerys/masterobjects/ChannelObject.java b/src/main/java/com/github/vaerys/masterobjects/ChannelObject.java
new file mode 100644
index 00000000..3af6ac2a
--- /dev/null
+++ b/src/main/java/com/github/vaerys/masterobjects/ChannelObject.java
@@ -0,0 +1,39 @@
+package com.github.vaerys.masterobjects;
+
+import com.github.vaerys.interfaces.ChannelSetting;
+import sx.blah.discord.handle.obj.IChannel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ChannelObject {
+    public ClientObject client;
+    private IChannel object;
+    public long longID;
+    public String stringID;
+    public String name;
+    public long position;
+    public List<String> settings = new ArrayList<>();
+
+    public ChannelObject(IChannel channel, GuildObject guild) {
+        this.client = new ClientObject(channel.getClient(), guild);
+        this.object = channel;
+        this.longID = channel.getLongID();
+        this.stringID = channel.getStringID();
+        this.name = channel.getName();
+        if (guild.get() != null) {
+            this.position = channel.getPosition();
+            for (ChannelSetting setting : guild.channelSettings) {
+                if (setting.getIDs(guild.config) == null || setting.getIDs(guild.config).size() == 0) {
+                    break;
+                } else if (setting.getIDs(guild.config).contains(stringID)) {
+                    settings.add(setting.type());
+                }
+            }
+        }
+    }
+
+    public IChannel get() {
+        return object;
+    }
+}
diff --git a/src/main/java/com/github/vaerys/masterobjects/ClientObject.java b/src/main/java/com/github/vaerys/masterobjects/ClientObject.java
new file mode 100644
index 00000000..245ff624
--- /dev/null
+++ b/src/main/java/com/github/vaerys/masterobjects/ClientObject.java
@@ -0,0 +1,40 @@
+package com.github.vaerys.masterobjects;
+
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import sx.blah.discord.api.IDiscordClient;
+import sx.blah.discord.handle.obj.IRole;
+import sx.blah.discord.handle.obj.IUser;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ClientObject {
+    private IDiscordClient object;
+    public IUser bot;
+    public long longID;
+    public String stringID;
+    public List<IRole> roles;
+    public Color color;
+    public IUser creator;
+
+    public ClientObject(IDiscordClient client, GuildObject guild) {
+        this.object = client;
+        this.bot = object.getOurUser();
+        this.longID = bot.getLongID();
+        this.stringID = bot.getStringID();
+        if (guild.get() != null) {
+            roles = bot.getRolesForGuild(guild.get());
+            color = Utility.getUsersColour(bot, guild.get());
+        } else {
+            roles = new ArrayList<>();
+            color = Color.cyan;
+        }
+        creator = client.fetchUser(Globals.creatorID);
+    }
+
+    public IDiscordClient get() {
+        return object;
+    }
+}
diff --git a/src/main/java/com/github/vaerys/masterobjects/GuildObject.java b/src/main/java/com/github/vaerys/masterobjects/GuildObject.java
new file mode 100644
index 00000000..9e472f5d
--- /dev/null
+++ b/src/main/java/com/github/vaerys/masterobjects/GuildObject.java
@@ -0,0 +1,227 @@
+package com.github.vaerys.masterobjects;
+
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.interfaces.ChannelSetting;
+import com.github.vaerys.interfaces.Command;
+import com.github.vaerys.interfaces.GuildFile;
+import com.github.vaerys.interfaces.GuildToggle;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.objects.UserRateObject;
+import com.github.vaerys.pogos.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sx.blah.discord.handle.obj.IGuild;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+
+public class GuildObject {
+    public ClientObject client;
+    private IGuild object;
+    public long longID;
+    public String stringID;
+    public GuildConfig config;
+    public CustomCommands customCommands;
+    public Servers servers;
+    public Characters characters;
+    public Competition competition;
+    public GuildUsers users;
+    public ChannelData channelData;
+    public List<GuildFile> guildFiles;
+    public List<Command> commands;
+    public List<GuildToggle> toggles;
+    public List<ChannelSetting> channelSettings;
+    public List<String> commandTypes;
+    private List<UserRateObject> ratelimiting = new ArrayList<>();
+    private List<Long> spokenUsers = new ArrayList<>();
+    private List<GuildToggle> toRemove = new ArrayList<>();
+
+
+    private final static Logger logger = LoggerFactory.getLogger(GuildObject.class);
+    private ArrayList<Command> commandsByType;
+
+    public GuildObject(IGuild object) {
+        this.object = object;
+        this.longID = object.getLongID();
+        this.stringID = object.getStringID();
+        this.config = (GuildConfig) GuildConfig.create(GuildConfig.FILE_PATH, longID, new GuildConfig());
+        this.customCommands = (CustomCommands) CustomCommands.create(CustomCommands.FILE_PATH, longID, new CustomCommands());
+        this.servers = (Servers) Servers.create(Servers.FILE_PATH, longID, new Servers());
+        this.characters = (Characters) Characters.create(Characters.FILE_PATH, longID, new Characters());
+        this.competition = (Competition) Competition.create(Competition.FILE_PATH, longID, new Competition());
+        this.users = (GuildUsers) GuildUsers.create(GuildUsers.FILE_PATH, longID, new GuildUsers());
+        this.channelData = (ChannelData) ChannelData.create(ChannelData.FILE_PATH, longID, new ChannelData());
+        this.guildFiles = new ArrayList<GuildFile>() {{
+            add(config);
+            add(customCommands);
+            add(servers);
+            add(characters);
+            add(competition);
+            add(users);
+            add(channelData);
+        }};
+        customCommands.initCustomCommands();
+        this.client = new ClientObject(object.getClient(), this);
+        loadCommandData();
+    }
+
+    public void loadCommandData() {
+        this.commands = new ArrayList<>(Globals.getCommands(false));
+        this.toggles = (List<GuildToggle>) Globals.getGuildGuildToggles().clone();
+        this.channelSettings = (List<ChannelSetting>) Globals.getChannelSettings().clone();
+        this.commandTypes = (List<String>) Globals.getCommandTypes().clone();
+        checkToggles();
+    }
+
+    public GuildObject() {
+        this.client = new ClientObject(Globals.getClient(), this);
+        this.object = null;
+        this.longID = -1;
+        this.stringID = null;
+        this.config = new GuildConfig();
+        this.customCommands = new CustomCommands();
+        this.servers = new Servers();
+        this.characters = new Characters();
+        this.competition = new Competition();
+        this.users = new GuildUsers();
+        this.channelData = new ChannelData();
+        this.guildFiles = new ArrayList<>();
+        this.commands = new ArrayList<>();
+        this.commands = new ArrayList<>(Globals.getCommands(true));
+    }
+
+    public IGuild get() {
+        return object;
+    }
+
+    private void checkToggles() {
+        for (GuildToggle g : toggles) {
+            if (!g.get(config)) {
+                g.execute(this);
+            }
+        }
+
+        for (GuildToggle g : toRemove) {
+            ListIterator iterator = toggles.listIterator();
+            while (iterator.hasNext()) {
+                GuildToggle toggle = (GuildToggle) iterator.next();
+                if (toggle.name().equalsIgnoreCase(g.name())) {
+                    if (g.isModule()) {
+                        logger.trace("Module: " + g.name() + " removed.");
+                    } else {
+                        logger.trace("Toggle: " + g.name() + " removed.");
+                    }
+                    iterator.remove();
+                }
+            }
+        }
+    }
+
+    public void removeCommandsByType(String type) {
+        ListIterator iterator = commands.listIterator();
+        while (iterator.hasNext()) {
+            Command c = (Command) iterator.next();
+            if (c.type().equals(type)) {
+                logger.trace("Command: " + c.names()[0] + " removed.");
+                iterator.remove();
+            }
+        }
+        for (String s : commandTypes) {
+            if (s.equals(type)) {
+                logger.trace("Type: " + s + " removed.");
+                commandTypes.remove(s);
+                return;
+            }
+        }
+    }
+
+    public void removeChannel(String channel) {
+        ListIterator iterator = channelSettings.listIterator();
+        while (iterator.hasNext()) {
+            ChannelSetting c = (ChannelSetting) iterator.next();
+            if (c.type().equals(channel)) {
+                iterator.remove();
+                logger.trace("Channel Setting: " + c.type() + " removed.");
+            }
+        }
+    }
+
+    public void removeCommand(String[] names) {
+        ListIterator iterator = commands.listIterator();
+        while (iterator.hasNext()) {
+            Command c = (Command) iterator.next();
+            if (c.names()[0].equals(names[0])) {
+                iterator.remove();
+                logger.trace("Command: " + c.names()[0] + " removed.");
+            }
+        }
+    }
+
+    public void removeToggle(String name) {
+        for (GuildToggle g : toggles) {
+            if (g.name().equalsIgnoreCase(name)) {
+                toRemove.add(g);
+            }
+        }
+    }
+
+    public List<UserRateObject> getRatelimiting() {
+        return ratelimiting;
+    }
+
+    public List<Long> getSpokenUsers() {
+        return spokenUsers;
+    }
+
+    public boolean rateLimit(String userID) {
+        int max = config.messageLimit;
+        if (max == -1) {
+            return false;
+        }
+        boolean isfound = false;
+        for (UserRateObject r : ratelimiting) {
+            if (r.userID.equals(userID)) {
+                r.counterUp();
+                isfound = true;
+                if (r.counter > max) {
+                    return true;
+                }
+            }
+        }
+        if (!isfound) {
+            ratelimiting.add(new UserRateObject(userID));
+        }
+        return false;
+    }
+
+    public int getUserRate(String userID) {
+        for (UserRateObject u : ratelimiting) {
+            if (u.userID.equals(userID)) {
+                return u.counter;
+            }
+        }
+        return 0;
+    }
+
+    public void resetRateLimit() {
+        ratelimiting.clear();
+    }
+
+    public List<String> getAllTypes(CommandObject command) {
+        List types = new ArrayList<>(commandTypes);
+        if (command.user.get().equals(command.client.creator)) {
+            types.add(Command.TYPE_CREATOR);
+        }
+        types.add(Command.TYPE_DM);
+        return types;
+    }
+
+    public List<Command> getAllCommands(CommandObject command) {
+        List<Command> allCommands = new ArrayList<>(commands);
+        if (command.user.get().equals(command.client.creator)) {
+            allCommands.addAll(Globals.getALLCreatorCommands());
+        }
+        return allCommands;
+    }
+}
diff --git a/src/main/java/com/github/vaerys/masterobjects/MessageObject.java b/src/main/java/com/github/vaerys/masterobjects/MessageObject.java
new file mode 100644
index 00000000..45249d7c
--- /dev/null
+++ b/src/main/java/com/github/vaerys/masterobjects/MessageObject.java
@@ -0,0 +1,22 @@
+package com.github.vaerys.masterobjects;
+
+import sx.blah.discord.handle.obj.IMessage;
+
+public class MessageObject {
+
+    public ClientObject client;
+    private IMessage object;
+    public long longID;
+    public String stringID;
+
+    public MessageObject(IMessage message, GuildObject guild) {
+        client = new ClientObject(message.getClient(), guild);
+        this.object = message;
+        this.longID = message.getLongID();
+        this.stringID = message.getStringID();
+    }
+
+    public IMessage get() {
+        return object;
+    }
+}
diff --git a/src/main/java/com/github/vaerys/masterobjects/UserObject.java b/src/main/java/com/github/vaerys/masterobjects/UserObject.java
new file mode 100644
index 00000000..e27907e5
--- /dev/null
+++ b/src/main/java/com/github/vaerys/masterobjects/UserObject.java
@@ -0,0 +1,80 @@
+package com.github.vaerys.masterobjects;
+
+import com.github.vaerys.enums.UserSetting;
+import com.github.vaerys.handlers.XpHandler;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.*;
+import sx.blah.discord.handle.obj.IRole;
+import sx.blah.discord.handle.obj.IUser;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class UserObject {
+    public ClientObject client;
+    private IUser object;
+    public long longID;
+    public String stringID;
+    public String name;
+    public String displayName;
+    public String username;
+    public List<IRole> roles;
+    public Color color;
+    public List<CCommandObject> customCommands;
+    public List<CharacterObject> characters;
+    public List<ServerObject> servers;
+    public List<DailyUserMessageObject> dailyMessages;
+    public String notAllowed;
+
+
+    public UserObject(IUser object, GuildObject guild) {
+        this.client = new ClientObject(object.getClient(), guild);
+        this.object = object;
+        this.longID = object.getLongID();
+        this.stringID = object.getStringID();
+        this.name = object.getName();
+        this.username = object.getName() + "#" + object.getDiscriminator();
+        if (guild.get() != null) {
+            this.displayName = object.getDisplayName(guild.get());
+            this.roles = object.getRolesForGuild(guild.get());
+            this.color = Utility.getUsersColour(get(), guild.get());
+            customCommands = guild.customCommands.getCommandList().stream().filter(c -> c.getUserID().equals(stringID)).collect(Collectors.toList());
+            characters = guild.characters.getCharacters(guild.get()).stream().filter(c -> c.getUserID().equals(stringID)).collect(Collectors.toList());
+            servers = guild.servers.getServers().stream().filter(s -> s.getCreatorID().equals(stringID)).collect(Collectors.toList());
+            dailyMessages = Globals.getDailyMessages().getMessages().stream().filter(d -> d.getUserID() == longID).collect(Collectors.toList());
+        } else {
+            this.displayName = name;
+            this.roles = new ArrayList<>();
+            this.color = Color.white;
+            customCommands = new ArrayList<>();
+            characters = new ArrayList<>();
+            servers = new ArrayList<>();
+            dailyMessages = new ArrayList<>();
+        }
+        notAllowed = "> I'm sorry " + displayName + ", I'm afraid I can't let you do that.";
+    }
+
+    public IUser get() {
+        return object;
+    }
+
+    public ProfileObject getProfile(GuildObject guild) {
+        return guild.users.getUserByID(stringID);
+    }
+
+    public boolean isPrivateProfile(GuildObject guild) {
+        ProfileObject profile = getProfile(guild);
+        if (profile.getSettings().size() == 0) {
+            return false;
+        } else {
+            return getProfile(guild).getSettings().contains(UserSetting.PRIVATE_PROFILE);
+        }
+    }
+
+    public boolean showRank(GuildObject guild) {
+        return XpHandler.rank(guild.users, guild.get(), stringID) != -1;
+    }
+}
diff --git a/src/main/java/Objects/BlackListObject.java b/src/main/java/com/github/vaerys/objects/BlackListObject.java
similarity index 90%
rename from src/main/java/Objects/BlackListObject.java
rename to src/main/java/com/github/vaerys/objects/BlackListObject.java
index 2f463c8b..99974d75 100644
--- a/src/main/java/Objects/BlackListObject.java
+++ b/src/main/java/com/github/vaerys/objects/BlackListObject.java
@@ -1,6 +1,6 @@
-package Objects;
+package com.github.vaerys.objects;
 
-import Main.Constants;
+import com.github.vaerys.main.Constants;
 
 /**
  * Created by Vaerys on 27/08/2016.
diff --git a/src/main/java/Objects/CCommandObject.java b/src/main/java/com/github/vaerys/objects/CCommandObject.java
similarity index 97%
rename from src/main/java/Objects/CCommandObject.java
rename to src/main/java/com/github/vaerys/objects/CCommandObject.java
index 00a48f55..a064bb74 100644
--- a/src/main/java/Objects/CCommandObject.java
+++ b/src/main/java/com/github/vaerys/objects/CCommandObject.java
@@ -1,4 +1,4 @@
-package Objects;
+package com.github.vaerys.objects;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/java/Objects/ChannelSettingObject.java b/src/main/java/com/github/vaerys/objects/ChannelSettingObject.java
similarity index 91%
rename from src/main/java/Objects/ChannelSettingObject.java
rename to src/main/java/com/github/vaerys/objects/ChannelSettingObject.java
index 60a95c03..c52d7070 100644
--- a/src/main/java/Objects/ChannelSettingObject.java
+++ b/src/main/java/com/github/vaerys/objects/ChannelSettingObject.java
@@ -1,6 +1,6 @@
-package Objects;
+package com.github.vaerys.objects;
 
-import Main.Globals;
+import com.github.vaerys.main.Globals;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/Objects/ChannelStatsObject.java b/src/main/java/com/github/vaerys/objects/ChannelStatsObject.java
similarity index 93%
rename from src/main/java/Objects/ChannelStatsObject.java
rename to src/main/java/com/github/vaerys/objects/ChannelStatsObject.java
index d565b235..df9a3dd1 100644
--- a/src/main/java/Objects/ChannelStatsObject.java
+++ b/src/main/java/com/github/vaerys/objects/ChannelStatsObject.java
@@ -1,4 +1,4 @@
-package Objects;
+package com.github.vaerys.objects;
 
 public class ChannelStatsObject {
     String name;
diff --git a/src/main/java/Objects/CharacterObject.java b/src/main/java/com/github/vaerys/objects/CharacterObject.java
similarity index 98%
rename from src/main/java/Objects/CharacterObject.java
rename to src/main/java/com/github/vaerys/objects/CharacterObject.java
index 9c5b9296..51cd693a 100644
--- a/src/main/java/Objects/CharacterObject.java
+++ b/src/main/java/com/github/vaerys/objects/CharacterObject.java
@@ -1,4 +1,4 @@
-package Objects;
+package com.github.vaerys.objects;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/Objects/CompObject.java b/src/main/java/com/github/vaerys/objects/CompObject.java
similarity index 94%
rename from src/main/java/Objects/CompObject.java
rename to src/main/java/com/github/vaerys/objects/CompObject.java
index ef8b100a..a070c32d 100644
--- a/src/main/java/Objects/CompObject.java
+++ b/src/main/java/com/github/vaerys/objects/CompObject.java
@@ -1,4 +1,4 @@
-package Objects;
+package com.github.vaerys.objects;
 
 /**
  * Created by Vaerys on 29/08/2016.
diff --git a/src/main/java/Objects/DailyMessageObject.java b/src/main/java/com/github/vaerys/objects/DailyMessageObject.java
similarity index 87%
rename from src/main/java/Objects/DailyMessageObject.java
rename to src/main/java/com/github/vaerys/objects/DailyMessageObject.java
index 7b5bcd69..8bccbb03 100644
--- a/src/main/java/Objects/DailyMessageObject.java
+++ b/src/main/java/com/github/vaerys/objects/DailyMessageObject.java
@@ -1,6 +1,4 @@
-package Objects;
-
-import Main.TagSystem;
+package com.github.vaerys.objects;
 
 import java.time.DayOfWeek;
 import java.util.Arrays;
@@ -31,7 +29,7 @@ public String getContents() {
         for (String s : contents) {
             builder.append(s + "\n");
         }
-        return TagSystem.tagRandom(TagSystem.tagSpacer(TagSystem.tagNoNL(TagSystem.tagMentionRemover(builder.toString()))));
+        return builder.toString();
     }
 
     public String getFileName() {
diff --git a/src/main/java/Objects/DailyUserMessageObject.java b/src/main/java/com/github/vaerys/objects/DailyUserMessageObject.java
similarity index 73%
rename from src/main/java/Objects/DailyUserMessageObject.java
rename to src/main/java/com/github/vaerys/objects/DailyUserMessageObject.java
index 53cbec3a..aaaf1eab 100644
--- a/src/main/java/Objects/DailyUserMessageObject.java
+++ b/src/main/java/com/github/vaerys/objects/DailyUserMessageObject.java
@@ -1,6 +1,7 @@
-package Objects;
+package com.github.vaerys.objects;
 
-import Main.TagSystem;
+import com.github.vaerys.handlers.TagHandler;
+import com.github.vaerys.masterobjects.GuildObject;
 
 import java.time.DayOfWeek;
 
@@ -8,7 +9,6 @@
  * Created by Vaerys on 19/07/2017.
  */
 public class DailyUserMessageObject {
-    String author;
     long userID = -1;
     String content;
     DayOfWeek day;
@@ -25,8 +25,8 @@ public DayOfWeek getDay() {
         return day;
     }
 
-    public String getContents() {
-        return TagSystem.tagRandom(TagSystem.tagSpacer(TagSystem.tagNoNL(TagSystem.tagMentionRemover(content))));
+    public String getContents(GuildObject guild) {
+        return TagHandler.prepDailyMessage(content, guild);
     }
 
     public long getUID() {
diff --git a/src/main/java/Objects/GroupUpObject.java b/src/main/java/com/github/vaerys/objects/GroupUpObject.java
similarity index 91%
rename from src/main/java/Objects/GroupUpObject.java
rename to src/main/java/com/github/vaerys/objects/GroupUpObject.java
index f3998b44..c2e1ea3d 100644
--- a/src/main/java/Objects/GroupUpObject.java
+++ b/src/main/java/com/github/vaerys/objects/GroupUpObject.java
@@ -1,4 +1,4 @@
-package Objects;
+package com.github.vaerys.objects;
 
 /**
  * Created by Vaerys on 31/05/2017.
diff --git a/src/main/java/Objects/GuildContentObject.java b/src/main/java/com/github/vaerys/objects/GuildContentObject.java
similarity index 96%
rename from src/main/java/Objects/GuildContentObject.java
rename to src/main/java/com/github/vaerys/objects/GuildContentObject.java
index 58ee14b0..b552e3fe 100644
--- a/src/main/java/Objects/GuildContentObject.java
+++ b/src/main/java/com/github/vaerys/objects/GuildContentObject.java
@@ -1,8 +1,8 @@
-package Objects;
+package com.github.vaerys.objects;
 
-import Main.Constants;
-import Main.Utility;
-import POGOs.*;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.pogos.*;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/Objects/OffenderObject.java b/src/main/java/com/github/vaerys/objects/OffenderObject.java
similarity index 89%
rename from src/main/java/Objects/OffenderObject.java
rename to src/main/java/com/github/vaerys/objects/OffenderObject.java
index 2f44393c..05e9ad07 100644
--- a/src/main/java/Objects/OffenderObject.java
+++ b/src/main/java/com/github/vaerys/objects/OffenderObject.java
@@ -1,6 +1,6 @@
-package Objects;
+package com.github.vaerys.objects;
 
-import Main.Globals;
+import com.github.vaerys.main.Globals;
 
 /**
  * Created by Vaerys on 04/11/2016.
diff --git a/src/main/java/Objects/PatchObject.java b/src/main/java/com/github/vaerys/objects/PatchObject.java
similarity index 92%
rename from src/main/java/Objects/PatchObject.java
rename to src/main/java/com/github/vaerys/objects/PatchObject.java
index 39cda36a..27a38971 100644
--- a/src/main/java/Objects/PatchObject.java
+++ b/src/main/java/com/github/vaerys/objects/PatchObject.java
@@ -1,4 +1,4 @@
-package Objects;
+package com.github.vaerys.objects;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/Objects/PollObject.java b/src/main/java/com/github/vaerys/objects/PollObject.java
similarity index 92%
rename from src/main/java/Objects/PollObject.java
rename to src/main/java/com/github/vaerys/objects/PollObject.java
index c3bbcfd5..8a515e3b 100644
--- a/src/main/java/Objects/PollObject.java
+++ b/src/main/java/com/github/vaerys/objects/PollObject.java
@@ -1,7 +1,7 @@
-package Objects;
+package com.github.vaerys.objects;
 
-import Commands.Competition.EnterVote;
-import POGOs.GuildConfig;
+import com.github.vaerys.commands.competition.EnterVote;
+import com.github.vaerys.pogos.GuildConfig;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/Objects/UserTypeObject.java b/src/main/java/com/github/vaerys/objects/ProfileObject.java
similarity index 67%
rename from src/main/java/Objects/UserTypeObject.java
rename to src/main/java/com/github/vaerys/objects/ProfileObject.java
index 22c54945..db54de91 100644
--- a/src/main/java/Objects/UserTypeObject.java
+++ b/src/main/java/com/github/vaerys/objects/ProfileObject.java
@@ -1,24 +1,25 @@
-package Objects;
-
-import Enums.UserSetting;
-import Handlers.MessageHandler;
-import Handlers.XpHandler;
-import Main.Constants;
-import Main.Globals;
-import POGOs.GuildConfig;
+package com.github.vaerys.objects;
+
+import com.github.vaerys.enums.UserSetting;
+import com.github.vaerys.handlers.MessageHandler;
+import com.github.vaerys.handlers.XpHandler;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.pogos.GuildConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.ListIterator;
 
 /**
  * Created by Vaerys on 27/08/2016.
  */
-public class UserTypeObject {
+public class ProfileObject {
     String ID;
     long xp = 0;
     long currentLevel = -1;
-    long rewardID = -1;
+    //    long rewardID = -1;
     String gender = "Unknown";
     String quote = "This person doesn't seem to have much to say for themselves.";
     ArrayList<UserSetting> settings = new ArrayList<>();
@@ -49,15 +50,15 @@ public void setGender(String gender) {
         this.gender = gender;
     }
 
-    public long getRewardID() {
-        return rewardID;
-    }
+//    public long getRewardID() {
+//        return rewardID;
+//    }
 
-    public void setRewardID(long rewardID) {
-        this.rewardID = rewardID;
-    }
+//    public void setRewardID(long rewardID) {
+//        this.rewardID = rewardID;
+//    }
 
-    public UserTypeObject(String ID) {
+    public ProfileObject(String ID) {
         this.ID = ID;
         if (links == null) links = new ArrayList<>();
         if (settings == null) settings = new ArrayList<>();
@@ -108,11 +109,25 @@ public void setCurrentLevel(long currentLevel) {
     }
 
     public UserSetting getLevelState() {
-        for (UserSetting s: settings){
-            if (Constants.levelUpStates.contains(s)){
+        for (UserSetting s : settings) {
+            if (Constants.levelUpStates.contains(s)) {
                 return s;
             }
         }
         return null;
     }
+
+    public void setLastTalked(long lastTalked) {
+        this.lastTalked = lastTalked;
+    }
+
+    public void removeLevelFloor() {
+        ListIterator iterator = settings.listIterator();
+        while (iterator.hasNext()) {
+            UserSetting setting = (UserSetting) iterator.next();
+            if (setting == UserSetting.HIT_LEVEL_FLOOR) {
+                iterator.remove();
+            }
+        }
+    }
 }
diff --git a/src/main/java/Objects/QueueObject.java b/src/main/java/com/github/vaerys/objects/QueueObject.java
similarity index 92%
rename from src/main/java/Objects/QueueObject.java
rename to src/main/java/com/github/vaerys/objects/QueueObject.java
index 33dc4a98..43037429 100644
--- a/src/main/java/Objects/QueueObject.java
+++ b/src/main/java/com/github/vaerys/objects/QueueObject.java
@@ -1,4 +1,4 @@
-package Objects;
+package com.github.vaerys.objects;
 
 public class QueueObject {
     long messageId;
diff --git a/src/main/java/Objects/RandomStatusObject.java b/src/main/java/com/github/vaerys/objects/RandomStatusObject.java
similarity index 91%
rename from src/main/java/Objects/RandomStatusObject.java
rename to src/main/java/com/github/vaerys/objects/RandomStatusObject.java
index b76fb3da..a9d198f6 100644
--- a/src/main/java/Objects/RandomStatusObject.java
+++ b/src/main/java/com/github/vaerys/objects/RandomStatusObject.java
@@ -1,4 +1,4 @@
-package Objects;
+package com.github.vaerys.objects;
 
 /**
  * Created by Vaerys on 29/06/2017.
diff --git a/src/main/java/Objects/ReminderObject.java b/src/main/java/com/github/vaerys/objects/ReminderObject.java
similarity index 92%
rename from src/main/java/Objects/ReminderObject.java
rename to src/main/java/com/github/vaerys/objects/ReminderObject.java
index 10e36edb..5c665a4a 100644
--- a/src/main/java/Objects/ReminderObject.java
+++ b/src/main/java/com/github/vaerys/objects/ReminderObject.java
@@ -1,6 +1,6 @@
-package Objects;
+package com.github.vaerys.objects;
 
-import Main.Globals;
+import com.github.vaerys.main.Globals;
 
 /**
  * Created by Vaerys on 05/04/2017.
diff --git a/src/main/java/Objects/ReplaceObject.java b/src/main/java/com/github/vaerys/objects/ReplaceObject.java
similarity index 90%
rename from src/main/java/Objects/ReplaceObject.java
rename to src/main/java/com/github/vaerys/objects/ReplaceObject.java
index 6ce27405..837fb60e 100644
--- a/src/main/java/Objects/ReplaceObject.java
+++ b/src/main/java/com/github/vaerys/objects/ReplaceObject.java
@@ -1,4 +1,4 @@
-package Objects;
+package com.github.vaerys.objects;
 
 /**
  * Created by Vaerys on 27/10/2016.
diff --git a/src/main/java/Objects/RewardRoleObject.java b/src/main/java/com/github/vaerys/objects/RewardRoleObject.java
similarity index 87%
rename from src/main/java/Objects/RewardRoleObject.java
rename to src/main/java/com/github/vaerys/objects/RewardRoleObject.java
index 44ba6377..c67ab56c 100644
--- a/src/main/java/Objects/RewardRoleObject.java
+++ b/src/main/java/com/github/vaerys/objects/RewardRoleObject.java
@@ -1,6 +1,6 @@
-package Objects;
+package com.github.vaerys.objects;
 
-import Handlers.XpHandler;
+import com.github.vaerys.handlers.XpHandler;
 
 /**
  * Created by Vaerys on 11/05/2017.
diff --git a/src/main/java/Objects/RoleStatsObject.java b/src/main/java/com/github/vaerys/objects/RoleStatsObject.java
similarity index 89%
rename from src/main/java/Objects/RoleStatsObject.java
rename to src/main/java/com/github/vaerys/objects/RoleStatsObject.java
index 3bfbcad8..a969cfeb 100644
--- a/src/main/java/Objects/RoleStatsObject.java
+++ b/src/main/java/com/github/vaerys/objects/RoleStatsObject.java
@@ -1,7 +1,7 @@
-package Objects;
+package com.github.vaerys.objects;
 
-import OldCode.RoleTypeObject;
-import POGOs.GuildConfig;
+import com.github.vaerys.oldcode.RoleTypeObject;
+import com.github.vaerys.pogos.GuildConfig;
 import sx.blah.discord.handle.obj.IRole;
 
 /**
diff --git a/src/main/java/Objects/ServerObject.java b/src/main/java/com/github/vaerys/objects/ServerObject.java
similarity index 97%
rename from src/main/java/Objects/ServerObject.java
rename to src/main/java/com/github/vaerys/objects/ServerObject.java
index 52116b98..825bcb39 100644
--- a/src/main/java/Objects/ServerObject.java
+++ b/src/main/java/com/github/vaerys/objects/ServerObject.java
@@ -1,4 +1,4 @@
-package Objects;
+package com.github.vaerys.objects;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/Objects/SplitFirstObject.java b/src/main/java/com/github/vaerys/objects/SplitFirstObject.java
similarity index 95%
rename from src/main/java/Objects/SplitFirstObject.java
rename to src/main/java/com/github/vaerys/objects/SplitFirstObject.java
index 9aae6f1e..3e51e8b2 100644
--- a/src/main/java/Objects/SplitFirstObject.java
+++ b/src/main/java/com/github/vaerys/objects/SplitFirstObject.java
@@ -1,4 +1,4 @@
-package Objects;
+package com.github.vaerys.objects;
 
 import java.util.regex.Pattern;
 
diff --git a/src/main/java/Objects/ToggleStatsObject.java b/src/main/java/com/github/vaerys/objects/ToggleStatsObject.java
similarity index 92%
rename from src/main/java/Objects/ToggleStatsObject.java
rename to src/main/java/com/github/vaerys/objects/ToggleStatsObject.java
index c7b0e3be..57769e02 100644
--- a/src/main/java/Objects/ToggleStatsObject.java
+++ b/src/main/java/com/github/vaerys/objects/ToggleStatsObject.java
@@ -1,4 +1,4 @@
-package Objects;
+package com.github.vaerys.objects;
 
 public class ToggleStatsObject {
     String toggle;
diff --git a/src/main/java/Objects/UserCountDown.java b/src/main/java/com/github/vaerys/objects/UserCountDown.java
similarity index 95%
rename from src/main/java/Objects/UserCountDown.java
rename to src/main/java/com/github/vaerys/objects/UserCountDown.java
index 81befaee..7d0defe7 100644
--- a/src/main/java/Objects/UserCountDown.java
+++ b/src/main/java/com/github/vaerys/objects/UserCountDown.java
@@ -1,4 +1,4 @@
-package Objects;
+package com.github.vaerys.objects;
 
 /**
  * Created by Vaerys on 27/08/2016.
diff --git a/src/main/java/Objects/UserLinkObject.java b/src/main/java/com/github/vaerys/objects/UserLinkObject.java
similarity index 90%
rename from src/main/java/Objects/UserLinkObject.java
rename to src/main/java/com/github/vaerys/objects/UserLinkObject.java
index 082660cf..f0321f7b 100644
--- a/src/main/java/Objects/UserLinkObject.java
+++ b/src/main/java/com/github/vaerys/objects/UserLinkObject.java
@@ -1,4 +1,4 @@
-package Objects;
+package com.github.vaerys.objects;
 
 /**
  * Created by Vaerys on 17/06/2017.
diff --git a/src/main/java/Objects/UserRateObject.java b/src/main/java/com/github/vaerys/objects/UserRateObject.java
similarity index 77%
rename from src/main/java/Objects/UserRateObject.java
rename to src/main/java/com/github/vaerys/objects/UserRateObject.java
index 60e50049..686c651d 100644
--- a/src/main/java/Objects/UserRateObject.java
+++ b/src/main/java/com/github/vaerys/objects/UserRateObject.java
@@ -1,11 +1,11 @@
-package Objects;
+package com.github.vaerys.objects;
 
 /**
  * Created by Vaerys on 21/02/2017.
  */
 public class UserRateObject {
-    String userID;
-    int counter;
+    public String userID;
+    public int counter;
 
     public UserRateObject(String userID) {
         this.userID = userID;
diff --git a/src/main/java/Objects/VoteObject.java b/src/main/java/com/github/vaerys/objects/VoteObject.java
similarity index 89%
rename from src/main/java/Objects/VoteObject.java
rename to src/main/java/com/github/vaerys/objects/VoteObject.java
index 21ad6928..c1b5d175 100644
--- a/src/main/java/Objects/VoteObject.java
+++ b/src/main/java/com/github/vaerys/objects/VoteObject.java
@@ -1,4 +1,4 @@
-package Objects;
+package com.github.vaerys.objects;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/Objects/XEmbedBuilder.java b/src/main/java/com/github/vaerys/objects/XEmbedBuilder.java
similarity index 93%
rename from src/main/java/Objects/XEmbedBuilder.java
rename to src/main/java/com/github/vaerys/objects/XEmbedBuilder.java
index 702b9e80..dbe7b103 100644
--- a/src/main/java/Objects/XEmbedBuilder.java
+++ b/src/main/java/com/github/vaerys/objects/XEmbedBuilder.java
@@ -1,6 +1,6 @@
-package Objects;
+package com.github.vaerys.objects;
 
-import Main.Utility;
+import com.github.vaerys.main.Utility;
 import sx.blah.discord.util.EmbedBuilder;
 
 /**
diff --git a/src/main/java/com/github/vaerys/objects/XRequestBuffer.java b/src/main/java/com/github/vaerys/objects/XRequestBuffer.java
new file mode 100644
index 00000000..2889b590
--- /dev/null
+++ b/src/main/java/com/github/vaerys/objects/XRequestBuffer.java
@@ -0,0 +1,374 @@
+/*
+ *     This file is part of Discord4J.
+ *
+ *     Discord4J is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Discord4J is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU Lesser General Public License for more details.
+ *
+ *     You should have received a copy of the GNU Lesser General Public License
+ *     along with Discord4J.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.github.vaerys.objects;
+
+import sx.blah.discord.Discord4J;
+import sx.blah.discord.api.internal.DiscordUtils;
+import sx.blah.discord.util.LogMarkers;
+import sx.blah.discord.util.RateLimitException;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.StampedLock;
+
+///**
+// * This is a utility class intended to help with dealing with {@link RateLimitException}s by queueing rate-limited
+// * operations until they can be sent.
+// */
+public class XRequestBuffer {
+
+    private static final ExecutorService initialExecutor = Executors.newFixedThreadPool(2, DiscordUtils.createDaemonThreadFactory("RequestBuffer Initial Executor"));
+    private static final Map<String, ScheduledExecutorService> requestServices = new ConcurrentHashMap<>();
+    private static final Map<String, List<RequestFuture>> requests = new ConcurrentHashMap<>();
+
+    /**
+     * Here it is, the magical method that does it all.
+     *
+     * @param request The request to be carried out.
+     * @param <T>     The expected object to be returned.
+     * @return The future value, the future will have a value after the request has been successfully executed.
+     */
+    public static <T> RequestFuture<T> request(IRequest<T> request) {
+        final RequestFuture<T> future = new RequestFuture<>(request);
+        initialExecutor.execute(() -> {
+            try {
+                future.run();
+                if (future.callable.rateLimited && future.getDelay(TimeUnit.MILLISECONDS) >= 0) {
+                    Discord4J.LOGGER.debug(LogMarkers.UTIL, "Attempted request rate-limited, queueing retry in {}ms",
+                            future.getDelay(TimeUnit.MILLISECONDS));
+
+                    if (future.getBucket() != null) {
+                        synchronized (requests) {
+                            if (future.getBucket() != null) {
+                                if (!requests.containsKey(future.getBucket())) {
+                                    requests.put(future.getBucket(), new CopyOnWriteArrayList<>());
+                                    requestServices.put(future.getBucket(), Executors.newSingleThreadScheduledExecutor(DiscordUtils.createDaemonThreadFactory("RequestBuffer Retry Handler")));
+                                    requestServices.get(future.getBucket()).schedule(new RequestRunnable(future.getBucket()), future.getDelay(TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS);
+                                }
+
+                                requests.get(future.getBucket()).add(future);
+                            }
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                Discord4J.LOGGER.error(LogMarkers.UTIL, "Exception caught while attempting to execute a request", e);
+            }
+        });
+        return future;
+    }
+
+    /**
+     * This is a version of {@link #request(IRequest)} without a return value. No functional difference, only more
+     * continence.
+     *
+     * @param request The request to be carried out.
+     * @return The request future.
+     */
+    public static RequestFuture<Void> request(IVoidRequest request) {
+        return request((IRequest<Void>) request); //Casted to use the correct request() method
+    }
+
+    /**
+     * This returns the number of incomplete requests.
+     *
+     * @return The number of incomplete requests.
+     */
+    public static int getIncompleteRequestCount() {
+        final AtomicInteger count = new AtomicInteger();
+        synchronized (requests) {
+            requests.values().parallelStream().forEach((requestFutures) -> count.addAndGet(requestFutures.size()));
+        }
+        return count.get();
+    }
+
+    /**
+     * This kills all currently queued requests.
+     *
+     * @return The number of requests killed.
+     */
+    public static int killAllRequests() {
+        final int toKill = getIncompleteRequestCount();
+        //We are ignoring the initialExecutor because those requests haven't been ratelimited (yet)
+        synchronized (requestServices) {
+            requestServices.keySet().parallelStream().distinct().forEach(bucket -> {
+                requestServices.get(bucket).shutdownNow();
+                requestServices.remove(bucket);
+            });
+        }
+        synchronized (requests) {
+            requests.values().forEach(futures -> futures.forEach(future -> future.cancel(true)));
+            requests.clear();
+        }
+        return toKill;
+    }
+
+    /**
+     * This is used to model the request, NOTE: it IS a functional interface so you are encouraged to use lambdas!
+     *
+     * @param <T> The type of object this request is expected to return.
+     */
+    @FunctionalInterface
+    public interface IRequest<T> {
+
+        //        /**
+//         * This is called when the request is attempted.
+//         *
+//         * @return The result of this request, if any.
+//         *
+//         * @throws RateLimitException
+//         */
+        T request();
+
+        /**
+         * This is called when this request is retried. This should NOT block.
+         *
+         * @param requestFuture The future managing this request.
+         */
+        default void onRetry(RequestFuture<T> requestFuture) {
+        }
+    }
+
+    /**
+     * This is used to model a request which returns nothing, NOTE: it IS a functional interface so you are encouraged
+     * to use lambdas!
+     */
+    @FunctionalInterface
+    public interface IVoidRequest extends IRequest<Void> {
+
+        default Void request() {
+            doRequest();
+            return null;
+        }
+
+        //        /**
+//         * This is called when the request is attempted.
+//         *
+//         * @throws RateLimitException
+//         */
+        void doRequest();
+    }
+
+    public static class RequestFuture<T> implements Future<T>, Delayed {
+
+        private final IRequest<T> request;
+        private final RequestCallable<T> callable;
+        private volatile FutureTask<T> backing;
+        final StampedLock lock = new StampedLock();
+
+        RequestFuture(IRequest<T> request) {
+            this.request = request;
+            this.callable = new RequestCallable<>(request, this);
+            backing = new FutureTask<>(callable);
+        }
+
+        /**
+         * Gets the delay until the next request is attempted.
+         *
+         * @param unit The time unit for the delay.
+         * @return The delay.
+         */
+        @Override
+        public long getDelay(TimeUnit unit) {
+            if (isDone() || isCancelled())
+                return 0;
+
+            return unit.convert(callable.timeForNextRequest - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
+        }
+
+        /**
+         * Gets the bucket this request was ratelimited for.
+         *
+         * @return The bucket.
+         */
+        public String getBucket() {
+            return callable.bucket;
+        }
+
+        /**
+         * Compares this to another delayed object.
+         *
+         * @param o The other object.
+         * @return Negative if the delay on this object is less than the other object, positive if the opposite or 0
+         * if otherwise.
+         */
+        @Override
+        public int compareTo(Delayed o) {
+            return (int) (getDelay(TimeUnit.MILLISECONDS) - o.getDelay(TimeUnit.MILLISECONDS));
+        }
+
+        @Override
+        public boolean cancel(boolean mayInterruptIfRunning) {
+            return backing.cancel(mayInterruptIfRunning);
+        }
+
+        @Override
+        public boolean isCancelled() {
+            return backing.isCancelled();
+        }
+
+        @Override
+        public boolean isDone() {
+            return backing.isDone() && !callable.rateLimited;
+        }
+
+        @Override
+        public T get() {
+            long stamp = lock.readLock();
+            try {
+                return backing.get();
+            } catch (Exception e) {
+                Discord4J.LOGGER.error(LogMarkers.UTIL, "Exception caught attempting to handle a ratelimited request", e);
+            } finally {
+                lock.unlockRead(stamp);
+            }
+
+            return null;
+        }
+
+        @Override
+        public T get(long timeout, TimeUnit unit) throws InterruptedException, TimeoutException {
+            long timeoutTime = System.currentTimeMillis() + TimeUnit.MILLISECONDS.convert(timeout, unit);
+
+            long stamp = lock.tryReadLock(timeout, unit);
+            if (!lock.validate(stamp)) {
+                if (System.currentTimeMillis() > timeoutTime)
+                    throw new TimeoutException();
+
+                if (isCancelled())
+                    throw new InterruptedException();
+            }
+            try {
+                return backing.get();
+            } catch (Exception e) {
+                Discord4J.LOGGER.error(LogMarkers.UTIL, "Exception caught attempting to handle a ratelimited request", e);
+            } finally {
+                lock.unlockRead(stamp);
+            }
+            return null;
+        }
+
+        /**
+         * Wrapper for the backing {@link FutureTask}'s run method.
+         */
+        private void run() {
+            backing.run();
+        }
+
+        private static class RequestCallable<T> implements Callable<T> {
+
+            final IRequest<T> request;
+            final RequestFuture<T> future;
+            final long stamp;
+
+            volatile boolean firstAttempt = true;
+            volatile long timeForNextRequest = -1;
+            volatile String bucket = null;
+            volatile boolean rateLimited = false;
+
+            RequestCallable(IRequest<T> request, RequestFuture<T> future) {
+                this.request = request;
+                this.future = future;
+                stamp = future.lock.writeLock();
+            }
+
+            @Override
+            public T call() {
+                try {
+                    if (!firstAttempt)
+                        request.onRetry(future);
+
+                    if (!future.isCancelled()) {
+                        T value = request.request();
+                        timeForNextRequest = -1;
+                        rateLimited = false;
+                        future.lock.unlockWrite(stamp);
+                        return value;
+                    }
+                } catch (RateLimitException e) {
+                    firstAttempt = false;
+                    timeForNextRequest = System.currentTimeMillis() + e.getRetryDelay();
+                    bucket = e.getMethod();
+                    rateLimited = true;
+                } catch (Exception e) {
+                    Discord4J.LOGGER.warn(LogMarkers.UTIL, "RequestBuffer handled an uncaught exception!", e);
+                }
+
+                if (!rateLimited && future.lock.validate(stamp)) {
+                    future.lock.unlockWrite(stamp);
+                }
+
+                return null;
+            }
+        }
+    }
+
+    /**
+     * Manages request futures to ensure it executes the request eventually.
+     */
+    private static class RequestRunnable implements Runnable {
+
+        private final String bucket;
+
+        private RequestRunnable(String bucket) {
+            this.bucket = bucket;
+        }
+
+        @Override
+        public void run() {
+            synchronized (requests) {
+                try {
+                    List<RequestFuture> futures = requests.get(bucket);
+
+                    if (futures != null) {
+                        List<RequestFuture> futuresToRetry = new CopyOnWriteArrayList<>();
+
+                        futures.forEach((RequestFuture future) -> {
+                            try {
+                                if (!future.isCancelled()) {
+                                    future.run();
+                                    if (future.callable.rateLimited) {
+                                        future.backing = new FutureTask<>(future.callable);
+                                        futuresToRetry.add(future);
+                                    }
+                                }
+                            } catch (Exception e) {
+                                Discord4J.LOGGER.error(LogMarkers.UTIL, "Exception caught while attempting to execute a request", e);
+                            }
+                        });
+
+                        if (futuresToRetry.size() > 0) {
+                            long delay = Math.max(0, futuresToRetry.get(0).getDelay(TimeUnit.MILLISECONDS));
+                            requests.replace(bucket, futuresToRetry);
+                            synchronized (requestServices) {
+                                requestServices.get(bucket).schedule(new RequestRunnable(bucket), delay, TimeUnit.MILLISECONDS);
+                            }
+                        } else {
+                            requests.remove(bucket);
+                            requestServices.remove(bucket).shutdownNow();
+                        }
+                    }
+                } catch (Exception e) {
+                    Discord4J.LOGGER.error(LogMarkers.UTIL, "Exception caught while attempting to retry requests", e);
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/OldCode/ChannelData.java b/src/main/java/com/github/vaerys/oldcode/ChannelData.java
similarity index 88%
rename from src/main/java/OldCode/ChannelData.java
rename to src/main/java/com/github/vaerys/oldcode/ChannelData.java
index 09d97bbc..d7656c08 100644
--- a/src/main/java/OldCode/ChannelData.java
+++ b/src/main/java/com/github/vaerys/oldcode/ChannelData.java
@@ -1,4 +1,4 @@
-package OldCode;
+package com.github.vaerys.oldcode;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/OldCode/ChannelTypeObject.java b/src/main/java/com/github/vaerys/oldcode/ChannelTypeObject.java
similarity index 90%
rename from src/main/java/OldCode/ChannelTypeObject.java
rename to src/main/java/com/github/vaerys/oldcode/ChannelTypeObject.java
index efd298ea..3ae593b1 100644
--- a/src/main/java/OldCode/ChannelTypeObject.java
+++ b/src/main/java/com/github/vaerys/oldcode/ChannelTypeObject.java
@@ -1,4 +1,4 @@
-package OldCode;
+package com.github.vaerys.oldcode;
 
 /**
  * Created by Vaerys on 17/08/2016.
diff --git a/src/main/java/OldCode/CustomCommands.java b/src/main/java/com/github/vaerys/oldcode/CustomCommands.java
similarity index 90%
rename from src/main/java/OldCode/CustomCommands.java
rename to src/main/java/com/github/vaerys/oldcode/CustomCommands.java
index e2145eb7..6398a252 100644
--- a/src/main/java/OldCode/CustomCommands.java
+++ b/src/main/java/com/github/vaerys/oldcode/CustomCommands.java
@@ -1,7 +1,7 @@
-package OldCode;
+package com.github.vaerys.oldcode;
 
-import Main.Globals;
-import Objects.CCommandObject;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.objects.CCommandObject;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/OldCode/OldCharacterObject.java b/src/main/java/com/github/vaerys/oldcode/OldCharacterObject.java
similarity index 89%
rename from src/main/java/OldCode/OldCharacterObject.java
rename to src/main/java/com/github/vaerys/oldcode/OldCharacterObject.java
index 607003e9..4a6ff1f9 100644
--- a/src/main/java/OldCode/OldCharacterObject.java
+++ b/src/main/java/com/github/vaerys/oldcode/OldCharacterObject.java
@@ -1,4 +1,4 @@
-package OldCode;
+package com.github.vaerys.oldcode;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/OldCode/OldCharacters.java b/src/main/java/com/github/vaerys/oldcode/OldCharacters.java
similarity index 86%
rename from src/main/java/OldCode/OldCharacters.java
rename to src/main/java/com/github/vaerys/oldcode/OldCharacters.java
index f6766c1d..c1df937b 100644
--- a/src/main/java/OldCode/OldCharacters.java
+++ b/src/main/java/com/github/vaerys/oldcode/OldCharacters.java
@@ -1,4 +1,4 @@
-package OldCode;
+package com.github.vaerys.oldcode;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/github/vaerys/oldcode/OldGlobalData.java b/src/main/java/com/github/vaerys/oldcode/OldGlobalData.java
new file mode 100644
index 00000000..a3424454
--- /dev/null
+++ b/src/main/java/com/github/vaerys/oldcode/OldGlobalData.java
@@ -0,0 +1,19 @@
+package com.github.vaerys.oldcode;
+
+import com.github.vaerys.objects.DailyUserMessageObject;
+import com.github.vaerys.objects.QueueObject;
+
+import java.util.ArrayList;
+
+public class OldGlobalData {
+    ArrayList<QueueObject> queuedRequests = new ArrayList<>();
+    ArrayList<DailyUserMessageObject> dailyMessages = new ArrayList<>();
+
+    public ArrayList<QueueObject> getQueuedRequests() {
+        return queuedRequests;
+    }
+
+    public ArrayList<DailyUserMessageObject> getDailyMessages() {
+        return dailyMessages;
+    }
+}
diff --git a/src/main/java/OldCode/OldGuildConfig.java b/src/main/java/com/github/vaerys/oldcode/OldGuildConfig.java
similarity index 95%
rename from src/main/java/OldCode/OldGuildConfig.java
rename to src/main/java/com/github/vaerys/oldcode/OldGuildConfig.java
index 25e6398e..3f7eda91 100644
--- a/src/main/java/OldCode/OldGuildConfig.java
+++ b/src/main/java/com/github/vaerys/oldcode/OldGuildConfig.java
@@ -1,4 +1,4 @@
-package OldCode;
+package com.github.vaerys.oldcode;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/OldCode/OldUserDailyMessageObject.java b/src/main/java/com/github/vaerys/oldcode/OldUserDailyMessageObject.java
similarity index 90%
rename from src/main/java/OldCode/OldUserDailyMessageObject.java
rename to src/main/java/com/github/vaerys/oldcode/OldUserDailyMessageObject.java
index bbd8633e..0a20c9c5 100644
--- a/src/main/java/OldCode/OldUserDailyMessageObject.java
+++ b/src/main/java/com/github/vaerys/oldcode/OldUserDailyMessageObject.java
@@ -1,4 +1,4 @@
-package OldCode;
+package com.github.vaerys.oldcode;
 
 import java.time.DayOfWeek;
 
diff --git a/src/main/java/OldCode/RoleTypeObject.java b/src/main/java/com/github/vaerys/oldcode/RoleTypeObject.java
similarity index 92%
rename from src/main/java/OldCode/RoleTypeObject.java
rename to src/main/java/com/github/vaerys/oldcode/RoleTypeObject.java
index 859a70dc..5a198e63 100644
--- a/src/main/java/OldCode/RoleTypeObject.java
+++ b/src/main/java/com/github/vaerys/oldcode/RoleTypeObject.java
@@ -1,4 +1,4 @@
-package OldCode;
+package com.github.vaerys.oldcode;
 
 /**
  * Created by Vaerys on 27/08/2016.
diff --git a/src/main/java/POGOs/BlackLists.java b/src/main/java/com/github/vaerys/pogos/BlackLists.java
similarity index 92%
rename from src/main/java/POGOs/BlackLists.java
rename to src/main/java/com/github/vaerys/pogos/BlackLists.java
index 907d4485..a9213805 100644
--- a/src/main/java/POGOs/BlackLists.java
+++ b/src/main/java/com/github/vaerys/pogos/BlackLists.java
@@ -1,7 +1,7 @@
-package POGOs;
+package com.github.vaerys.pogos;
 
-import Main.Constants;
-import Objects.BlackListObject;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.objects.BlackListObject;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/POGOs/ChannelData.java b/src/main/java/com/github/vaerys/pogos/ChannelData.java
similarity index 61%
rename from src/main/java/POGOs/ChannelData.java
rename to src/main/java/com/github/vaerys/pogos/ChannelData.java
index 68f39801..16110555 100644
--- a/src/main/java/POGOs/ChannelData.java
+++ b/src/main/java/com/github/vaerys/pogos/ChannelData.java
@@ -1,13 +1,15 @@
-package POGOs;
+package com.github.vaerys.pogos;
 
-import Objects.GroupUpObject;
+import com.github.vaerys.interfaces.GuildFile;
+import com.github.vaerys.objects.GroupUpObject;
 
 import java.util.ArrayList;
 
 /**
  * Created by Vaerys on 12/05/2017.
  */
-public class ChannelData {
+public class ChannelData extends GuildFile {
+    public static final String FILE_PATH = "Channel_Data.json";
     ArrayList<Long> pinnedMessages = new ArrayList<>();
     ArrayList<GroupUpObject> groupUpObjects = new ArrayList<>();
 
diff --git a/src/main/java/POGOs/Characters.java b/src/main/java/com/github/vaerys/pogos/Characters.java
similarity index 89%
rename from src/main/java/POGOs/Characters.java
rename to src/main/java/com/github/vaerys/pogos/Characters.java
index b81689e6..4b198e13 100644
--- a/src/main/java/POGOs/Characters.java
+++ b/src/main/java/com/github/vaerys/pogos/Characters.java
@@ -1,8 +1,9 @@
-package POGOs;
+package com.github.vaerys.pogos;
 
-import Main.Constants;
-import Main.Globals;
-import Objects.CharacterObject;
+import com.github.vaerys.interfaces.GuildFile;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.objects.CharacterObject;
 import sx.blah.discord.handle.obj.IGuild;
 import sx.blah.discord.handle.obj.IRole;
 import sx.blah.discord.handle.obj.IUser;
@@ -14,13 +15,12 @@
  * Created by Vaerys on 14/08/2016.
  */
 
-public class Characters {
-
+public class Characters extends GuildFile {
+    public static final String FILE_PATH = "Characters.json";
     boolean properlyInit = false;
     ArrayList<CharacterObject> characters = new ArrayList<>();
     private String rolePrefix = "";
 
-
     public boolean isProperlyInit() {
         return properlyInit;
     }
diff --git a/src/main/java/POGOs/Competition.java b/src/main/java/com/github/vaerys/pogos/Competition.java
similarity index 83%
rename from src/main/java/POGOs/Competition.java
rename to src/main/java/com/github/vaerys/pogos/Competition.java
index 6074916d..b1a51580 100644
--- a/src/main/java/POGOs/Competition.java
+++ b/src/main/java/com/github/vaerys/pogos/Competition.java
@@ -1,8 +1,9 @@
-package POGOs;
+package com.github.vaerys.pogos;
 
-import Main.Constants;
-import Objects.CompObject;
-import Objects.PollObject;
+import com.github.vaerys.interfaces.GuildFile;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.objects.CompObject;
+import com.github.vaerys.objects.PollObject;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -10,7 +11,8 @@
 /**
  * Created by Vaerys on 29/08/2016.
  */
-public class Competition {
+public class Competition extends GuildFile {
+    public static final String FILE_PATH = "Competition.json";
     boolean properlyInit = false;
     ArrayList<CompObject> entries = new ArrayList<>();
     ArrayList<String> voting = new ArrayList<>();
@@ -67,12 +69,11 @@ public String addVote(String voterID, String vote) {
                     int entry = Integer.parseInt(newVotes.get(i));
                     if (entry > entries.size()) {
                         //builder.append("    **Vote Not Counted. Reason: Number too high**\n");
-                    } else if(entry <= 0) {
+                    } else if (entry <= 0) {
                         //builder.append("    **Vote Not Counted. Reason: Number = 0\n");
-                    }
-                    else{
+                    } else {
                         userVotes.add("" + entry);
-                        builder.append(Constants.PREFIX_INDENT+"Entry: **" + entry + "**\n");
+                        builder.append(Constants.PREFIX_INDENT + "Entry: **" + entry + "**\n");
                         x++;
                     }
                 } catch (NumberFormatException e) {
@@ -83,7 +84,7 @@ public String addVote(String voterID, String vote) {
         if (newVotes.size() > voteLimit) {
             //builder.append("    **Rest of Votes Not Counted: Reason Max votes = " + Globals.voteLimit + "**\n");
         }
-        builder.append(Constants.PREFIX_INDENT+"Have been saved. you now have: **" + (voteLimit - userVotes.size() + 1) + "** Vote token(s) left.");
+        builder.append(Constants.PREFIX_INDENT + "Have been saved. you now have: **" + (voteLimit - userVotes.size() + 1) + "** Vote token(s) left.");
 
         StringBuilder finalVotes = new StringBuilder();
         for (String s : userVotes) {
diff --git a/src/main/java/POGOs/Config.java b/src/main/java/com/github/vaerys/pogos/Config.java
similarity index 89%
rename from src/main/java/POGOs/Config.java
rename to src/main/java/com/github/vaerys/pogos/Config.java
index 1737f5c8..c46a5568 100644
--- a/src/main/java/POGOs/Config.java
+++ b/src/main/java/com/github/vaerys/pogos/Config.java
@@ -1,8 +1,9 @@
-package POGOs;
+package com.github.vaerys.pogos;
 
-import Main.Constants;
-import Objects.DailyMessageObject;
-import Objects.RandomStatusObject;
+import com.github.vaerys.interfaces.GlobalFile;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.objects.DailyMessageObject;
+import com.github.vaerys.objects.RandomStatusObject;
 
 import java.time.DayOfWeek;
 import java.util.ArrayList;
@@ -10,7 +11,8 @@
 /**
  * Created by Vaerys on 14/01/2017.
  */
-public class Config {
+public class Config extends GlobalFile {
+    public static final String FILE_PATH = "Config.json";
     public boolean resetToDefault = false;
     public String botName = "S.A.I.L";
     public String creatorID = "153159020528533505";
@@ -53,7 +55,6 @@ public class Config {
         add(new RandomStatusObject("Wanderlust Rebirth", 1));
     }};
 
-
     public boolean initObject(Config config) {
         if (resetToDefault) {
             config = new Config();
diff --git a/src/main/java/POGOs/CustomCommands.java b/src/main/java/com/github/vaerys/pogos/CustomCommands.java
similarity index 70%
rename from src/main/java/POGOs/CustomCommands.java
rename to src/main/java/com/github/vaerys/pogos/CustomCommands.java
index 25568c27..51593dc2 100644
--- a/src/main/java/POGOs/CustomCommands.java
+++ b/src/main/java/com/github/vaerys/pogos/CustomCommands.java
@@ -1,13 +1,16 @@
-package POGOs;
+package com.github.vaerys.pogos;
 
-import Commands.CommandObject;
-import Handlers.FileHandler;
-import Handlers.XpHandler;
-import Main.Constants;
-import Main.Globals;
-import Main.Utility;
-import Objects.BlackListObject;
-import Objects.CCommandObject;
+import com.github.vaerys.commands.CommandObject;
+import com.github.vaerys.handlers.FileHandler;
+import com.github.vaerys.handlers.XpHandler;
+import com.github.vaerys.interfaces.GuildFile;
+import com.github.vaerys.main.Constants;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.masterobjects.UserObject;
+import com.github.vaerys.objects.BlackListObject;
+import com.github.vaerys.objects.CCommandObject;
 import org.apache.commons.lang3.StringUtils;
 import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IGuild;
@@ -25,9 +28,16 @@
 /**
  * Created by Vaerys on 14/08/2016.
  */
-public class CustomCommands {
+public class CustomCommands extends GuildFile {
+    public static final String FILE_PATH = "Custom_Commands.json";
     boolean properlyInit = false;
-    ArrayList<BlackListObject> blackList = new ArrayList<>();
+    ArrayList<BlackListObject> blackList = new ArrayList<BlackListObject>() {{
+        add(new BlackListObject("<@", "Please do not put **mentions** in Custom Commands."));
+        add(new BlackListObject("discord.gg", "Please do not put **invites** in Custom Commands."));
+        add(new BlackListObject("discordapp.com/Invite/", "Please do not put **invites** in Custom Commands."));
+        add(new BlackListObject("@everyone", "Please go not put **mentions** in Custom Commands."));
+        add(new BlackListObject("@here", "Please go not put **mentions** in Custom Commands."));
+    }};
     ArrayList<CCommandObject> commands = new ArrayList<>();
 
     public boolean isProperlyInit() {
@@ -38,23 +48,23 @@ public void setProperlyInit(boolean properlyInit) {
         this.properlyInit = properlyInit;
     }
 
-    public int maxCCs(CommandObject object) {
+    public int maxCCs(UserObject user, GuildObject guild) {
         // TODO: 03/07/2017 move this to grant ccs based on reward roles.
         int total = 10;
-        boolean hasManagePerms = Utility.testForPerms(new Permissions[]{Permissions.MANAGE_MESSAGES}, object.author, object.guild);
-        boolean hasAdminPerms = Utility.testForPerms(new Permissions[]{Permissions.ADMINISTRATOR}, object.author, object.guild);
+        boolean hasManagePerms = Utility.testForPerms(new Permissions[]{Permissions.MANAGE_MESSAGES}, user.get(), guild.get());
+        boolean hasAdminPerms = Utility.testForPerms(new Permissions[]{Permissions.ADMINISTRATOR}, user.get(), guild.get());
         if (hasManagePerms) {
             total += 50;
         }
         if (hasAdminPerms) {
             total += 100;
         }
-        if (object.guildConfig.modulePixels) {
-            total += (XpHandler.getRewardCount(object, object.author) * 10);
-        }else{
+        if (guild.config.modulePixels) {
+            total += (XpHandler.getRewardCount(guild, user.stringID) * 10);
+        } else {
             total += 40;
         }
-        if (object.guild.getOwner().getStringID().equals(object.authorSID)) {
+        if (guild.get().getOwner().getStringID().equals(user.stringID)) {
             total = 200;
         }
         return total;
@@ -76,21 +86,21 @@ public String addCommand(boolean isLocked, String commandName, String commandCon
         if (StringUtils.countMatches(commandContents, "#embedImage#{") > 1) {
             return "> Custom Commands Cannot have multiple #embedImage# tags";
         }
-        limitCCs = maxCCs(object);
+        limitCCs = maxCCs(object.user, object.guild);
 
         for (CCommandObject c : commands) {
             if (c.getName().equalsIgnoreCase(commandName)) {
                 return "> Command name already in use.";
             }
-            if (c.getUserID().equals(object.authorSID)) {
+            if (c.getUserID().equals(object.user.stringID)) {
                 counter++;
             }
         }
         if (counter < limitCCs) {
             if (commandContents.length() < 1500) {
-                commands.add(new CCommandObject(isLocked, object.authorSID, commandName, commandContents, isShitPost));
+                commands.add(new CCommandObject(isLocked, object.user.stringID, commandName, commandContents, isShitPost));
                 return "> Command Added you have " + (limitCCs - counter - 1) + " custom command slots left.\n" +
-                        Constants.PREFIX_INDENT + "You can run your new command by performing `" + object.guildConfig.getPrefixCC() + commandName + "`.";
+                        Constants.PREFIX_INDENT + "You can run your new command by performing `" + object.guild.config.getPrefixCC() + commandName + "`.";
             } else {
                 return "> Command Contents to long. max length = 1500 chars.";
             }
@@ -100,16 +110,18 @@ public String addCommand(boolean isLocked, String commandName, String commandCon
     }
 
     public void initCustomCommands() {
-        if (!properlyInit) {
-            blackList.add(new BlackListObject("<@", "Please do not put **mentions** in Custom Commands."));
-            blackList.add(new BlackListObject("discord.gg", "Please do not put **invites** in Custom Commands."));
-            blackList.add(new BlackListObject("discordapp.com/Invite/", "Please do not put **invites** in Custom Commands."));
-            blackList.add(new BlackListObject("@everyone", "Please go not put **mentions** in Custom Commands."));
-            blackList.add(new BlackListObject("@here", "Please go not put **mentions** in Custom Commands."));
+        boolean echoExists = false;
+        boolean wikiExists = false;
+        for (CCommandObject c : commands) {
+            if (c.getName().equalsIgnoreCase("Echo"))
+                echoExists = true;
+            if (c.getName().equalsIgnoreCase("Wiki"))
+                wikiExists = true;
+        }
+        if (!echoExists)
             commands.add(new CCommandObject(true, Globals.getClient().getOurUser().getStringID(), "Echo", "#args#", false));
+        if (!wikiExists)
             commands.add(new CCommandObject(true, Globals.getClient().getOurUser().getStringID(), "Wiki", "http://starbounder.org/Special:Search/#args##regex#{ ;_}", false));
-            commands.add(new CCommandObject(true, Globals.getClient().getOurUser().getStringID(), "CCAllowance", "Base User **+10**\nTrusted Role **+20**\nManage Messages Perm **+40**\nAdministrator perms **+100**", false));
-        }
     }
 
     public ArrayList<CCommandObject> getCommandList() {
@@ -132,7 +144,7 @@ public String sendCCasJSON(String channelID, String commandName) {
                 try {
                     Thread.sleep(5000);
                 } catch (InterruptedException e) {
-                    e.printStackTrace();
+                    Utility.sendStack(e);
                 }
                 file.delete();
                 return null;
@@ -164,11 +176,11 @@ public String delCommand(String args, IUser author, IGuild guild) {
         return Constants.ERROR_CC_NOT_FOUND;
     }
 
-    public String getUserCommandCount(CommandObject object) {
+    public String getUserCommandCount(UserObject user, GuildObject guild) {
         int totalCommands = 0;
-        int ccMax = maxCCs(object);
+        int ccMax = maxCCs(user, guild);
         for (CCommandObject c : commands) {
-            if (c.getUserID().equals(object.authorSID)) {
+            if (c.getUserID().equals(user.stringID)) {
                 totalCommands++;
             }
         }
diff --git a/src/main/java/com/github/vaerys/pogos/DailyMessages.java b/src/main/java/com/github/vaerys/pogos/DailyMessages.java
new file mode 100644
index 00000000..a0abe416
--- /dev/null
+++ b/src/main/java/com/github/vaerys/pogos/DailyMessages.java
@@ -0,0 +1,53 @@
+package com.github.vaerys.pogos;
+
+import com.github.vaerys.interfaces.GlobalFile;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.objects.DailyMessageObject;
+import com.github.vaerys.objects.DailyUserMessageObject;
+import com.github.vaerys.objects.QueueObject;
+
+import java.time.DayOfWeek;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+
+public class DailyMessages extends GlobalFile {
+    ArrayList<DailyUserMessageObject> dailyMessages = new ArrayList<>();
+    ArrayList<QueueObject> queuedRequests = new ArrayList<>();
+    public static final String FILE_PATH = "DailyMessages.json";
+
+    public ArrayList<DailyUserMessageObject> getMessages() {
+        return dailyMessages;
+    }
+
+    public ArrayList<QueueObject> getQueue() {
+        return queuedRequests;
+    }
+
+    public ArrayList<DailyUserMessageObject> getDailyMessages(DayOfWeek day) {
+        ArrayList dailyMessages = new ArrayList();
+        for (DailyUserMessageObject d : this.dailyMessages) {
+            if (d.getDay() == day) {
+                dailyMessages.add(d);
+            }
+        }
+        return dailyMessages;
+    }
+
+    public DailyUserMessageObject getMessageByUID(long dailyMessageID) {
+        DayOfWeek today = ZonedDateTime.now(ZoneOffset.UTC).getDayOfWeek();
+        DailyMessageObject configMessage = null;
+        for (DailyMessageObject d : Globals.configDailyMessages) {
+            if (d.getDayOfWeek() == today) {
+                configMessage = d;
+            }
+        }
+        DailyUserMessageObject object = new DailyUserMessageObject(configMessage.getContents(), today, Globals.client.getOurUser().getLongID(), 0000);
+        for (DailyUserMessageObject d : dailyMessages) {
+            if (d.getUID() == dailyMessageID) {
+                return d;
+            }
+        }
+        return object;
+    }
+}
diff --git a/src/main/java/com/github/vaerys/pogos/GlobalData.java b/src/main/java/com/github/vaerys/pogos/GlobalData.java
new file mode 100644
index 00000000..9ecf4a13
--- /dev/null
+++ b/src/main/java/com/github/vaerys/pogos/GlobalData.java
@@ -0,0 +1,82 @@
+package com.github.vaerys.pogos;
+
+
+import com.github.vaerys.interfaces.GlobalFile;
+import com.github.vaerys.objects.PatchObject;
+import com.github.vaerys.objects.ReminderObject;
+
+import java.util.ArrayList;
+
+/**
+ * Created by Vaerys on 10/02/2017.
+ */
+public class GlobalData extends GlobalFile {
+    public static final String FILE_PATH = "Global_Data.json";
+    ArrayList<String> blockedFromDMS = new ArrayList<>();
+    ArrayList<ReminderObject> reminders = new ArrayList<>();
+    private ArrayList<PatchObject> patches = new ArrayList<>();
+    private ArrayList<String> globalPatches = new ArrayList<>();
+
+//    private ArrayList<QueueObject> queuedRequests = new ArrayList<>();
+//    private ArrayList<DailyUserMessageObject> dailyMessages = new ArrayList<>();
+
+    public ArrayList<PatchObject> getPatches() {
+        return patches;
+    }
+
+    public ArrayList<String> getBlockedFromDMS() {
+        return blockedFromDMS;
+    }
+
+//    public ArrayList<QueueObject> getQueuedRequests() {
+//        return queuedRequests;
+//    }
+
+    public boolean blockUserFromDMS(String userID) {
+        blockedFromDMS.add(userID);
+        return true;
+    }
+
+
+    public ArrayList<ReminderObject> getReminders() {
+        return reminders;
+    }
+
+    public void addReminder(ReminderObject object) {
+        reminders.add(object);
+    }
+
+    public void removeReminder(String userID) {
+        for (int i = 0; i < reminders.size(); i++) {
+            if (reminders.get(i).getUserID().equals(userID)) {
+                reminders.remove(i);
+            }
+        }
+    }
+
+    public void removeReminder(String userID, String reminder) {
+        for (int i = 0; i < reminders.size(); i++) {
+            if (reminders.get(i).getUserID().equals(userID) && reminders.get(i).getMessage().equals(reminder)) {
+                reminders.remove(i);
+            }
+        }
+    }
+
+    public ArrayList<String> getGlobalPatches() {
+        return globalPatches;
+    }
+
+//    public ArrayList<DailyUserMessageObject> getMessages() {
+//        return dailyMessages;
+//    }
+
+//    public ArrayList<DailyUserMessageObject> getMessages(DayOfWeek day) {
+//        ArrayList dailyMessages = new ArrayList();
+//        for (DailyUserMessageObject d: this.dailyMessages){
+//            if (d.getDay() == day){
+//                dailyMessages.add(d);
+//            }
+//        }
+//        return dailyMessages;
+//    }
+}
diff --git a/src/main/java/POGOs/GuildConfig.java b/src/main/java/com/github/vaerys/pogos/GuildConfig.java
similarity index 83%
rename from src/main/java/POGOs/GuildConfig.java
rename to src/main/java/com/github/vaerys/pogos/GuildConfig.java
index 6414282b..aab7d31a 100644
--- a/src/main/java/POGOs/GuildConfig.java
+++ b/src/main/java/com/github/vaerys/pogos/GuildConfig.java
@@ -1,24 +1,28 @@
-package POGOs;
-
-import Enums.UserSetting;
-import Main.Globals;
-import Main.Utility;
-import Objects.BlackListObject;
-import Objects.ChannelSettingObject;
-import Objects.OffenderObject;
-import Objects.RewardRoleObject;
+package com.github.vaerys.pogos;
+
+import com.github.vaerys.enums.UserSetting;
+import com.github.vaerys.interfaces.GuildFile;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.masterobjects.GuildObject;
+import com.github.vaerys.objects.ChannelSettingObject;
+import com.github.vaerys.objects.OffenderObject;
+import com.github.vaerys.objects.RewardRoleObject;
 import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IGuild;
 import sx.blah.discord.handle.obj.IRole;
 import sx.blah.discord.handle.obj.IUser;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.ListIterator;
+import java.util.stream.Collectors;
 
 /**
  * Created by Vaerys on 03/08/2016.
  */
-public class GuildConfig {
+public class GuildConfig extends GuildFile {
+    public static final String FILE_PATH = "Guild_Config.json";
     String prefixCommand = Globals.defaultPrefixCommand;
     String prefixCC = Globals.defaultPrefixCC;
     boolean properlyInit = false;
@@ -26,7 +30,7 @@ public class GuildConfig {
     long guildID = -1;
     //toggles
     //--Auto Tasks
-    public boolean dailyMessage = true;
+    public boolean dailyMessage = false;
     public boolean artPinning = false;
     public boolean autoArtPinning = false;
     public boolean xpDecay = false;
@@ -72,6 +76,7 @@ public class GuildConfig {
     public int messageLimit = 10;
     public int xpRate = 20;
     public float xpModifier = 1;
+    public long lastDailyMessageID = -1;
 
     public long xpDeniedRoleID = -1;
     public long topTenRoleID = -1;
@@ -94,7 +99,6 @@ public class GuildConfig {
     ArrayList<RewardRoleObject> rewardRoles = new ArrayList<>();
     ArrayList<OffenderObject> repeatOffenders = new ArrayList<>();
 
-
     public ArrayList<RewardRoleObject> getRewardRoles() {
         return rewardRoles;
     }
@@ -127,10 +131,6 @@ public void addChannelSetting(String type, String id) {
         channelSettings.add(new ChannelSettingObject(type, id));
     }
 
-    public void initConfig() {
-        //lol why is this here again??
-    }
-
     public void setGuildName(String guildName) {
         this.guildName = guildName;
     }
@@ -249,11 +249,9 @@ public boolean testIsTrusted(IUser author, IGuild guild) {
         if (trustedRoleIDs.size() == 0) {
             return true;
         } else {
-            for (Long task : trustedRoleIDs) {
-                for (IRole role : author.getRolesForGuild(guild)) {
-                    if (role.getStringID().equals(task)) {
-                        return true;
-                    }
+            for (IRole r : author.getRolesForGuild(guild)) {
+                if (isRoleTrusted(r.getLongID())) {
+                    return true;
                 }
             }
             return false;
@@ -310,6 +308,15 @@ public boolean isRoleTrusted(long id) {
         return trustedRoleIDs.contains(id);
     }
 
+    public boolean isRoleReward(long id) {
+        validateRoles();
+        if (id == topTenRoleID) {
+            return true;
+        }
+        ArrayList<Long> ids = rewardRoles.stream().map(RewardRoleObject::getRoleID).collect(Collectors.toCollection(ArrayList::new));
+        return ids.contains(id);
+    }
+
     public int getMaxMentionLimit() {
         return maxMentionLimit;
     }
@@ -354,23 +361,15 @@ public RewardRoleObject getLowerReward(RewardRoleObject rewardRole) {
         return lowerReward;
     }
 
-    public ArrayList<RewardRoleObject> getAllRewards(long rewardID) {
+    public ArrayList<RewardRoleObject> getAllRewards(long currentLevel) {
         validateRoles();
-        if (rewardID == -1) {
-            return null;
-        }
-        ArrayList<RewardRoleObject> allRewards = new ArrayList<>();
-        RewardRoleObject topReward = getRewardRole(rewardID);
+        ArrayList<RewardRoleObject> rewards = new ArrayList<>();
         for (RewardRoleObject r : rewardRoles) {
-            if (r.getLevel() <= topReward.getLevel()) {
-                allRewards.add(r);
+            if (r.getLevel() <= currentLevel) {
+                rewards.add(r);
             }
         }
-        if (allRewards.size() == 0) {
-            return null;
-        } else {
-            return allRewards;
-        }
+        return rewards;
     }
 
     public RewardRoleObject lowestReward() {
@@ -436,4 +435,35 @@ public void setJoinMessage(String args) {
     public ArrayList<String> getXPDeniedPrefixes() {
         return XPDeniedPrefixes;
     }
+
+    public RewardRoleObject getCurrentReward(long currentLevel) {
+        RewardRoleObject currentReward = null;
+        for (RewardRoleObject r : rewardRoles) {
+            if (r.getLevel() <= currentLevel) {
+                if (currentReward == null) {
+                    currentReward = r;
+                } else {
+                    if (currentReward.getLevel() < r.getLevel()) {
+                        currentReward = r;
+                    }
+                }
+            }
+        }
+        return currentReward;
+    }
+
+    public List<IChannel> getChannelsByType(String type, GuildObject guild) {
+        List<IChannel> channels = new ArrayList<>();
+        for (ChannelSettingObject c : channelSettings) {
+            if (c.getType().equalsIgnoreCase(type)) {
+                for (String s : c.getChannelIDs()) {
+                    IChannel channel = guild.get().getChannelByID(s);
+                    if (channel != null) {
+                        channels.add(channel);
+                    }
+                }
+            }
+        }
+        return channels;
+    }
 }
diff --git a/src/main/java/POGOs/GuildUsers.java b/src/main/java/com/github/vaerys/pogos/GuildUsers.java
similarity index 55%
rename from src/main/java/POGOs/GuildUsers.java
rename to src/main/java/com/github/vaerys/pogos/GuildUsers.java
index 385f84d2..06ddeb30 100644
--- a/src/main/java/POGOs/GuildUsers.java
+++ b/src/main/java/com/github/vaerys/pogos/GuildUsers.java
@@ -1,24 +1,29 @@
-package POGOs;
+package com.github.vaerys.pogos;
 
-import Main.Utility;
-import Objects.UserCountDown;
-import Objects.UserTypeObject;
+import com.github.vaerys.interfaces.GuildFile;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.ProfileObject;
+import com.github.vaerys.objects.UserCountDown;
+import com.google.gson.annotations.SerializedName;
 
 import java.util.ArrayList;
 
 /**
  * Created by Vaerys on 03/02/2017.
  */
-public class GuildUsers {
+public class GuildUsers extends GuildFile {
+    public static final String FILE_PATH = "Guild_Users.json";
     private boolean properlyInit;
-    public ArrayList<UserTypeObject> users = new ArrayList<>();
+    // TODO: 12/08/2017 make this just a liiitle bit less of a hack.
+    @SerializedName("users")
+    public ArrayList<ProfileObject> profiles = new ArrayList<>();
     public ArrayList<UserCountDown> mutedUsers = new ArrayList<>();
 
-    public ArrayList<UserTypeObject> getUsers() {
-        return users;
+    public ArrayList<ProfileObject> getProfiles() {
+        return profiles;
     }
 
-    public boolean muteUser(String userID, long time, String guildID) {
+    public boolean muteUser(String userID, long time, long guildID) {
         boolean found = false;
         for (UserCountDown c : mutedUsers) {
             if (c.getID().equals(userID)) {
@@ -32,7 +37,7 @@ public boolean muteUser(String userID, long time, String guildID) {
         return Utility.muteUser(guildID, userID, true);
     }
 
-    public boolean unMuteUser(String userID, String guildID) {
+    public boolean unMuteUser(String userID, long guildID) {
         for (int i = 0; i < mutedUsers.size(); i++) {
             if (mutedUsers.get(i).getID().equals(userID)) {
                 mutedUsers.remove(i);
@@ -54,16 +59,20 @@ public ArrayList<UserCountDown> getMutedUsers() {
     }
 
     public void addUser(String id) {
-        UserTypeObject user = new UserTypeObject(id);
-        users.add(user);
+        ProfileObject user = new ProfileObject(id);
+        profiles.add(user);
     }
 
-    public UserTypeObject getUserByID(String authorSID) {
-        for (UserTypeObject u : users) {
+    public ProfileObject getUserByID(String authorSID) {
+        for (ProfileObject u : profiles) {
             if (u.getID().equalsIgnoreCase(authorSID)) {
                 return u;
             }
         }
         return null;
     }
+
+    public void addUser(ProfileObject profile) {
+        profiles.add(profile);
+    }
 }
diff --git a/src/main/java/POGOs/Servers.java b/src/main/java/com/github/vaerys/pogos/Servers.java
similarity index 88%
rename from src/main/java/POGOs/Servers.java
rename to src/main/java/com/github/vaerys/pogos/Servers.java
index 8d6b15da..df84e423 100644
--- a/src/main/java/POGOs/Servers.java
+++ b/src/main/java/com/github/vaerys/pogos/Servers.java
@@ -1,9 +1,10 @@
-package POGOs;
+package com.github.vaerys.pogos;
 
-import Main.Globals;
-import Main.Utility;
-import Objects.BlackListObject;
-import Objects.ServerObject;
+import com.github.vaerys.interfaces.GuildFile;
+import com.github.vaerys.main.Globals;
+import com.github.vaerys.main.Utility;
+import com.github.vaerys.objects.BlackListObject;
+import com.github.vaerys.objects.ServerObject;
 import org.apache.commons.lang3.StringUtils;
 import sx.blah.discord.handle.obj.IGuild;
 import sx.blah.discord.handle.obj.Permissions;
@@ -14,7 +15,8 @@
 /**
  * Created by Vaerys on 14/08/2016.
  */
-public class Servers {
+public class Servers extends GuildFile {
+    public static final String FILE_PATH = "Servers.json";
     boolean properlyInit = false;
     ArrayList<BlackListObject> blackList = new ArrayList<>();
     ArrayList<ServerObject> servers = new ArrayList<>();
@@ -149,19 +151,6 @@ public String deleteServer(String userID, String serverName, IGuild guild) {
         return "> Server with that name not found.";
     }
 
-    public String getServer(String serverName, IGuild guild) {
-        for (ServerObject s : servers) {
-            if (s.getName().equalsIgnoreCase(serverName)) {
-                StringBuilder builder = new StringBuilder();
-                builder.append("**" + s.getName() + "**\n");
-                builder.append("**IP:** " + s.getServerIP() + " **Port:** " + s.getServerPort() + "\n");
-                builder.append("**Listing Creator:** " + guild.getUserByID(s.getCreatorID()).getDisplayName(guild) + "\n");
-                builder.append(s.getServerDesc());
-                return builder.toString();
-            }
-        }
-        return "> Server with that name not found.";
-    }
 }
 
 
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index d8b3f752..30e5a6c4 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- This file is not essential but helps to get you used to logback -->
-<!-- Put this file under src/main/resources folder -->
+<!-- Put this file under src/com.github.vaerys.main/resources folder -->
 
 <configuration scan="true">
     <!-- Avoid logger spam from web socket -->
diff --git a/target/JavaDiscordSAILv2.jar b/target/JavaDiscordSAILv2.jar
index c0e7094f..a39011d9 100644
Binary files a/target/JavaDiscordSAILv2.jar and b/target/JavaDiscordSAILv2.jar differ
diff --git a/target/classes/logback.xml b/target/classes/logback.xml
index d8b3f752..30e5a6c4 100644
--- a/target/classes/logback.xml
+++ b/target/classes/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- This file is not essential but helps to get you used to logback -->
-<!-- Put this file under src/main/resources folder -->
+<!-- Put this file under src/com.github.vaerys.main/resources folder -->
 
 <configuration scan="true">
     <!-- Avoid logger spam from web socket -->
diff --git a/target/classes/project.properties b/target/classes/project.properties
index 36ebb44d..7c498081 100644
--- a/target/classes/project.properties
+++ b/target/classes/project.properties
@@ -1 +1 @@
-version=2.8.2
\ No newline at end of file
+version=2.8.3
\ No newline at end of file
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
index 6b799247..b51a7903 100644
--- a/target/maven-archiver/pom.properties
+++ b/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Aug 01 17:01:18 AEST 2017
-version=2.8.2
+#Tue Aug 22 14:38:25 AEST 2017
+version=2.8.3
 groupId=com.github.vaerys
 artifactId=DiscordSAIL
diff --git a/target/original-JavaDiscordSAILv2.jar b/target/original-JavaDiscordSAILv2.jar
index ca0c0e4c..b12ed9b5 100644
Binary files a/target/original-JavaDiscordSAILv2.jar and b/target/original-JavaDiscordSAILv2.jar differ
diff --git a/website.blacklist b/website.blacklist
index 0a31d71c..9270dccb 100644
--- a/website.blacklist
+++ b/website.blacklist
@@ -943,7 +943,7 @@ nextgenstats.com
 nht-2.extreme-dm.com
 nl.nedstatbasic.net
 o.addthis.com
-objects.tremormedia.com
+com.github.vaerys.objects.tremormedia.com
 okcounter.com
 omniture.theglobeandmail.com
 omtrdc.net