diff --git a/.gradle/2.13/taskArtifacts/cache.properties.lock b/.gradle/2.13/taskArtifacts/cache.properties.lock
index 02ef9cd..f0bb6bc 100644
Binary files a/.gradle/2.13/taskArtifacts/cache.properties.lock and b/.gradle/2.13/taskArtifacts/cache.properties.lock differ
diff --git a/.gradle/2.13/taskArtifacts/fileHashes.bin b/.gradle/2.13/taskArtifacts/fileHashes.bin
index ca82192..eaeec7e 100644
Binary files a/.gradle/2.13/taskArtifacts/fileHashes.bin and b/.gradle/2.13/taskArtifacts/fileHashes.bin differ
diff --git a/.gradle/2.13/taskArtifacts/fileSnapshots.bin b/.gradle/2.13/taskArtifacts/fileSnapshots.bin
index f6c5b64..73133bb 100644
Binary files a/.gradle/2.13/taskArtifacts/fileSnapshots.bin and b/.gradle/2.13/taskArtifacts/fileSnapshots.bin differ
diff --git a/.gradle/2.13/taskArtifacts/taskArtifacts.bin b/.gradle/2.13/taskArtifacts/taskArtifacts.bin
index e219dc6..85463a5 100644
Binary files a/.gradle/2.13/taskArtifacts/taskArtifacts.bin and b/.gradle/2.13/taskArtifacts/taskArtifacts.bin differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3ddfb23..6046760 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,11 @@
   <component name="ChangeListManager">
     <list default="true" id="d884bc5a-63a1-4e03-b68b-617ebe9b8e2a" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+<<<<<<< HEAD
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/twitter/TwitterModule.java" afterPath="$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/twitter/TwitterModule.java" />
+=======
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/general/MusicCommand.java" afterPath="$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/general/MusicCommand.java" />
+>>>>>>> 72304bb14ceff865c5e525ea00e77760a05af553
     </list>
     <ignored path="Rixa.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -41,16 +45,26 @@
     <favorites_list name="Rixa" />
   </component>
   <component name="FileEditorManager">
+<<<<<<< HEAD
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="MessageEvent.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/events/MessageEvent.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="224">
+              <caret line="60" column="33" lean-forward="true" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+=======
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
       <file leaf-file-name="Rixa.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/Rixa.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1376">
+            <state relative-caret-position="1411">
               <caret line="123" column="32" lean-forward="false" selection-start-line="123" selection-start-column="32" selection-end-line="123" selection-end-column="32" />
               <folding>
                 <element signature="e#5315#5316#0" expanded="true" />
                 <element signature="e#5362#5363#0" expanded="true" />
                 <marker date="1501259767955" expanded="true" signature="4804:4935" ph="{...}" />
+                <marker date="1501259767955" expanded="true" signature="5002:5122" ph="{...}" />
+                <marker date="1501259767955" expanded="true" signature="5172:5283" ph="{...}" />
               </folding>
             </state>
           </provider>
@@ -59,7 +73,7 @@
       <file leaf-file-name="TwitterModule.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/twitter/TwitterModule.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="784">
+            <state relative-caret-position="918">
               <caret line="58" column="5" lean-forward="false" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -71,7 +85,7 @@
       <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/build.gradle">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="432">
+            <state relative-caret-position="459">
               <caret line="27" column="47" lean-forward="false" selection-start-line="27" selection-start-column="47" selection-end-line="27" selection-end-column="47" />
               <folding>
                 <marker date="1501259767938" expanded="true" signature="478:725" ph="{...}" />
@@ -83,7 +97,7 @@
       <file leaf-file-name="Database.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/database/sql/mysql/Database.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="656">
+            <state relative-caret-position="262">
               <caret line="48" column="19" lean-forward="false" selection-start-line="48" selection-start-column="19" selection-end-line="48" selection-end-column="19" />
               <folding />
             </state>
@@ -93,7 +107,7 @@
       <file leaf-file-name="DatabaseManager.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/database/sql/DatabaseManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1728">
+            <state relative-caret-position="1836">
               <caret line="117" column="31" lean-forward="false" selection-start-line="117" selection-start-column="31" selection-end-line="117" selection-end-column="31" />
               <folding />
             </state>
@@ -103,17 +117,25 @@
       <file leaf-file-name="MusicCommand.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/general/MusicCommand.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="256">
-              <caret line="158" column="56" lean-forward="true" selection-start-line="158" selection-start-column="56" selection-end-line="158" selection-end-column="56" />
+            <state relative-caret-position="149">
+              <caret line="221" column="36" lean-forward="false" selection-start-line="221" selection-start-column="36" selection-end-line="221" selection-end-column="36" />
+>>>>>>> 72304bb14ceff865c5e525ea00e77760a05af553
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
+      <file leaf-file-name="CommandHandler.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/handlers/CommandHandler.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="289">
+              <caret line="28" column="32" lean-forward="false" selection-start-line="28" selection-start-column="32" selection-end-line="28" selection-end-column="32" />
+=======
       <file leaf-file-name="MySQL.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/database/sql/mysql/mysql/MySQL.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1168">
+            <state relative-caret-position="618">
               <caret line="77" column="41" lean-forward="false" selection-start-line="77" selection-start-column="41" selection-end-line="77" selection-end-column="41" />
               <folding />
             </state>
@@ -135,6 +157,7 @@
           <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" />
+>>>>>>> 72304bb14ceff865c5e525ea00e77760a05af553
               <folding />
             </state>
           </provider>
@@ -143,9 +166,15 @@
       <file leaf-file-name="ActionManager.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/action/ActionManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="272">
+            <state relative-caret-position="289">
               <caret line="21" column="5" lean-forward="false" selection-start-line="21" selection-start-column="5" selection-end-line="21" selection-end-column="5" />
-              <folding />
+              <folding>
+                <element signature="imports" expanded="false" />
+                <element signature="e#475#476#0" expanded="false" />
+                <element signature="e#523#524#0" expanded="false" />
+                <element signature="e#938#939#0" expanded="false" />
+                <element signature="e#994#995#0" expanded="false" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -174,13 +203,21 @@
       <find>The configuration</find>
       <find>getMessage(</find>
       <find>Adding to queue</find>
-      <find>leave</find>
       <find>log_channel</find>
       <find>testin</find>
       <find>testing</find>
       <find>RixaManager</find>
       <find>addPerm</find>
       <find>list</find>
+      <find>setString</find>
+      <find>openConn</find>
+      <find>join</find>
+      <find>&quot;play&quot;</find>
+      <find>&quot;join&quot;</find>
+      <find>leave</find>
+      <find>disable</find>
+      <find>enable</find>
+      <find>setEna</find>
     </findStrings>
     <replaceStrings>
       <replace>setTitle(String.format(&quot;Help: %s&quot;, title))</replace>
@@ -618,7 +655,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/music/youtube/YoutubeSearch.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/database/Data.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/handlers/Command.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/music/TrackScheduler.java" />
@@ -639,10 +675,8 @@
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/guild/RixaManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/events/VoiceChannel.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/BatchMoveCommand.java" />
-        <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/ConfigCommand.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/general/ServerInfoCommand.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/mod/DeleteMessagesCommand.java" />
-        <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/handlers/CommandHandler.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/reactions/react/HelpReaction.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/reactions/react/ConfigReaction.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/events/MemberEvent.java" />
@@ -658,17 +692,26 @@
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/TwitterCommand.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/twitter/TwitterModule.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/guild/RixaGuild.java" />
-        <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/levels/LevelsModule.java" />
-        <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/general/LevelsCommand.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/guild/user/UserData.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/extras/polls/Poll.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/Rixa.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/utils/MessageBuilder.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/general/PingCommand.java" />
+<<<<<<< HEAD
+        <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/database/sql/DatabaseManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/database/sql/mysql/mysql/MySQL.java" />
+=======
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/database/sql/mysql/mysql/MySQL.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/events/MessageEvent.java" />
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/database/sql/DatabaseManager.java" />
+>>>>>>> 72304bb14ceff865c5e525ea00e77760a05af553
         <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/general/MusicCommand.java" />
+        <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/LevelsManagementCommand.java" />
+        <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/general/LevelsCommand.java" />
+        <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/events/MessageEvent.java" />
+        <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/levels/LevelsModule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/ConfigCommand.java" />
+        <option value="$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/handlers/CommandHandler.java" />
       </list>
     </option>
   </component>
@@ -681,11 +724,19 @@
   <component name="MavenProjectNavigator">
     <treeState />
   </component>
+<<<<<<< HEAD
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1256" />
+    <option name="height" value="1047" />
+=======
   <component name="ProjectFrameBounds">
     <option name="x" value="-9" />
     <option name="y" value="-9" />
     <option name="width" value="1298" />
     <option name="height" value="1006" />
+>>>>>>> 72304bb14ceff865c5e525ea00e77760a05af553
   </component>
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="1" id="Add" />
@@ -705,9 +756,108 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+<<<<<<< HEAD
+=======
       <pane id="Scope" />
+>>>>>>> 72304bb14ceff865c5e525ea00e77760a05af553
+      <pane id="Scratches" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
+<<<<<<< HEAD
+          <expand>
+            <path>
+              <item name="Rixa" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Rixa" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="Rixa" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Rixa" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Rixa" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Rixa" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="Rixa" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Rixa" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Rixa" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Rixa" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="rixa" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Rixa" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Rixa" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="rixa" type="462c0819:PsiDirectoryNode" />
+              <item name="commands" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Rixa" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Rixa" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="rixa" type="462c0819:PsiDirectoryNode" />
+              <item name="commands" type="462c0819:PsiDirectoryNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Rixa" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Rixa" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="rixa" type="462c0819:PsiDirectoryNode" />
+              <item name="commands" type="462c0819:PsiDirectoryNode" />
+              <item name="general" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Rixa" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Rixa" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="rixa" type="462c0819:PsiDirectoryNode" />
+              <item name="events" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Rixa" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Rixa" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="rixa" type="462c0819:PsiDirectoryNode" />
+              <item name="guild" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Rixa" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Rixa" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="rixa" type="462c0819:PsiDirectoryNode" />
+              <item name="modules" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+=======
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="Rixa" />
@@ -731,11 +881,86 @@
               <option name="myItemId" value="src" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="org.jetbrains.plugins.gradle.projectView.GradleTreeStructureProvider$GradleSourceSetDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="rixa" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Rixa" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Rixa" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="org.jetbrains.plugins.gradle.projectView.GradleTreeStructureProvider$GradleSourceSetDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="rixa" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="commands" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Rixa" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Rixa" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="org.jetbrains.plugins.gradle.projectView.GradleTreeStructureProvider$GradleSourceSetDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="rixa" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="commands" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="general" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scratches" />
+>>>>>>> 72304bb14ceff865c5e525ea00e77760a05af553
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -771,6 +996,171 @@
       <recent name="me.savvy.rixa.commands.handlers" />
     </key>
   </component>
+  <component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
+    <UpdatedFiles>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Updated from server" />
+        <option name="myStatusName" value="Changed on server" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="CHANGED_ON_SERVER" />
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Updated" />
+          <option name="myStatusName" value="Changed" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="UPDATED" />
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/.gradle/2.13/taskArtifacts/cache.properties.lock</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/.gradle/2.13/taskArtifacts/fileHashes.bin</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/.gradle/2.13/taskArtifacts/fileSnapshots.bin</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/.gradle/2.13/taskArtifacts/taskArtifacts.bin</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/.idea/modules/Rixa_main.iml</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/.idea/modules/Rixa_test.iml</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/.idea/workspace.xml</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/build.gradle</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/build/tmp/jar/MANIFEST.MF</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/Rixa.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/BatchMoveCommand.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/ConfigCommand.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/general/MusicCommand.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/general/PingCommand.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/general/ServerInfoCommand.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/handlers/CommandHandler.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/mod/DeleteMessagesCommand.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/mod/MuteCommand.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/mod/PurgeMessagesCommand.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/filemanager/ConfigManager.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/filemanager/LanguageManager.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/events/BotEvent.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/events/MemberEvent.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/events/MessageEvent.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/extras/polls/Poll.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/guild/RixaGuild.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/levels/LevelsModule.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/reactions/react/ConfigReaction.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/reactions/react/HelpReaction.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/twitter/TwitterModule.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/utils/MessageBuilder.java</PATH>
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Created" />
+          <option name="myStatusName" value="Created" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="CREATED" />
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/AddRoleCommand.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/RemoveRoleCommand.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/TwitterCommand.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/general/LevelsCommand.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/events/VoiceChannel.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/guild/user/UserData.java</PATH>
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Deleted" />
+          <option name="myStatusName" value="Deleted" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="true" />
+          <option name="myId" value="REMOVED_FROM_REPOSITORY" />
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/.idea/libraries/Gradle__com_mashape_unirest_unirest_java_1_4_9.xml</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/.idea/libraries/Gradle__com_neovisionaries_nv_websocket_client_2_0.xml</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/.idea/libraries/Gradle__org_apache_httpcomponents_httpasyncclient_4_1_1.xml</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_nio_4_4_4.xml</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/.idea/libraries/Gradle__org_apache_httpcomponents_httpmime_4_5_2.xml</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/thunderbolt/Thunderbolt.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/thunderbolt/exceptions/FileLoadException.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/thunderbolt/io/ThunderFile.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/thunderbolt/io/ThunderboltThreadPool.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/thunderbolt/json/ItemList.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/thunderbolt/json/JSONArray.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/thunderbolt/json/JSONAware.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/thunderbolt/json/JSONException.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/thunderbolt/json/JSONObject.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/thunderbolt/json/JSONStreamAware.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/thunderbolt/json/JSONString.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/thunderbolt/json/JSONTokener.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/thunderbolt/utils/Validator.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/src/main/java/me/savvy/rixa/guild/RixaManager.java</PATH>
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Restored" />
+          <option name="myStatusName" value="Will be restored" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="RESTORED" />
+        </FILE-GROUP>
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Modified" />
+        <option name="myStatusName" value="Modified" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MODIFIED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Skipped" />
+        <option name="myStatusName" value="Skipped" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="SKIPPED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged with conflicts" />
+        <option name="myStatusName" value="Will be merged with conflicts" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED_WITH_CONFLICTS" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged with tree conflicts" />
+        <option name="myStatusName" value="Merged with tree conflicts" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged with property conflicts" />
+        <option name="myStatusName" value="Will be merged with property conflicts" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged" />
+        <option name="myStatusName" value="Will be merged" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Not in repository" />
+        <option name="myStatusName" value="Not in repository" />
+        <option name="mySupportsDeletion" value="true" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="UNKNOWN" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Locally added" />
+        <option name="myStatusName" value="Locally added" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="LOCALLY_ADDED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Locally removed" />
+        <option name="myStatusName" value="Locally removed" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="LOCALLY_REMOVED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Switched" />
+        <option name="myStatusName" value="Switched" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="SWITCHED" />
+      </FILE-GROUP>
+    </UpdatedFiles>
+  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -965,6 +1355,24 @@
       <option name="WORKING_DIRECTORY" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs />
+<<<<<<< HEAD
+      <patterns />
+    </configuration>
+    <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="Rixa" />
+      <envs />
+    </configuration>
+    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+=======
+>>>>>>> 72304bb14ceff865c5e525ea00e77760a05af553
       <module name="" />
       <option name="SCRIPT_NAME" value="" />
       <option name="PARAMETERS" value="" />
@@ -1037,19 +1445,6 @@
       <envs />
       <method />
     </configuration>
-    <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="Rixa" />
-      <envs />
-      <method />
-    </configuration>
     <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <option name="filePath" />
@@ -1168,14 +1563,7 @@
       <option name="project" value="LOCAL" />
       <updated>1501261410126</updated>
     </task>
-    <task id="LOCAL-00002" summary="Typo on operator (woops)">
-      <created>1501261606791</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1501261606791</updated>
-    </task>
-    <option name="localTasksCounter" value="3" />
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
@@ -1196,20 +1584,37 @@
     <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="3" 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.32932165" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+<<<<<<< HEAD
+      <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="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.33403805" sideWeight="0.51875" order="7" side_tool="true" content_ui="tabs" />
+=======
       <window_info id="Nl-Palette" 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="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="5" 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="2" 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="8" 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.33403805" sideWeight="0.51875" order="7" side_tool="true" 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.33615223" sideWeight="0.51458335" order="7" side_tool="true" content_ui="tabs" />
+>>>>>>> 72304bb14ceff865c5e525ea00e77760a05af553
       <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.32941177" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <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.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.63424945" sideWeight="0.49573562" order="2" side_tool="false" content_ui="tabs" />
-      <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.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+<<<<<<< HEAD
+      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33297986" sideWeight="0.48125" order="10" 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="8" 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.24270834" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Gradle" 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="9" side_tool="false" content_ui="tabs" />
+      <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="1" 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="5" 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.33" sideWeight="0.5" order="6" side_tool="true" 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.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+=======
+      <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.3289941" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Floobits" 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="7" side_tool="false" content_ui="tabs" />
       <window_info id="Properties" 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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3325444" sideWeight="0.48125" 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.3337278" sideWeight="0.48541668" order="9" 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="2" 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="5" 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.1202946" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2561375" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Gradle" 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="7" side_tool="false" content_ui="tabs" />
       <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="1" side_tool="false" content_ui="tabs" />
@@ -1218,47 +1623,56 @@
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" 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.33" sideWeight="0.5" order="4" 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="4" 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="2" side_tool="false" content_ui="combo" />
-      <window_info id="Database" 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="6" 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.32769555" sideWeight="0.4978678" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980973" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-    </layout>
-    <layout-to-restore>
       <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="3" side_tool="false" 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="4" side_tool="false" content_ui="tabs" />
       <window_info id="Nl-Palette" 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="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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33403805" sideWeight="0.51875" order="7" 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.32941177" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Properties" 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="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="3" 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="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Properties" 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="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="2" 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="2" side_tool="false" content_ui="combo" />
-      <window_info id="Database" 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="8" 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="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" 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="6" side_tool="false" content_ui="tabs" />
       <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="1" 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="5" 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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" 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.32932165" sideWeight="0.5" order="6" 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.32769555" sideWeight="0.4978678" order="8" 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="5" 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="2" 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="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.63424945" sideWeight="0.49573562" order="2" side_tool="false" content_ui="tabs" />
+      <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.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Floobits" 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="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33297986" sideWeight="0.48125" order="9" 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.118229166" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980973" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Gradle" 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="7" 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.33" sideWeight="0.5" order="4" side_tool="true" 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" />
+    </layout>
+    <layout-to-restore>
+      <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="3" side_tool="false" content_ui="tabs" />
+>>>>>>> 72304bb14ceff865c5e525ea00e77760a05af553
+      <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="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Nl-Palette" 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="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="Properties" 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="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="3" 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="2" side_tool="false" content_ui="combo" />
+      <window_info id="Database" 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="7" 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.32769555" sideWeight="0.4978678" order="9" 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="7" 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="10" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.63424945" sideWeight="0.49573562" order="2" side_tool="false" content_ui="tabs" />
-      <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.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Floobits" 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="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33403805" sideWeight="0.48125" order="10" 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.23958333" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980973" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Gradle" 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="9" 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.33" sideWeight="0.5" order="6" side_tool="true" 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="6" side_tool="false" content_ui="tabs" />
-    </layout-to-restore>
+    </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
     <option name="RECENTLY_FILTERED_USER_GROUPS">
@@ -1273,8 +1687,7 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Argument support for joining channels (untested) resultseta and preparedstatements closing" />
-    <MESSAGE value="Typo on operator (woops)" />
-    <option name="LAST_COMMIT_MESSAGE" value="Typo on operator (woops)" />
+    <option name="LAST_COMMIT_MESSAGE" value="Argument support for joining channels (untested) resultseta and preparedstatements closing" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1287,6 +1700,8 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
+=======
     <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/mod/PurgeMessagesCommand.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-159">
@@ -1301,6 +1716,7 @@
         </state>
       </provider>
     </entry>
+>>>>>>> 72304bb14ceff865c5e525ea00e77760a05af553
     <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/mod/DeleteMessagesCommand.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="272">
@@ -1332,7 +1748,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="432">
+        <state relative-caret-position="459">
           <caret line="27" column="47" lean-forward="false" selection-start-line="27" selection-start-column="47" selection-end-line="27" selection-end-column="47" />
           <folding>
             <marker date="1501259767938" expanded="true" signature="478:725" ph="{...}" />
@@ -1368,20 +1784,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/BatchMoveCommand.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="29" column="7" lean-forward="false" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="181" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/RemoveRoleCommand.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="39" column="17" lean-forward="true" selection-start-line="39" selection-start-column="17" selection-end-line="39" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/locale/Language.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="204">
@@ -1396,13 +1798,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/AddRoleCommand.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="22" column="13" lean-forward="false" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/InviteCommand.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
@@ -1426,7 +1821,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/twitter/TwitterModule.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="784">
+        <state relative-caret-position="918">
           <caret line="58" column="5" lean-forward="false" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1451,12 +1846,26 @@
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/Random.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2037">
+          <caret line="424" column="5" lean-forward="true" selection-start-line="424" selection-start-column="5" selection-end-line="424" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.16.18/d65e72edec3424e45335602fc1a4ff6e614f4553/lombok-1.16.18-sources.jar!/lombok/Getter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="218">
+          <caret line="54" column="7" lean-forward="false" selection-start-line="54" selection-start-column="4" selection-end-line="54" selection-end-column="7" />
+=======
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/Random.java" />
     <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.16.18/d65e72edec3424e45335602fc1a4ff6e614f4553/lombok-1.16.18-sources.jar!/lombok/Getter.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/ConfigCommand.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-340">
           <caret line="59" column="31" lean-forward="false" selection-start-line="59" selection-start-column="31" selection-end-line="59" selection-end-column="31" />
+>>>>>>> 72304bb14ceff865c5e525ea00e77760a05af553
         </state>
       </provider>
     </entry>
@@ -1467,27 +1876,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/general/LevelsCommand.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="409">
-          <caret line="38" column="82" lean-forward="false" selection-start-line="38" selection-start-column="82" selection-end-line="38" selection-end-column="82" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/guild/RixaGuild.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="36" column="41" lean-forward="false" selection-start-line="36" selection-start-column="41" selection-end-line="36" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/levels/LevelsModule.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="34" column="35" lean-forward="false" selection-start-line="34" selection-start-column="35" selection-end-line="34" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/extras/polls/Poll.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="102">
@@ -1497,12 +1885,14 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/Rixa.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1376">
+        <state relative-caret-position="1411">
           <caret line="123" column="32" lean-forward="false" selection-start-line="123" selection-start-column="32" selection-end-line="123" selection-end-column="32" />
           <folding>
             <element signature="e#5315#5316#0" expanded="true" />
             <element signature="e#5362#5363#0" expanded="true" />
             <marker date="1501259767955" expanded="true" signature="4804:4935" ph="{...}" />
+            <marker date="1501259767955" expanded="true" signature="5002:5122" ph="{...}" />
+            <marker date="1501259767955" expanded="true" signature="5172:5283" ph="{...}" />
           </folding>
         </state>
       </provider>
@@ -1537,6 +1927,15 @@
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
+    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/database/sql/mysql/Database.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="39" column="18" lean-forward="false" selection-start-line="38" selection-start-column="17" selection-end-line="39" selection-end-column="18" />
+          <folding>
+            <element signature="method#checkConnection#0;class#Database#0" expanded="false" />
+          </folding>
+=======
     <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/guild/user/UserData.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
@@ -1555,6 +1954,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
           <caret line="7" column="17" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1562,6 +1962,11 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
           <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+          <folding>
+            <marker date="1501259767959" expanded="true" signature="1407:1582" ph="{...}" />
+            <marker date="1501259767959" expanded="false" signature="1645:1656" ph=" { " />
+            <marker date="1501259767959" expanded="false" signature="1672:1678" ph=" }" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1569,20 +1974,199 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
           <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/database/sql/mysql/mysql/MySQL.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1168">
+        <state relative-caret-position="618">
           <caret line="77" column="41" lean-forward="false" selection-start-line="77" selection-start-column="41" selection-end-line="77" selection-end-column="41" />
           <folding />
+>>>>>>> 72304bb14ceff865c5e525ea00e77760a05af553
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/database/sql/mysql/Database.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="656">
+<<<<<<< HEAD
+        <state relative-caret-position="303">
+          <caret line="114" column="27" lean-forward="true" selection-start-line="114" selection-start-column="27" selection-end-line="114" selection-end-column="27" />
+          <folding>
+            <element signature="method#createTable#0;class#DatabaseManager#0" expanded="true" />
+            <element signature="method#checkConnection#0;class#DatabaseManager#0" expanded="true" />
+            <element signature="method#executeUpdate#0;class#DatabaseManager#0" expanded="true" />
+            <element signature="method#getObject#0;class#DatabaseManager#0" expanded="true" />
+            <element signature="method#getObject#1;class#DatabaseManager#0" expanded="true" />
+            <element signature="method#executeQuery#0;class#DatabaseManager#0" expanded="true" />
+            <element signature="method#getCount#0;class#DatabaseManager#0" expanded="true" />
+            <element signature="method#insert#0;class#DatabaseManager#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/sql/DriverManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-504">
+          <caret line="632" column="84" lean-forward="true" selection-start-line="632" selection-start-column="84" selection-end-line="632" selection-end-column="84" />
+          <folding>
+            <element signature="method#getConnection#1;class#DriverManager#0" expanded="false" />
+            <element signature="method#getConnection#3;class#DriverManager#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/database/sql/mysql/mysql/MySQL.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="292">
+          <caret line="51" column="7" lean-forward="true" selection-start-line="51" selection-start-column="7" selection-end-line="51" selection-end-column="7" />
+          <folding>
+            <element signature="method#MySQL#0;class#MySQL#0" expanded="false" />
+            <element signature="method#MySQL#1;class#MySQL#0" expanded="false" />
+            <element signature="method#openConnection#0;class#MySQL#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/general/MusicCommand.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="592">
+          <caret line="121" column="68" lean-forward="false" selection-start-line="121" selection-start-column="68" selection-end-line="121" selection-end-column="68" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/LevelsManagementCommand.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="7" column="9" lean-forward="false" selection-start-line="7" selection-start-column="9" selection-end-line="7" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/Collections.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="193">
+          <caret line="173" column="27" lean-forward="false" selection-start-line="173" selection-start-column="27" selection-end-line="173" selection-end-column="27" />
+          <folding>
+            <element signature="e#7284#7285#0" expanded="false" />
+            <element signature="e#7312#7313#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/Comparator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="149" column="8" lean-forward="false" selection-start-line="149" selection-start-column="8" selection-end-line="149" selection-end-column="8" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/general/LevelsCommand.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-235">
+          <caret line="34" column="38" lean-forward="true" selection-start-line="34" selection-start-column="38" selection-end-line="34" selection-end-column="38" />
+          <folding>
+            <element signature="e#581#590#0" expanded="true" />
+            <element signature="e#1160#1218#0" expanded="true" />
+            <element signature="method#sortHashMapByValues#0;class#LevelsCommand#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/guild/user/UserData.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="918">
+          <caret line="111" column="4" lean-forward="false" selection-start-line="111" selection-start-column="4" selection-end-line="115" selection-end-column="5" />
+          <folding>
+            <element signature="method#load#0;class#UserData#0" expanded="true" />
+            <element signature="method#checkExists#0;class#UserData#0" expanded="true" />
+            <element signature="method#insert#0;class#UserData#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/guild/RixaGuild.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="462">
+          <caret line="164" column="1" lean-forward="true" selection-start-line="164" selection-start-column="1" selection-end-line="164" selection-end-column="1" />
+          <folding>
+            <element signature="method#RixaGuild#0;class#RixaGuild#0" expanded="true" />
+            <element signature="method#load#0;class#RixaGuild#0" expanded="true" />
+            <element signature="method#getGuildSettings#0;class#RixaGuild#0" expanded="true" />
+            <element signature="method#checkExists#0;class#RixaGuild#0" expanded="true" />
+            <element signature="method#hasPermission#0;class#RixaGuild#0" expanded="true" />
+            <element signature="method#hasPermission#1;class#RixaGuild#0" expanded="true" />
+            <element signature="method#permissionExists#0;class#RixaGuild#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/levels/LevelsModule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="501">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+          <folding>
+            <element signature="method#LevelsModule#0;class#LevelsModule#0" expanded="true" />
+            <element signature="method#registerUser#0;class#LevelsModule#0" expanded="true" />
+            <element signature="method#getUserData#0;class#LevelsModule#0" expanded="true" />
+            <element signature="method#checkUser#0;class#LevelsModule#0" expanded="true" />
+            <element signature="method#load#0;class#LevelsModule#0" expanded="true" />
+            <element signature="method#checkExists#0;class#LevelsModule#0" expanded="true" />
+            <element signature="method#insert#0;class#LevelsModule#0" expanded="true" />
+            <element signature="method#setEnabled#0;class#LevelsModule#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/modules/music/MusicModule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-8">
+          <caret line="18" column="11" lean-forward="false" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="11" />
+          <folding>
+            <element signature="method#setEnabled#0;class#MusicModule#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/ConfigCommand.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="145">
+          <caret line="190" column="75" lean-forward="false" selection-start-line="190" selection-start-column="75" selection-end-line="190" selection-end-column="75" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/BatchMoveCommand.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="29" column="7" lean-forward="false" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="181" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/RemoveRoleCommand.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="21" column="4" lean-forward="true" selection-start-line="21" selection-start-column="4" selection-end-line="21" selection-end-column="4" />
+          <folding>
+            <element signature="e#726#964#0" expanded="false" />
+            <element signature="method#execute#0;class#RemoveRoleCommand#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/admin/AddRoleCommand.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="51">
+          <caret line="29" column="57" lean-forward="true" selection-start-line="29" selection-start-column="57" selection-end-line="29" selection-end-column="57" />
+          <folding>
+            <element signature="e#886#1120#0" expanded="false" />
+            <element signature="method#execute#0;class#AddRoleCommand#0" expanded="false" />
+          </folding>
+=======
+        <state relative-caret-position="262">
           <caret line="48" column="19" lean-forward="false" selection-start-line="48" selection-start-column="19" selection-end-line="48" selection-end-column="19" />
           <folding />
         </state>
@@ -1590,23 +2174,35 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/data/database/sql/DatabaseManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1728">
+        <state relative-caret-position="1836">
           <caret line="117" column="31" lean-forward="false" selection-start-line="117" selection-start-column="31" selection-end-line="117" selection-end-column="31" />
           <folding />
+>>>>>>> 72304bb14ceff865c5e525ea00e77760a05af553
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/gradlew">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
+        <state relative-caret-position="224">
+          <caret line="60" column="33" lean-forward="true" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+=======
         <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" />
+>>>>>>> 72304bb14ceff865c5e525ea00e77760a05af553
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/general/MusicCommand.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/me/savvy/rixa/commands/handlers/CommandHandler.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="256">
-          <caret line="158" column="56" lean-forward="true" selection-start-line="158" selection-start-column="56" selection-end-line="158" selection-end-column="56" />
+<<<<<<< HEAD
+        <state relative-caret-position="289">
+          <caret line="28" column="32" lean-forward="false" selection-start-line="28" selection-start-column="32" selection-end-line="28" selection-end-column="32" />
+=======
+        <state relative-caret-position="149">
+          <caret line="221" column="36" lean-forward="false" selection-start-line="221" selection-start-column="36" selection-end-line="221" selection-end-column="36" />
+>>>>>>> 72304bb14ceff865c5e525ea00e77760a05af553
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/me/savvy/rixa/commands/admin/ConfigCommand.java b/src/main/java/me/savvy/rixa/commands/admin/ConfigCommand.java
index d963bf3..f74da22 100644
--- a/src/main/java/me/savvy/rixa/commands/admin/ConfigCommand.java
+++ b/src/main/java/me/savvy/rixa/commands/admin/ConfigCommand.java
@@ -5,7 +5,6 @@ import me.savvy.rixa.commands.handlers.CommandExec;
 import me.savvy.rixa.commands.handlers.CommandType;
 import me.savvy.rixa.commands.handlers.RixaPermission;
 import me.savvy.rixa.guild.RixaGuild;
-import me.savvy.rixa.guild.RixaGuild;
 import me.savvy.rixa.utils.MessageBuilder;
 import net.dv8tion.jda.core.entities.ChannelType;
 import net.dv8tion.jda.core.entities.Member;
@@ -88,7 +87,7 @@ public class ConfigCommand implements CommandExec {
         }
         String message;
         if (messages[1].equalsIgnoreCase("joinmessage")) {
-            message = getMessage(messages, 2);
+            message = getMessage(messages);
             if(event.getMessage().getMentionedChannels().size() > 0) {
                 for (TextChannel messageChannel : event.getMessage().getMentionedChannels()) {
                     message = message.replace(messageChannel.getAsMention(), "<#" + messageChannel.getId() + ">");
@@ -98,7 +97,7 @@ public class ConfigCommand implements CommandExec {
             new MessageBuilder("Successfully set Join Message to\n" + message.replace("{0}", event.getMember().getUser().getName())
                     .replace("{1}", event.getGuild().getName())).setColor(event.getMember().getColor()).queue(event.getChannel());
         } else if (messages[1].equalsIgnoreCase("quitmessage")) {
-            message = getMessage(messages, 2);
+            message = getMessage(messages);
             if(event.getMessage().getMentionedChannels().size() > 0) {
                 for (TextChannel messageChannel : event.getMessage().getMentionedChannels()) {
                     message = message.replace(messageChannel.getAsMention(), "<#" + messageChannel.getId() + ">");
@@ -108,7 +107,7 @@ public class ConfigCommand implements CommandExec {
             new MessageBuilder("Successfully set Quit Message to\n" + message.replace("{0}", event.getMember().getUser().getName())
                     .replace("{1}", event.getGuild().getName())).setColor(event.getMember().getColor()).queue(event.getChannel());
         } else if (messages[1].equalsIgnoreCase("joinpm")) {
-            message = getMessage(messages, 2);
+            message = getMessage(messages);
             if(event.getMessage().getMentionedChannels().size() > 0) {
                 for (TextChannel messageChannel : event.getMessage().getMentionedChannels()) {
                     message = message.replace(messageChannel.getAsMention(), "<#" + messageChannel.getId() + ">");
@@ -118,7 +117,7 @@ public class ConfigCommand implements CommandExec {
             new MessageBuilder("Successfully set Private Join Message to\n" + message.replace("{0}", event.getMember().getUser().getName())
                     .replace("{1}", event.getGuild().getName())).setColor(event.getMember().getColor()).queue(event.getChannel());
         } else if (messages[1].equalsIgnoreCase("description")) {
-            message = getMessage(messages, 2);
+            message = getMessage(messages);
             rixaGuild.getGuildSettings().setDescription(message);
             new MessageBuilder("Successfully set Server Description to\n" + message.replace("{0}", event.getMember().getUser().getName())
                     .replace("{1}", event.getGuild().getName())).setColor(event.getMember().getColor()).queue(event.getChannel());
@@ -174,10 +173,10 @@ public class ConfigCommand implements CommandExec {
             if (messages[2].equalsIgnoreCase("music")) {
                 RixaGuild.getGuild(event.getGuild()).getMusicModule().setEnabled(true);
                 new MessageBuilder("Successfully enabled the music module!").setColor(event.getMember().getColor()).queue(event.getChannel());
-            } /*else if (messages[2].equalsIgnoreCase("levels")) {
-                GuildManager.getGuild(event.getGuild().getId()).getLevels().setEnabled(true);
-                event.getChannel().sendMessage("Successfully enabled the `Levels` module").queue();
-            }*/ else if (messages[2].equalsIgnoreCase("joinverification")) {
+            } else if (messages[2].equalsIgnoreCase("levels")) {
+                RixaGuild.getGuild(event.getGuild()).getLevelsModule().setEnabled(true);
+                event.getChannel().sendMessage("Successfully enabled the levels module").queue();
+            } else if (messages[2].equalsIgnoreCase("joinverification")) {
                 RixaGuild.getGuild(event.getGuild()).getGuildSettings().setJoinVerification(true);
                 new MessageBuilder("Successfully enabled Join Verification!").setColor(event.getMember().getColor()).queue(event.getChannel());
             }
@@ -185,10 +184,10 @@ public class ConfigCommand implements CommandExec {
             if (messages[2].equalsIgnoreCase("music")) {
                 RixaGuild.getGuild(event.getGuild()).getMusicModule().setEnabled(false);
                 new MessageBuilder("Successfully disabled the music module!").setColor(event.getMember().getColor()).queue(event.getChannel());
-            }/* else if (messages[2].equalsIgnoreCase("levels")) {
-                GuildManager.getGuild(event.getGuild().getId()).getLevels().setEnabled(false);
-                event.getChannel().sendMessage("Successfully disabled the `Levels` module").queue();
-            }*/ else if (messages[2].equalsIgnoreCase("joinverification")) {
+            } else if (messages[2].equalsIgnoreCase("levels")) {
+                RixaGuild.getGuild(event.getGuild()).getLevelsModule().setEnabled(false);
+                event.getChannel().sendMessage("Successfully disabled the levels module").queue();
+            } else if (messages[2].equalsIgnoreCase("joinverification")) {
                 RixaGuild.getGuild(event.getGuild()).getGuildSettings().setJoinVerification(false);
                 new MessageBuilder("Successfully disabled Join Verification!").setColor(event.getMember().getColor()).queue(event.getChannel());
             }
@@ -274,9 +273,9 @@ public class ConfigCommand implements CommandExec {
         return builder.setColor(member.getColor()).setTitle(String.format("Config: %s", member.getGuild().getId()));
     }
 
-    private String getMessage(String[] messages, int argToBegin) {
+    private String getMessage(String[] messages) {
         StringBuilder builder = new StringBuilder();
-        for(int i = argToBegin; i < messages.length; i++) {
+        for(int i = 2; i < messages.length; i++) {
             builder.append(messages[i]).append(" ");
         }
         return builder.toString().trim();
diff --git a/src/main/java/me/savvy/rixa/commands/admin/LevelsManagementCommand.java b/src/main/java/me/savvy/rixa/commands/admin/LevelsManagementCommand.java
new file mode 100644
index 0000000..24bf94e
--- /dev/null
+++ b/src/main/java/me/savvy/rixa/commands/admin/LevelsManagementCommand.java
@@ -0,0 +1,9 @@
+package me.savvy.rixa.commands.admin;
+
+public class LevelsManagementCommand {
+
+    // xp give/add <user> <amount>
+    // xp take/remove <user> <amount>
+    // xp set <user> <amount>
+    // xp convert <type> <user/all>
+}
diff --git a/src/main/java/me/savvy/rixa/commands/general/InfoCommand.java b/src/main/java/me/savvy/rixa/commands/general/InfoCommand.java
index 9ef529d..d44ea30 100644
--- a/src/main/java/me/savvy/rixa/commands/general/InfoCommand.java
+++ b/src/main/java/me/savvy/rixa/commands/general/InfoCommand.java
@@ -28,7 +28,7 @@ public class InfoCommand implements CommandExec {
         EmbedBuilder messageEmbed = new EmbedBuilder();
         User botOwner = event.getJDA().getUserById("202944101333729280");
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MM/dd/yyyy HH:mm:ss");
-        Date date1 = new Date(Rixa.getInstance().getTimeUp());
+        Date date1 = new Date(Rixa.getTimeUp());
         Date date2 = new Date();
         long difference = date2.getTime() - date1.getTime();
         long seconds = difference / 1000;
@@ -38,7 +38,7 @@ public class InfoCommand implements CommandExec {
         long second = TimeUnit.SECONDS.toSeconds(seconds) - (TimeUnit.SECONDS.toMinutes(seconds) *60);
         int guildCount = 0;
         int userCount = 0;
-        for(JDA jda: Rixa.getInstance().getShardsList()) {
+        for(JDA jda: Rixa.getShardsList()) {
             guildCount += jda.getGuilds().size();
             userCount += jda.getUsers().size();
         }
diff --git a/src/main/java/me/savvy/rixa/commands/general/LevelsCommand.java b/src/main/java/me/savvy/rixa/commands/general/LevelsCommand.java
index 4deb467..7192c0d 100644
--- a/src/main/java/me/savvy/rixa/commands/general/LevelsCommand.java
+++ b/src/main/java/me/savvy/rixa/commands/general/LevelsCommand.java
@@ -10,6 +10,7 @@ import net.dv8tion.jda.core.entities.ChannelType;
 import net.dv8tion.jda.core.events.message.guild.GuildMessageReceivedEvent;
 
 import java.io.IOException;
+import java.util.*;
 
 /**
  * Created by savit on 7/11/2017.
@@ -27,6 +28,11 @@ public class LevelsCommand implements CommandExec {
             return;
         }
         UserData data = rixaGuild.getLevelsModule().getUserData(event.getAuthor().getId());
+//        Map<UserData, Integer> newMap = new HashMap<>();
+//        rixaGuild.getLevelsModule().getUserData().forEach((s, userData) -> {
+//            newMap.put(userData, userData.getExperience());
+//        });
+//        sortHashMapByValues(newMap);
         new MessageBuilder()
                 .setAuthor(event.getAuthor().getName(), event.getAuthor().getEffectiveAvatarUrl(), event.getAuthor().getEffectiveAvatarUrl())
                 .setTitle(event.getAuthor().getName() + "'s level")
@@ -39,4 +45,32 @@ public class LevelsCommand implements CommandExec {
                 .addField("Total Exp", String.valueOf(data.getExperience()), false)
                 .queue(event.getChannel());
     }
+
+    public LinkedHashMap<UserData, Integer> sortHashMapByValues(
+            Map<UserData, Integer> passedMap) {
+        List<UserData> mapKeys = new ArrayList<>(passedMap.keySet());
+        List<Integer> mapValues = new ArrayList<>(passedMap.values());
+        Collections.sort(mapValues);
+        //Collections.sort(mapKeys);
+
+
+        LinkedHashMap<UserData, Integer> sortedMap =
+                new LinkedHashMap<>();
+
+        for (Integer val : mapValues) {
+            Iterator<UserData> keyIt = mapKeys.iterator();
+
+            while (keyIt.hasNext()) {
+                UserData key = keyIt.next();
+                Integer comp1 = passedMap.get(key);
+
+                if (comp1.equals(val)) {
+                    keyIt.remove();
+                    sortedMap.put(key, val);
+                    break;
+                }
+            }
+        }
+        return sortedMap;
+    }
 }
diff --git a/src/main/java/me/savvy/rixa/commands/general/MusicCommand.java b/src/main/java/me/savvy/rixa/commands/general/MusicCommand.java
index 59f3ce9..7c11d4e 100644
--- a/src/main/java/me/savvy/rixa/commands/general/MusicCommand.java
+++ b/src/main/java/me/savvy/rixa/commands/general/MusicCommand.java
@@ -42,7 +42,7 @@ import java.util.logging.Level;
  */
 public class MusicCommand implements CommandExec {
 
-    public final int DEFAULT_VOLUME = 35; //(0 - 150, where 100 is default max volume)
+    private final int DEFAULT_VOLUME = 35; //(0 - 150, where 100 is default max volume)
     private final AudioPlayerManager playerManager;
     private final Map<String, MusicManager> musicManagers;
     public MusicCommand() {
@@ -92,7 +92,7 @@ public class MusicCommand implements CommandExec {
         if(message.length == 1) {
             sendHelp();
         } else if (message.length == 2) {
-            if(message[1].equalsIgnoreCase("join")) {
+            if(message[1].equalsIgnoreCase("join") || message[1].equalsIgnoreCase("summon") ) {
                 if (event.getMember().getVoiceState().getChannel() == null) {
                     new MessageBuilder("You must be in a voice channel to summon me!").setColor(event.getMember().getColor()).queue(event.getChannel());
                     return;
@@ -114,16 +114,14 @@ public class MusicCommand implements CommandExec {
                     new MessageBuilder("The audio queue is empty! Add a track to the queue first!").setColor(event.getMember().getColor()).queue(event.getChannel());
                 }
             } else if (message[1].equalsIgnoreCase("leave")) {
-                new MessageBuilder("Leaving voice channel.").setColor(event.getMember().getColor()).queue(event.getChannel());
-                guild.getAudioManager().setSendingHandler(null);
-
+                String desc = "";
                 AudioTrack track = scheduler.nextTrack();
                 if(track != null) {
-                    new MessageBuilder("The current track has been skipped. Now Playiguild.getAudioManager().closeAudioConnection();\n" +
-                            "            } else if(message[1].equalsIgnoreCase(\"skip\")) {ng: " + track.getInfo().title).setColor(event.getMember().getColor()).queue(event.getChannel());
-                } else {
-                    new MessageBuilder("Track Skipped. Queue Complete").setColor(event.getMember().getColor()).queue(event.getChannel());
+                    desc += "Track skipped. ";
                 }
+                new MessageBuilder(desc + " Leaving voice channel...").setColor(event.getMember().getColor()).queue(event.getChannel());
+                guild.getAudioManager().setSendingHandler(null);
+                guild.getAudioManager().closeAudioConnection();
             } else if(message[1].equalsIgnoreCase("link")) {
                 if (player.getPlayingTrack() == null) {
                     new MessageBuilder("There is no track currently playing.").setColor(event.getMember().getColor()).queue(event.getChannel());
@@ -217,16 +215,13 @@ public class MusicCommand implements CommandExec {
         } else if (message.length == 3) {
             if(message[1].equalsIgnoreCase("join")) {
                 VoiceChannel chan = null;
-                StringBuilder stringBuilder = new StringBuilder();
-                for (int i = 2; i != message.length; i++) {
-                    stringBuilder.append(message[i]).append(" ");
-                }
-                String channelName = stringBuilder.toString();
+                String channelName = message[2];//getMessage(message, 2).trim();
                 if (guild.getVoiceChannelsByName(channelName, true).size() >= 1) {
                     chan = guild.getVoiceChannelsByName(channelName, true).get(0);
                 } else {
                     for (VoiceChannel voiceChannel : guild.getVoiceChannels()) {
-                        if (voiceChannel.getName().contains(channelName) || voiceChannel.getId().equalsIgnoreCase(channelName)) {
+                        if (voiceChannel.getName().contains(channelName) || voiceChannel.getName().equalsIgnoreCase(channelName) ||
+                                voiceChannel.getId().equalsIgnoreCase(channelName)) {
                             chan = voiceChannel;
                             break;
                         }
@@ -246,7 +241,18 @@ public class MusicCommand implements CommandExec {
                     }
                 }
             } else if(message[1].equalsIgnoreCase("play") || message[1].equalsIgnoreCase("playlist")) {
-                loadAndPlay(mng, event.getChannel(), message[2], false);
+                if (event.getMember().getVoiceState().getChannel() == null) {
+                    new MessageBuilder("You must be in a voice channel to summon me!").setColor(event.getMember().getColor()).queue(event.getChannel());
+                    return;
+                }
+                try {
+                    guild.getAudioManager().openAudioConnection(event.getMember().getVoiceState().getChannel());
+                    loadAndPlay(mng, event.getChannel(), message[2], false);
+                } catch (PermissionException e) {
+                    if (e.getPermission() == Permission.VOICE_CONNECT) {
+                        new MessageBuilder("I do not have permission to join the requested voice channel.").setColor(event.getMember().getColor()).queue(event.getChannel());
+                    }
+                }
             } else  if(message[1].equalsIgnoreCase("vol") || message[1].equalsIgnoreCase("volume")) {
                 try {
                     int newVolume = Math.max(10, Math.min(100, Integer.parseInt(message[2])));
@@ -258,8 +264,35 @@ public class MusicCommand implements CommandExec {
                 }
             }
         } // music youtube <query
-        if(message.length >= 3) {
-            if(message[1].equalsIgnoreCase("youtube") || message[1].equalsIgnoreCase("yt") || message[1].equalsIgnoreCase("search")
+        else if(message.length >= 3) {
+            if(message[1].equalsIgnoreCase("join")) {
+                VoiceChannel chan = null;
+                String channelName = getMessage(message, 2);
+                if (guild.getVoiceChannelsByName(channelName, true).size() >= 1) {
+                    chan = guild.getVoiceChannelsByName(channelName, true).get(0);
+                } else {
+                    for (VoiceChannel voiceChannel : guild.getVoiceChannels()) {
+                        if (voiceChannel.getName().contains(channelName) || voiceChannel.getId().equalsIgnoreCase(channelName)
+                            || voiceChannel.getName().equalsIgnoreCase(channelName)) {
+                            chan = voiceChannel;
+                            break;
+                        }
+                    }
+                }
+                if (chan == null) {
+                    new MessageBuilder("Sorry I was unable to find the VoiceChannel: `" + message[2] + "`.").setColor(event.getMember().getColor()).queue(event.getChannel());
+                } else {
+                    guild.getAudioManager().setSendingHandler(mng.sendHandler);
+                    try {
+                        new MessageBuilder("Entering Voice Channel: " + chan.getName()).setColor(event.getMember().getColor()).queue(event.getChannel());
+                        guild.getAudioManager().openAudioConnection(chan);
+                    } catch (PermissionException e) {
+                        if (e.getPermission() == Permission.VOICE_CONNECT) {
+                            new MessageBuilder("I do not have permission to join the requested voice channel.").setColor(event.getMember().getColor()).queue(event.getChannel());
+                        }
+                    }
+                }
+            } else if(message[1].equalsIgnoreCase("youtube") || message[1].equalsIgnoreCase("yt") || message[1].equalsIgnoreCase("search")
                     || message[1].equalsIgnoreCase("ytsearch")) {
                 String search = getMessage(message, 2);
                 try {
diff --git a/src/main/java/me/savvy/rixa/commands/general/UrbanDictionaryCommand.java b/src/main/java/me/savvy/rixa/commands/general/UrbanDictionaryCommand.java
index 9e974fe..3166f68 100644
--- a/src/main/java/me/savvy/rixa/commands/general/UrbanDictionaryCommand.java
+++ b/src/main/java/me/savvy/rixa/commands/general/UrbanDictionaryCommand.java
@@ -23,7 +23,7 @@ public class UrbanDictionaryCommand implements CommandExec {
             channelType = ChannelType.TEXT)
     public void execute(GuildMessageReceivedEvent event) {
         String[] message = event.getMessage().getContent().split(" ");
-        String search = getMessage(message, 1);
+        String search = getMessage(message);
         UrbanDictionary ud = null;
         try {
             ud = new UrbanDictionary(URLEncoder.encode(search, "UTF-8"));
@@ -45,9 +45,9 @@ public class UrbanDictionaryCommand implements CommandExec {
                 .addThumbnail("https://s-media-cache-ak0.pinimg.com/originals/f2/aa/37/f2aa3712516cfd0cf6f215301d87a7c2.jpg").queue(event.getChannel());
     }
 
-    private String getMessage(String[] messages, int argToBegin) {
+    private String getMessage(String[] messages) {
         StringBuilder builder = new StringBuilder();
-        for(int i = argToBegin; i < messages.length; i++) {
+        for(int i = 1; i < messages.length; i++) {
             builder.append(messages[i]).append(" ");
         }
         return builder.toString().trim();
diff --git a/src/main/java/me/savvy/rixa/commands/general/YoutubeCommand.java b/src/main/java/me/savvy/rixa/commands/general/YoutubeCommand.java
index 95c215b..fe3f2eb 100644
--- a/src/main/java/me/savvy/rixa/commands/general/YoutubeCommand.java
+++ b/src/main/java/me/savvy/rixa/commands/general/YoutubeCommand.java
@@ -21,7 +21,7 @@ public class YoutubeCommand implements CommandExec {
             channelType = ChannelType.TEXT)
     public void execute(GuildMessageReceivedEvent event) {
         String[] message = event.getMessage().getContent().split(" ");
-        String search = getMessage(message, 1);
+        String search = getMessage(message);
         try {
             YoutubeSearch ytSearch = new YoutubeSearch(search);
             new MessageBuilder(ytSearch.getUrl(0))
@@ -31,9 +31,9 @@ public class YoutubeCommand implements CommandExec {
         }
     }
 
-    private String getMessage(String[] messages, int argToBegin) {
+    private String getMessage(String[] messages) {
         StringBuilder builder = new StringBuilder() ;
-        for(int i = argToBegin; i < messages.length; i++) {
+        for(int i = 1; i < messages.length; i++) {
             builder.append(messages[i]).append(" ");
         }
         return builder.toString().trim();
diff --git a/src/main/java/me/savvy/rixa/commands/handlers/CommandExec.java b/src/main/java/me/savvy/rixa/commands/handlers/CommandExec.java
index 426e865..42b5e05 100644
--- a/src/main/java/me/savvy/rixa/commands/handlers/CommandExec.java
+++ b/src/main/java/me/savvy/rixa/commands/handlers/CommandExec.java
@@ -7,5 +7,5 @@ import net.dv8tion.jda.core.events.message.guild.GuildMessageReceivedEvent;
  */
 public interface CommandExec {
 
-    public void execute(GuildMessageReceivedEvent event);
+    void execute(GuildMessageReceivedEvent event);
 }
diff --git a/src/main/java/me/savvy/rixa/commands/handlers/CommandHandler.java b/src/main/java/me/savvy/rixa/commands/handlers/CommandHandler.java
index ed38afb..4310793 100644
--- a/src/main/java/me/savvy/rixa/commands/handlers/CommandHandler.java
+++ b/src/main/java/me/savvy/rixa/commands/handlers/CommandHandler.java
@@ -25,6 +25,9 @@ public class CommandHandler {
             return true;
         } else {
             for (CommandRegistrar commandRegistrar : getCommands().values()) {
+                if (commandRegistrar.getAnnotation().mainCommand().equalsIgnoreCase(s)) {
+                    return true;
+                }
                 for (String string : commandRegistrar.getAnnotation().aliases()) {
                     if (string.equalsIgnoreCase(s)) return true;
                 }
diff --git a/src/main/java/me/savvy/rixa/commands/handlers/CommandType.java b/src/main/java/me/savvy/rixa/commands/handlers/CommandType.java
index cb6cb07..ee81924 100644
--- a/src/main/java/me/savvy/rixa/commands/handlers/CommandType.java
+++ b/src/main/java/me/savvy/rixa/commands/handlers/CommandType.java
@@ -4,5 +4,5 @@ package me.savvy.rixa.commands.handlers;
  * Created by Timber on 5/22/2017.
  */
 public enum CommandType {
-    USER, MOD, ADMIN, BOT_OWNER;
+    USER, MOD, ADMIN, BOT_OWNER
 }
diff --git a/src/main/java/me/savvy/rixa/data/database/Data.java b/src/main/java/me/savvy/rixa/data/database/Data.java
index 223c159..0ee4fe8 100644
--- a/src/main/java/me/savvy/rixa/data/database/Data.java
+++ b/src/main/java/me/savvy/rixa/data/database/Data.java
@@ -18,7 +18,7 @@ public class Data {
     private DatabaseManager db;
     public Data(DataType dataType) {
         this.dataType = dataType;
-        this.db = Rixa.getInstance().getDbManager();
+        this.db = Rixa.getDbManager();
     }
 
     public Object get(String key, String value, String objToGet, String table) throws SQLException {
@@ -64,7 +64,11 @@ public class Data {
     public Result exists(String check) {
         switch(dataType) {
             case SQL:
-                return db.checkExists(check);
+                try {
+                    return db.checkExists(check);
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
         }
         return Result.FALSE;
     }
diff --git a/src/main/java/me/savvy/rixa/data/database/DataType.java b/src/main/java/me/savvy/rixa/data/database/DataType.java
index f243275..2e8478e 100644
--- a/src/main/java/me/savvy/rixa/data/database/DataType.java
+++ b/src/main/java/me/savvy/rixa/data/database/DataType.java
@@ -6,5 +6,5 @@ package me.savvy.rixa.data.database;
 public enum DataType {
 
     SQL,
-    FLAT_FILE;
+    FLAT_FILE
 }
diff --git a/src/main/java/me/savvy/rixa/data/database/sql/DatabaseManager.java b/src/main/java/me/savvy/rixa/data/database/sql/DatabaseManager.java
index ab2eab2..31679b3 100644
--- a/src/main/java/me/savvy/rixa/data/database/sql/DatabaseManager.java
+++ b/src/main/java/me/savvy/rixa/data/database/sql/DatabaseManager.java
@@ -23,18 +23,12 @@ public class DatabaseManager {
     }
 
     public void createTable() {
-        try {
-            connection = MYSQL.openConnection();
-            Rixa.getInstance().getLogger().info("Mysql database connected");
-        } catch (SQLException | ClassNotFoundException e) {
-            e.printStackTrace();
-        }
+        checkConnection();
         try {
             PreparedStatement ps = connection.prepareStatement(
                     "CREATE TABLE IF NOT EXISTS `core` (`guild_id` varchar(255) NOT NULL, `guild_name` varchar(255) NOT NULL, PRIMARY KEY (`guild_id`));");
             ps.executeUpdate();
             ps.close();
-            connection.close();
         } catch (SQLException e) {
             Rixa.getInstance().getLogger().severe("Could not check if table exists, stopping server.");
             e.printStackTrace();
@@ -46,6 +40,7 @@ public class DatabaseManager {
         try {
             if (!MYSQL.checkConnection()) {
                 connection = MYSQL.openConnection();
+                Rixa.getInstance().getLogger().info("Mysql database connected");
             }
         } catch (ClassNotFoundException | SQLException e) {
             e.printStackTrace();
@@ -112,12 +107,18 @@ public class DatabaseManager {
 
     public Result checkExists(String string) throws SQLException {
         checkConnection();
-        PreparedStatement preparedStatement = connection.prepareStatement(string);
-        ResultSet resultSet = preparedStatement.executeQuery();
-        if (resultSet.next()) {
-            return Result.TRUE;
-        } else {
-            return Result.FALSE;
+        try {
+            PreparedStatement ps = connection.prepareStatement(string);
+            ResultSet rs = ps.executeQuery();
+            if (rs.next()) {
+                rs.close();
+                return Result.TRUE;
+            } else {
+                rs.close();
+                return Result.FALSE;
+            }
+        } catch (SQLException e) {
+            return Result.ERROR;
         }
     }
 
diff --git a/src/main/java/me/savvy/rixa/data/database/sql/mysql/Database.java b/src/main/java/me/savvy/rixa/data/database/sql/mysql/Database.java
index e83513a..5941a4f 100644
--- a/src/main/java/me/savvy/rixa/data/database/sql/mysql/Database.java
+++ b/src/main/java/me/savvy/rixa/data/database/sql/mysql/Database.java
@@ -36,7 +36,7 @@ public abstract class Database {
 	 * @throws ClassNotFoundException
 	 *             if the driver cannot be found
 	 */
-	public abstract Connection openConnection() throws SQLException,
+	protected abstract Connection openConnection() throws SQLException,
 			ClassNotFoundException;
 
 	/**
@@ -88,9 +88,7 @@ public abstract class Database {
 
 		Statement statement = connection.createStatement();
 
-		ResultSet result = statement.executeQuery(query);
-
-		return result;
+        return statement.executeQuery(query);
 	}
 
 	/**
@@ -114,8 +112,6 @@ public abstract class Database {
 
 		Statement statement = connection.createStatement();
 
-		int result = statement.executeUpdate(query);
-
-		return result;
+        return statement.executeUpdate(query);
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/me/savvy/rixa/data/database/sql/mysql/mysql/MySQL.java b/src/main/java/me/savvy/rixa/data/database/sql/mysql/mysql/MySQL.java
index 50126da..71fc9ae 100644
--- a/src/main/java/me/savvy/rixa/data/database/sql/mysql/mysql/MySQL.java
+++ b/src/main/java/me/savvy/rixa/data/database/sql/mysql/mysql/MySQL.java
@@ -73,7 +73,6 @@ public class MySQL extends Database {
 		}
 		
 		Class.forName("com.mysql.jdbc.Driver");
-	//	Class.forName("com.mysql.cj.jdbc.Driver");
 		connection = DriverManager.getConnection(connectionURL,
 				this.user, this.password);
 		return connection;
diff --git a/src/main/java/me/savvy/rixa/data/placeholder/PlaceHolder.java b/src/main/java/me/savvy/rixa/data/placeholder/PlaceHolder.java
index 079fbbd..f7d6814 100644
--- a/src/main/java/me/savvy/rixa/data/placeholder/PlaceHolder.java
+++ b/src/main/java/me/savvy/rixa/data/placeholder/PlaceHolder.java
@@ -3,5 +3,5 @@ package me.savvy.rixa.data.placeholder;
 /**
  * Created by Timber on 6/4/2017.
  */
-public class PlaceHolder {
+class PlaceHolder {
 }
diff --git a/src/main/java/me/savvy/rixa/enums/Result.java b/src/main/java/me/savvy/rixa/enums/Result.java
index 3ef0d1e..2d502ab 100644
--- a/src/main/java/me/savvy/rixa/enums/Result.java
+++ b/src/main/java/me/savvy/rixa/enums/Result.java
@@ -8,5 +8,5 @@ public enum Result {
     SUCCESS,
     TRUE,
     FALSE,
-    ERROR;
+    ERROR
 }
diff --git a/src/main/java/me/savvy/rixa/events/MessageEvent.java b/src/main/java/me/savvy/rixa/events/MessageEvent.java
index 5305edc..efe882d 100644
--- a/src/main/java/me/savvy/rixa/events/MessageEvent.java
+++ b/src/main/java/me/savvy/rixa/events/MessageEvent.java
@@ -36,6 +36,7 @@ public class MessageEvent {
     @SubscribeEvent
     public void handle(GuildMessageReceivedEvent event) {
         if (event.getGuild() == null) return;
+        if (event.getAuthor().isBot()) return;
         RixaGuild rixaGuild = RixaGuild.getGuild(event.getGuild());
         String prefix = rixaGuild
                 .getGuildSettings()
@@ -45,10 +46,10 @@ public class MessageEvent {
             if (!(rixaGuild.getLevelsModule().isEnabled())) {
                 return;
             }
-            if(!event.getAuthor().getId().equalsIgnoreCase("202944101333729280") &&
+            /*if(!event.getAuthor().getId().equalsIgnoreCase("202944101333729280") &&
                     !event.getAuthor().getId().equalsIgnoreCase("207322957075185665")) {
                 return;
-            }
+            }*/
             if(rixaGuild.getLevelsModule().getUserData(event.getAuthor().getId()).awardIfCan()) {
                 new MessageBuilder(event.getAuthor().getAsMention() + " has leveled up to level " +
                         rixaGuild.getLevelsModule().getUserData(event.getAuthor().getId()).getLevel())
diff --git a/src/main/java/me/savvy/rixa/guild/RixaGuild.java b/src/main/java/me/savvy/rixa/guild/RixaGuild.java
index 725a3fb..f1165c4 100644
--- a/src/main/java/me/savvy/rixa/guild/RixaGuild.java
+++ b/src/main/java/me/savvy/rixa/guild/RixaGuild.java
@@ -60,7 +60,12 @@ public class RixaGuild {
     }
     
     private boolean checkExists() {
-        Result r = Rixa.getDbManager().checkExists("SELECT `guild_name` FROM `core` WHERE `guild_id` = '" + guild.getId() + "';");
+        Result r = Result.ERROR;
+        try {
+            r = Rixa.getDbManager().checkExists("SELECT `guild_name` FROM `core` WHERE `guild_id` = '" + guild.getId() + "';");
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
         return r == Result.TRUE;
     }
     
@@ -141,7 +146,7 @@ public class RixaGuild {
     @Getter
     private static Map<String, RixaGuild> guilds = new HashMap<>();
 
-    public static void addGuild(RixaGuild guild) {
+    private static void addGuild(RixaGuild guild) {
         if(check(guild.getGuild())) return;
         guilds.put(guild.getGuild().getId(), guild);
     }
diff --git a/src/main/java/me/savvy/rixa/guild/management/GuildSettings.java b/src/main/java/me/savvy/rixa/guild/management/GuildSettings.java
index ebce498..9dda4f4 100644
--- a/src/main/java/me/savvy/rixa/guild/management/GuildSettings.java
+++ b/src/main/java/me/savvy/rixa/guild/management/GuildSettings.java
@@ -34,16 +34,16 @@ public class GuildSettings {
 
     private void load() throws SQLException {
         if(!checkExists()) {
-            Rixa.getInstance().getDbManager().insert("INSERT INTO `settings` (`guild_id`, `log_enabled`, `log_channel`, `joinMessage`, `quitMessage`, `greetings`, `farewell`," +
+            Rixa.getDbManager().insert("INSERT INTO `settings` (`guild_id`, `log_enabled`, `log_channel`, `joinMessage`, `quitMessage`, `greetings`, `farewell`," +
                     " `prefix`, `joinPm`, `joinVerification`, `defaultRole`, `muteRole`)" +
                     " VALUES ('" + guild.getId() + "', '0', 'default_value', 'default_value', 'default_value', 'default_value', 'default_value', '/'," +
                     " 'default', '0', 'default_value', 'default_value');");
             return;
         }
-        PreparedStatement ps = Rixa.getInstance().getDbManager()
+        PreparedStatement ps = Rixa.getDbManager()
                 .getConnection().prepareStatement("SELECT * FROM `settings` WHERE `guild_id` = ?");
         ps.setString(1, guild.getId());
-        ResultSet set = Rixa.getInstance().getDbManager().getObject(ps);
+        ResultSet set = Rixa.getDbManager().getObject(ps);
         this.prefix = (set.getString("prefix"));
         this.defaultRole = (set.getString("defaultRole"));
         this.joinMessage = (set.getString("joinMessage"));
@@ -57,16 +57,21 @@ public class GuildSettings {
         if(!set.getString("farewell").equalsIgnoreCase("default_value")) {
             quitMessageChannel = guild.getTextChannelById(set.getString("farewell"));
         }
-        ps = Rixa.getInstance().getDbManager()
+        ps = Rixa.getDbManager()
                 .getConnection().prepareStatement("SELECT * FROM `core` WHERE `guild_id` = ?");
         ps.setString(1, guild.getId());
-        set = Rixa.getInstance().getDbManager().getObject(ps);
+        set = Rixa.getDbManager().getObject(ps);
         this.description = (set.getString("description"));
         this.enlisted = (set.getBoolean("enlisted"));
     }
 
     private boolean checkExists() {
-        return Rixa.getInstance().getDbManager().checkExists("SELECT `guild_id` FROM `settings` WHERE `guild_id` = '" + guild.getId() + "'") == Result.TRUE;
+        try {
+            return Rixa.getDbManager().checkExists("SELECT `guild_id` FROM `settings` WHERE `guild_id` = '" + guild.getId() + "'") == Result.TRUE;
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
     }
 
     public void unload() {
@@ -75,56 +80,56 @@ public class GuildSettings {
 
     public void setJoinMessage(String joinMessage) {
         this.joinMessage = joinMessage;
-        Rixa.getInstance().getData().update("settings", "joinMessage", "guild_id", joinMessage, guild.getId());
+        Rixa.getData().update("settings", "joinMessage", "guild_id", joinMessage, guild.getId());
     }
     
     public void setQuitMessage(String quitMessage) {
         this.quitMessage = quitMessage;
-        Rixa.getInstance().getData().update("settings", "quitMessage", "guild_id", quitMessage, guild.getId());
+        Rixa.getData().update("settings", "quitMessage", "guild_id", quitMessage, guild.getId());
     }
     
     public void setJoinPrivateMessage(String joinPrivateMessage) {
         this.joinPrivateMessage = joinPrivateMessage;
-        Rixa.getInstance().getData().update("settings", "joinPM", "guild_id", joinPrivateMessage, guild.getId());
+        Rixa.getData().update("settings", "joinPM", "guild_id", joinPrivateMessage, guild.getId());
     }
     
     public void setJoinMessageChannel(TextChannel joinMessageChannel) {
         this.joinMessageChannel = joinMessageChannel;
-        Rixa.getInstance().getData().update("settings", "greetings", "guild_id", joinMessageChannel.getId(), guild.getId());
+        Rixa.getData().update("settings", "greetings", "guild_id", joinMessageChannel.getId(), guild.getId());
     }
     
     public void setQuitMessageChannel(TextChannel quitMessageChannel) {
         this.quitMessageChannel = quitMessageChannel;
-        Rixa.getInstance().getData().update("settings", "farewell", "guild_id", quitMessageChannel.getId(), guild.getId());
+        Rixa.getData().update("settings", "farewell", "guild_id", quitMessageChannel.getId(), guild.getId());
     }
     
     public void setDefaultRole(String defaultRole) {
         this.defaultRole = defaultRole;
-        Rixa.getInstance().getData().update("settings", "defaultRole", "guild_id", defaultRole, guild.getId());
+        Rixa.getData().update("settings", "defaultRole", "guild_id", defaultRole, guild.getId());
     }
     
     public void setPrefix(String prefix) {
         this.prefix = prefix;
-        Rixa.getInstance().getData().update("settings", "prefix", "guild_id", prefix, guild.getId());
+        Rixa.getData().update("settings", "prefix", "guild_id", prefix, guild.getId());
     }
     
     public void setDescription(String description) {
         this.description = description;
-        Rixa.getInstance().getData().update("core", "description", "guild_id", description, guild.getId());
+        Rixa.getData().update("core", "description", "guild_id", description, guild.getId());
     }
     
     public void setEnlisted(boolean enlisted) {
         this.enlisted = enlisted;
-        Rixa.getInstance().getData().update("core", "enlisted", "guild_id", enlisted, guild.getId());
+        Rixa.getData().update("core", "enlisted", "guild_id", enlisted, guild.getId());
     }
     
     public void setMuteRole(String muteRole) {
         this.muteRole = muteRole;
-        Rixa.getInstance().getData().update("settings", "muteRole", "guild_id", muteRole, guild.getId());
+        Rixa.getData().update("settings", "muteRole", "guild_id", muteRole, guild.getId());
     }
     
     public void setJoinVerification(boolean joinVerification) {
         this.joinVerification = joinVerification;
-        Rixa.getInstance().getData().update("settings", "joinVerification", "guild_id", joinVerification, guild.getId());
+        Rixa.getData().update("settings", "joinVerification", "guild_id", joinVerification, guild.getId());
     }
 }
diff --git a/src/main/java/me/savvy/rixa/guild/user/UserData.java b/src/main/java/me/savvy/rixa/guild/user/UserData.java
index 748cfd5..557527e 100644
--- a/src/main/java/me/savvy/rixa/guild/user/UserData.java
+++ b/src/main/java/me/savvy/rixa/guild/user/UserData.java
@@ -104,9 +104,15 @@ public class UserData {
 
     private boolean checkExists() {
         String query = "SELECT `%s` FROM `%s` WHERE `%s` = '%s' AND `%s` = '%s';";
-        Result r = Rixa.getDbManager().checkExists(String.format
-                (query, "user_id", "levels", "guild_id", guild.getId(), "user_id", user.getId()));
+        Result r;
+        try {
+            r = Rixa.getDbManager().checkExists(String.format
+                    (query, "user_id", "levels", "guild_id", guild.getId(), "user_id", user.getId()));
         return r == Result.TRUE;
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
     }
 
     private void insert() {
@@ -115,7 +121,7 @@ public class UserData {
                 .insert(String.format(query, "levels", "guild_id", "user_id", "experience", guild.getId(), user.getId(), 0));
     }
 
-    public void setExperience(int experience) {
+    private void setExperience(int experience) {
         this.experience = experience;
         String query = "UPDATE `%s` SET `%s` = '%s' WHERE `%s` = '%s' AND `%s` = '%s';";
         try {
@@ -129,7 +135,7 @@ public class UserData {
         }
     }
 
-    public int getRandom() {
+    private int getRandom() {
         int i = random.nextInt(25);
         return (i > 15 && i < 25 ? i : getRandom());
     }
diff --git a/src/main/java/me/savvy/rixa/modules/levels/LevelsModule.java b/src/main/java/me/savvy/rixa/modules/levels/LevelsModule.java
index d86bb33..3d219ba 100644
--- a/src/main/java/me/savvy/rixa/modules/levels/LevelsModule.java
+++ b/src/main/java/me/savvy/rixa/modules/levels/LevelsModule.java
@@ -1,10 +1,17 @@
 package me.savvy.rixa.modules.levels;
 
 import lombok.Getter;
+import lombok.Setter;
+import me.savvy.rixa.Rixa;
+import me.savvy.rixa.commands.handlers.RixaPermission;
+import me.savvy.rixa.enums.Result;
 import me.savvy.rixa.guild.RixaGuild;
 import me.savvy.rixa.guild.user.UserData;
 import me.savvy.rixa.modules.RixaModule;
 
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -20,6 +27,7 @@ public class LevelsModule implements RixaModule {
     public LevelsModule(RixaGuild rixaGuild) {
         this.rixaGuild = rixaGuild;
         enabled = true;
+        load();
     }
 
     @Override
@@ -52,4 +60,47 @@ public class LevelsModule implements RixaModule {
                 (getRixaGuild().getGuild().getJDA().getUserById(key),
                         getRixaGuild().getGuild());
     }
+
+    private void load() {
+        if (!(checkExists())) {
+            this.enabled = true;
+            insert();
+        }
+        String query = "SELECT `levels` FROM `modules` WHERE `guild_id` = ?;";
+        PreparedStatement ps = null;
+        ResultSet rs = null;
+        try {
+            ps = Rixa.getDbManager().getConnection().prepareStatement(query);
+                ps.setString(1, getRixaGuild().getGuild().getId());
+            rs = Rixa.getDbManager().getObject(ps);
+            this.enabled = rs.getBoolean("levels");
+            ps.close();
+            rs.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private boolean checkExists() {
+        String query = "SELECT `%s` FROM `%s` WHERE `%s` = '%s';";
+        Result r = Result.ERROR;
+        try {
+            r = Rixa.getDbManager().checkExists(String.format
+                    (query, "guild_id", "modules", "guild_id", rixaGuild.getGuild().getId()));
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return r == Result.TRUE;
+    }
+
+    private void insert() {
+        String query = "INSERT INTO `%s` (`%s`) VALUES ('%s');";
+        Rixa.getDbManager()
+                .insert(String.format(query, "modules", "guild_id", rixaGuild.getGuild().getId()));
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+        Rixa.getData().update("modules", "enabled", "guild_id", enabled, rixaGuild.getGuild().getId());
+    }
 }
diff --git a/src/main/java/me/savvy/rixa/modules/music/MusicModule.java b/src/main/java/me/savvy/rixa/modules/music/MusicModule.java
index a6ab873..d9722cc 100644
--- a/src/main/java/me/savvy/rixa/modules/music/MusicModule.java
+++ b/src/main/java/me/savvy/rixa/modules/music/MusicModule.java
@@ -27,7 +27,7 @@ public class MusicModule implements RixaModule {
         this.guild = guild;
         this.enabled = false;
         this.musicRole = "default_value";
-        db = Rixa.getInstance().getDbManager();
+        db = Rixa.getDbManager();
         load();
     }
 
@@ -61,7 +61,7 @@ public class MusicModule implements RixaModule {
 
     public Result setEnabled(boolean val) {
         this.enabled = val;
-        return Rixa.getInstance().getData().update("music", "enabled", "guild_id", val, guild.getId());
+        return Rixa.getData().update("music", "enabled", "guild_id", val, guild.getId());
     }
 
     public boolean isRoleRequired() {
@@ -71,12 +71,17 @@ public class MusicModule implements RixaModule {
 
     public Result setRole(String newRole) {
         this.musicRole = newRole;
-        return Rixa.getInstance().getData().update("music", "music_role", "guild_id", newRole, guild.getId());
+        return Rixa.getData().update("music", "music_role", "guild_id", newRole, guild.getId());
     }
     
     public boolean checkExists() {
-        Result r = Rixa.getInstance().getDbManager().checkExists("SELECT `guild_id` FROM `music` WHERE `guild_id` = '" +
-                        guild.getId() + "';");
+        Result r = Result.ERROR;
+        try {
+            r = Rixa.getDbManager().checkExists("SELECT `guild_id` FROM `music` WHERE `guild_id` = '" +
+                            guild.getId() + "';");
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
         return r == Result.TRUE;
     }
 }
diff --git a/src/main/java/me/savvy/rixa/modules/reactions/handlers/React.java b/src/main/java/me/savvy/rixa/modules/reactions/handlers/React.java
index e9a0c85..a8bf4af 100644
--- a/src/main/java/me/savvy/rixa/modules/reactions/handlers/React.java
+++ b/src/main/java/me/savvy/rixa/modules/reactions/handlers/React.java
@@ -7,5 +7,5 @@ import net.dv8tion.jda.core.events.message.react.MessageReactionAddEvent;
  */
 public interface React {
 
-    public void reactionTrigger(MessageReactionAddEvent event);
+    void reactionTrigger(MessageReactionAddEvent event);
 }
diff --git a/src/main/java/me/savvy/rixa/utils/YoutubeSearch.java b/src/main/java/me/savvy/rixa/utils/YoutubeSearch.java
index 0d0b057..a763c00 100644
--- a/src/main/java/me/savvy/rixa/utils/YoutubeSearch.java
+++ b/src/main/java/me/savvy/rixa/utils/YoutubeSearch.java
@@ -15,7 +15,6 @@ public class YoutubeSearch {
 
     private static final String API_KEY;
     private JSONArray items;
-    private final String YOUTUBE_WATCH_BASE_URL = "https://www.youtube.com/watch?v=";
 
     static {
         API_KEY = "AIzaSyD1wjRGbzKgvjqAU25pREy1dVio9WpcuS0";
@@ -83,6 +82,7 @@ public class YoutubeSearch {
     }
 
     public String getUrl(int index) {
+        String YOUTUBE_WATCH_BASE_URL = "https://www.youtube.com/watch?v=";
         return YOUTUBE_WATCH_BASE_URL + getVideoId(index);
     }