175 changed files with 5440 additions and 8030 deletions
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: BBN Holding Discord Support
-    url: https://discord.gg/nPwjaJk
-    about: Please ask questions here.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -1,28 +0,0 @@
---
-name: "💡 Feature request"
-about: Submit your idea for a change in the codebase.
---
-
-# Feature request
-
-<!--
-This issue should serve for you to present or pitch an idea to the maintainers - but remember that it would be better if you were to submit a PR instead 🤗
-->
-
-## Why it is needed
-
-<!--
-Please tell us a bit more of why you want this feature to be added, what's its origin.
-->
-
-## Possible implementation
-
-<!--
-It really helps if you could describe from a technical POV how this new feature would work, which code it rely on, etc.
-->
-
-### Code sample
-
-<!--
-Please show how the new code could work, if doable.
-->
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,13 +0,0 @@
-version: 2
-updates:
- package-ecosystem: maven
-  directory: "/"
-  schedule:
-    interval: monthly
-    time: "13:00"
-  open-pull-requests-limit: 99
-  target-branch: greg-dev
-  assignees:
-  - GregTCLTK
-  labels:
-  - pending-deploy
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@ -3,36 +3,35 @@ name: Hadder
 on: [push]

 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2.3.4
-      - name: Set up JDK 15
-        uses: actions/setup-java@v1.4.3
+    build:
+      runs-on: ubuntu-latest
+      steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK 1.13
+        uses: actions/setup-java@v1
        with:
-          java-version: '15'
+          java-version: 1.13
      - name: Build with Maven
        run: mvn -B package --file pom.xml

-  deploy:
-    runs-on: ubuntu-latest
-    needs: build
-    if: github.ref == 'refs/heads/master'
-    steps:
-      - uses: actions/checkout@v2.3.4
-      - name: Set up JDK 15
-        uses: actions/setup-java@v1.4.3
+    deploy:
+      runs-on: ubuntu-latest
+      needs: build
+      if: github.ref == 'refs/heads/master'
+      steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK 1.13
+        uses: actions/setup-java@v1
        with:
-          java-version: '15'
+          java-version: 1.13
      - name: Build Final Jar
        run:  mvn clean compile assembly:single
      - name: Copy folder content recursively to remote
        uses: garygrossgarten/github-action-scp@release
        with:
          local: ./target/Hadder-Build.jar
-          remote: /root/bots/Hadder/Hadder-Build.jar
+          remote: /home/Bots/Hadder-Build.jar
          host: ${{ secrets.HOST }}
-          port: ${{ secrets.PORT }}
          username: ${{ secrets.USERNAME }}
          password: ${{ secrets.PASSWORD }}
      - name: executing remote ssh commands using password
@ -42,7 +41,7 @@ jobs:
          username: ${{ secrets.USERNAME }}
          password: ${{ secrets.PASSWORD }}
          port: ${{ secrets.PORT }}
-          script: /root/bots/Hadder/deploy.sh
+          script: /home/Bots/deploy.sh
      - name: Send Webhook Notification
        if: always()
        env:
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@ -57,7 +57,7 @@ If a community member engages in unacceptable behavior, the community organizers

 ## 7. Reporting Guidelines

-If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. admin@bbn.one.
+If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. admin@bigbotnetwork.com.



@ -65,7 +65,7 @@ Additionally, community organizers are available to help community members engag

 ## 8. Addressing Grievances

-If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify BBN with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies. 
+If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify BigBotNetwork with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies. 



@ -77,7 +77,7 @@ This code of conduct and its related procedures also applies to unacceptable beh

 ## 10. Contact info

-admin@bbn.one
+admin@bigbotnetwork.com

 ## 11. License and attribution

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -69,7 +69,7 @@ further defined and clarified by project maintainers.
 ### Enforcement

 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team on [Discord](https://discordapp.com/invite/nPwjaJk). All
+reported by contacting the project team on [Discord](https://discordapp.com/invite/Vf4zCYn). All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.
--- a/2
+++ b/2
@ -1,2 +0,0 @@
-FROM debian:buster
-WORKDIR /home/Hadder
--- a/README.md
+++ b/README.md
@ -2,60 +2,22 @@

 Hadder Discord is a multi-purpose Discord bot with 100% uptime.

-<a href="https://discord.gg/nPwjaJk"><img src="https://discord.com/api/guilds/757966278936756345/embed.png"/></a>
-[![Build Status](https://github.com/BBN-Holding/Hadder/workflows/Hadder/badge.svg)](https://github.com/BBN-Holding/Hadder)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ddb8cb7ec85f467caa691c175e1f01b5)](https://www.codacy.com/gh/BBN-Holding/Hadder?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=BBN-Holding/Hadder&amp;utm_campaign=Badge_Grade)
+<a href="https://discord.gg/58My2dM"><img src="https://discordapp.com/api/guilds/448554629282922527/embed.png"/></a>
+[![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Hadder/badge.svg)](https://github.com/BigBotNetwork/Hadder)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ddb8cb7ec85f467caa691c175e1f01b5)](https://www.codacy.com/gh/BigBotNetwork/Hadder?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=BigBotNetwork/Hadder&amp;utm_campaign=Badge_Grade)
 [![CodeFactor](https://www.codefactor.io/repository/github/bigbotnetwork/hadder/badge)](https://www.codefactor.io/repository/github/bigbotnetwork/hadder)
 [![Crowdin](https://badges.crowdin.net/e/bc0babde730eb3eada34778502a31b03/localized.svg)](https://bbn.crowdin.com/hadder)
-[![GitHub issues](https://img.shields.io/github/issues/BBN-Holding/Hadder)](https://github.com/BBN-Holding/Hadder/issues)
-[![GitHub license](https://img.shields.io/github/license/BBN-Holding/Hadder)](https://github.com/BBN-Holding/Hadder/blob/master/LICENSE)
-[![time tracker](https://wakatime.com/badge/github/BBN-Holding/Hadder.svg)](https://wakatime.com/badge/github/BBN-Holding/Hadder)
+[![GitHub issues](https://img.shields.io/github/issues/BigBotNetwork/Hadder)](https://github.com/BigBotNetwork/Hadder/issues)
+[![GitHub license](https://img.shields.io/github/license/BigBotNetwork/Hadder)](https://github.com/BigBotNetwork/Hadder/blob/master/LICENSE)
+
+[![Discord Extreme List](https://api.discordextremelist.xyz/v1/bot/637002314162372639/widget)](https://discordextremelist.xyz/bots/Hadder)
+[![Discord Bots](https://top.gg/api/widget/637002314162372639.svg)](https://top.gg/bot/637002314162372639)
+[![Hadder's Widget](https://api.botlist.space/widget/637002314162372639/2 "Hadder's Widget")](https://botlist.space/bot/637002314162372639?utm_source=bls&utm_medium=widget&utm_campaign=637002314162372639)

 ## Hadder Team
 ### Developer
 Skidder#6775 <br>
 Hax#6775

-## A few commands
-| **Command**    | **Description**                                               |
-|----------------|---------------------------------------------------------------|
-| h.about        | Shows information about Hadder                                |
-| h.avatar       | Sends the avatar of the specified Member                      |
-| h.ban          | Bans one or more users from the server                        |
-| h.bass         | Change the bass for the song which is played at the moment    |
-| h.clear        | Deletes the specified number of messages                      |
-| h.clyde        | Sends a message as a webhook named Clyde                      |
-| h.code         | Shows information about a invite code                         |
-| h.corona       | Shows the newest stats of COVID-19                            |
-| h.echo         | Sends your voice through Hadder                               |
-| h.editrules    | Edits the rules message                                       |
-| h.equals       | Checks if two strings are equal                               |
-| h.feedback     | Sends feedback directly to the developers                     |
-| h.gif          | Looks for a GIF on Giphy                                      |
-| h.github       | Displays information about a GitHub user profile              |
-| h.help         | Shows each command and explains its usage                     |
-| h.info         | Shows information about the playing song                      |
-| h.invite       | Shows the invitation link to invite Hadder to your server     |
-| h.invitedetect | Activate or deactivate the Discord invite link detection      |
-| h.join         | Joins your voice channel                                      |
-| h.kick         | Kicks one or more user from the server                        |
-| h.language     | Sets the new primary language for a user                      |
-| h.loop         | Repeats a song/queue                                          |
-| h.meme         | Sends you a random meme                                       |
-| h.moveall      | Moves all users in the source channel to the target channel   |
-| h.nick         | Rename a one or more user                                     |
-| h.pause        | Pause the playing song                                        |
-| h.ping         | Shows the ping to the Discord API                             |
-| h.play         | Plays the specified song                                      |
-| h.prefix       | Sets the Guild-Prefix                                         |
-| h.profile      | Shows some information about the specified user               |
-| h.queue        | Shows the music queue                                         |
-| h.regionchange | Changes the server region to locked regions                   |
-| h.role         | Adds and removes one or more role(s) from one or more user(s) |
-| h.rules        | Setup the rules on your Discord server                        |
-| h.screenshare  | Shows you the link to share your screen                       |
-| h.serverstats  | Shows information about a server                              |
-| h.skip         | Skips the currently playing song                              |
-| h.starboard    | Sets the starboard channel                                    |
-| h.stop         | Stops the song                                                |
-| h.volume       | Change the volume of the music                                |
+### Designer
+TopComp#1288
--- a/crowdin.yml
+++ b/crowdin.yml
@ -1,4 +1,4 @@
-base_url: 'https://bbn.one'
+base_url: 'https://bigbotnetwork.com'
 commit_message: 'New %language% translation'
 files:
  - source: /src/main/resources/Translations/Translations_en.properties
--- a/example-config.json
+++ b/example-config.json
@ -1,17 +1,25 @@
 {
-  "Owners": [
-  ],
-  "Database": {
-    "IP": "",
+  "Owners":
+  [],
+  "Database":{"IP":"",
    "Port": 6775,
    "DBName": "",
    "Username": "",
-    "Password": ""
-  },
+    "Password": ""},
  "Tokens": {
    "BotToken": "",
    "Giphy": "",
-    "GitHub": ""
+    "GitHub": "",
+    "MythicalBotList": "",
+    "BotsForDiscord": "",
+    "DiscordBotList": "",
+    "DiscordBestBots": "",
+    "DiscordBoats": "",
+    "YetAnotherBotList": "",
+    "DiscordExtremeList": "",
+    "DiscordBotReviews": "",
+    "DiscordBots": "",
+    "BotListSpace": ""
  },
  "Clyde": ""
 }
--- a/pom.xml
+++ b/pom.xml
@ -1,138 +1,136 @@
 <?xml version="1.0" encoding="UTF-8" ?>

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>

-    <modelVersion>4.0.0</modelVersion>
-    <groupId>Hadder</groupId>
-    <artifactId>Hadder</artifactId>
-    <version>2.0.4</version>
-    <name>Hadder</name>
-    <inceptionYear>2019</inceptionYear>
-    <description>Hadder is a multi-purpose Discord bot.</description>
-    <url>https://github.com/BBN-Holding/Hadder</url>
+  <groupId>Hadder</groupId>
+  <artifactId>Hadder</artifactId>
+  <version>0.1-BETA</version>

-    <licenses>
-        <license>
-            <name>GNU Affero General Public License v3.0</name>
-            <url>https://www.gnu.org/licenses/agpl-3.0.en.html</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
+  <name>Hadder</name>

-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.15</maven.compiler.source>
-        <maven.compiler.target>1.15</maven.compiler.target>
-        <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
-    </properties>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.13</maven.compiler.source>
+    <maven.compiler.target>1.13</maven.compiler.target>
+  </properties>

-    <developers>
-        <developer>
-            <id>Hax#6775</id>
-            <name>Hax</name>
-            <email>hax@bbn.one</email>
-            <url>https://bbn.one/</url>
-            <timezone>Europe/Berlin</timezone>
-            <properties>
-                <picUrl>https://cdn.discordapp.com/avatars/261083609148948488/f2c9efc629ef65fffa634f0d63cd467e.webp
-                </picUrl>
-            </properties>
-        </developer>
-        <developer>
-            <id>Skidder#6775</id>
-            <name>Greg</name>
-            <email>skidder@bbn.one</email>
-            <url>https://bbn.one/</url>
-            <timezone>Europe/Berlin</timezone>
-            <properties>
-                <picUrl>https://cdn.discordapp.com/avatars/401817301919465482/a_f81bd03e3862de579dec59241714d86d.gif
-                </picUrl>
-            </properties>
-        </developer>
-    </developers>
+  <dependencies>
+    <dependency>
+      <groupId>net.dv8tion</groupId>
+      <artifactId>JDA</artifactId>
+      <version>4.1.0_90</version>
+    </dependency>
+    <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <version>20190722</version>
+    </dependency>
+      <dependency>
+        <groupId>com.rethinkdb</groupId>
+        <artifactId>rethinkdb-driver</artifactId>
+        <version>2.3.3</version>
+      </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>1.7.30</version>
+    </dependency>
+    <dependency>
+      <groupId>club.minnced</groupId>
+      <artifactId>discord-webhooks</artifactId>
+      <version>0.1.8</version>
+    </dependency>
+    <dependency>
+      <groupId>org.kohsuke</groupId>
+      <artifactId>github-api</artifactId>
+      <version>1.101</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sedmelluq</groupId>
+      <artifactId>lavaplayer</artifactId>
+      <version>1.3.32</version>
+    </dependency>
+  </dependencies>

-    <repositories>
-        <repository>
-            <id>jcenter</id>
-            <name>jcenter-bintray</name>
-            <url>https://jcenter.bintray.com</url>
-        </repository>
-        <repository>
-            <id>dv8tion</id>
-            <name>m2-dv8tion</name>
-            <url>https://m2.dv8tion.net/releases</url>
-        </repository>
-    </repositories>
+  <repositories>
+    <repository>
+      <id>jcenter</id>
+      <name>jcenter-bintray</name>
+      <url>https://jcenter.bintray.com</url>
+    </repository>
+  </repositories>

-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-model</artifactId>
-            <version>3.8.6</version>
-        </dependency>
-        <dependency>
-            <groupId>net.dv8tion</groupId>
-            <artifactId>JDA</artifactId>
-            <version>4.4.0_352</version>
-        </dependency>
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20220924</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>2.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>club.minnced</groupId>
-            <artifactId>discord-webhooks</artifactId>
-            <version>0.8.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.kohsuke</groupId>
-            <artifactId>github-api</artifactId>
-            <version>1.313</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sedmelluq</groupId>
-            <artifactId>lavaplayer</artifactId>
-            <version>1.3.78</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongodb-driver-sync</artifactId>
-            <version>4.7.1</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>15</source>
-                    <target>15</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <finalName>Hadder-Build</finalName>
-                    <archive>
-                        <manifest>
-                            <mainClass>one.bbn.hadder.Hadder</mainClass>
-                        </manifest>
-                    </archive>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <appendAssemblyId>false</appendAssemblyId>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.22.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.2.0</version>
+          <configuration>
+            <finalName>Hadder-Build</finalName>
+            <archive>
+              <manifest>
+                <mainClass>com.bbn.hadder.Hadder</mainClass>
+              </manifest>
+            </archive>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.8.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <source>13</source>
+          <target>13</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <finalName>Hadder-Build</finalName>
+          <archive>
+            <manifest>
+              <mainClass>com.bbn.hadder.Hadder</mainClass>
+            </manifest>
+          </archive>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+          <appendAssemblyId>false</appendAssemblyId>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
--- a/src/main/java/com/bbn/hadder/Hadder.java
+++ b/src/main/java/com/bbn/hadder/Hadder.java
@ -1,46 +1,21 @@
-/*
- * Copyright 2019-2020 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+package com.bbn.hadder;

-package one.bbn.hadder;
-
-import net.dv8tion.jda.api.utils.cache.CacheFlag;
-import one.bbn.hadder.audio.AudioManager;
-import one.bbn.hadder.commands.fun.AvatarCommand;
-import one.bbn.hadder.commands.fun.ClydeCommand;
-import one.bbn.hadder.commands.fun.GifCommand;
-import one.bbn.hadder.commands.fun.MemeCommand;
-import one.bbn.hadder.commands.general.*;
-import one.bbn.hadder.commands.misc.*;
-import one.bbn.hadder.commands.moderation.*;
-import one.bbn.hadder.commands.music.*;
-import one.bbn.hadder.commands.nsfw.*;
-import one.bbn.hadder.commands.owner.*;
-import one.bbn.hadder.commands.settings.LanguageCommand;
-import one.bbn.hadder.commands.settings.UserPrefixCommand;
-import one.bbn.hadder.core.CommandHandler;
-import one.bbn.hadder.core.Config;
-import one.bbn.hadder.db.Mongo;
-import one.bbn.hadder.listener.*;
-import net.dv8tion.jda.api.OnlineStatus;
+import com.bbn.hadder.audio.AudioManager;
+import com.bbn.hadder.commands.general.*;
+import com.bbn.hadder.commands.misc.*;
+import com.bbn.hadder.commands.moderation.*;
+import com.bbn.hadder.commands.nsfw.*;
+import com.bbn.hadder.commands.owner.*;
+import com.bbn.hadder.commands.fun.*;
+import com.bbn.hadder.commands.settings.*;
+import com.bbn.hadder.commands.music.*;
+import com.bbn.hadder.core.*;
+import com.bbn.hadder.listener.*;
 import net.dv8tion.jda.api.entities.Activity;
-import net.dv8tion.jda.api.requests.GatewayIntent;
 import net.dv8tion.jda.api.sharding.DefaultShardManagerBuilder;
 import net.dv8tion.jda.api.sharding.ShardManager;
-import net.dv8tion.jda.api.utils.ChunkingFilter;

+import javax.security.auth.login.LoginException;
 import java.util.List;

 public class Hadder {
@ -56,19 +31,15 @@ public class Hadder {
        if (!config.fileExists()) config.create();
        config.load();

-        Mongo mongo = new Mongo(config);
-        mongo.connect();
+        Rethink rethink = new Rethink(config);
+        rethink.connect();

-        DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.getIntents(14053));
+        DefaultShardManagerBuilder builder = new DefaultShardManagerBuilder();

        builder.setAutoReconnect(true);
        builder.setShardsTotal(1);
-        builder.setChunkingFilter(ChunkingFilter.NONE);
-        builder.setBulkDeleteSplittingEnabled(true);
-        builder.setActivity(Activity.listening("h.help"));
-        builder.setStatus(OnlineStatus.DO_NOT_DISTURB);
+        builder.setActivity(Activity.streaming("on the BigBotNetwork", "https://twitch.tv/BigBotNetwork"));
        builder.setToken(config.getBotToken());
-        builder.disableCache(CacheFlag.ACTIVITY, CacheFlag.EMOTE, CacheFlag.CLIENT_STATUS);

        HelpCommand helpCommand = new HelpCommand();
        AudioManager audioManager = new AudioManager();
@ -106,6 +77,7 @@ public class Hadder {
                        new AvatarCommand(),
                        new EvalCommand(),
                        new JoinCommand(),
+                        new LeaveCommand(),
                        new GuildLeaveCommand(),
                        new MemeCommand(),
                        new InviteDetectCommand(),
@ -120,39 +92,28 @@ public class Hadder {
                        new LanguageCommand(),
                        new ClydeCommand(),
                        new PlayCommand(),
-                        new StarboardCommand(),
+                        new StarBoardCommand(),
                        new QueueCommand(),
                        new InfoCommand(),
                        new SkipCommand(),
                        new EditRulesCommand(),
                        new VolumeCommand(),
-                        new StopCommand(),
-                        new BlacklistCommand(),
-                        new PauseCommand(),
-                        new LoopCommand(),
-                        new BassCommand(),
-                        new EchoCommand(),
-                        new ServerStatsCommand(),
-                        new ProfileCommand(),
-                        new CodeCommand(),
-                        new MoveAllCommand(),
-                        new CoronaCommand()), config, helpCommand);
+                        new StopCommand()), config, helpCommand);

        builder.addEventListeners(
-                new MentionListener(mongo, config),
-                new PrivateMessageListener(mongo),
-                new CommandListener(mongo, commandHandler, audioManager),
-                new GuildListener(mongo, config),
-                new ReadyListener(config),
-                new InviteLinkListener(mongo),
-                new RulesListener(mongo),
-                new StarboardListener(mongo),
-                new VoiceLeaveListener(audioManager),
-                new OwnerMessageListener(config));
+                new MentionListener(rethink),
+                new PrivateMessageListener(rethink),
+                new CommandListener(rethink, commandHandler, audioManager),
+                new GuildListener(rethink, config),
+                new ReadyListener(rethink, config),
+                new InviteLinkListener(rethink),
+                new RulesListener(rethink),
+                new StarboardListener(rethink),
+                new VoiceLeaveListener(audioManager));

        try {
            shardManager = builder.build();
-        } catch (Exception e) {
+        } catch (LoginException e) {
            e.printStackTrace();
        }
    }
--- a/src/main/java/com/bbn/hadder/Rethink.java
+++ b/src/main/java/com/bbn/hadder/Rethink.java
@ -0,0 +1,218 @@
+package com.bbn.hadder;
+
+import com.bbn.hadder.core.Config;
+import com.rethinkdb.RethinkDB;
+import com.rethinkdb.gen.exc.ReqlOpFailedError;
+import com.rethinkdb.net.Connection;
+import org.json.JSONArray;
+
+import java.util.NoSuchElementException;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+public class Rethink {
+    private RethinkDB r = RethinkDB.r;
+    private Connection conn;
+    private Config config;
+
+    Rethink(Config config) {
+        this.config = config;
+    }
+
+    public void connect() {
+        try {
+            conn = r.connection()
+                    .hostname(config.getDatabaseIP())
+                    .db(config.getDatabaseName())
+                    .port(config.getDatabasePort())
+                    .user(config.getDatabaseUsername(), config.getDatabasePassword())
+                    .connect();
+            System.out.println("DB CONNECTED");
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("DB CONNECTION FAILED");
+        }
+    }
+
+    public void disconnect() {
+        conn.close();
+        System.out.println("DISCONNECTED");
+    }
+
+    private JSONArray getAsArray(String table, String where, String value) {
+        try {
+            String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn);
+            return new JSONArray(string);
+        } catch (NoSuchElementException e) {
+            return null;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new JSONArray();
+    }
+
+    public Object get(String table, String where, String value, String column) {
+        JSONArray array = this.getAsArray(table, where, value);
+        if (array.length() > 0)
+            if (array.getJSONObject(0).has(column))
+                return array.getJSONObject(0).get(column);
+            else return null;
+        else return null;
+    }
+
+    public void update(String table, String value, String what, String whatvalue) {
+        try {
+            r.table(table).get(value).update(r.hashMap(what, whatvalue)).run(conn);
+        } catch (ClassCastException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void insert(String table, Object object) {
+        try {
+            r.table(table).insert(object).run(conn);
+        } catch (ClassCastException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void remove(String table, String where, String value) {
+        r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).delete().run(conn);
+    }
+
+    public void setup() {
+        try {
+            r.dbCreate("Hadder").run(conn);
+        } catch (ReqlOpFailedError e) {
+            System.out.println(e.getMessage());
+        }
+        try {
+            r.tableCreate("server").run(conn);
+        } catch (ReqlOpFailedError e) {
+           System.out.println(e.getMessage());
+        }
+        try {
+            r.tableCreate("user").run(conn);
+        } catch (ReqlOpFailedError e) {
+            System.out.println(e.getMessage());
+        }
+        try {
+            r.tableCreate("stars").run(conn);
+        } catch (ReqlOpFailedError e) {
+            System.out.println(e.getMessage());
+        }
+    }
+
+    public void setUserPrefix(String prefix, String user_id) {
+        this.update("user", user_id, "prefix", prefix);
+    }
+
+    public String getUserPrefix(String id) {
+        return (String) this.get("user", "id", id, "prefix");
+    }
+
+    public void setGuildPrefix(String prefix, String guild_id) {
+        this.update("server", guild_id, "prefix", prefix);
+    }
+
+    public String getGuildPrefix(String id) {
+        return (String) this.get("server", "id", id, "prefix");
+    }
+
+    public void insertGuild(String id) {
+        this.insert("server", r.hashMap("id", id)
+                .with("prefix", "h.")
+                .with("message_id", "")
+                .with("role_id", "")
+                .with("invite_detect", false)
+                .with("starboard", "")
+                .with("neededstars", "4")
+        );
+    }
+
+    public void insertUser(String id) {
+        this.insert("user", r.hashMap("id", id).with("prefix", "h.").with("language", "en"));
+    }
+
+    public void setNeededstars(String stars, String guild_id) {
+        this.update("server", guild_id, "neededstars", stars);
+    }
+
+    public String getNeededstars(String guild_id) {
+        return (String) this.get("server", "id", guild_id, "neededstars");
+    }
+
+    public void setStarboardChannel(String guild_id, String channel_id) {
+        this.update("server", guild_id, "starboard", channel_id);
+    }
+
+    public String getStarboardChannel(String guild_id) {
+        return (String) this.get("server", "id", guild_id, "starboard");
+    }
+
+    public boolean hasStarboardChannel(String guild_id) {
+        return !this.get("server", "id", guild_id, "starboard").equals("");
+    }
+
+    public void insertStarboardMessage(String message_id, String guild_id, String starboardmessageid) {
+        this.insert("stars", r.hashMap("id", message_id).with("guild", guild_id).with("starboardmsg", starboardmessageid));
+    }
+
+    public String getStarboardMessage(String message_id) {
+        return (String) this.get("stars", "id", message_id, "starboardmsg");
+    }
+
+    public void removeStarboardMessage(String message_id) {
+        this.remove("stars", "id", message_id);
+    }
+
+    public boolean hasStarboardMessage(String message_id) {
+        return this.get("stars", "id", message_id, "guild") != null;
+    }
+
+    public void updateRules(String guild_id, String message_id, String role_id, String accept_emote, String decline_emote) {
+        this.update("server", guild_id, "message_id", message_id);
+        this.update("server", guild_id, "role_id", role_id);
+        this.update("server", guild_id, "accept_emote", accept_emote);
+        this.update("server", guild_id, "decline_emote", decline_emote);
+    }
+
+    public String getRulesMID(String guild_id) {
+        return (String) this.get("server", "id", guild_id, "message_id");
+    }
+
+    public String getRulesRID(String guild_id) {
+        return (String) this.get("server", "id", guild_id, "role_id");
+    }
+
+    public String getRulesAEmote(String guild_id) {
+        return this.get("server", "id", guild_id, "accept_emote").toString().replaceAll("\"", "");
+    }
+
+    public String getRulesDEmote(String guild_id) {
+        return this.get("server", "id", guild_id, "decline_emote").toString().replaceAll("\"", "");
+    }
+
+    public void setInviteDetection(String guild_id, boolean b) {
+        try {
+            r.table("server").get(guild_id).update(r.hashMap("invite_detect", b)).run(conn);
+        } catch (ClassCastException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public Boolean getInviteDetection(String guild_id) {
+        return (Boolean) this.get("server", "id", guild_id, "invite_detect");
+    }
+
+    public void setLanguage(String user_id, String language) {
+        this.update("user", user_id, "language", language);
+    }
+
+    public String getLanguage(String user_id) {
+        return (String) this.get("user", "id", user_id, "language");
+    }
+
+}
--- a/src/main/java/com/bbn/hadder/audio/AudioInfo.java
+++ b/src/main/java/com/bbn/hadder/audio/AudioInfo.java
@ -0,0 +1,28 @@
+package com.bbn.hadder.audio;
+
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import net.dv8tion.jda.api.entities.Member;
+
+/**
+ * @author Skidder / GregTCLTK
+ */
+
+public class AudioInfo {
+
+    private final AudioTrack track;
+    private final Member author;
+
+    AudioInfo(AudioTrack track, Member author) {
+        this.track = track;
+        this.author = author;
+    }
+
+    public AudioTrack getTrack() {
+        return track;
+    }
+
+    public Member getAuthor() {
+        return author;
+    }
+
+}
--- a/src/main/java/com/bbn/hadder/audio/AudioManager.java
+++ b/src/main/java/com/bbn/hadder/audio/AudioManager.java
@ -1,23 +1,7 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+package com.bbn.hadder.audio;

-package one.bbn.hadder.audio;
-
-import one.bbn.hadder.commands.CommandEvent;
-import one.bbn.hadder.utils.MessageEditor;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
 import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
@ -27,6 +11,7 @@ import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

 import java.util.AbstractMap;
@ -34,6 +19,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;

+/**
+ * @author Skidder / GregTCLTK
+ */
+
 public class AudioManager {

    public Map<String, Map.Entry<AudioPlayer, TrackManager>> players = new HashMap<>();
@ -41,7 +30,6 @@ public class AudioManager {

    public AudioManager() {
        AudioSourceManagers.registerRemoteSources(myManager);
-        myManager.getConfiguration().setFilterHotSwapEnabled(true);
    }

    public boolean hasPlayer(Guild guild) {
@ -64,7 +52,7 @@ public class AudioManager {

    public AudioPlayer createPlayer(Guild guild) {
        AudioPlayer nPlayer = myManager.createPlayer();
-        TrackManager manager = new TrackManager(nPlayer, this);
+        TrackManager manager = new TrackManager(nPlayer);
        nPlayer.addListener(manager);
        guild.getAudioManager().setSendingHandler(new AudioPlayerSendHandler(nPlayer));
        players.put(guild.getId(), new AbstractMap.SimpleEntry<>(nPlayer, manager));
@ -79,31 +67,17 @@ public class AudioManager {

            @Override
            public void trackLoaded(AudioTrack track) {
-                if (getTrackManager(guild).getQueuedTracks().isEmpty()) {
-                    getTrackManager(guild).queue(track, event.getMember());
-                    msg.editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                            "commands.music.play.success.loading.title", "⏯",
-                            "", "")
-                            .addField(event.getMessageEditor().getTerm("commands.music.play.success.title"), track.getInfo().title, false)
-                            .addField(event.getMessageEditor().getTerm("commands.music.play.success.author"), track.getInfo().author, true)
-                            .addField(event.getMessageEditor().getTerm("commands.music.play.success.length"),
-                                    String.format("%02d:%02d:%02d", TimeUnit.MILLISECONDS.toHours(track.getInfo().length),
-                                            TimeUnit.MILLISECONDS.toMinutes(track.getInfo().length) % TimeUnit.HOURS.toMinutes(1),
-                                            TimeUnit.MILLISECONDS.toSeconds(track.getInfo().length) % TimeUnit.MINUTES.toSeconds(1)), true)
-                            .build()).queue();
-                } else {
-                    getTrackManager(guild).queue(track, event.getMember());
-                    msg.editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                            "commands.music.play.success.queueing.title", "⏺",
-                            "", "")
-                            .addField(event.getMessageEditor().getTerm("commands.music.play.success.title"), track.getInfo().title, false)
-                            .addField(event.getMessageEditor().getTerm("commands.music.play.success.author"), track.getInfo().author, true)
-                            .addField(event.getMessageEditor().getTerm("commands.music.play.success.length"),
-                                    String.format("%02d:%02d:%02d", TimeUnit.MILLISECONDS.toHours(track.getInfo().length),
-                                            TimeUnit.MILLISECONDS.toMinutes(track.getInfo().length) % TimeUnit.HOURS.toMinutes(1),
-                                            TimeUnit.MILLISECONDS.toSeconds(track.getInfo().length) % TimeUnit.MINUTES.toSeconds(1)), true)
-                            .build()).queue();
-                }
+                getTrackManager(guild).queue(track, event.getMember());
+                msg.editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                        "commands.music.play.success.loading.title", "⏯",
+                        "", "")
+                        .addField(event.getMessageEditor().getTerm("commands.music.play.success.title"), track.getInfo().title, false)
+                        .addField(event.getMessageEditor().getTerm("commands.music.play.success.author"), track.getInfo().author, true)
+                        .addField(event.getMessageEditor().getTerm("commands.music.play.success.length"),
+                                String.format("%02d:%02d:%02d", TimeUnit.MILLISECONDS.toHours(track.getInfo().length),
+                                        TimeUnit.MILLISECONDS.toMinutes(track.getInfo().length) % TimeUnit.HOURS.toMinutes(1),
+                                        TimeUnit.MILLISECONDS.toSeconds(track.getInfo().length) % TimeUnit.MINUTES.toSeconds(1)), true)
+                        .build()).queue();
            }

            @Override
@ -143,8 +117,6 @@ public class AudioManager {
        });
    }

-    /*
-    TODO: DJ integration
    public boolean isDj(Member member) {
        return member.getRoles().stream().anyMatch(r -> r.getName().equals("DJ"));
    }
@ -152,17 +124,22 @@ public class AudioManager {
    public boolean isCurrentDj(Member member) {
        return getTrackManager(member.getGuild()).getTrackInfo(getPlayer(member.getGuild()).getPlayingTrack()).getAuthor().equals(member);
    }
-*/
+
    public void forceSkipTrack(CommandEvent event) {
        getPlayer(event.getGuild()).stopTrack();
    }

-    public String getTimestamp(long m) {
-        long s = m / 1000;
-        long hours = Math.floorDiv(s, 3600);
-        s = s - (hours * 3600);
-        long minutes = Math.floorDiv(s, 60);
-        s = s - (minutes * 60);
-        return (hours == 0 ? "" : hours + ":") + String.format("%02d", minutes) + ":" + String.format("%02d", s);
+    public String getTimestamp(long milis) {
+        long seconds = milis / 1000;
+        long hours = Math.floorDiv(seconds, 3600);
+        seconds = seconds - (hours * 3600);
+        long mins = Math.floorDiv(seconds, 60);
+        seconds = seconds - (mins * 60);
+        return (hours == 0 ? "" : hours + ":") + String.format("%02d", mins) + ":" + String.format("%02d", seconds);
    }
+
+    public String getOrNull(String s) {
+        return s.isEmpty() ? "N/A" : s;
+    }
+
 }
--- a/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java
+++ b/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java
@ -0,0 +1,49 @@
+package com.bbn.hadder.audio;
+
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
+import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
+import net.dv8tion.jda.api.audio.AudioSendHandler;
+
+import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
+
+/**
+ * @author Skidder / GregTCLTK
+ */
+
+public class AudioPlayerSendHandler implements AudioSendHandler {
+
+    private final AudioPlayer audioPlayer;
+    private AudioFrame lastFrame;
+
+    public AudioPlayerSendHandler(AudioPlayer audioPlayer) {
+        this.audioPlayer = audioPlayer;
+    }
+
+    @Override
+    public boolean canProvide() {
+        if (lastFrame == null) {
+            lastFrame = audioPlayer.provide();
+        }
+
+        return lastFrame != null;
+    }
+
+    @Nullable
+    @Override
+    public ByteBuffer provide20MsAudio() {
+        if (lastFrame == null) {
+            lastFrame = audioPlayer.provide();
+        }
+
+        byte[] data = lastFrame != null ? lastFrame.getData() : null;
+        lastFrame = null;
+
+        return ByteBuffer.wrap(data);
+    }
+
+    @Override
+    public boolean isOpus() {
+        return true;
+    }
+}
--- a/src/main/java/com/bbn/hadder/audio/TrackManager.java
+++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java
@ -1,20 +1,4 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package one.bbn.hadder.audio;
+package com.bbn.hadder.audio;

 import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
 import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter;
@ -24,21 +8,19 @@ import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.VoiceChannel;

-import java.util.LinkedHashSet;
-import java.util.Queue;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;

+/**
+ * @author Skidder / GregTCLTK
+ */
+
 public class TrackManager extends AudioEventAdapter {

    private final AudioPlayer player;
-    private final AudioManager manager;
    private final Queue<AudioInfo> queue;
-    private AudioTrack lastTrack;
-    private boolean loop = false;

-    public TrackManager(AudioPlayer player, AudioManager manager) {
-        this.manager = manager;
+    public TrackManager(AudioPlayer player) {
        this.player = player;
        this.queue = new LinkedBlockingQueue<>();
    }
@ -65,19 +47,11 @@ public class TrackManager extends AudioEventAdapter {

    @Override
    public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
-        if (loop) {
-            this.lastTrack = track;
-            player.playTrack(lastTrack.makeClone());
+        Guild g = queue.poll().getAuthor().getGuild();
+        if (queue.isEmpty()) {
+            g.getAudioManager().closeAudioConnection();
        } else {
-            Guild g = queue.poll().getAuthor().getGuild();
-            manager.getPlayer(g).stopTrack();
-            if (!queue.isEmpty()) player.playTrack(queue.element().getTrack().makeClone());
-            else {
-                manager.players.remove(g.getId());
-                manager.getPlayer(g).destroy();
-                manager.getTrackManager(g).purgeQueue();
-                g.getAudioManager().closeAudioConnection();
-            }
+            player.playTrack(queue.element().getTrack());
        }
    }

@ -93,11 +67,7 @@ public class TrackManager extends AudioEventAdapter {
        queue.remove(entry);
    }

-    public boolean isLoop() {
-        return loop;
-    }
-
-    public void setLoop(boolean repeating) {
-        this.loop = repeating;
+    public AudioInfo getTrackInfo(AudioTrack track) {
+        return queue.stream().filter(audioInfo -> audioInfo.getTrack().equals(track)).findFirst().orElse(null);
    }
 }
--- a/src/main/java/com/bbn/hadder/commands/Command.java
+++ b/src/main/java/com/bbn/hadder/commands/Command.java
@ -0,0 +1,17 @@
+package com.bbn.hadder.commands;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+public interface Command {
+    void executed(String[] args, CommandEvent event);
+
+    String[] labels();
+
+    String description();
+
+    String usage();
+
+    String example();
+}
--- a/src/main/java/com/bbn/hadder/commands/CommandEvent.java
+++ b/src/main/java/com/bbn/hadder/commands/CommandEvent.java
@ -0,0 +1,75 @@
+package com.bbn.hadder.commands;
+
+import com.bbn.hadder.Rethink;
+import com.bbn.hadder.audio.AudioManager;
+import com.bbn.hadder.commands.general.HelpCommand;
+import com.bbn.hadder.core.CommandHandler;
+import com.bbn.hadder.core.Config;
+import com.bbn.hadder.utils.EventWaiter;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+
+import javax.annotation.Nonnull;
+
+public class CommandEvent extends MessageReceivedEvent {
+
+    private Rethink rethink;
+    private Config config;
+    private CommandHandler commandHandler;
+    private HelpCommand helpCommand;
+    private MessageEditor messageEditor;
+    private EventWaiter eventWaiter;
+    private AudioManager audioManager;
+
+    public CommandEvent(@Nonnull JDA api, long responseNumber, @Nonnull Message message, Rethink rethink, Config config, CommandHandler commandHandler, HelpCommand helpCommand, MessageEditor messageEditor, EventWaiter eventWaiter, AudioManager audioManager) {
+        super(api, responseNumber, message);
+        this.rethink = rethink;
+        this.config = config;
+        this.commandHandler = commandHandler;
+        this.helpCommand = helpCommand;
+        this.messageEditor = messageEditor;
+        this.eventWaiter = eventWaiter;
+        this.audioManager = audioManager;
+    }
+
+    public CommandEvent(MessageReceivedEvent event, Rethink rethink, Config config, CommandHandler commandHandler, HelpCommand helpCommand, MessageEditor messageEditor, EventWaiter eventWaiter, AudioManager audioManager) {
+        super(event.getJDA(), event.getResponseNumber(), event.getMessage());
+        this.rethink = rethink;
+        this.config = config;
+        this.commandHandler = commandHandler;
+        this.helpCommand = helpCommand;
+        this.messageEditor = messageEditor;
+        this.eventWaiter = eventWaiter;
+        this.audioManager = audioManager;
+    }
+
+    public Rethink getRethink() {
+        return rethink;
+    }
+
+    public Config getConfig() {
+        return config;
+    }
+
+    public HelpCommand getHelpCommand() {
+        return helpCommand;
+    }
+
+    public CommandHandler getCommandHandler() {
+        return commandHandler;
+    }
+
+    public MessageEditor getMessageEditor() {
+        return messageEditor;
+    }
+
+    public EventWaiter getEventWaiter() {
+        return eventWaiter;
+    }
+
+    public AudioManager getAudioManager() {
+        return audioManager;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java
@ -0,0 +1,76 @@
+package com.bbn.hadder.commands.fun;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.entities.Member;
+
+public class AvatarCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (args.length == 0) {
+            Member member = event.getMember();
+            event.getTextChannel().sendMessage(
+                    event.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.INFO,
+                            "commands.fun.avatar.success.title",
+                            member.getUser().getAsTag(),
+                            "",
+                            "")
+                    .setImage(member.getUser().getAvatarUrl())
+                    .setFooter(member.getUser().getAsTag())
+                    .build()).queue();
+        } else if (event.getMessage().getMentionedMembers().size() == 1) {
+            Member member = event.getMessage().getMentionedMembers().get(0);
+            event.getTextChannel().sendMessage(
+                    event.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.INFO,
+                            "commands.fun.avatar.success.title",
+                            member.getUser().getAsTag(),
+                            "",
+                            "")
+                    .setImage(member.getUser().getAvatarUrl())
+                    .setFooter(member.getUser().getAsTag())
+                    .build()).queue();
+        } else if (args[0].length() == 18){
+            Member member = event.getGuild().getMemberById(args[0]);
+            event.getTextChannel().sendMessage(
+                    event.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.INFO,
+                            "commands.fun.avatar.success.title",
+                            member.getUser().getAsTag(),
+                            "",
+                            "")
+                    .setImage(member.getUser().getAvatarUrl())
+                    .setFooter(member.getUser().getAsTag())
+                    .build()).queue();
+        } else {
+            event.getHelpCommand().sendHelp(this, event);
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"avatar"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.fun.avatar.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[User]";
+    }
+
+    @Override
+    public String example() {
+        return "@Skidder";
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java
@ -0,0 +1,83 @@
+package com.bbn.hadder.commands.fun;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import club.minnced.discord.webhook.WebhookClient;
+import club.minnced.discord.webhook.WebhookClientBuilder;
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Icon;
+import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.Webhook;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.util.concurrent.TimeUnit;
+
+@Perms(Perm.MANAGE_WEBHOOKS)
+public class ClydeCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (args.length > 0) {
+            if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_WEBHOOKS)) {
+                TextChannel channel = event.getMessage().getTextChannel();
+                String content = event.getMessage().getContentRaw().replace(event.getRethink().getGuildPrefix(event.getGuild().getId()), "").replace(event.getRethink().getUserPrefix(event.getAuthor().getId()), "").replace("clyde", "");
+
+                Webhook webhook = channel.createWebhook(event.getConfig().getClydeName()).complete();
+                try {
+                    InputStream s = new URL("https://discordapp.com/assets/f78426a064bc9dd24847519259bc42af.png").openStream();
+                    webhook.getManager().setAvatar(Icon.from(s)).queue();
+
+                    WebhookClientBuilder builder = new WebhookClientBuilder(webhook.getUrl());
+
+                    WebhookClient client = builder.build();
+                    try {
+                        TimeUnit.SECONDS.sleep(1);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                    client.send(content);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                try {
+                    TimeUnit.SECONDS.sleep(2);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                webhook.delete().queue();
+                event.getMessage().delete().queue();
+            } else {
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+            }
+        } else event.getHelpCommand().sendHelp(this, event);
+
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"clyde"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.fun.clyde.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[Content]";
+    }
+
+    @Override
+    public String example() {
+        return "Hey I am Clyde";
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java
@ -1,24 +1,12 @@
+package com.bbn.hadder.commands.fun;
+
 /*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * @author Skidder / GregTCLTK
 */

-package one.bbn.hadder.commands.fun;
-
-import one.bbn.hadder.commands.Command;
-import one.bbn.hadder.commands.CommandEvent;
-import one.bbn.hadder.utils.MessageEditor;
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@ -30,7 +18,7 @@ import java.util.Random;
 public class GifCommand implements Command {

    @Override
-    public void executed(String[] args, CommandEvent e) {
+    public void executed(String[] args, CommandEvent event) {
        if (args.length > 0) {
            StringBuilder query = new StringBuilder();
            for (String arg : args) {
@ -39,7 +27,7 @@ public class GifCommand implements Command {
            }

            OkHttpClient client = new OkHttpClient();
-            Request request = new Request.Builder().url("http://api.giphy.com/v1/gifs/search?q=" + query + "&api_key=" + e.getConfig().getGiphyToken()).build();
+            Request request = new Request.Builder().url("http://api.giphy.com/v1/gifs/search?q=" + query + "&api_key=" + event.getConfig().getGiphyToken()).build();
            try {
                Random rand = new Random();
                Response response = client.newCall(request).execute();
@ -47,15 +35,15 @@ public class GifCommand implements Command {
                JSONArray array = json.getJSONArray("data");
                int gifIndex = rand.nextInt(array.length());
                String url = array.getJSONObject(gifIndex).get("url").toString();
-                e.getTextChannel().sendMessage(url).queue();
-            } catch (Exception ignore) {
-                e.getTextChannel().sendMessage(
-                        e.getMessageEditor().getMessage(
+                event.getTextChannel().sendMessage(url).queue();
+            } catch (Exception e) {
+                event.getTextChannel().sendMessage(
+                        event.getMessageEditor().getMessage(
                                MessageEditor.MessageType.ERROR,
                                "error",
                                "commands.fun.gif.error.description").build()).queue();
            }
-        } else e.getHelpCommand().sendHelp(this, e);
+        } else event.getHelpCommand().sendHelp(this, event);
    }

    @Override
@ -70,11 +58,11 @@ public class GifCommand implements Command {

    @Override
    public String usage() {
-        return "[term]";
+        return "[Term]";
    }

    @Override
    public String example() {
-        return "cute cat";
+        return "Cute cat";
    }
 }
--- a/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java
@ -0,0 +1,67 @@
+package com.bbn.hadder.commands.fun;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
+
+import java.awt.*;
+import java.io.IOException;
+
+public class MemeCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+
+        OkHttpClient client = new OkHttpClient();
+        Request request = new Request.Builder().url("https://meme-api.herokuapp.com/gimme").build();
+
+        try {
+            Response response = client.newCall(request).execute();
+            JSONObject json = new JSONObject(response.body().string());
+            String url = json.getString("url");
+            event.getTextChannel().sendMessage(
+                    event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                    "commands.fun.meme.success.title", "")
+                    .setImage(url)
+                            .setAuthor("Subreddit: " + json.getString("subreddit"))
+                    .build()).queue();
+        } catch (IOException e) {
+            e.printStackTrace();
+            event.getTextChannel().sendMessage(
+                    event.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.ERROR,
+                            "error",
+                            "commands.fun.meme.api.error")
+                    .setColor(Color.RED)
+                    .build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"meme"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.fun.meme.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java
@ -0,0 +1,44 @@
+package com.bbn.hadder.commands.general;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+
+public class AboutCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        event.getTextChannel().sendMessage(
+                event.getMessageEditor().getMessage(
+                        MessageEditor.MessageType.INFO,
+                        "commands.general.about.success.title",
+                        "commands.general.about.success.description")
+                        .addField(event.getMessageEditor().getTerm("commands.general.about.success.field.one.title"), event.getMessageEditor().getTerm("commands.general.about.success.field.one.description", "(https://donatebot.io/checkout/448554629282922527?buyer=" + event.getAuthor().getId() + "). :smiley:", ""), true)
+                .setThumbnail("https://bigbotnetwork.com/images/Hadder.png")
+                .build()).queue();
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"about"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.general.about.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java
@ -0,0 +1,60 @@
+package com.bbn.hadder.commands.general;
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.EventWaiter;
+import com.bbn.hadder.utils.MessageEditor;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+public class EqualsCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        event.getChannel().sendMessage(
+                event.getMessageEditor().getMessage(
+                        MessageEditor.MessageType.INFO,
+                        "commands.general.equals.string.first.request", "")
+                        .build()).queue();
+        new EventWaiter().newOnMessageEventWaiter(msgevent -> {
+            String firstString = msgevent.getMessage().getContentRaw();
+            event.getChannel().sendMessage(
+                    event.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.INFO,
+                            "commands.general.equals.string.second.request",
+                            "").build()).queue();
+            new EventWaiter().newOnMessageEventWaiter(msgevent2 -> {
+                String secondString = msgevent2.getMessage().getContentRaw();
+                event.getChannel().sendMessage(
+                        event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                                .setTitle((firstString.equals(secondString)) ? event.getMessageEditor().getTerm( "commands.general.equals.string.equals.true") : event.getMessageEditor().getTerm( "commands.general.equals.string.equals.false"))
+                                .addField(event.getMessageEditor().getTerm( "commands.general.equals.string.first"), firstString, false)
+                                .addField(event.getMessageEditor().getTerm( "commands.general.equals.string.second"), secondString, false)
+                                .addField(event.getMessageEditor().getTerm( "commands.general.equals.string.result"), String.valueOf(firstString.equals(secondString)), false)
+                                .build()).queue();
+            }, event.getJDA(), event.getAuthor());
+        }, event.getJDA(), event.getAuthor());
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"equals"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.general.equals.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java
@ -1,24 +1,8 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+package com.bbn.hadder.commands.general;

-package one.bbn.hadder.commands.general;
-
-import one.bbn.hadder.commands.Command;
-import one.bbn.hadder.commands.CommandEvent;
-import one.bbn.hadder.utils.MessageEditor;
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.Permission;

@ -29,11 +13,11 @@ import java.util.Map;
 public class HelpCommand implements Command {

    @Override
-    public void executed(String[] args, CommandEvent e) {
-        if (e.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_EMBED_LINKS)) {
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_EMBED_LINKS)) {
            if (args.length == 0) {
                HashMap<String, ArrayList<Command>> hashMap = new HashMap<>();
-                for (Command cmd : e.getCommandHandler().getCommandList()) {
+                for (Command cmd : event.getCommandHandler().getCommandList()) {
                    if (!hashMap.containsKey(cmd.getClass().getPackageName())) {
                        ArrayList<Command> cmdlist = new ArrayList<>();
                        cmdlist.add(cmd);
@ -44,8 +28,8 @@ public class HelpCommand implements Command {
                }
                EmbedBuilder eb = new EmbedBuilder();
                for (Map.Entry<String, ArrayList<Command>> entry : hashMap.entrySet()) {
-                    if (!entry.getKey().endsWith("owner") || (entry.getKey().endsWith("owner") && (e.getAuthor().getId().equals("477141528981012511") ||
-                            e.getAuthor().getId().equals("261083609148948488")))) {
+                    if (!entry.getKey().endsWith("owner") || (entry.getKey().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") ||
+                            event.getAuthor().getId().equals("261083609148948488")))) {
                        StringBuilder sb = new StringBuilder();
                        for (int i = 0; i < entry.getValue().size(); i++) {
                            Command cmd = entry.getValue().get(i);
@ -56,35 +40,35 @@ public class HelpCommand implements Command {
                        eb.addField(ps[ps.length - 1], sb.toString(), false);
                    }
                }
-                e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO);
-                e.getChannel().sendMessage(eb.build()).queue();
+                event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO);
+                event.getChannel().sendMessage(eb.build()).queue();
            } else {
-                for (Command cmd : e.getCommandHandler().getCommandList()) {
+                for (Command cmd : event.getCommandHandler().getCommandList()) {
                    for (String label : cmd.labels()) {
                        if (label.equalsIgnoreCase(args[0])) {
-                            sendHelp(cmd, e);
+                            sendHelp(cmd, event);
                        }
                    }
                }
            }
        } else {
-            e.getTextChannel().sendMessage(e.getMessageEditor().getTerm("commands.general.help.error.description")).queue();
+            event.getTextChannel().sendMessage(event.getMessageEditor().getTerm("commands.general.help.error.description")).queue();
        }
    }

-    public void sendHelp(Command cmd, CommandEvent e) {
+    public void sendHelp(Command cmd, CommandEvent event) {
        if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") &&
-                (e.getAuthor().getId().equals("477141528981012511") || e.getAuthor().getId().equals("261083609148948488")))) {
-            String name = cmd.labels()[0];
+                (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) {
+            String name = labels()[0];
            StringBuilder b = new StringBuilder();
-            b.append(e.getMessageEditor().getTerm("commands.general.help.description")).append(" ").append(e.getMessageEditor().getTerm(cmd.description())).append("\n");
+            b.append(event.getMessageEditor().getTerm("commands.general.help.description")).append(" ").append(event.getMessageEditor().getTerm(cmd.description())).append("\n");
            if (cmd.usage() != null) {
-                b.append(e.getMessageEditor().getTerm("commands.general.help.usage")).append(" ").append(e.getMongoServer().getPrefix()).append(name).append(" ").append(cmd.usage()).append("\n");
+                b.append(event.getMessageEditor().getTerm("commands.general.help.usage")).append(" ").append(event.getRethink().getGuildPrefix(event.getGuild().getId())).append(name).append(" ").append(cmd.usage()).append("\n");
            }
            if (cmd.example() != null) {
-                b.append(e.getMessageEditor().getTerm("commands.general.help.example")).append(" ").append(e.getMongoServer().getPrefix()).append(name).append(" ").append(cmd.example());
+                b.append(event.getMessageEditor().getTerm("commands.general.help.example")).append(" ").append(event.getRethink().getGuildPrefix(event.getGuild().getId())).append(name).append(" ").append(cmd.example());
            }
-            e.getChannel().sendMessage(e.getMessageEditor().getMessage(
+            event.getChannel().sendMessage(event.getMessageEditor().getMessage(
                    MessageEditor.MessageType.INFO)
                    .setTitle(cmd.labels()[0])
                    .setDescription(b.toString())
@ -104,7 +88,7 @@ public class HelpCommand implements Command {

    @Override
    public String usage() {
-        return "[command]";
+        return "[Command name]";
    }

    @Override
--- a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java
@ -0,0 +1,47 @@
+package com.bbn.hadder.commands.general;
+
+import com.bbn.hadder.Hadder;
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+public class InviteCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        event.getTextChannel().sendMessage(
+                event.getMessageEditor().getMessage(
+                        MessageEditor.MessageType.INFO,
+                        "commands.general.invite.success.title",
+                        "",
+                        "commands.general.invite.success.description",
+                        "(https://discordapp.com/oauth2/authorize?client_id="
+                                + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId()
+                                + "&scope=bot&permissions=470133879)")
+                .build()).queue();
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"invite"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.general.invite.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java
@ -0,0 +1,41 @@
+package com.bbn.hadder.commands.general;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+
+public class PingCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        event.getJDA().getRestPing().queue(ping -> event.getTextChannel().sendMessage(event.getMessageEditor()
+                .getMessage(MessageEditor.MessageType.INFO)
+                .setTitle("Ping")
+                .setDescription(String.valueOf(ping))
+                .build()).queue());
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"ping"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.general.ping.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java
@ -0,0 +1,75 @@
+package com.bbn.hadder.commands.misc;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.EventWaiter;
+import com.bbn.hadder.utils.MessageEditor;
+import org.kohsuke.github.GHIssue;
+import org.kohsuke.github.GHRepository;
+import org.kohsuke.github.GitHub;
+
+import java.io.IOException;
+
+public class FeedbackCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        event.getTextChannel().sendMessage(
+                event.getMessageEditor().getMessage(
+                        MessageEditor.MessageType.INFO,
+                "commands.misc.feedback.title.request.title",
+                "commands.misc.feedback.title.request.description")
+                .build()).queue();
+        new EventWaiter().newOnMessageEventWaiter(event1 -> {
+                String title = event1.getMessage().getContentDisplay();
+                event1.getChannel().sendMessage(event.getMessageEditor().getMessage(
+                        MessageEditor.MessageType.INFO,
+                        "commands.misc.feedback.description.request.title",
+                        "commands.misc.feedback.description.request.description")
+                        .build()).queue();
+            new EventWaiter().newOnMessageEventWaiter(event2 -> {
+                String description = event2.getMessage().getContentDisplay();
+                try {
+                    GitHub connection = GitHub.connectUsingOAuth(event.getConfig().getGitHubToken());
+                    GHRepository Hadder = connection.getOrganization("BigBotNetwork").getRepository("Hadder");
+                    GHIssue issue = Hadder.createIssue(title).body("<strong>Feedback by " + event.getAuthor().getAsTag() + "</strong><br>" + description).label("feedback").create();
+                    issue.addLabels("feedback");
+                    event.getTextChannel().sendMessage(
+                            event.getMessageEditor().getMessage(
+                                    MessageEditor.MessageType.INFO,
+                                    "commands.misc.feedback.success.title",
+                                    "")
+                                    .setDescription(issue.getHtmlUrl().toString())
+                            .build()).queue();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                }, event.getJDA(), event.getAuthor());
+            }, event.getJDA(), event.getAuthor());
+
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"feedback"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.misc.feedback.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java
@ -1,24 +1,12 @@
+package com.bbn.hadder.commands.misc;
+
 /*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * @author Skidder / GregTCLTK
 */

-package one.bbn.hadder.commands.misc;
-
-import one.bbn.hadder.commands.Command;
-import one.bbn.hadder.commands.CommandEvent;
-import one.bbn.hadder.utils.MessageEditor;
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@ -30,11 +18,11 @@ import java.io.IOException;
 public class GitHubCommand implements Command {

    @Override
-    public void executed(String[] args, CommandEvent e) {
+    public void executed(String[] args, CommandEvent event) {
        if (args.length > 0) {
            if (args[0].equals("link")) {
-                e.getTextChannel().sendMessage(
-                        e.getMessageEditor().getMessage(
+                event.getTextChannel().sendMessage(
+                        event.getMessageEditor().getMessage(
                                MessageEditor.MessageType.INFO,
                                "commands.misc.github.link.title",
                                "")
@ -63,45 +51,42 @@ public class GitHubCommand implements Command {

                    if (!json.getString("blog").equals("")) website = json.getString("blog");

-                    e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                            .setAuthor(e.getMessageEditor().getTerm("commands.misc.github.success.title", nickname + " (" + args[0] + ")", ""), "https://github.com/" + args[0] + "", "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png")
+                    event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                            .setAuthor(event.getMessageEditor().getTerm("commands.misc.github.success.title", nickname + " (" + args[0] + ")", ""), "https://github.com/" + args[0] + "", "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png")
                            .setThumbnail(json.getString("avatar_url"))
-                            .addField(e.getMessageEditor().getTerm("commands.misc.github.success.bio"), bio, false)
-                            .addField(e.getMessageEditor().getTerm("commands.misc.github.success.location"), location, true)
-                            .addField(e.getMessageEditor().getTerm("commands.misc.github.success.website"), website, true)
-                            .addField(e.getMessageEditor().getTerm("commands.misc.github.success.repositories"), String.valueOf(json.getInt("public_repos")), true)
-                            .addField(e.getMessageEditor().getTerm("commands.misc.github.success.gists"), String.valueOf(json.getInt("public_gists")), true)
-                            .addField(e.getMessageEditor().getTerm("commands.misc.github.success.followers"), String.valueOf(json.getInt("followers")), true)
-                            .addField(e.getMessageEditor().getTerm("commands.misc.github.success.following"), String.valueOf(json.getInt("following")), true)
+                            .addField(event.getMessageEditor().getTerm("commands.misc.github.success.bio"), bio, false)
+                            .addField(event.getMessageEditor().getTerm("commands.misc.github.success.location"), location, true)
+                            .addField(event.getMessageEditor().getTerm("commands.misc.github.success.website"), website, true)
+                            .addField(event.getMessageEditor().getTerm("commands.misc.github.success.repositories"), String.valueOf(json.getInt("public_repos")), true)
+                            .addField(event.getMessageEditor().getTerm("commands.misc.github.success.gists"), String.valueOf(json.getInt("public_gists")), true)
+                            .addField(event.getMessageEditor().getTerm("commands.misc.github.success.followers"), String.valueOf(json.getInt("followers")), true)
+                            .addField(event.getMessageEditor().getTerm("commands.misc.github.success.following"), String.valueOf(json.getInt("following")), true)
                            .build()).queue();

-                } catch (IOException | NullPointerException ex) {
-                    e.getTextChannel().sendMessage(
-                            e.getMessageEditor().getMessage(
+                } catch (IOException | NullPointerException e) {
+                    event.getTextChannel().sendMessage(
+                            event.getMessageEditor().getMessage(
                                    MessageEditor.MessageType.ERROR,
                                    "commands.misc.github.api.error.title",
                                    "commands.misc.github.api.error.description")
                                    .build()
                    ).queue();
-                } catch (JSONException ex) {
-                    e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
+                } catch (JSONException e) {
+                    event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
                            MessageEditor.MessageType.ERROR,
                            "commands.misc.github.user.error.title",
                            "commands.misc.github.user.error.description").build()).queue();
                }
            }
        } else {
-            e.getHelpCommand().sendHelp(this, e);
-            /*
-            TODO: THIS
-            e.getTextChannel().sendMessage(
-                    e.getMessageEditor().getMessage(
+            event.getTextChannel().sendMessage(
+                    event.getMessageEditor().getMessage(
                            MessageEditor.MessageType.INFO,
                            "commands.misc.github.connect.title",
                            "",
                            "commands.misc.github.connect.description",
                            "(https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942)")
-                    .build()).queue(); */
+                    .build()).queue();
        }
    }

@ -117,7 +102,7 @@ public class GitHubCommand implements Command {

    @Override
    public String usage() {
-        return "[user]";
+        return "[GH name]";
    }

    @Override
--- a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java
@ -0,0 +1,85 @@
+package com.bbn.hadder.commands.misc;
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.EventWaiter;
+import com.bbn.hadder.utils.MessageEditor;
+import com.bbn.hadder.utils.MessageEditor.MessageType;
+
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.VoiceChannel;
+
+import java.util.List;
+
+public class ScreenShareCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (args.length>0) {
+            if (args[0].matches("[0-9]*") && args.length==1 && args[0].length() == 18) {
+                if (event.getGuild().getVoiceChannelById(args[0]) != null) {
+                    event.getChannel().sendMessage(event.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.INFO,
+                            "commands.misc.screenshare.success.title", "")
+                            .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + args[0] + "/").build()).queue();
+                } else {
+                    event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.id.error.description").build()).queue();
+                    event.getHelpCommand().sendHelp(this, event);
+                }
+            } else {
+                List<VoiceChannel> vcs = event.getGuild().getVoiceChannelsByName(String.join(" ", args), true);
+                if (vcs.size() > 1) {
+                    EmbedBuilder eb = event.getMessageEditor().getMessage(MessageType.WARNING, "commands.misc.screenshare.channel.error.title", "commands.misc.screenshare.channel.error.description");
+                    for (int i = 0; i < vcs.size(); i++) {
+                        VoiceChannel voiceChannel = vcs.get(i);
+                        eb.addField(i + ": " + voiceChannel.getName(), voiceChannel.getId(), false);
+                    }
+                    event.getChannel().sendMessage(eb.build()).queue();
+                    new EventWaiter().newOnMessageEventWaiter(msgevent -> {
+                        try {
+                            int i = Integer.parseInt(msgevent.getMessage().getContentRaw());
+                            if (vcs.size() > i) {
+                                event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "")
+                                        .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(i).getId() + "/").build()).queue();
+                            } else {
+                                event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.number.error.title", "").build()).queue();
+                                event.getHelpCommand().sendHelp(this, event);
+                            }
+                        } catch (NumberFormatException e) {
+                            event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.number.error.description").build()).queue();
+                            event.getHelpCommand().sendHelp(this, event);
+                        }
+                    }, event.getJDA(), event.getAuthor());
+                } else if (vcs.size()==0) {
+                    event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.channel.existing.error", "commands.misc.screenshare.channel.existing.description").build()).queue();
+                    event.getHelpCommand().sendHelp(this, event);
+                } else {
+                    event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "")
+                            .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue();
+                }
+            }
+        } else {
+            event.getHelpCommand().sendHelp(this, event);
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"screenshare"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.misc.screenshare.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[Channel]";
+    }
+
+    @Override
+    public String example() {
+        return "Gaming-Lounge";
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java
@ -0,0 +1,102 @@
+package com.bbn.hadder.commands.moderation;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.entities.Member;
+
+@Perms(Perm.BAN_MEMBERS)
+public class BanCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getMessage().getMentionedMembers().size() == 1) {
+            Member victim = event.getMessage().getMentionedMembers().get(0);
+            if (!event.getAuthor().getId().equals(victim.getId())) {
+                if (!event.getJDA().getSelfUser().getId().equals(victim.getId())) {
+                    if (event.getGuild().getSelfMember().canInteract(victim)) {
+                        event.getGuild().ban(victim, 0, "Banned by " + event.getAuthor().getAsTag()).queue();
+                        event.getTextChannel().sendMessage(
+                                event.getMessageEditor().getMessage(
+                                        MessageEditor.MessageType.INFO,
+                                        "commands.moderation.ban.success.title",
+                                        "",
+                                        "commands.moderation.ban.success.description",
+                                        victim.getUser().getName() + ".").build()).queue();
+                    } else {
+                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+                    }
+                } else {
+                    event.getTextChannel().sendMessage(
+                            event.getMessageEditor().getMessage(
+                                    MessageEditor.MessageType.ERROR,
+                                    "commands.moderation.ban.error.title",
+                                    "commands.moderation.ban.myself.error.description").build()).queue();
+                }
+            } else {
+                event.getTextChannel().sendMessage
+                        (event.getMessageEditor().getMessage(
+                                MessageEditor.MessageType.ERROR,
+                                "commands.moderation.ban.error.title",
+                                "commands.moderation.ban.yourself.error.description").build()).queue();
+            }
+        } else if (event.getMessage().getMentionedMembers().size() == 0) {
+            event.getHelpCommand().sendHelp(this, event);
+        } else if (event.getMessage().getMentionedMembers().size() > 1) {
+            for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) {
+                Member member = event.getMessage().getMentionedMembers().get(i);
+                if (!event.getAuthor().getId().equals(member.getId())) {
+                    if (!event.getJDA().getSelfUser().getId().equals(member.getId())) {
+                        if (event.getGuild().getSelfMember().canInteract(member)) {
+                            event.getGuild().ban(member, 0).reason("Mass Ban by " + event.getAuthor().getAsTag()).queue();
+                        } else {
+                            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+                        }
+                    } else {
+                        event.getTextChannel().sendMessage(
+                                event.getMessageEditor().getMessage(
+                                        MessageEditor.MessageType.ERROR,
+                                        "commands.moderation.ban.error.title",
+                                        "commands.moderation.ban.myself.error.description").build()).queue();
+                    }
+                } else {
+                    event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.ERROR,
+                            "commands.moderation.ban.error.title",
+                            "commands.moderation.ban.yourself.error.description").build()).queue();
+                }
+            }
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                    "commands.moderation.ban.success.title",
+                    "",
+                    "commands.moderation.ban.massban.success.description",
+                    String.valueOf(event.getMessage().getMentionedMembers().size())).build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"ban"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.moderation.ban.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[User(s)]";
+    }
+
+    @Override
+    public String example() {
+        return "@Skidder";
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java
@ -0,0 +1,107 @@
+package com.bbn.hadder.commands.moderation;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Message;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+@Perms(Perm.MANAGE_MESSAGES)
+public class ClearCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (args.length > 0) {
+            if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_MANAGE)) {
+                if (args[0].equals("all")) {
+                    List<Message> msg = event.getTextChannel().getIterableHistory().complete();
+                    for (Message message : msg) {
+                        message.delete().queue();
+                    }
+                    Message message = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.INFO,
+                            "commands.moderation.lear.all.success.title",
+                            "",
+                            "commands.moderation.lear.all.success.description",
+                            String.valueOf(msg.size()))
+                            .build()).complete();
+                    try {
+                        TimeUnit.SECONDS.sleep(3);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                    message.delete().queue();
+                } else {
+                    try {
+                        int nbToDelete = Integer.parseInt(args[0]);
+                        if (nbToDelete < 1 || nbToDelete > 99) {
+                            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.clear.number.error.title", "commands.moderation.clear.number.error.description").build()).queue();
+                        } else {
+                            List<Message> history = event.getTextChannel().getHistory().retrievePast(nbToDelete + 1).complete();
+                            List<Message> msgToDelete = new ArrayList<>(history);
+                            event.getTextChannel().deleteMessages(msgToDelete).queue();
+                            if (nbToDelete == 1) {
+                                Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.clear.success.title",
+                                        "commands.moderation.clear.success.description.singular").build()).complete();
+                                try {
+                                    TimeUnit.SECONDS.sleep(2);
+                                } catch (InterruptedException e) {
+                                    e.printStackTrace();
+                                }
+                                msg.delete().queue();
+                            } else {
+                                Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.clear.success.title", "",
+                                        "commands.moderation.clear.success.description.plural", String.valueOf(nbToDelete)).build()).complete();
+                                try {
+                                    TimeUnit.SECONDS.sleep(2);
+                                } catch (InterruptedException e) {
+                                    e.printStackTrace();
+                                }
+                                msg.delete().queue();
+                            }
+                        }
+                    } catch (NumberFormatException e) {
+                        event.getHelpCommand().sendHelp(this, event);
+                    } catch (IllegalArgumentException e) {
+                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.clear.message.error.title", "commands.moderation.clear.message.error.description")
+                                .build()).queue();
+                    }
+                }
+            } else {
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+            }
+        } else {
+            event.getHelpCommand().sendHelp(this, event);
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"clear"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.moderation.clear.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[Amount]";
+    }
+
+    @Override
+    public String example() {
+        return "69";
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java
@ -0,0 +1,103 @@
+package com.bbn.hadder.commands.moderation;
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.entities.TextChannel;
+
+/**
+ * @author Skidder / GregTCLTK
+ */
+
+@Perms(Perm.MANAGE_SERVER)
+public class EditRulesCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getRethink().getRulesMID(event.getGuild().getId()).length() == 18) {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                    "commands.moderation.editrules.message.title",
+                    "commands.moderation.editrules.message.description").build()).queue();
+
+            event.getEventWaiter().newOnMessageEventWaiter(event1 -> {
+                String rules = event1.getMessage().getContentRaw();
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                        "commands.moderation.editrules.channel.title",
+                        "commands.moderation.editrules.channel.description").build()).queue();
+
+                event.getEventWaiter().newOnMessageEventWaiter(event2 -> {
+                    if (event2.getMessage().getMentionedChannels().size() == 1) {
+                        try {
+                            TextChannel channel = event2.getMessage().getMentionedChannels().get(0);
+                            checkChannel(event, rules, channel);
+                        } catch (Exception e) {
+                            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                                    "commands.moderation.editrules.channel.error.title",
+                                    "commands.moderation.editrules.channel.error.description")
+                                    .build()).queue();
+                        }
+                    } else {
+                        try {
+                            TextChannel channel = event1.getGuild().getTextChannelsByName(event2.getMessage().getContentRaw(), true).get(0);
+                            checkChannel(event, rules, channel);
+                        } catch (Exception e) {
+                            event.getTextChannel().sendMessage(
+                                    event.getMessageEditor().getMessage(
+                                            MessageEditor.MessageType.ERROR,
+                                            "commands.moderation.editrules.channel.error.title",
+                                            "commands.moderation.editrules.channel.error.description")
+                                            .build()).queue();
+                        }
+                    }
+                }, event.getJDA(), event.getAuthor());
+            }, event.getJDA(), event.getAuthor());
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                    "commands.moderation.editrules.error.title", "",
+                    "commands.moderation.editrules.error.description", event.getRethink().getGuildPrefix(event.getGuild().getId())).build()).queue();
+        }
+    }
+
+    public void checkChannel(CommandEvent event, String rules, TextChannel channel) {
+        try {
+            channel.retrieveMessageById(event.getRethink().getRulesMID(event.getGuild().getId())).queue();
+            setRules(event, rules, channel);
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                    "commands.moderation.editrules.success.title",
+                    "commands.moderation.editrules.success.description").build()).queue();
+        } catch (Exception e) {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                    "commands.moderation.editrules.channel.message.error.title",
+                    "commands.moderation.editrules.channel.message.error.description").build()).queue();
+        }
+    }
+
+    public void setRules(CommandEvent event, String rules, TextChannel channel) {
+        channel.retrieveMessageById(event.getRethink().getRulesMID(event.getGuild().getId())).complete().editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                .setTitle("Rules")
+                .setDescription(rules)
+                .build()).queue();
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"editrules", "rulesedit", "edit_rules", "rules_edit"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.moderation.editrules.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java
@ -1,47 +1,34 @@
+package com.bbn.hadder.commands.moderation;
+
 /*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * @author Skidder / GregTCLTK
 */

-package one.bbn.hadder.commands.moderation;
-
-import one.bbn.hadder.commands.Command;
-import one.bbn.hadder.commands.CommandEvent;
-import one.bbn.hadder.core.Perm;
-import one.bbn.hadder.core.Perms;
-import one.bbn.hadder.utils.MessageEditor;
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
+import com.bbn.hadder.utils.MessageEditor;

@Perms(Perm.MANAGE_SERVER)
 public class InviteDetectCommand implements Command {

    @Override
-    public void executed(String[] args, CommandEvent e) {
+    public void executed(String[] args, CommandEvent event) {
        if (args.length == 1) {
            String opinion = args[0].toLowerCase();
            switch (opinion) {
                case "on":
-                    if (!e.getMongoServer().hasInviteDetect()) {
-                        e.getMongoServer().setInviteDetect(true);
-                        e.getTextChannel().sendMessage(
-                                e.getMessageEditor().getMessage(
+                    if (!event.getRethink().getInviteDetection(event.getGuild().getId())) {
+                        event.getRethink().setInviteDetection(event.getGuild().getId(), true);
+                        event.getTextChannel().sendMessage(
+                                event.getMessageEditor().getMessage(
                                        MessageEditor.MessageType.INFO,
                                        "commands.moderation.invitedetect.activate.success.title",
                                        "commands.moderation.invitedetect.activate.success.description")
                                        .build()).queue();
-                        e.getMongoServer().push();
                    } else {
-                        e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
+                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
                                MessageEditor.MessageType.ERROR,
                                "commands.moderation.invitedetect.activate.error.title",
                                "commands.moderation.invitedetect.activate.error.description")
@ -50,16 +37,15 @@ public class InviteDetectCommand implements Command {
                    break;

                case "off":
-                    if (e.getMongoServer().hasInviteDetect()) {
-                        e.getMongoServer().setInviteDetect(false);
-                        e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
+                    if (event.getRethink().getInviteDetection(event.getGuild().getId())) {
+                        event.getRethink().setInviteDetection(event.getGuild().getId(), false);
+                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
                                MessageEditor.MessageType.INFO,
                                "commands.moderation.invitedetect.deactivate.success.title",
                                "commands.moderation.invitedetect.deactivate.success.description")
                                .build()).queue();
-                        e.getMongoServer().push();
                    } else {
-                        e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
+                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
                                MessageEditor.MessageType.ERROR,
                                "commands.moderation.invitedetect.deactivate.error.title",
                                "commands.moderation.invitedetect.deactivate.error.description")
@ -67,15 +53,16 @@ public class InviteDetectCommand implements Command {
                    }
                    break;
                default:
-                    e.getHelpCommand().sendHelp(this, e);
-                    break;
+                    event.getHelpCommand().sendHelp(this, event);
            }
-        } else e.getHelpCommand().sendHelp(this, e);
+        } else {
+            event.getHelpCommand().sendHelp(this, event);
+        }
    }

    @Override
    public String[] labels() {
-        return new String[]{"invitedetect", "detectinvite", "invite-detect"};
+        return new String[]{"invitedetect", "detectinvite"};
    }

    @Override
--- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java
@ -0,0 +1,87 @@
+package com.bbn.hadder.commands.moderation;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.entities.Member;
+
+@Perms(Perm.KICK_MEMBERS)
+public class KickCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getMessage().getMentionedMembers().size() == 1) {
+            Member victim = event.getMessage().getMentionedMembers().get(0);
+            if (!event.getAuthor().getId().equals(victim.getId())) {
+                if (!event.getJDA().getSelfUser().getId().equals(victim.getId())) {
+                    if (event.getGuild().getSelfMember().canInteract(victim)) {
+                        event.getGuild().kick(victim, "Kicked by " + event.getAuthor().getAsTag()).queue();
+                        event.getTextChannel().sendMessage(
+                                event.getMessageEditor().getMessage(
+                                        MessageEditor.MessageType.INFO,
+                                        "commands.moderation.kick.success.title",
+                                        "✅",
+                                        "commands.moderation.kick.success.description",
+                                        victim.getUser().getName()).build()).queue();
+                    } else {
+                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+                    }
+                } else {
+                    event.getTextChannel().sendMessage(
+                            event.getMessageEditor().getMessage(
+                                    MessageEditor.MessageType.ERROR,
+                                    "commands.moderation.kick.error.title",
+                                    "commands.moderation.kick.myself.error.description").build()).queue();
+                }
+            } else {
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue();
+            }
+        } else if (event.getMessage().getMentionedMembers().size() == 0) {
+            event.getHelpCommand().sendHelp(this, event);
+        } else if (event.getMessage().getMentionedMembers().size() > 1) {
+            for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) {
+                Member member = event.getMessage().getMentionedMembers().get(i);
+                if (!event.getAuthor().getId().equals(member.getId())) {
+                    if (!event.getJDA().getSelfUser().getId().equals(member.getId())) {
+                        if (event.getGuild().getSelfMember().canInteract(member)) {
+                            event.getGuild().kick(member).reason("Mass Kicked by " + event.getAuthor().getAsTag()).queue();
+                        } else {
+                            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+                        }
+                    } else {
+                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.myself.error.description").build()).queue();
+                    }
+                } else {
+                    event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue();
+                }
+            }
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.kick.success.title", "✅", "commands.moderation.kick.masskick.success.description", String.valueOf(event.getMessage().getMentionedMembers().size())).build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"kick"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.moderation.kick.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[User(s)]";
+    }
+
+    @Override
+    public String example() {
+        return "@Skidder";
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java
@ -0,0 +1,115 @@
+package com.bbn.hadder.commands.moderation;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Member;
+
+@Perms(Perm.MANAGE_NICKNAMES)
+public class NickCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getGuild().getSelfMember().hasPermission(Permission.NICKNAME_MANAGE)) {
+            if (event.getMessage().getMentionedMembers().size() == 1) {
+                if (!event.getMessage().getMentionedMembers().get(0).getId().equals(event.getGuild().getSelfMember().getId())) {
+                    if (event.getGuild().getSelfMember().canInteract(event.getMessage().getMentionedMembers().get(0))) {
+                        if (args.length > 1) {
+                            if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) {
+                                event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue();
+                                event.getTextChannel().sendMessage(
+                                        event.getMessageEditor().getMessage(
+                                                MessageEditor.MessageType.INFO,
+                                                "commands.moderation.nick.success.title",
+                                                "✅",
+                                                "commands.moderation.nick.success.description",
+                                                event.getMessage().getMentionedMembers().get(0).getUser().getAsTag()
+                                        ).build()).queue();
+                            } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) {
+                                event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue();
+                                event.getTextChannel().sendMessage(
+                                        event.getMessageEditor().getMessage(
+                                                MessageEditor.MessageType.INFO,
+                                                "commands.moderation.nick.success.title",
+                                                "✅",
+                                                "commands.moderation.nick.success.description", event.getMessage().getMentionedMembers().get(0).getUser().getAsTag()
+                                        ).build()).queue();
+                            }
+                        } else {
+                            event.getHelpCommand().sendHelp(this, event);
+                        }
+                    } else {
+                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+                    }
+                } else {
+                    if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) {
+                        event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue();
+                        event.getTextChannel().sendMessage(
+                                event.getMessageEditor().getMessage(
+                                        MessageEditor.MessageType.INFO,
+                                        "commands.moderation.nick.success.title",
+                                        "✅",
+                                        "commands.moderation.nick.myself.success.description",
+                                        "").build()).queue();
+                    } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) {
+                        event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue();
+                        event.getTextChannel().sendMessage(
+                                event.getMessageEditor().getMessage(
+                                        MessageEditor.MessageType.INFO,
+                                        "commands.moderation.nick.success.title",
+                                        "✅",
+                                        "commands.moderation.nick.myself.success.description", ""
+                                ).build()).queue();
+                    }
+                }
+            } else if (event.getMessage().getMentionedMembers().size() == 0) {
+                event.getHelpCommand().sendHelp(this, event);
+            } else {
+                for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) {
+                    Member member = event.getMessage().getMentionedMembers().get(i);
+                    if (!event.getJDA().getSelfUser().getId().equals(member.getId())) {
+                        event.getGuild().modifyNickname(member, args[args.length - 1]).reason("Mass Nicked by " + event.getAuthor().getAsTag()).queue();
+                    } else {
+                        event.getGuild().getSelfMember().modifyNickname(args[args.length - 1]).reason("Mass Nicked by " + event.getAuthor().getAsTag()).queue();
+                    }
+                }
+                event.getTextChannel().sendMessage(
+                        event.getMessageEditor().getMessage(
+                                MessageEditor.MessageType.INFO,
+                                "commands.moderation.nick.success.title",
+                                "✅",
+                                "commands.moderation.nick.myself.success.description", String.valueOf(event.getMessage().getMentionedMembers().size())
+                        ).build()).queue();
+            }
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"nick"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.moderation.nick.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[User(s)] [New nickname]";
+    }
+
+    @Override
+    public String example() {
+        return "@Skidder Cutie";
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java
@ -0,0 +1,55 @@
+package com.bbn.hadder.commands.moderation;
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
+import com.bbn.hadder.utils.MessageEditor;
+
+@Perms(Perm.MANAGE_SERVER)
+public class PrefixCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (args.length == 1) {
+            if (!args[0].contains("\"")) {
+                event.getRethink().setGuildPrefix(args[0], event.getGuild().getId());
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
+                        MessageEditor.MessageType.INFO,
+                        "commands.moderation.prefix.success.title",
+                        "✅",
+                        "commands.moderation.prefix.success.description",
+                        args[0]).build()
+                ).queue();
+            } else {
+                event.getTextChannel().sendMessage(
+                        event.getMessageEditor().getMessage(
+                                MessageEditor.MessageType.WARNING,
+                                "",
+                                "commands.moderation.prefix.error.description").build()).queue();
+            }
+        } else {
+            event.getHelpCommand().sendHelp(this, event);
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"prefix"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.moderation.prefix.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[New Prefix]";
+    }
+
+    @Override
+    public String example() {
+        return "!";
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
@ -1,26 +1,14 @@
+package com.bbn.hadder.commands.moderation;
+
 /*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * @author Skidder / GregTCLTK
 */

-package one.bbn.hadder.commands.moderation;
-
-import one.bbn.hadder.commands.Command;
-import one.bbn.hadder.commands.CommandEvent;
-import one.bbn.hadder.core.Perm;
-import one.bbn.hadder.core.Perms;
-import one.bbn.hadder.utils.MessageEditor;
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
+import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.Region;

@ -28,67 +16,67 @@ import net.dv8tion.jda.api.Region;
 public class RegionChangeCommand implements Command {

    @Override
-    public void executed(String[] args, CommandEvent e) {
+    public void executed(String[] args, CommandEvent event) {
        if (args.length == 1) {
-            if (e.getGuild().getSelfMember().hasPermission(Permission.MANAGE_SERVER)) {
+            if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_SERVER)) {
                switch (args[0].toLowerCase()) {
                    case "amsterdam":
-                        setRegion(Region.AMSTERDAM, "Amsterdam", e);
+                        setRegion(Region.AMSTERDAM, "Amsterdam", event);
                        break;
                    case "frankfurt":
-                        setRegion(Region.FRANKFURT, "Frankfurt", e);
+                        setRegion(Region.FRANKFURT, "Frankfurt", event);
                        break;
                    case "eu-west":
-                        setRegion(Region.EU_WEST, "EU West", e);
+                        setRegion(Region.EU_WEST, "EU West", event);
                        break;
                    case "eu-central":
-                        setRegion(Region.EU_CENTRAL, "EU Central", e);
+                        setRegion(Region.EU_CENTRAL, "EU Central", event);
                        break;
                    case "europe":
-                        setRegion(Region.EUROPE, "EUROPE", e);
+                        setRegion(Region.EUROPE, "EUROPE", event);
                        break;
                    case "brazil":
-                        setRegion(Region.BRAZIL, "Brazil", e);
+                        setRegion(Region.BRAZIL, "Brazil", event);
                        break;
                    case "hongkong":
-                        setRegion(Region.HONG_KONG, "Hong Kong", e);
+                        setRegion(Region.HONG_KONG, "Hong Kong", event);
                        break;
                    case "india":
-                        setRegion(Region.INDIA, "India", e);
+                        setRegion(Region.INDIA, "India", event);
                        break;
                    case "japan":
-                        setRegion(Region.JAPAN, "Japan", e);
+                        setRegion(Region.JAPAN, "Japan", event);
                        break;
                    case "london":
-                        setRegion(Region.LONDON, "London", e);
+                        setRegion(Region.LONDON, "London", event);
                        break;
                    case "russia":
-                        setRegion(Region.RUSSIA, "Russia", e);
+                        setRegion(Region.RUSSIA, "Russia", event);
                        break;
                    case "singapore":
-                        setRegion(Region.SINGAPORE, "Singapore", e);
+                        setRegion(Region.SINGAPORE, "Singapore", event);
                        break;
                    case "south-africa":
-                        setRegion(Region.SOUTH_AFRICA, "South Africa", e);
+                        setRegion(Region.SOUTH_AFRICA, "South Africa", event);
                        break;
                    case "sydney":
-                        setRegion(Region.SYDNEY, "Sydney", e);
+                        setRegion(Region.SYDNEY, "Sydney", event);
                        break;
                    case "us-central":
-                        setRegion(Region.US_CENTRAL, "US Central", e);
+                        setRegion(Region.US_CENTRAL, "US Central", event);
                        break;
                    case "us-east":
-                        setRegion(Region.US_EAST, "US East", e);
+                        setRegion(Region.US_EAST, "US East", event);
                        break;
                    case "us-west":
-                        setRegion(Region.US_WEST, "US West", e);
+                        setRegion(Region.US_WEST, "US West", event);
                        break;
                    case "us-south":
-                        setRegion(Region.US_SOUTH, "US South", e);
+                        setRegion(Region.US_SOUTH, "US South", event);
                        break;
                    default:
-                        e.getTextChannel().sendMessage(
-                                e.getMessageEditor().getMessage(
+                        event.getTextChannel().sendMessage(
+                                event.getMessageEditor().getMessage(
                                        MessageEditor.MessageType.INFO,
                                        "commands.moderation.regionchange.regions.title",
                                        "")
@ -96,11 +84,10 @@ public class RegionChangeCommand implements Command {
                                        .build()).queue();
                        break;
                }
-
            } else
-                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-        } else e.getTextChannel().sendMessage(
-                e.getMessageEditor().getMessage(
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+        } else event.getTextChannel().sendMessage(
+                event.getMessageEditor().getMessage(
                        MessageEditor.MessageType.INFO,
                        "commands.moderation.regionchange.regions.title",
                        "")
@ -108,19 +95,19 @@ public class RegionChangeCommand implements Command {
                        .build()).queue();
    }

-    public void setRegion(Region region, String region_name, CommandEvent e) {
-        e.getGuild().getManager().setRegion(region).reason("Region changed by " + e.getAuthor().getAsTag()).queue();
-        e.getTextChannel().sendMessage(
-                e.getMessageEditor().getMessage(
+    public void setRegion (Region region, String region_name, CommandEvent event) {
+        event.getGuild().getManager().setRegion(region).reason("Region changed by " + event.getAuthor().getAsTag()).queue();
+        event.getTextChannel().sendMessage(
+                event.getMessageEditor().getMessage(
                        MessageEditor.MessageType.INFO,
                        "commands.moderation.regionchange.success.title", "",
                        "commands.moderation.regionchange.success.description", region_name)
-                        .build()).queue();
+                .build()).queue();
    }

    @Override
    public String[] labels() {
-        return new String[]{"changeregion", "cr", "change-region", "region"};
+        return new String[]{"changeregion", "cr", "change-region"};
    }

    @Override
@ -130,7 +117,7 @@ public class RegionChangeCommand implements Command {

    @Override
    public String usage() {
-        return "[new region]";
+        return "[New region]";
    }

    @Override
--- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java
@ -0,0 +1,106 @@
+package com.bbn.hadder.commands.moderation;
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Role;
+
+@Perms(Perm.MANAGE_ROLES)
+public class RoleCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (args.length > 0) {
+            if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) {
+                switch (args[0].toLowerCase()) {
+                    case "add":
+                        if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() > 0) {
+                            for (Member member : event.getMessage().getMentionedMembers()) {
+                                for (Role role : event.getMessage().getMentionedRoles()) {
+                                    if (event.getGuild().getSelfMember().canInteract(member)) {
+                                        if (event.getGuild().getSelfMember().canInteract(role)) {
+                                            event.getGuild().addRoleToMember(member, role).reason("Role added by " + event.getAuthor().getAsTag()).queue();
+                                        } else {
+                                            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+                                        }
+                                    } else {
+                                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+                                    }
+                                }
+                            }
+                            event.getChannel().sendMessage(
+                                    event.getMessageEditor().getMessage(
+                                            MessageEditor.MessageType.INFO,
+                                            "commands.moderation.role.add.success.title",
+                                            "✅",
+                                            "",
+                                            "commands.moderation.role.add.success.description",
+                                            String.valueOf(event.getMessage().getMentionedRoles().size()),
+                                            String.valueOf(event.getMessage().getMentionedMembers().size()))
+                                            .build()).queue();
+                        }
+                        break;
+
+                    case "remove":
+                        if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() > 0) {
+                            for (Member member : event.getMessage().getMentionedMembers()) {
+                                for (Role role : event.getMessage().getMentionedRoles()) {
+                                    if (event.getGuild().getSelfMember().canInteract(member)) {
+                                        if (event.getGuild().getSelfMember().canInteract(role)) {
+                                            event.getGuild().removeRoleFromMember(member, role).reason("Role removed by " + event.getAuthor().getAsTag()).queue();
+                                        } else {
+                                            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+                                        }
+                                    } else {
+                                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+                                    }
+                                }
+                            }
+                            event.getChannel().sendMessage(
+                                    event.getMessageEditor().getMessage(
+                                            MessageEditor.MessageType.INFO,
+                                            "commands.moderation.role.remove.success.title",
+                                            "",
+                                            "",
+                                            "commands.moderation.role.remove.success.description",
+                                            String.valueOf(event.getMessage().getMentionedRoles().size()),
+                                            String.valueOf(event.getMessage().getMentionedMembers().size()))
+                                            .build()).queue();
+                        }
+                        break;
+                    default:
+                        event.getHelpCommand().sendHelp(this, event);
+                        break;
+                }
+            } else {
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+            }
+        } else {
+            event.getHelpCommand().sendHelp(this, event);
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"role", "roles"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.moderation.role.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[add/remove] [Role>] [User]";
+    }
+
+    @Override
+    public String example() {
+        return "add @Skidder @Epic-Gamer";
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
@ -0,0 +1,240 @@
+package com.bbn.hadder.commands.moderation;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
+import com.bbn.hadder.utils.EventWaiter;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Emote;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
+
+@Perms(Perm.MANAGE_SERVER)
+public class RulesCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) {
+            event.getTextChannel().sendMessage(
+                    event.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.INFO,
+                            "commands.moderation.rules.setup.title",
+                            "commands.moderation.rules.setup.description")
+                            .build()).queue();
+            event.getEventWaiter().newOnMessageEventWaiter(event1 -> {
+                if (event1.getMessage().getMentionedChannels().size() == 1) {
+                    try {
+                        TextChannel channel = event1.getMessage().getMentionedChannels().get(0);
+                        createRules(event, event1, channel);
+                    } catch (Exception e) {
+                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                                "commands.moderation.rules.channel.error.title",
+                                "commands.moderation.rules.channel.error.description")
+                                .build()).queue();
+                    }
+                } else {
+                    try {
+                        TextChannel channel = event1.getGuild().getTextChannelsByName(event1.getMessage().getContentRaw(), true).get(0);
+                        createRules(event, event1, channel);
+                    } catch (Exception e) {
+                        event.getTextChannel().sendMessage(
+                                event.getMessageEditor().getMessage(
+                                        MessageEditor.MessageType.ERROR,
+                                        "commands.moderation.rules.channel.error.title",
+                                        "commands.moderation.rules.channel.error.description")
+                                        .build()).queue();
+                    }
+                }
+            }, event.getJDA(), event.getAuthor());
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+        }
+    }
+
+    public void createRules(CommandEvent event, GuildMessageReceivedEvent event1, TextChannel channel) {
+        if (channel.getGuild().getId().equals(event1.getGuild().getId())) {
+            if (event.getGuild().getSelfMember().hasPermission(channel, Permission.MESSAGE_WRITE)) {
+                event1.getChannel().sendMessage(
+                        event.getMessageEditor().getMessage(
+                                MessageEditor.MessageType.INFO,
+                                "commands.moderation.rules.rules.title",
+                                "",
+                                "commands.moderation.rules.rules.description",
+                                channel.getName())
+                        .build()).queue();
+                event.getEventWaiter().newOnMessageEventWaiter(event2 -> {
+                    String message = event2.getMessage().getContentRaw();
+                    event2.getChannel().sendMessage(
+                            event.getMessageEditor().getMessage(
+                                    MessageEditor.MessageType.INFO,
+                                    "commands.moderation.rules.role.title",
+                                    "commands.moderation.rules.role.description")
+                            .build()).queue();
+                    new EventWaiter().newOnMessageEventWaiter(event3 -> {
+                        if (event3.getMessage().getMentionedRoles().size() == 1) {
+                            Role role = event3.getMessage().getMentionedRoles().get(0);
+                            setRole(event, channel, message, event3, role);
+                        } else if (event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).size() > 0) {
+                                Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).get(0);
+                                setRole(event, channel, message, event3, role);
+                        } else {
+                            event3.getChannel().sendMessage(
+                                    event.getMessageEditor().getMessage(
+                                            MessageEditor.MessageType.ERROR,
+                                            "commands.moderation.rules.role.error.title",
+                                            "commands.moderation.rules.role.error.description")
+                                    .build()).queue();
+                        }
+                    }, event.getJDA(), event.getAuthor());
+                }, event.getJDA(), event.getAuthor());
+            } else {
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                        "commands.moderation.rules.error.message.title",
+                        "commands.moderation.rules.error.message.description")
+                        .build()).queue();
+            }
+        } else {
+            event.getTextChannel().sendMessage(
+                    event.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.ERROR,
+                            "commands.moderation.rules.guild.error.title",
+                            "commands.moderation.rules.guild.error.description")
+                    .build()).queue();
+        }
+    }
+
+    public void setRole(CommandEvent event, TextChannel channel, String message, GuildMessageReceivedEvent event3, Role role) {
+        if (event3.getGuild().getSelfMember().canInteract(role)) {
+            event3.getChannel().sendMessage(
+                    event.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.INFO,
+                            "commands.moderation.rules.emote.accept.title",
+                            "",
+                            "commands.moderation.rules.emote.accept.description", role.getName())
+                    .build()).queue();
+            event.getEventWaiter().newOnMessageEventWaiter(event4 -> {
+                if (event4.getMessage().getEmotes().size() == 1) {
+                    Emote aemote = event4.getMessage().getEmotes().get(0);
+                    event4.getChannel().sendMessage(
+                            event.getMessageEditor().getMessage(
+                                    MessageEditor.MessageType.INFO,
+                                    "commands.moderation.rules.emote.decline.title", "",
+                                    "commands.moderation.rules.emote.decline.description", String.valueOf(aemote))
+                            .build()).queue();
+                    event.getEventWaiter().newOnMessageEventWaiter(event5 -> {
+                        Emote demote = event5.getMessage().getEmotes().get(0);
+                        if (!aemote.equals(demote)) {
+                            Message rules = channel.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                                    .setTitle("Rules")
+                                    .setDescription(message)
+                                    .build()).complete();
+                            try {
+                                rules.addReaction(aemote).queue();
+                                rules.addReaction(demote).queue();
+                                event5.getChannel().sendMessage(
+                                        event.getMessageEditor().getMessage(
+                                                MessageEditor.MessageType.INFO,
+                                                "commands.moderation.rules.success.title",
+                                                "",
+                                                "commands.moderation.rules.success.description",
+                                                channel.getAsMention())
+                                        .build()).queue();
+                            } catch (Exception e) {
+                                event5.getChannel().sendMessage(
+                                        event.getMessageEditor().getMessage(
+                                                MessageEditor.MessageType.ERROR,
+                                                "error",
+                                                "commands.moderation.rules.emote.error.access.description")
+                                        .build()).queue();
+                                e.printStackTrace();
+                            }
+                            event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote.toString(), demote.toString());
+                        } else {
+                            event.getTextChannel().sendMessage(
+                                    event.getMessageEditor().getMessage(
+                                            MessageEditor.MessageType.ERROR,
+                                            "commands.moderation.rules.emote.error.equal.title",
+                                            "commands.moderation.rules.emote.error.equal.description")
+                                    .build()).queue();
+                        }
+                    }, event.getJDA(), event.getAuthor());
+                } else {
+                    String aemote = event4.getMessage().getContentRaw();
+                    event4.getChannel().sendMessage(
+                            event.getMessageEditor().getMessage(
+                                    MessageEditor.MessageType.INFO,
+                                    "commands.moderation.rules.emote.decline.title",
+                                    "commands.moderation.rules.emoji.decline.description")
+                            .build()).queue();
+                    event.getEventWaiter().newOnMessageEventWaiter(event5 -> {
+                        String demote = event5.getMessage().getContentRaw();
+                        if (!aemote.equals(demote)) {
+                            Message rules = channel.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                                    .setTitle("Rules")
+                                    .setDescription(message)
+                                    .build()).complete();
+                            try {
+                                rules.addReaction(aemote).queue();
+                                rules.addReaction(demote).queue();
+                                event5.getChannel().sendMessage(
+                                        event.getMessageEditor().getMessage(
+                                                MessageEditor.MessageType.INFO,
+                                                "commands.moderation.rules.success.title",
+                                                "",
+                                                "commands.moderation.rules.success.description",
+                                                channel.getAsMention())
+                                        .build()).queue();
+                            } catch (Exception e) {
+                                event5.getChannel().sendMessage(
+                                        event.getMessageEditor().getMessage(
+                                                MessageEditor.MessageType.ERROR,
+                                                "error",
+                                                "commands.moderation.rules.emoji.error.description")
+                                        .build()).queue();
+                                e.printStackTrace();
+                            }
+                            event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote, demote);
+                        } else {
+                            event.getTextChannel().sendMessage(
+                                    event.getMessageEditor().getMessage(
+                                            MessageEditor.MessageType.ERROR,
+                                            "commands.moderation.rules.emote.error.equal.title",
+                                            "commands.moderation.rules.emote.error.equal.description")
+                                    .build()).queue();
+                        }
+                    }, event.getJDA(), event.getAuthor());
+                }
+            }, event.getJDA(), event.getAuthor());
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"rules", "rule", "setup"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.moderation.rules.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java
@ -0,0 +1,55 @@
+package com.bbn.hadder.commands.moderation;
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.entities.TextChannel;
+
+public class StarBoardCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getMessage().getMentionedChannels().size()==1) {
+            event.getRethink().setStarboardChannel(event.getGuild().getId(), event.getMessage().getMentionedChannels().get(0).getId());
+            event.getChannel().sendMessage(
+                    event.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.INFO,
+                                            "commands.moderation.starboard.success.title","")
+                            .build())
+                    .queue();
+        } else {
+            if (args.length>0) {
+                TextChannel channel = event.getGuild().getTextChannelById(args[0]);
+                if (channel!=null) {
+                    event.getRethink().setStarboardChannel(event.getGuild().getId(), channel.getId());
+                }
+            } else {
+                event.getHelpCommand().sendHelp(this, event);
+            }
+        }
+
+        if (args.length==2) {
+            event.getRethink().setNeededstars(args[1], event.getGuild().getId());
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"starboard"};
+    }
+
+    @Override
+    public String description() {
+        return "Sets the starboard channel";
+    }
+
+    @Override
+    public String usage() {
+        return "[Channel] [Needed stars]";
+    }
+
+    @Override
+    public String example() {
+        return "#starboard 4";
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java
@ -0,0 +1,50 @@
+package com.bbn.hadder.commands.music;
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+
+/**
+ * @author Skidder / GregTCLTK
+ */
+
+public class InfoCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) {
+            AudioTrack track = event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack();
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                    "commands.music.info.success.title", "")
+                    .setAuthor(track.getInfo().author)
+                    .addField("Title", track.getInfo().title, true)
+                    .addField("Progress", "`[ " + event.getAudioManager().getTimestamp(track.getPosition()) + " / " + event.getAudioManager().getTimestamp(track.getInfo().length) + " ]`", false)
+                    .build()).queue();
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                    "commands.music.info.error.title",
+                    "commands.music.info.error.description").build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"info", "songinfo"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.music.info.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java
@ -0,0 +1,84 @@
+package com.bbn.hadder.commands.music;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.entities.VoiceChannel;
+import net.dv8tion.jda.api.managers.AudioManager;
+
+
+public class JoinCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getMember().getVoiceState().inVoiceChannel()) {
+            AudioManager audioManager = event.getGuild().getAudioManager();
+            if(!audioManager.isAttemptingToConnect()) {
+                VoiceChannel vc = event.getMember().getVoiceState().getChannel();
+                if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) {
+                    if (!event.getGuild().getSelfMember().getVoiceState().getChannel().getId().equals(vc.getId())) {
+                        event.getGuild().getAudioManager().openAudioConnection(vc);
+                        event.getTextChannel().sendMessage(
+                                event.getMessageEditor().getMessage(
+                                        MessageEditor.MessageType.INFO,
+                                        "commands.music.join.success.title",
+                                        "",
+                                        "commands.music.join.success.description",
+                                        vc.getName())
+                                .build()).queue();
+                    } else {
+                        event.getTextChannel().sendMessage(
+                            event.getMessageEditor().getMessage(
+                                MessageEditor.MessageType.WARNING,
+                                "commands.music.join.error.connecting.already.title",
+                                "commands.music.join.error.connecting.already.description")
+                                .build()).queue();
+                    }
+                } else {
+                    event.getGuild().getAudioManager().openAudioConnection(vc);
+                    event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
+                        MessageEditor.MessageType.INFO,
+                        "commands.music.join.success.title", "",
+                        "commands.music.join.success.description", vc.getName())
+                        .build()).queue();
+                }
+            } else {
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
+                    MessageEditor.MessageType.WARNING,
+                    "commands.music.join.error.connecting.trying.title",
+                    "commands.music.join.error.connecting.trying.description")
+                    .build()).queue();
+            }
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
+                MessageEditor.MessageType.ERROR,
+                "commands.music.join.error.channel.title",
+                "commands.music.join.error.channel.description")
+                    .build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"join"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.music.join.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java
@ -0,0 +1,50 @@
+package com.bbn.hadder.commands.music;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+
+public class LeaveCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) {
+            event.getGuild().getAudioManager().closeAudioConnection();
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
+                MessageEditor.MessageType.INFO,
+                "commands.music.leave.success.title",
+                "commands.music.leave.success.description")
+                    .build()).queue();
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
+                MessageEditor.MessageType.ERROR,
+                "commands.music.leave.error.tile",
+                "commands.music.leave.error.description")
+                    .build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"leave", "quit"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.music.leave.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java
@ -0,0 +1,62 @@
+package com.bbn.hadder.commands.music;
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.entities.Message;
+
+import java.net.URL;
+
+/**
+ * @author Skidder / GregTCLTK
+ */
+
+public class PlayCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (args.length > 0) {
+            if (event.getMember().getVoiceState().inVoiceChannel()) {
+                String input = event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "play ", "").replaceFirst(event.getRethink().getUserPrefix(event.getAuthor().getId()) + "play ", "");
+                try {
+                    new URL(input).toURI();
+                    Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                            "commands.music.play.load.title", "⭕",
+                            "commands.music.play.load.description", "").build()).complete();
+                    event.getAudioManager().loadTrack(input, event, msg);
+                } catch (Exception ignore) {
+                    Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                            "commands.music.play.load.title", "⭕",
+                            "commands.music.play.load.description", "").build()).complete();
+                    event.getAudioManager().loadTrack("ytsearch: " + input, event, msg);
+                }
+            } else {
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
+                        MessageEditor.MessageType.ERROR,
+                        "commands.music.join.error.channel.title",
+                        "commands.music.join.error.channel.description")
+                        .build()).queue();
+            }
+        } else event.getHelpCommand().sendHelp(this, event);
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"play"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.music.play.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[Song URL/Name]";
+    }
+
+    @Override
+    public String example() {
+        return "Last Christmas";
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java
@ -0,0 +1,55 @@
+package com.bbn.hadder.commands.music;
+
+import com.bbn.hadder.audio.AudioInfo;
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+
+import java.util.Set;
+
+/**
+ * @author Skidder / GregTCLTK
+ */
+
+public class QueueCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (!event.getAudioManager().hasPlayer(event.getGuild()) || event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks().isEmpty()) {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                    "commands.music.queue.error.title",
+                    "commands.music.queue.error.description"
+            ).build()).queue();
+        } else {
+            Set<AudioInfo> queue = event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks();
+            StringBuilder builder = new StringBuilder();
+            for (AudioInfo g : queue) {
+                builder.append("**").append(g.getTrack().getInfo().author).append("**: `").append(g.getTrack().getInfo().title).append("` \n");
+            }
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                    "commands.music.queue.success.title", "",
+                    "commands.music.queue.success.description", builder.toString())
+                    .build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"queue"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.music.queue.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java
@ -0,0 +1,46 @@
+package com.bbn.hadder.commands.music;
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+
+/**
+ * @author Skidder / GregTCLTK
+ */
+
+public class SkipCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getAudioManager().hasPlayer(event.getGuild()) && !event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks().isEmpty()) {
+            event.getAudioManager().forceSkipTrack(event);
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                    "commands.music.skip.success.title",
+                    "commands.music.skip.success.description").build()).queue();
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                    "commands.music.info.error.title",
+                    "commands.music.info.error.description").build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"skip"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.music.skip.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java
@ -0,0 +1,49 @@
+package com.bbn.hadder.commands.music;
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+
+/**
+ * @author Skidder / GregTCLTK
+ */
+
+public class StopCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) {
+            event.getAudioManager().players.remove(event.getGuild().getId());
+            event.getAudioManager().getPlayer(event.getGuild()).destroy();
+            event.getAudioManager().getTrackManager(event.getGuild()).purgeQueue();
+            event.getGuild().getAudioManager().closeAudioConnection();
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                    "commands.music.stop.success.title",
+                    "commands.music.stop.success.description").build()).queue();
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                    "commands.music.info.error.title",
+                    "commands.music.info.error.description").build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"stop"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.music.stop.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java
@ -0,0 +1,61 @@
+package com.bbn.hadder.commands.music;
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+
+/**
+ * @author Skidder / GregTCLTK
+ */
+
+public class VolumeCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (args.length > 0) {
+            if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) {
+                try {
+                    int volume = Integer.parseInt(args[0]);
+                    if (volume < 201 && volume > 0 || event.getConfig().getOwners().contains(event.getAuthor().getIdLong())) {
+                        event.getAudioManager().getPlayer(event.getGuild()).setVolume(volume);
+                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                                "commands.music.volume.success.title", "",
+                                "commands.music.volume.success.description", String.valueOf(volume)).build()).queue();
+                    } else {
+                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                                "commands.music.volume.error.int.title",
+                                "commands.music.volume.error.int.description").build()).queue();
+                    }
+                } catch (NumberFormatException e) {
+                    event.getHelpCommand().sendHelp(this, event);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } else {
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                        "commands.music.info.error.title",
+                        "commands.music.info.error.description").build()).queue();
+            }
+        } else event.getHelpCommand().sendHelp(this, event);
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"volume"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.music.volume.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[New volume]";
+    }
+
+    @Override
+    public String example() {
+        return "100";
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java
@ -0,0 +1,67 @@
+package com.bbn.hadder.commands.nsfw;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+public class AnalCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getTextChannel().isNSFW()) {
+
+            OkHttpClient caller = new OkHttpClient();
+            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/anal/").build();
+
+            try {
+                Response response = caller.newCall(request).execute();
+                JSONObject json = new JSONObject(response.body().string());
+                JSONObject data = json.getJSONObject("data");
+                JSONObject response1 = data.getJSONObject("response");
+                String url = response1.toString().replace("{\"url\":\"", "");
+
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
+                        .setImage(url.replace("\"}", ""))
+                        .setFooter("Anal")
+                        .build()).queue();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"anal"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.nsfw.anal.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java
@ -0,0 +1,67 @@
+package com.bbn.hadder.commands.nsfw;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+public class BDSMCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getTextChannel().isNSFW()) {
+
+            OkHttpClient caller = new OkHttpClient();
+            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/img/bdsm_lewd").build();
+
+            try {
+                Response response = caller.newCall(request).execute();
+                JSONObject json = new JSONObject(response.body().string());
+                JSONObject data = json.getJSONObject("data");
+                JSONObject response1 = data.getJSONObject("response");
+                String url = response1.toString().replace("{\"url\":\"", "");
+
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
+                        .setImage(url.replace("\"}", ""))
+                        .setFooter("BDSM")
+                        .build()).queue();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[] { "bdsm" };
+    }
+
+    @Override
+    public String description() {
+        return "commands.nsfw.bdsm.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java
@ -0,0 +1,64 @@
+package com.bbn.hadder.commands.nsfw;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+import java.io.IOException;
+
+public class BlowjobCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getTextChannel().isNSFW()) {
+
+            OkHttpClient caller = new OkHttpClient();
+            Request request = new Request.Builder().url("https://nekos.life/api/v2/img/blowjob").build();
+
+            try {
+
+                Response response = caller.newCall(request).execute();
+                String url = response.body().string().replace("{\"url\":\"", "");
+
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
+                        .setImage(url.replace("\"}", ""))
+                        .setFooter("Blowjob")
+                        .build()).queue();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"blowjob"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.nsfw.blowjob.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java
@ -0,0 +1,68 @@
+package com.bbn.hadder.commands.nsfw;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+public class BoobsCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getTextChannel().isNSFW()) {
+
+            OkHttpClient caller = new OkHttpClient();
+            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/tits/").build();
+
+            try {
+
+                Response response = caller.newCall(request).execute();
+                JSONObject json = new JSONObject(response.body().string());
+                JSONObject data = json.getJSONObject("data");
+                JSONObject response1 = data.getJSONObject("response");
+                String url = response1.toString().replace("{\"url\":\"", "");
+
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
+                        .setImage(url.replace("\"}", ""))
+                        .setFooter("Boobs")
+                        .build()).queue();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"boobs", "boob", "tits"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.nsfw.boobs.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java
@ -0,0 +1,68 @@
+package com.bbn.hadder.commands.nsfw;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+public class CumCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getTextChannel().isNSFW()) {
+
+            OkHttpClient caller = new OkHttpClient();
+            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/cum/").build();
+
+            try {
+
+                Response response = caller.newCall(request).execute();
+                JSONObject json = new JSONObject(response.body().string());
+                JSONObject data = json.getJSONObject("data");
+                JSONObject response1 = data.getJSONObject("response");
+                String url = response1.toString().replace("{\"url\":\"", "");
+
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
+                        .setImage(url.replace("\"}", ""))
+                        .setFooter("Cum")
+                        .build()).queue();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"cum"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.nsfw.cum.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java
@ -0,0 +1,64 @@
+package com.bbn.hadder.commands.nsfw;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+import java.io.IOException;
+
+public class EroticCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getTextChannel().isNSFW()) {
+
+            OkHttpClient caller = new OkHttpClient();
+            Request request = new Request.Builder().url("https://nekos.life/api/v2/img/erok").build();
+
+            try {
+
+                Response response = caller.newCall(request).execute();
+                String url = response.body().string().replace("{\"url\":\"", "");
+
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
+                        .setImage(url.replace("\"}", ""))
+                        .setFooter("Erotic")
+                        .build()).queue();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"erotic"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.nsfw.erotic.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java
@ -0,0 +1,68 @@
+package com.bbn.hadder.commands.nsfw;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+public class FeetCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getTextChannel().isNSFW()) {
+
+            OkHttpClient caller = new OkHttpClient();
+            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/feet/").build();
+
+            try {
+
+                Response response = caller.newCall(request).execute();
+                JSONObject json = new JSONObject(response.body().string());
+                JSONObject data = json.getJSONObject("data");
+                JSONObject response1 = data.getJSONObject("response");
+                String url = response1.toString().replace("{\"url\":\"", "");
+
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
+                        .setImage(url.replace("\"}", ""))
+                        .setFooter("Feet")
+                        .build()).queue();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"feet"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.nsfw.feet.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java
@ -0,0 +1,68 @@
+package com.bbn.hadder.commands.nsfw;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+public class FingeringCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getTextChannel().isNSFW()) {
+
+            OkHttpClient caller = new OkHttpClient();
+            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/pussy_wank/").build();
+
+            try {
+
+                Response response = caller.newCall(request).execute();
+                JSONObject json = new JSONObject(response.body().string());
+                JSONObject data = json.getJSONObject("data");
+                JSONObject response1 = data.getJSONObject("response");
+                String url = response1.toString().replace("{\"url\":\"", "");
+
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
+                        .setImage(url.replace("\"}", ""))
+                        .setFooter("Fingering")
+                        .build()).queue();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"fingering"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.nsfw.fingering.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java
@ -0,0 +1,68 @@
+package com.bbn.hadder.commands.nsfw;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+public class LickingCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getTextChannel().isNSFW()) {
+
+            OkHttpClient caller = new OkHttpClient();
+            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/kuni/").build();
+
+            try {
+
+                Response response = caller.newCall(request).execute();
+                JSONObject json = new JSONObject(response.body().string());
+                JSONObject data = json.getJSONObject("data");
+                JSONObject response1 = data.getJSONObject("response");
+                String url = response1.toString().replace("{\"url\":\"", "");
+
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
+                        .setImage(url.replace("\"}", ""))
+                        .setFooter("Licking")
+                        .build()).queue();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"licking"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.nsfw.linking.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java
@ -0,0 +1,68 @@
+package com.bbn.hadder.commands.nsfw;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+public class PornCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getTextChannel().isNSFW()) {
+
+            OkHttpClient caller = new OkHttpClient();
+            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/classic/").build();
+
+            try {
+
+                Response response = caller.newCall(request).execute();
+                JSONObject json = new JSONObject(response.body().string());
+                JSONObject data = json.getJSONObject("data");
+                JSONObject response1 = data.getJSONObject("response");
+                String url = response1.toString().replace("{\"url\":\"", "");
+
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
+                        .setImage(url.replace("\"}", ""))
+                        .setFooter("Porn")
+                        .build()).queue();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"porn"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.nsfw.porn.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java
@ -0,0 +1,64 @@
+package com.bbn.hadder.commands.nsfw;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+import java.io.IOException;
+
+public class PussyCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getTextChannel().isNSFW()) {
+
+            OkHttpClient caller = new OkHttpClient();
+            Request request = new Request.Builder().url("https://nekos.life/api/v2/img/pussy").build();
+
+            try {
+
+                Response response = caller.newCall(request).execute();
+                String url = response.body().string().replace("{\"url\":\"", "");
+
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
+                        .setImage(url.replace("\"}", ""))
+                        .setFooter("Pussy")
+                        .build()).queue();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"pussy"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.nsfw.pussy.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java
@ -0,0 +1,72 @@
+package com.bbn.hadder.commands.nsfw;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+public class RandomPornCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getTextChannel().isNSFW()) {
+
+            OkHttpClient caller = new OkHttpClient();
+            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/all_tags/")
+                    .build();
+
+            try {
+
+                Response response = caller.newCall(request).execute();
+                JSONObject json = new JSONObject(response.body().string());
+                JSONObject data = json.getJSONObject("data");
+                JSONObject response1 = data.getJSONObject("response");
+                String url = response1.toString().replace("{\"url\":\"", "");
+
+                event.getTextChannel()
+                        .sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                                .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"),
+                                        url.replace("\"}", ""))
+                                .setImage(url.replace("\"}", "")).setFooter("Random Porn").build())
+                        .queue();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            event.getTextChannel()
+                    .sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build())
+                    .queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[] { "randomporn", "pornrandom" };
+    }
+
+    @Override
+    public String description() {
+        return "commands.nsfw.randomporn.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java
@ -0,0 +1,68 @@
+package com.bbn.hadder.commands.nsfw;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+public class SoloCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getTextChannel().isNSFW()) {
+
+            OkHttpClient caller = new OkHttpClient();
+            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/girls_solo/").build();
+
+            try {
+
+                Response response = caller.newCall(request).execute();
+                JSONObject json = new JSONObject(response.body().string());
+                JSONObject data = json.getJSONObject("data");
+                JSONObject response1 = data.getJSONObject("response");
+                String url = response1.toString().replace("{\"url\":\"", "");
+
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
+                        .setImage(url.replace("\"}", ""))
+                        .setFooter("Solo")
+                        .build()).queue();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"solo"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.nsfw.solo.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java
@ -0,0 +1,69 @@
+package com.bbn.hadder.commands.nsfw;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+public class SpankCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getTextChannel().isNSFW()) {
+
+            OkHttpClient caller = new OkHttpClient();
+            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/spank/").build();
+
+            try {
+
+                Response response = caller.newCall(request).execute();
+                JSONObject json = new JSONObject(response.body().string());
+                JSONObject data = json.getJSONObject("data");
+                JSONObject response1 = data.getJSONObject("response");
+                String url = response1.toString().replace("{\"url\":\"", "");
+
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"),
+                                url.replace("\"}", ""))
+                        .setImage(url.replace("\"}", "")).setFooter("Spank").build()).queue();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            event.getTextChannel()
+                    .sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build())
+                    .queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[] { "spank", "beat", "hit" };
+    }
+
+    @Override
+    public String description() {
+        return "commands.nsfw.spank.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java
@ -0,0 +1,65 @@
+package com.bbn.hadder.commands.nsfw;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+import java.io.IOException;
+
+public class TransCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (event.getTextChannel().isNSFW()) {
+
+            OkHttpClient caller = new OkHttpClient();
+            Request request = new Request.Builder().url("https://nekos.life/api/v2/img/trap").build();
+
+            try {
+
+                Response response = caller.newCall(request).execute();
+                String url = response.body().string().replace("{\"url\":\"", "");
+
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"),
+                                url.replace("\"}", ""))
+                        .setImage(url.replace("\"}", "")).setFooter("Trans").build()).queue();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            event.getTextChannel()
+                    .sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build())
+                    .queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[] { "trans" };
+    }
+
+    @Override
+    public String description() {
+        return "commands.nsfw.trans.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java
@ -1,27 +1,15 @@
+package com.bbn.hadder.commands.owner;
+
 /*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * @author Skidder / GregTCLTK
 */

-package one.bbn.hadder.commands.owner;
-
-import one.bbn.hadder.Hadder;
-import one.bbn.hadder.commands.Command;
-import one.bbn.hadder.commands.CommandEvent;
-import one.bbn.hadder.core.Perm;
-import one.bbn.hadder.core.Perms;
-import one.bbn.hadder.utils.MessageEditor;
+import com.bbn.hadder.Hadder;
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
+import com.bbn.hadder.utils.MessageEditor;

 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
@ -34,7 +22,7 @@ import java.util.concurrent.TimeUnit;
 public class EvalCommand implements Command {

    @Override
-    public void executed(String[] args, CommandEvent e) {
+    public void executed(String[] args, CommandEvent event) {
        if (args.length > 0) {
            ScriptEngine engine = new ScriptEngineManager().getEngineByName("nashorn");

@ -43,18 +31,19 @@ public class EvalCommand implements Command {
            } catch (ScriptException ex) {
                ex.printStackTrace();
            }
-            engine.put("msg".toLowerCase(), e.getMessage());
+
+            engine.put("msg".toLowerCase(), event.getMessage());
            engine.put("shardmanager".toLowerCase(), Hadder.shardManager);
-            engine.put("rethink".toLowerCase(), e.getMongo());
-            engine.put("e".toLowerCase(), e);
-            engine.put("jda".toLowerCase(), e.getJDA());
-            engine.put("message".toLowerCase(), e.getMessage());
-            engine.put("guild".toLowerCase(), e.getGuild());
-            engine.put("channel".toLowerCase(), e.getChannel());
-            engine.put("author".toLowerCase(), e.getAuthor());
-            engine.put("member".toLowerCase(), e.getMember());
-            engine.put("self".toLowerCase(), e.getGuild().getSelfMember());
-            engine.put("audio".toLowerCase(), e.getAudioManager());
+            engine.put("rethink".toLowerCase(), event.getRethink());
+            engine.put("event".toLowerCase(), event);
+            engine.put("jda".toLowerCase(), event.getJDA());
+            engine.put("message".toLowerCase(), event.getMessage());
+            engine.put("guild".toLowerCase(), event.getGuild());
+            engine.put("channel".toLowerCase(), event.getChannel());
+            engine.put("author".toLowerCase(), event.getAuthor());
+            engine.put("member".toLowerCase(), event.getMember());
+            engine.put("self".toLowerCase(), event.getGuild().getSelfMember());
+            engine.put("audio".toLowerCase(), event.getAudioManager());
            engine.put("out".toLowerCase(), System.out);

            ScheduledExecutorService service = Executors.newScheduledThreadPool(1);
@ -72,21 +61,21 @@ public class EvalCommand implements Command {
                    }
                    out = engine.eval(script.toString());

-                    e.getTextChannel().sendMessage(e.getMessageEditor()
+                    event.getTextChannel().sendMessage(event.getMessageEditor()
                            .getMessage(MessageEditor.MessageType.INFO, "commands.owner.eval.success.title", "")
-                            .addField(e.getMessageEditor().getTerm("commands.owner.eval.success.input"),
+                            .addField(event.getMessageEditor().getTerm("commands.owner.eval.success.input"),
                                    "```java\n\n" + script + "```", false)
-                            .addField(e.getMessageEditor().getTerm("commands.owner.eval.success.output"),
+                            .addField(event.getMessageEditor().getTerm("commands.owner.eval.success.output"),
                                    "```java\n\n" + out.toString() + "```", false)
-                            .addField(e.getMessageEditor().getTerm("commands.owner.eval.success.timing"),
+                            .addField(event.getMessageEditor().getTerm("commands.owner.eval.success.timing"),
                                    System.currentTimeMillis() - startExec + " milliseconds", false)
                            .build()).queue();
                } catch (Exception ex) {
-                    e.getTextChannel().sendMessage(e.getMessageEditor()
+                    event.getTextChannel().sendMessage(event.getMessageEditor()
                            .getMessage(MessageEditor.MessageType.INFO, "commands.owner.eval.success.title", "")
-                            .addField(e.getMessageEditor().getTerm("error"),
+                            .addField(event.getMessageEditor().getTerm("error"),
                                    "```java\n\n" + ex.getMessage() + "```", false)
-                            .addField(e.getMessageEditor().getTerm("commands.owner.eval.success.timing"),
+                            .addField(event.getMessageEditor().getTerm("commands.owner.eval.success.timing"),
                                    System.currentTimeMillis() - startExec + " milliseconds", false)
                            .build()).queue();

@ -96,7 +85,9 @@ public class EvalCommand implements Command {

            }, 0, TimeUnit.MILLISECONDS);

-        } else e.getHelpCommand().sendHelp(this, e);
+        } else {
+            event.getHelpCommand().sendHelp(this, event);
+        }
    }

    @Override
@ -111,7 +102,7 @@ public class EvalCommand implements Command {

    @Override
    public String usage() {
-        return "[code]";
+        return "[Code]";
    }

    @Override
--- a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java
@ -0,0 +1,56 @@
+package com.bbn.hadder.commands.owner;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.entities.Guild;
+
+@Perms(Perm.BOT_OWNER)
+public class GuildLeaveCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (args.length > 0) {
+            Guild guild = event.getJDA().getGuildById(args[0]);
+            try {
+                guild.leave().queue();
+                event.getTextChannel()
+                        .sendMessage(event.getMessageEditor()
+                                .getMessage(MessageEditor.MessageType.INFO, "commands.owner.guildleave.success.title",
+                                        "", "commands.owner.guildleave.success.description", guild.getName())
+                                .build())
+                        .queue();
+            } catch (Exception e) {
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.owner.guildleave.error.title", "", "commands.owner.guildleave.help.description", guild.getName()).build()).queue();
+            }
+        } else {
+            event.getHelpCommand().sendHelp(this, event);
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"guildleave"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.owner.guildleave.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[Guild-ID]";
+    }
+
+    @Override
+    public String example() {
+        return "366971954244354048";
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java
@ -0,0 +1,39 @@
+package com.bbn.hadder.commands.owner;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
+
+@Perms(Perm.BOT_OWNER)
+public class RebootCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        Runtime.getRuntime().exit(69);
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"restart", "restart"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.owner.reboot.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java
@ -0,0 +1,43 @@
+package com.bbn.hadder.commands.owner;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
+import com.bbn.hadder.utils.MessageEditor;
+
+@Perms(Perm.BOT_OWNER)
+public class ShutdownCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO).setTitle("Shutdown").build()).queue();
+        event.getJDA().getShardManager().shutdown();
+        System.out.println("Bot shut down via Command...");
+        Runtime.getRuntime().exit(69);
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"shutdown", "exit"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.owner.shutdown.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java
@ -0,0 +1,37 @@
+package com.bbn.hadder.commands.owner;
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor.MessageType;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+public class TestCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageType.INFO, "commands.owner.test.success", "").build()).queue();
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"test"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.owner.test.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
@ -0,0 +1,74 @@
+package com.bbn.hadder.commands.settings;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+
+public class LanguageCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (args.length == 1) {
+            switch (args[0].toLowerCase()) {
+            case "de":
+                setLanguage("de", "German", event);
+                break;
+            case "en":
+                setLanguage("en", "English", event);
+                break;
+            case "es":
+                setLanguage("es", "Spanish", event);
+                break;
+            case "fr":
+                setLanguage("fr", "French", event);
+                break;
+            case "ru":
+                setLanguage("ru", "Russian", event);
+                break;
+            case "tr":
+                setLanguage("tr", "Turkish", event);
+                break;
+            case "zh":
+                setLanguage("zh", "Chinese", event);
+                break;
+            }
+        } else {
+            event.getHelpCommand().sendHelp(this, event);
+        }
+    }
+
+    public void setLanguage(String language_code, String language, CommandEvent event) {
+        event.getRethink().setLanguage(event.getAuthor().getId(), language_code);
+        event.getTextChannel()
+                .sendMessage(
+                        event.getMessageEditor()
+                                .getMessage(MessageEditor.MessageType.INFO, "commands.settings.language.success.title",
+                                        "", "commands.settings.language.success.description", language)
+                                .build())
+                .queue();
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[] { "language" };
+    }
+
+    @Override
+    public String description() {
+        return "commands.settings.language.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[Language code]";
+    }
+
+    @Override
+    public String example() {
+        return "de";
+    }
+}
--- a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java
@ -0,0 +1,46 @@
+package com.bbn.hadder.commands.settings;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+
+public class UserPrefixCommand implements Command {
+
+    public void executed(String[] args, CommandEvent event) {
+        if (args.length == 1) {
+            event.getRethink().setUserPrefix(args[0], event.getAuthor().getId());
+            event.getTextChannel()
+                    .sendMessage(event.getMessageEditor()
+                            .getMessage(MessageEditor.MessageType.INFO, "commands.settings.prefix.success.title", "",
+                                    "commands.settings.prefix.success.description", args[0])
+                            .build())
+                    .queue();
+        } else {
+            event.getHelpCommand().sendHelp(this, event);
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[] { "userprefix" };
+    }
+
+    @Override
+    public String description() {
+        return "commands.settings.prefix.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[New Prefix]";
+    }
+
+    @Override
+    public String example() {
+        return "!";
+    }
+}
--- a/src/main/java/com/bbn/hadder/core/CommandHandler.java
+++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java
@ -0,0 +1,61 @@
+package com.bbn.hadder.core;
+
+import com.bbn.hadder.Rethink;
+import com.bbn.hadder.audio.AudioManager;
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.commands.general.HelpCommand;
+import com.bbn.hadder.utils.EventWaiter;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class CommandHandler {
+
+    private List<Command> commandList;
+    private Config config;
+    private HelpCommand helpCommand;
+
+    public CommandHandler(List<Command> commandList, Config config, HelpCommand helpCommand) {
+        this.commandList = commandList;
+        this.config = config;
+        this.helpCommand = helpCommand;
+    }
+
+    public void handle(MessageReceivedEvent event, Rethink rethink, String prefix, AudioManager audioManager) {
+        String invoke = event.getMessage().getContentRaw().replaceFirst(prefix, "").split(" ")[0];
+        for (Command cmd : commandList) {
+            for (String label : cmd.labels()) {
+                if (label.equals(invoke)) {
+                    String argString = event.getMessage().getContentRaw()
+                            .replaceFirst(prefix, "").replaceFirst(invoke, "");
+                    if (argString.startsWith(" ")) argString = argString.replaceFirst(" ", "");
+                    String[] args = argString.split(" ");
+                    if (args.length > 0 && args[0].equals("")) args = new String[0];
+
+                    CommandEvent commandEvent = new CommandEvent(event.getJDA(), event.getResponseNumber(), event.getMessage(), rethink,
+                            config, this, helpCommand, new MessageEditor(rethink, event.getAuthor()), new EventWaiter(), audioManager);
+                    if (cmd.getClass().getAnnotations().length > 0 && !Arrays.asList(cmd.getClass().getAnnotations()).contains(Perms.class)) {
+                        for (Perm perm : cmd.getClass().getAnnotation(Perms.class).value()) {
+                            if (!perm.check(commandEvent)) {
+                                commandEvent.getTextChannel()
+                                        .sendMessage(commandEvent.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build())
+                                        .queue();
+                                return;
+                            }
+                        }
+                    }
+
+                    cmd.executed(args, commandEvent);
+                    return;
+                }
+            }
+        }
+    }
+
+    public List<Command> getCommandList() {
+        return commandList;
+    }
+}
--- a/src/main/java/com/bbn/hadder/core/Config.java
+++ b/src/main/java/com/bbn/hadder/core/Config.java
@ -1,20 +1,4 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package one.bbn.hadder.core;
+package com.bbn.hadder.core;

 import org.json.JSONObject;
 import org.json.JSONStringer;
@ -70,22 +54,17 @@ public class Config {
                .key("Tokens").object()
                .key("BotToken").value(null)
                .key("Giphy").value(null)
-                .key("GitHub").value(null)
                .key("MythicalBotList").value(null)
                .key("BotsForDiscord").value(null)
                .key("DiscordBotList").value(null)
+                .key("DiscordBestBots").value(null)
                .key("DiscordBoats").value(null)
                .key("YetAnotherBotList").value(null)
-                .key("DiscordExtremeList").value(null)
-                .key("DiscordBotReviews").value(null)
-                .key("DiscordBots").value(null)
-                .key("BotListSpace").value(null)
-                .key("DiscordBots2").value(null)
-                .key("CloudList").value(null)
-                .key("Arcane").value(null)
-                .endObject()
-                .key("Clyde").value("Clyde")
-                .endObject().toString();
+                .value("DiscordExtremeList").value(null)
+                .value("DiscordBotReviews").value(null)
+                .value("DiscordBots").value(null)
+                .value("BotListSpace").value(null)
+                .endObject().endObject().toString();
    }

    public String getBotToken() {
@ -136,6 +115,10 @@ public class Config {
        return config.getJSONObject("Tokens").getString("DiscordBotList");
    }

+    public String getDiscordBestBotsToken() {
+        return config.getJSONObject("Tokens").getString("DiscordBestBots");
+    }
+
    public String getDiscordBoatsToken() {
        return config.getJSONObject("Tokens").getString("DiscordBoats");
    }
@ -148,6 +131,10 @@ public class Config {
        return config.getJSONObject("Tokens").getString("DiscordExtremeList");
    }

+    public String getDiscordBotReviewsToken() {
+        return config.getJSONObject("Tokens").getString("DiscordBotReviews");
+    }
+
    public String getDiscordBotsToken() {
        return config.getJSONObject("Tokens").getString("DiscordBots");
    }
@ -156,18 +143,6 @@ public class Config {
        return config.getJSONObject("Tokens").getString("BotListSpace");
    }

-    public String getDiscordBots2Token() {
-        return config.getJSONObject("Tokens").getString("DiscordBots2");
-    }
-
-    public String getCloudListToken() {
-        return config.getJSONObject("Tokens").getString("CloudList");
-    }
-
-    public String getArcaneToken() {
-        return config.getJSONObject("Tokens").getString("Arcane");
-    }
-
    public String getClydeName() {
        return config.getString("Clyde");
    }
--- a/src/main/java/com/bbn/hadder/core/Perm.java
+++ b/src/main/java/com/bbn/hadder/core/Perm.java
@ -0,0 +1,75 @@
+package com.bbn.hadder.core;
+
+import com.bbn.hadder.commands.CommandEvent;
+import net.dv8tion.jda.api.Permission;
+
+/**
+ * @author Skidder / GregTCLTK
+ * @author Hax / Hax6775 / Schlauer_Hax
+ */
+
+public enum Perm {
+
+    BOT_OWNER() {
+        @Override
+        public boolean check(CommandEvent event) {
+            return event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
+        }
+        },
+    MANAGE_MESSAGES {
+        @Override
+        public boolean check(CommandEvent event) {
+            return event.getMember().hasPermission(Permission.MESSAGE_MANAGE) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
+        }
+        },
+    EMBED_MESSAGES {
+        @Override
+        public boolean check(CommandEvent event) {
+            return event.getMember().hasPermission(Permission.MESSAGE_EMBED_LINKS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
+        }
+        },
+    BAN_MEMBERS {
+        @Override
+        public boolean check(CommandEvent event) {
+            return event.getMember().hasPermission(Permission.BAN_MEMBERS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
+        }
+        },
+    KICK_MEMBERS {
+        @Override
+        public boolean check(CommandEvent event) {
+            return event.getMember().hasPermission(Permission.KICK_MEMBERS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
+        }
+        },
+    MANAGE_SERVER {
+        @Override
+        public boolean check(CommandEvent event) {
+            return event.getMember().hasPermission(Permission.MANAGE_SERVER) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
+        }
+        },
+    MANAGE_ROLES {
+        @Override
+        public boolean check(CommandEvent event) {
+            return event.getMember().hasPermission(Permission.MANAGE_ROLES) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
+        }
+        },
+    MANAGE_NICKNAMES {
+        @Override
+        public boolean check(CommandEvent event) {
+            return event.getMember().hasPermission(Permission.NICKNAME_MANAGE) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
+        }
+        },
+    ADMINISTRATOR {
+        @Override
+        public boolean check(CommandEvent event) {
+            return event.getMember().hasPermission(Permission.ADMINISTRATOR) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
+        }
+        },
+    MANAGE_WEBHOOKS {
+        @Override
+        public boolean check(CommandEvent event) {
+            return event.getMember().hasPermission(Permission.MANAGE_WEBHOOKS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
+        }
+    };
+
+    public abstract boolean check(CommandEvent event);
+}
--- a/src/main/java/com/bbn/hadder/core/Perms.java
+++ b/src/main/java/com/bbn/hadder/core/Perms.java
@ -0,0 +1,14 @@
+package com.bbn.hadder.core;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @author Skidder / GregTCLTK
+ * @author Hax / Hax6775 / Schlauer_Hax
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Perms {
+    Perm[] value() default {};
+}
--- a/src/main/java/com/bbn/hadder/listener/CommandListener.java
+++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java
@ -0,0 +1,43 @@
+package com.bbn.hadder.listener;
+
+import com.bbn.hadder.Rethink;
+import com.bbn.hadder.audio.AudioManager;
+import com.bbn.hadder.core.CommandHandler;
+import net.dv8tion.jda.api.entities.ChannelType;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+public class CommandListener extends ListenerAdapter {
+
+    private Rethink rethink;
+    private CommandHandler handler;
+    private AudioManager audioManager;
+
+    public CommandListener(Rethink rethink, CommandHandler handler, AudioManager audioManager) {
+        this.rethink = rethink;
+        this.handler = handler;
+        this.audioManager = audioManager;
+    }
+
+    @Override
+    public void onMessageReceived(MessageReceivedEvent event) {
+        if (event.isFromType(ChannelType.TEXT) && !event.getAuthor().isBot()) {
+            String[] prefixes = {
+                    rethink.getUserPrefix(event.getAuthor().getId()), rethink.getGuildPrefix(event.getGuild().getId()),
+                    event.getGuild().getSelfMember().getAsMention() + " ", event.getGuild().getSelfMember().getAsMention(),
+                    event.getGuild().getSelfMember().getAsMention().replace("@", "@!") + " ",
+                    event.getGuild().getSelfMember().getAsMention().replace("@", "@!")
+            };
+            for (String prefix : prefixes) {
+                if (event.getMessage().getContentRaw().startsWith(prefix)) {
+                    handler.handle(event, rethink, prefix, audioManager);
+                    return;
+                }
+            }
+        }
+    }
+}
--- a/src/main/java/com/bbn/hadder/listener/GuildListener.java
+++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java
@ -0,0 +1,73 @@
+package com.bbn.hadder.listener;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.Rethink;
+import com.bbn.hadder.core.Config;
+import com.bbn.hadder.utils.BotList;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
+import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
+import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+
+import java.time.Instant;
+
+public class GuildListener extends ListenerAdapter {
+
+    private Rethink rethink;
+    private Config config;
+
+    public GuildListener(Rethink rethink, Config config) {
+        this.rethink = rethink;
+        this.config = config;
+    }
+
+    public void onGuildJoin(GuildJoinEvent event) {
+        new Thread(() -> {
+            for (Member member : event.getGuild().getMembers()) {
+                if (!member.getUser().getId().equals(event.getJDA().getSelfUser().getId())) {
+                    rethink.insertUser(member.getUser().getId());
+                }
+            }
+        }).start();
+
+        rethink.insertGuild(event.getGuild().getId());
+        event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor(null, null).getMessage(MessageEditor.MessageType.INFO)
+                .setTitle("Joined Server")
+                .setThumbnail(event.getGuild().getIconUrl())
+                .addField("Name", event.getGuild().getName(), true)
+                .addField("Guild ID", event.getGuild().getId(), true)
+                .addField("Guild Owner", event.getGuild().getOwner().getUser().getAsTag(), true)
+                .addField("Users", String.valueOf(event.getGuild().getMembers().size()), true)
+                .setFooter(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl())
+                .setTimestamp(Instant.now())
+                .build()).queue();
+
+        new BotList(config).post();
+    }
+
+    public void onGuildLeave(GuildLeaveEvent event) {
+        event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor(null, null).getMessage(MessageEditor.MessageType.INFO)
+                .setTitle("Left Server")
+                .setThumbnail(event.getGuild().getIconUrl())
+                .addField("Name", event.getGuild().getName(), true)
+                .addField("Guild ID", event.getGuild().getId(), true)
+                .addField("Guild Owner", event.getGuild().getOwner().getUser().getAsTag(), true)
+                .addField("Users", String.valueOf(event.getGuild().getMembers().size()), true)
+                .setFooter(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl())
+                .setTimestamp(Instant.now())
+                .build()).queue();
+
+        new BotList(config).post();
+    }
+
+    public void onGuildMemberJoin(GuildMemberJoinEvent event) {
+        if (!event.getUser().getId().equals(event.getJDA().getSelfUser().getId())) {
+            rethink.insertUser(event.getUser().getId());
+        }
+    }
+}
--- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
+++ b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
@ -0,0 +1,66 @@
+package com.bbn.hadder.listener;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.Rethink;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.ChannelType;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
+
+import javax.annotation.Nonnull;
+
+public class InviteLinkListener extends ListenerAdapter {
+
+    private Rethink rethink;
+
+    public InviteLinkListener(Rethink rethink) {
+        this.rethink = rethink;
+    }
+
+    @Override
+    public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
+        if (event.isFromType(ChannelType.TEXT)) {
+            if (event.getMessage().getContentRaw().contains("discord.gg/") && (!event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId()))) {
+                checkInvite(event.getMessage(), "discord.gg/");
+            } else if (event.getMessage().getContentRaw().contains("discordapp.com/invite") && (!event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId()))) {
+                checkInvite(event.getMessage(), "discordapp.com/invite/");
+            }
+        }
+    }
+
+    public void checkInvite(Message message, String regex) {
+        String split = message.getContentRaw().split(regex, 10)[1];
+        String invite = split.split(" ")[0];
+        OkHttpClient client = new OkHttpClient();
+        Request request = new Request.Builder().url("https://canary.discordapp.com/api/v6/invites/" + invite).build();
+        try {
+            Response response = client.newCall(request).execute();
+            JSONObject json = new JSONObject(response.body().string());
+            if (!json.toString().contains("\"message\":")) {
+                message.delete().reason("Invite Link detected").queue();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void onMessageUpdate(@Nonnull MessageUpdateEvent event) {
+        if (event.isFromType(ChannelType.TEXT)) {
+            if (event.getMessage().getContentRaw().contains("discord.gg/") && !event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId())) {
+                checkInvite(event.getMessage(), "discord.gg/");
+            } else if (event.getMessage().getContentRaw().contains("discordapp.com/invite") && !event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId())) {
+                checkInvite(event.getMessage(), "discordapp.com/invite/");
+            }
+        }
+    }
+}
--- a/src/main/java/com/bbn/hadder/listener/MentionListener.java
+++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java
@ -0,0 +1,40 @@
+package com.bbn.hadder.listener;
+
+import com.bbn.hadder.Rethink;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.entities.ChannelType;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+
+import javax.annotation.Nonnull;
+import java.util.Random;
+
+public class MentionListener extends ListenerAdapter {
+
+    private Rethink rethink;
+
+
+    public MentionListener(Rethink rethink) {
+        this.rethink = rethink;
+    }
+
+    @Override
+    public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
+        if (event.isFromType(ChannelType.TEXT) && (event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention())||
+                event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention().replace("@", "@!")))) {
+            event.getChannel().sendMessage(new MessageEditor(rethink, event.getAuthor()).getMessage(MessageEditor.MessageType.INFO)
+                    .setTitle("Hello I'm Hadder.")
+                    .setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl())
+                    .addField("Users", String.valueOf(event.getJDA().getUsers().size()), false)
+                    .addField("Guilds", String.valueOf(event.getJDA().getGuilds().size()), false)
+                    .addField("Prefix (User)", rethink.getUserPrefix(event.getAuthor().getId()), false)
+                    .addField("Prefix (Guild)", rethink.getGuildPrefix(event.getGuild().getId()), false)
+                    .build()).queue();
+        } else if (event.getMessage().getContentRaw().equalsIgnoreCase("@someone")) {
+            int member = new Random().nextInt(event.getGuild().getMembers().size()-1);
+            if (member>0&&member<event.getGuild().getMembers().size()) {
+                event.getChannel().sendMessage(event.getGuild().getMembers().get(member).getAsMention()+ " (Executed by: "+event.getAuthor().getAsTag()+")").queue();
+            }
+        }
+    }
+}
--- a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
+++ b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
@ -0,0 +1,43 @@
+package com.bbn.hadder.listener;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.Rethink;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.entities.ChannelType;
+import net.dv8tion.jda.api.entities.PrivateChannel;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+
+import java.time.Instant;
+
+public class PrivateMessageListener extends ListenerAdapter {
+
+    private Rethink rethink;
+
+    public PrivateMessageListener(Rethink rethink) {
+        this.rethink = rethink;
+    }
+
+    public void onMessageReceived(MessageReceivedEvent event) {
+        if (event.isFromType(ChannelType.PRIVATE) && !event.getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) {
+            PrivateChannel Skidder = event.getJDA().getUserById("477141528981012511").openPrivateChannel().complete();
+            PrivateChannel Hax = event.getJDA().getUserById("261083609148948488").openPrivateChannel().complete();
+
+            Skidder.sendMessage(new MessageEditor(rethink, event.getJDA().getUserById("261083609148948488")).getMessage(MessageEditor.MessageType.INFO)
+                    .setTitle("New DM by " + event.getAuthor().getAsTag())
+                    .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl())
+                    .setDescription(event.getMessage().getContentRaw())
+                    .setTimestamp(Instant.now())
+                    .build()).queue();
+            Hax.sendMessage(new MessageEditor(rethink, event.getJDA().getUserById("261083609148948488")).getMessage(MessageEditor.MessageType.INFO)
+                    .setTitle("New DM by " + event.getAuthor().getAsTag())
+                    .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl())
+                    .setDescription(event.getMessage().getContentRaw())
+                    .setTimestamp(Instant.now())
+                    .build()).queue();
+        }
+    }
+}
--- a/src/main/java/com/bbn/hadder/listener/ReadyListener.java
+++ b/src/main/java/com/bbn/hadder/listener/ReadyListener.java
@ -0,0 +1,39 @@
+package com.bbn.hadder.listener;
+
+import com.bbn.hadder.Rethink;
+import com.bbn.hadder.core.Config;
+import com.bbn.hadder.utils.BotList;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.events.ReadyEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+
+import javax.annotation.Nonnull;
+
+public class ReadyListener extends ListenerAdapter {
+
+    private Rethink rethink;
+    private Config config;
+
+    public ReadyListener(Rethink rethink, Config config) {
+        this.rethink = rethink;
+        this.config = config;
+    }
+
+    @Override
+    public void onReady(@Nonnull ReadyEvent event) {
+        rethink.setup();
+        new Thread(() -> {
+            for (User user : event.getJDA().getUsers()) {
+                if (!user.getId().equals(event.getJDA().getSelfUser().getId())) {
+                    rethink.insertUser(user.getId());
+                }
+            }
+            for (Guild g : event.getJDA().getGuilds()) {
+                rethink.insertGuild(g.getId());
+            }
+        }).start();
+
+        new BotList(config).post();
+    }
+}
--- a/src/main/java/com/bbn/hadder/listener/RulesListener.java
+++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java
@ -0,0 +1,44 @@
+package com.bbn.hadder.listener;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.Rethink;
+import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
+import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+
+public class RulesListener extends ListenerAdapter {
+
+    private Rethink rethink;
+
+    public RulesListener(Rethink rethink) {
+        this.rethink = rethink;
+    }
+
+    @Override
+    public void onMessageReactionAdd(MessageReactionAddEvent event) {
+        if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot()) {
+            if (event.getReactionEmote().isEmote()) {
+                if (rethink.getRulesAEmote(event.getGuild().getId()).contains(event.getReactionEmote().getId())) {
+                    event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue();
+                } else if (rethink.getRulesDEmote(event.getGuild().getId()).contains(event.getReactionEmote().getId())) {
+                    event.getReaction().removeReaction(event.getUser()).queue();
+                    if (event.getGuild().getSelfMember().canInteract(event.getMember())) {
+                        event.getMember().kick().reason("Declined the rules");
+                    }
+                }
+            } else if (event.getReactionEmote().isEmoji()) {
+                event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue();
+            }
+        }
+    }
+
+    @Override
+    public void onMessageReactionRemove(MessageReactionRemoveEvent event) {
+        if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot()) {
+                event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Withdrawal of the acceptance of the rules").queue();
+        }
+    }
+}
--- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java
+++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java
@ -1,23 +1,6 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+package com.bbn.hadder.listener;

-package one.bbn.hadder.listener;
-
-import one.bbn.hadder.db.Mongo;
-import one.bbn.hadder.db.MongoServer;
+import com.bbn.hadder.Rethink;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.MessageBuilder;
 import net.dv8tion.jda.api.entities.MessageReaction;
@ -30,47 +13,47 @@ import javax.annotation.Nonnull;

 public class StarboardListener extends ListenerAdapter {

-    private final Mongo mongo;
+    private Rethink rethink;

-    public StarboardListener(Mongo mongo) {
-        this.mongo = mongo;
+    public StarboardListener(Rethink rethink) {
+        this.rethink = rethink;
    }

    @Override
-    public void onMessageReactionAdd(@Nonnull MessageReactionAddEvent e) {
-        update(e);
+    public void onMessageReactionAdd(@Nonnull MessageReactionAddEvent event) {
+        update(event);
    }

    @Override
-    public void onMessageReactionRemove(@Nonnull MessageReactionRemoveEvent e) {
-        update(e);
+    public void onMessageReactionRemove(@Nonnull MessageReactionRemoveEvent event) {
+        update(event);
    }

-    public void update(GenericMessageReactionEvent e) {
-        if (e.getReaction().getReactionEmote().getName().equals("⭐")) {
-            MongoServer mongoServer = new MongoServer(mongo.getObjectByID("server", e.getGuild().getId()), mongo);
-            if (!mongo.hasStarboardMessage(e.getMessageId())) {
-                if (mongoServer.hasStarboardChannel()) {
-                    e.getTextChannel().retrieveMessageById(e.getMessageId()).queue(
+    public void update(GenericMessageReactionEvent event) {
+        if (event.getReaction().getReactionEmote().getName().equals("⭐")) {
+            if (!rethink.hasStarboardMessage(event.getMessageId())) {
+                if (rethink.hasStarboardChannel(event.getGuild().getId())) {
+
+                    event.getTextChannel().retrieveMessageById(event.getMessageId()).queue(
                            msg -> {
-                                int stars = 0;
+                                Integer stars = 0;
                                for (MessageReaction reaction : msg.getReactions()) {
                                    if (reaction.getReactionEmote().getName().equals("⭐")) {
                                        stars = reaction.getCount();
                                    }
                                }

-                                if (Integer.parseInt(mongoServer.getNeededStars()) <= stars) {
-                                    e.getGuild().getTextChannelById(mongoServer.getStarboard())
+                                if (Integer.parseInt(rethink.getNeededstars(event.getGuild().getId())) <= stars) {
+                                    event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId()))
                                            .sendMessage(new MessageBuilder()
-                                                    .setContent("⭐ 1" + " " + e.getTextChannel().getAsMention())
+                                                    .setContent("⭐ 1" + " " + event.getTextChannel().getAsMention())
                                                    .setEmbed(
                                                            new EmbedBuilder()
                                                                    .setAuthor(msg.getAuthor().getAsTag())
                                                                    .setDescription(msg.getContentRaw())
                                                                    .setTimestamp(msg.getTimeCreated()).build()).build()).queue(
                                            starboardmsg -> {
-                                                mongo.insertStarboardMessage(msg.getId(), e.getGuild().getId(), starboardmsg.getId());
+                                                rethink.insertStarboardMessage(msg.getId(), event.getGuild().getId(), starboardmsg.getId());
                                            }
                                    );
                                }
@ -80,23 +63,23 @@ public class StarboardListener extends ListenerAdapter {
                }
            } else {

-                e.getTextChannel().retrieveMessageById(e.getMessageId()).queue(
+                event.getTextChannel().retrieveMessageById(event.getMessageId()).queue(
                        msg -> {
-                            int stars = 0;
+                            Integer stars = 0;
                            for (MessageReaction reaction : msg.getReactions()) {
                                if (reaction.getReactionEmote().getName().equals("⭐")) {
                                    stars = reaction.getCount();
                                }
                            }

-                            int finalStars = stars;
-                            e.getGuild().getTextChannelById(mongoServer.getStarboard())
-                                    .retrieveMessageById(mongo.getStarboardMessage(e.getMessageId())).queue(
+                            Integer finalStars = stars;
+                            event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId()))
+                                    .retrieveMessageById(rethink.getStarboardMessage(event.getMessageId())).queue(
                                    msg2 -> {

-                                        if (Integer.parseInt(mongoServer.getNeededStars()) <= finalStars) {
+                                        if (Integer.parseInt(rethink.getNeededstars(event.getGuild().getId())) <= finalStars) {
                                            msg2.editMessage(new MessageBuilder()
-                                                    .setContent("⭐ " + finalStars + " " + e.getTextChannel().getAsMention())
+                                                    .setContent("⭐ " + finalStars + " " + event.getTextChannel().getAsMention())
                                                    .setEmbed(
                                                            new EmbedBuilder()
                                                                    .setAuthor(msg.getAuthor().getAsTag())
@ -104,12 +87,14 @@ public class StarboardListener extends ListenerAdapter {
                                                                    .setTimestamp(msg.getTimeCreated()).build()).build()).queue();
                                        } else {
                                            msg2.delete().queue();
-                                            mongo.removeStarboardMessage(msg.getId());
+                                            rethink.removeStarboardMessage(msg.getId());
                                        }
                                    }
                            );
+
                        }
                );
+
            }
        }
    }
--- a/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java
+++ b/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java
@ -0,0 +1,28 @@
+package com.bbn.hadder.listener;
+
+import com.bbn.hadder.audio.AudioManager;
+import net.dv8tion.jda.api.events.guild.voice.GuildVoiceLeaveEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+
+/**
+ * @author Skidder / GregTCLTK
+ */
+
+public class VoiceLeaveListener extends ListenerAdapter {
+
+    private AudioManager audioManager;
+
+    public VoiceLeaveListener(AudioManager audioManager) {
+        this.audioManager = audioManager;
+    }
+
+    @Override
+    public void onGuildVoiceLeave(GuildVoiceLeaveEvent event) {
+        if (audioManager.hasPlayer(event.getGuild()) && event.getChannelLeft().getMembers().equals(event.getGuild().getSelfMember())) {
+            audioManager.players.remove(event.getGuild().getId());
+            audioManager.getPlayer(event.getGuild()).destroy();
+            audioManager.getTrackManager(event.getGuild()).purgeQueue();
+            event.getGuild().getAudioManager().closeAudioConnection();
+        }
+    }
+}
--- a/src/main/java/com/bbn/hadder/utils/BotList.java
+++ b/src/main/java/com/bbn/hadder/utils/BotList.java
@ -0,0 +1,200 @@
+package com.bbn.hadder.utils;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.Hadder;
+import com.bbn.hadder.core.Config;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+public class BotList {
+
+    private static String MythicalBotList = "https://mythicalbots.xyz/api/bot/637002314162372639";
+    private static String BotsForDiscord = "https://botsfordiscord.com/api/bot/637002314162372639";
+    private static String DiscordBotList = "https://discordbotlist.com/api/bots/637002314162372639/stats";
+    private static String DiscordBestBots = "https://discordsbestbots.xyz/api/bots/637002314162372639/stats";
+    private static String DiscordBoats = "https://discord.boats/api/bot/637002314162372639";
+    private static String YetAnotherBotList = "https://yabl.xyz/api/bot/637002314162372639/stats";
+    private static String DiscordExtremeList = "https://api.discordextremelist.xyz/v1/bot/637002314162372639";
+    private static String DiscordBotReviews = "https://discordbotreviews.xyz/api/bot/637002314162372639/stats";
+    private static String DiscordBots = "https://top.gg/api/bots/637002314162372639/stats";
+    private static String BotListSpace = "https://api.botlist.space/v1/bots/637002314162372639";
+
+    private Config config;
+
+    public BotList(Config config) {
+        this.config = config;
+    }
+
+    public void post() {
+        if (Files.notExists(Paths.get("./DEBUG"))) {
+            JSONObject json = new JSONObject();
+            json.put("server_count", Hadder.shardManager.getGuilds().size());
+            json.put("guildCount", Hadder.shardManager.getGuilds().size());
+            json.put("guilds", Hadder.shardManager.getGuilds().size());
+            json.put("users", Hadder.shardManager.getUsers().size());
+            json.put("shard_count", Hadder.shardManager.getShards().size());
+
+            RequestBody body = RequestBody.create(MediaType.parse("application/json"), json.toString());
+
+            // Mythical Bot List
+
+            Request mythicalbotlist = new Request.Builder()
+                    .url(MythicalBotList)
+                    .post(body)
+                    .addHeader("Authorization", config.getMythicalBotListToken())
+                    .build();
+
+            try {
+                new OkHttpClient().newCall(mythicalbotlist).execute().close();
+                System.out.println("Successfully posted count for the Mythical Bot List!");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+            // BotsForDiscord
+
+            Request botsfordiscord = new Request.Builder()
+                    .url(BotsForDiscord)
+                    .post(body)
+                    .addHeader("Authorization", config.getBotsForDiscordToken())
+                    .build();
+
+            try {
+                new OkHttpClient().newCall(botsfordiscord).execute().close();
+                System.out.println("Successfully posted count to Bots For Discord!");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+            // Discord Bot List
+
+            Request discordbotlist = new Request.Builder()
+                    .url(DiscordBotList)
+                    .post(body)
+                    .addHeader("Authorization", "Bot " + config.getDiscordBotListToken())
+                    .build();
+
+            try {
+                new OkHttpClient().newCall(discordbotlist).execute().close();
+                System.out.println("Successfully posted count for the Discord Bot List!");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+            // Discord Best Bots
+
+            Request discordbestbots = new Request.Builder()
+                    .url(DiscordBestBots)
+                    .post(body)
+                    .addHeader("Authorization", config.getDiscordBestBotsToken())
+                    .build();
+
+            try {
+                new OkHttpClient().newCall(discordbestbots).execute().close();
+                System.out.println("Successfully posted count to Discord Best Bots!");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+            // Discord Boats
+
+            Request discordboats = new Request.Builder()
+                    .url(DiscordBoats)
+                    .post(body)
+                    .addHeader("Authorization", config.getDiscordBoatsToken())
+                    .build();
+
+            try {
+                new OkHttpClient().newCall(discordboats).execute().close();
+                System.out.println("Successfully posted count to Discord Boats!");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+            // Yet Another Bot List
+
+            Request yetanotherbotlist = new Request.Builder()
+                    .url(YetAnotherBotList)
+                    .post(body)
+                    .addHeader("Authorization", config.getYetAnotherBotListToken())
+                    .build();
+
+            try {
+                new OkHttpClient().newCall(yetanotherbotlist).execute().close();
+                System.out.println("Successfully posted count to Yet Another Bot List!");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+            // Discord Extreme List
+
+            Request discordextremelist = new Request.Builder()
+                    .url(DiscordExtremeList)
+                    .post(body)
+                    .addHeader("Authorization", config.getDiscordExtremeListToken())
+                    .build();
+
+            try {
+                new OkHttpClient().newCall(discordextremelist).execute().close();
+                System.out.println("Successfully posted count for the Discord Extreme List!");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+            // Discord Bot Reviews
+
+            Request discordbotreviews = new Request.Builder()
+                    .url(DiscordBotReviews)
+                    .post(body)
+                    .addHeader("Authorization", config.getDiscordBotReviewsToken())
+                    .build();
+
+            try {
+                new OkHttpClient().newCall(discordbotreviews).execute().close();
+                System.out.println("Successfully posted count to Discord Bot Reviews!");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+            // Discord Bots
+
+            Request discordbots = new Request.Builder()
+                    .url(DiscordBots)
+                    .post(body)
+                    .addHeader("Authorization", config.getDiscordBotsToken())
+                    .build();
+
+            try {
+                new OkHttpClient().newCall(discordbots).execute().close();
+                System.out.println("Successfully posted count to Discord Bots!");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+            // BotListSpace
+
+            Request botlistspace = new Request.Builder()
+                    .url(BotListSpace)
+                    .post(body)
+                    .addHeader("Authorization", config.getBotListSpaceToken())
+                    .build();
+
+            try {
+                new OkHttpClient().newCall(botlistspace).execute().close();
+                System.out.println("Successfully posted count to BotList.Space!");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}
--- a/src/main/java/com/bbn/hadder/utils/EventWaiter.java
+++ b/src/main/java/com/bbn/hadder/utils/EventWaiter.java
@ -0,0 +1,29 @@
+package com.bbn.hadder.utils;
+
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+
+import javax.annotation.Nonnull;
+import java.util.function.Consumer;
+
+public class EventWaiter {
+
+    public void newOnMessageEventWaiter(Consumer<GuildMessageReceivedEvent> onEvent, JDA jda, User user) {
+        Object listener = new ListenerAdapter() {
+            @Override
+            public void onGuildMessageReceived(@Nonnull GuildMessageReceivedEvent event) {
+                if (user==null) {
+                    onEvent.accept(event);
+                    event.getJDA().getShardManager().removeEventListener(this);
+                } else if (event.getAuthor().getId().equals(user.getId())) {
+                    onEvent.accept(event);
+                    event.getJDA().getShardManager().removeEventListener(this);
+                }
+            }
+        };
+        jda.getShardManager().addEventListener(listener);
+    }
+
+}
--- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java
+++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java
@ -1,22 +1,6 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+package com.bbn.hadder.utils;

-package one.bbn.hadder.utils;
-
-import one.bbn.hadder.db.MongoUser;
+import com.bbn.hadder.Rethink;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.User;

@ -27,11 +11,11 @@ import java.util.ResourceBundle;

 public class MessageEditor {

-    private final MongoUser mongoUser;
-    private final User user;
+    private Rethink rethink;
+    private User user;

-    public MessageEditor(MongoUser mongoUser, User user) {
-        this.mongoUser = mongoUser;
+    public MessageEditor(Rethink rethink, User user) {
+        this.rethink = rethink;
        this.user = user;
    }

@ -49,12 +33,11 @@ public class MessageEditor {
    }

    public EmbedBuilder getMessage(MessageType type, String title, String title_extra, String title_extra_two,
-                                   String description, String description_extra, String description_extra_two) {
-        String language = (this.user != null) ? mongoUser.getLanguage() : null;
+                            String description, String description_extra, String description_extra_two) {
+        String language = (this.user!=null) ? rethink.getLanguage(this.user.getId()) : null;
        EmbedBuilder eb = this.getDefaultSettings(type);
-        if (!"".equals(title)) eb.setTitle(this.handle(language, title, title_extra, title_extra_two));
-        if (!"".equals(description))
-            eb.setDescription(this.handle(language, description, description_extra, description_extra_two));
+        if (!title.equals("")) eb.setTitle(this.handle(language, title, title_extra, title_extra_two));
+        if (!description.equals("")) eb.setDescription(this.handle(language, description, description_extra, description_extra_two));
        return eb;
    }

@ -73,21 +56,21 @@ public class MessageEditor {
            case INFO:
                builder
                        .setColor(new Color(78, 156, 174))
-                        .setFooter("Hadder", "https://bbn.one/images/Hadder.png")
+                        .setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
                        .setTimestamp(Instant.now());
                break;

            case ERROR:
                builder
                        .setColor(Color.RED)
-                        .setFooter("Hadder", "https://bbn.one/images/Hadder.png")
+                        .setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
                        .setTimestamp(Instant.now());
                break;

            case WARNING:
                builder
                        .setColor(Color.ORANGE)
-                        .setFooter("Hadder", "https://bbn.one/images/Hadder.png")
+                        .setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
                        .setTimestamp(Instant.now());
                break;

@ -96,7 +79,7 @@ public class MessageEditor {
                        .setTitle("⛔ No Permission ⛔")
                        .setDescription("You are not authorized to execute this command!")
                        .setColor(Color.RED)
-                        .setFooter("Hadder", "https://bbn.one/images/Hadder.png")
+                        .setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
                        .setTimestamp(Instant.now());
                break;

@ -105,7 +88,7 @@ public class MessageEditor {
                        .setTitle("⛔ No Permission ⛔")
                        .setDescription("Unfortunately, I do not have the required rights to perform this action!")
                        .setColor(Color.RED)
-                        .setFooter("Hadder", "https://bbn.one/images/Hadder.png")
+                        .setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
                        .setTimestamp(Instant.now());
                break;

@ -114,7 +97,7 @@ public class MessageEditor {
                        .setTitle("⛔ No NSFW ⛔")
                        .setDescription("You can only execute this command in NSFW channels!")
                        .setColor(Color.RED)
-                        .setFooter("Hadder", "https://bbn.one/images/Hadder.png")
+                        .setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
                        .setTimestamp(Instant.now());
                break;
        }
@ -122,11 +105,11 @@ public class MessageEditor {
    }

    public String getTerm(String string) {
-        return this.handle(mongoUser.getLanguage(), string, "", "");
+        return this.handle(rethink.getLanguage(user.getId()), string, "", "");
    }

    public String getTerm(String string, String extra, String extra_two) {
-        return this.handle(mongoUser.getLanguage(), string, extra, extra_two);
+        return this.handle(rethink.getLanguage(user.getId()), string, extra, extra_two);
    }

    private String handle(String language_code, String string, String extra, String extra_two) {
@ -134,7 +117,6 @@ public class MessageEditor {
        ResourceBundle resourceBundle = ResourceBundle.getBundle("Translations/Translations", locale);
        if (resourceBundle.containsKey(string))
            return resourceBundle.getString(string).replaceAll("%extra%", extra).replaceAll("%extra_two%", extra_two);
-        else
-            return "This key doesn't exist. Please report this to the Bot Developers. Key: `" + string + "` Language_code: `" + language_code + "`";
+        else return "This key doesn't exist. Please report this to the Bot Developers. Key: " + string + " Language_code: " + language_code;
    }
 }
--- a/src/main/java/one/bbn/hadder/audio/AudioInfo.java
+++ b/src/main/java/one/bbn/hadder/audio/AudioInfo.java
@ -1,40 +0,0 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package one.bbn.hadder.audio;
-
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import net.dv8tion.jda.api.entities.Member;
-
-public class AudioInfo {
-
-    private final AudioTrack track;
-    private final Member author;
-
-    AudioInfo(AudioTrack track, Member author) {
-        this.track = track;
-        this.author = author;
-    }
-
-    public AudioTrack getTrack() {
-        return track;
-    }
-
-    public Member getAuthor() {
-        return author;
-    }
-
-}
--- a/src/main/java/one/bbn/hadder/audio/AudioPlayerSendHandler.java
+++ b/src/main/java/one/bbn/hadder/audio/AudioPlayerSendHandler.java
@ -1,87 +0,0 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package one.bbn.hadder.audio;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
-import net.dv8tion.jda.api.audio.AudioReceiveHandler;
-import net.dv8tion.jda.api.audio.AudioSendHandler;
-import net.dv8tion.jda.api.audio.CombinedAudio;
-
-import javax.annotation.Nullable;
-import java.nio.ByteBuffer;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-public class AudioPlayerSendHandler implements AudioSendHandler, AudioReceiveHandler {
-
-    private final AudioPlayer audioPlayer;
-    private AudioFrame lastFrame;
-    private final Queue<byte[]> queue = new ConcurrentLinkedQueue<>();
-
-    public AudioPlayerSendHandler(AudioPlayer audioPlayer) {
-        this.audioPlayer = audioPlayer;
-    }
-
-    @Override
-    public boolean canProvide() {
-        if (audioPlayer.getPlayingTrack() == null)
-            return !queue.isEmpty();
-        else if (lastFrame == null) {
-            lastFrame = audioPlayer.provide();
-            return lastFrame != null;
-        }
-        return false;
-    }
-
-    @Nullable
-    @Override
-    public ByteBuffer provide20MsAudio() {
-        if (audioPlayer.getPlayingTrack() == null) {
-            byte[] data = queue.poll();
-            return data == null ? null : ByteBuffer.wrap(data);
-        } else {
-            if (lastFrame == null) {
-                lastFrame = audioPlayer.provide();
-            }
-
-            byte[] data = lastFrame != null ? lastFrame.getData() : null;
-            lastFrame = null;
-
-            return ByteBuffer.wrap(data);
-        }
-    }
-
-    @Override
-    public boolean canReceiveCombined() {
-        return queue.size() < 10;
-    }
-
-    @Override
-    public void handleCombinedAudio(CombinedAudio combinedAudio) {
-        if (combinedAudio.getUsers().isEmpty())
-            return;
-
-        byte[] data = combinedAudio.getAudioData(1.0f);
-        queue.add(data);
-    }
-
-    @Override
-    public boolean isOpus() {
-        return audioPlayer.getPlayingTrack() != null;
-    }
-}
--- a/src/main/java/one/bbn/hadder/commands/Command.java
+++ b/src/main/java/one/bbn/hadder/commands/Command.java
@ -1,29 +0,0 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package one.bbn.hadder.commands;
-
-public interface Command {
-    void executed(String[] args, CommandEvent e);
-
-    String[] labels();
-
-    String description();
-
-    String usage();
-
-    String example();
-}
--- a/src/main/java/one/bbn/hadder/commands/CommandEvent.java
+++ b/src/main/java/one/bbn/hadder/commands/CommandEvent.java
@ -1,97 +0,0 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package one.bbn.hadder.commands;
-
-import one.bbn.hadder.audio.AudioManager;
-import one.bbn.hadder.commands.general.HelpCommand;
-import one.bbn.hadder.core.CommandHandler;
-import one.bbn.hadder.core.Config;
-import one.bbn.hadder.db.Mongo;
-import one.bbn.hadder.db.MongoServer;
-import one.bbn.hadder.db.MongoUser;
-import one.bbn.hadder.utils.EventWaiter;
-import one.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-
-import javax.annotation.Nonnull;
-
-public class CommandEvent extends MessageReceivedEvent {
-
-    private Mongo mongo;
-    private Config config;
-    private CommandHandler commandHandler;
-    private HelpCommand helpCommand;
-    private MessageEditor messageEditor;
-    private EventWaiter eventWaiter;
-    private AudioManager audioManager;
-    private MongoUser mongoUser;
-    private MongoServer mongoServer;
-
-    public CommandEvent(@Nonnull JDA api, long responseNumber, @Nonnull Message message, Mongo mongo, Config config,
-                        CommandHandler commandHandler, HelpCommand helpCommand, MessageEditor messageEditor,
-                        EventWaiter eventWaiter, AudioManager audioManager, MongoUser mongoUser,
-                        MongoServer mongoServer) {
-        super(api, responseNumber, message);
-        this.mongo = mongo;
-        this.config = config;
-        this.commandHandler = commandHandler;
-        this.helpCommand = helpCommand;
-        this.messageEditor = messageEditor;
-        this.eventWaiter = eventWaiter;
-        this.audioManager = audioManager;
-        this.mongoUser = mongoUser;
-        this.mongoServer = mongoServer;
-    }
-
-    public Mongo getMongo() {
-        return mongo;
-    }
-
-    public Config getConfig() {
-        return config;
-    }
-
-    public HelpCommand getHelpCommand() {
-        return helpCommand;
-    }
-
-    public CommandHandler getCommandHandler() {
-        return commandHandler;
-    }
-
-    public MessageEditor getMessageEditor() {
-        return messageEditor;
-    }
-
-    public EventWaiter getEventWaiter() {
-        return eventWaiter;
-    }
-
-    public AudioManager getAudioManager() {
-        return audioManager;
-    }
-
-    public MongoServer getMongoServer() {
-        return mongoServer;
-    }
-
-    public MongoUser getMongoUser() {
-        return mongoUser;
-    }
-}
--- a/src/main/java/one/bbn/hadder/commands/fun/AvatarCommand.java
+++ b/src/main/java/one/bbn/hadder/commands/fun/AvatarCommand.java
@ -1,121 +0,0 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package one.bbn.hadder.commands.fun;
-
-import one.bbn.hadder.commands.Command;
-import one.bbn.hadder.commands.CommandEvent;
-import one.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.entities.User;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class AvatarCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent e) {
-        if (args.length == 0) {
-            User u = e.getAuthor();
-            e.getTextChannel().sendMessage(
-                    e.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.INFO,
-                            "commands.fun.avatar.success.title",
-                            u.getAsTag(),
-                            "",
-                            "")
-                            .setImage(u.getAvatarUrl())
-                            .setFooter(u.getAsTag())
-                            .build()).queue();
-        } else if (e.getMessage().getMentionedUsers().size() == 1) {
-            User u = e.getMessage().getMentionedUsers().get(0);
-            e.getTextChannel().sendMessage(
-                    e.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.INFO,
-                            "commands.fun.avatar.success.title",
-                            u.getAsTag(),
-                            "",
-                            "")
-                            .setImage(u.getAvatarUrl())
-                            .setFooter(u.getAsTag())
-                            .build()).queue();
-        } else if (args[0].length() == 18) {
-            try {
-                User u = e.getJDA().getUserById(args[0]);
-                e.getTextChannel().sendMessage(
-                        e.getMessageEditor().getMessage(
-                                MessageEditor.MessageType.INFO,
-                                "commands.fun.avatar.success.title",
-                                u.getAsTag(),
-                                "",
-                                "")
-                                .setImage(u.getAvatarUrl())
-                                .setFooter(u.getAsTag())
-                                .build()).queue();
-            } catch (NullPointerException ignore) {
-
-                OkHttpClient client = new OkHttpClient();
-                Request request = new Request.Builder().url("https://canary.discord.com/api/v8/users/" + args[0]).addHeader("Authorization", "Bot " + e.getConfig().getBotToken()).build();
-
-                try {
-                    Response response = client.newCall(request).execute();
-                    JSONObject json = new JSONObject(response.body().string());
-                    String url = "https://cdn.discordapp.com/avatars/" + args[0] + "/" + json.getString("avatar") + ".png";
-                    e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.INFO,
-                            "commands.fun.avatar.success.title",
-                            json.getString("username") + "#" + json.getString("discriminator"),
-                            "",
-                            "")
-                            .setImage(url)
-                            .setFooter(json.getString("username") + "#" + json.getString("discriminator"))
-                            .build()).queue();
-                } catch (JSONException ex) {
-                    e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
-                            "commands.fun.avatar.error.title",
-                            "commands.fun.avatar.error.description"
-                    ).build()).queue();
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                }
-            }
-        } else {
-            e.getHelpCommand().sendHelp(this, e);
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"avatar"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.fun.avatar.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "[user]";
-    }
-
-    @Override
-    public String example() {
-        return "@Skidder";
-    }
-}
--- a/src/main/java/one/bbn/hadder/commands/fun/ClydeCommand.java
+++ b/src/main/java/one/bbn/hadder/commands/fun/ClydeCommand.java
@ -1,94 +0,0 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package one.bbn.hadder.commands.fun;
-
-import club.minnced.discord.webhook.WebhookClient;
-import club.minnced.discord.webhook.WebhookClientBuilder;
-import one.bbn.hadder.commands.Command;
-import one.bbn.hadder.commands.CommandEvent;
-import one.bbn.hadder.core.Perm;
-import one.bbn.hadder.core.Perms;
-import one.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.Icon;
-import net.dv8tion.jda.api.entities.TextChannel;
-import net.dv8tion.jda.api.entities.Webhook;
-
-import java.io.InputStream;
-import java.net.URL;
-import java.util.concurrent.TimeUnit;
-
-@Perms(Perm.MANAGE_WEBHOOKS)
-public class ClydeCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent e) {
-        if (args.length > 0) {
-            if (e.getGuild().getSelfMember().hasPermission(Permission.MANAGE_WEBHOOKS)) {
-                TextChannel channel = e.getMessage().getTextChannel();
-                String content = e.getMessage().getContentRaw().replace(e.getMongoServer().getPrefix(), "").replace(e.getMongoUser().getPrefix(), "").replace("clyde", "");
-
-                Webhook webhook = channel.createWebhook(e.getConfig().getClydeName()).complete();
-                try {
-                    InputStream s = new URL("https://discordapp.com/assets/f78426a064bc9dd24847519259bc42af.png").openStream();
-                    webhook.getManager().setAvatar(Icon.from(s)).queue();
-
-                    WebhookClientBuilder builder = new WebhookClientBuilder(webhook.getUrl());
-
-                    WebhookClient client = builder.build();
-                    try {
-                        TimeUnit.SECONDS.sleep(1);
-                    } catch (InterruptedException ex) {
-                        ex.printStackTrace();
-                    }
-                    client.send(content);
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                }
-                try {
-                    TimeUnit.SECONDS.sleep(2);
-                } catch (InterruptedException ex) {
-                    ex.printStackTrace();
-                }
-                webhook.delete().queue();
-                e.getMessage().delete().queue();
-            } else
-                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-        } else e.getHelpCommand().sendHelp(this, e);
-
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"clyde"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.fun.clyde.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "[content]";
-    }
-
-    @Override
-    public String example() {
-        return "Hey I am Clyde";
-    }
-}
--- a/src/main/java/one/bbn/hadder/commands/fun/MemeCommand.java
+++ b/src/main/java/one/bbn/hadder/commands/fun/MemeCommand.java
@ -1,78 +0,0 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package one.bbn.hadder.commands.fun;
-
-import one.bbn.hadder.commands.Command;
-import one.bbn.hadder.commands.CommandEvent;
-import one.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONObject;
-
-import java.awt.*;
-import java.io.IOException;
-
-public class MemeCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent e) {
-
-        OkHttpClient client = new OkHttpClient();
-        Request request = new Request.Builder().url("https://meme-api.herokuapp.com/gimme").build();
-
-        try {
-            Response response = client.newCall(request).execute();
-            JSONObject json = new JSONObject(response.body().string());
-            String url = json.getString("url");
-            e.getTextChannel().sendMessage(
-                    e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                            "commands.fun.meme.success.title", "")
-                            .setImage(url)
-                            .setAuthor("Subreddit: " + json.getString("subreddit"))
-                            .build()).queue();
-        } catch (IOException ignore) {
-            e.getTextChannel().sendMessage(
-                    e.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.ERROR,
-                            "error",
-                            "commands.fun.meme.api.error")
-                            .setColor(Color.RED)
-                            .build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"meme"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.fun.meme.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}
--- a/src/main/java/one/bbn/hadder/commands/general/AboutCommand.java
+++ b/src/main/java/one/bbn/hadder/commands/general/AboutCommand.java
@ -1,56 +0,0 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package one.bbn.hadder.commands.general;
-
-import one.bbn.hadder.commands.Command;
-import one.bbn.hadder.commands.CommandEvent;
-import one.bbn.hadder.utils.MessageEditor;
-
-public class AboutCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent e) {
-        e.getTextChannel().sendMessage(
-                e.getMessageEditor().getMessage(
-                        MessageEditor.MessageType.INFO,
-                        "commands.general.about.success.title",
-                        "commands.general.about.success.description")
-                        .addField(e.getMessageEditor().getTerm("commands.general.about.success.field.one.title"), e.getMessageEditor().getTerm("commands.general.about.success.field.one.description", "(https://donatebot.io/checkout/448554629282922527?buyer=" + e.getAuthor().getId() + "). :smiley:", ""), true)
-                        .setThumbnail("https://bbn.one/images/Hadder.png")
-                        .build()).queue();
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"about"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.general.about.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}
--- a/src/main/java/one/bbn/hadder/commands/general/EqualsCommand.java
+++ b/src/main/java/one/bbn/hadder/commands/general/EqualsCommand.java
@ -1,72 +0,0 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package one.bbn.hadder.commands.general;
-
-import one.bbn.hadder.commands.Command;
-import one.bbn.hadder.commands.CommandEvent;
-import one.bbn.hadder.utils.EventWaiter;
-import one.bbn.hadder.utils.MessageEditor;
-
-public class EqualsCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent e) {
-        e.getChannel().sendMessage(
-                e.getMessageEditor().getMessage(
-                        MessageEditor.MessageType.INFO,
-                        "commands.general.equals.string.first.request", "")
-                        .build()).queue();
-        new EventWaiter().newOnMessageEventWaiter(msge -> {
-            String firstString = msge.getMessage().getContentRaw();
-            e.getChannel().sendMessage(
-                    e.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.INFO,
-                            "commands.general.equals.string.second.request",
-                            "").build()).queue();
-            new EventWaiter().newOnMessageEventWaiter(msge2 -> {
-                String secondString = msge2.getMessage().getContentRaw();
-                e.getChannel().sendMessage(
-                        e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                                .setTitle((firstString.equals(secondString)) ? e.getMessageEditor().getTerm("commands.general.equals.string.equals.true") : e.getMessageEditor().getTerm("commands.general.equals.string.equals.false"))
-                                .addField(e.getMessageEditor().getTerm("commands.general.equals.string.first"), firstString, false)
-                                .addField(e.getMessageEditor().getTerm("commands.general.equals.string.second"), secondString, false)
-                                .addField(e.getMessageEditor().getTerm("commands.general.equals.string.result"), String.valueOf(firstString.equals(secondString)), false)
-                                .build()).queue();
-            }, e.getJDA(), e.getAuthor());
-        }, e.getJDA(), e.getAuthor());
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"equals"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.general.equals.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}
--- a/src/main/java/one/bbn/hadder/commands/general/InviteCommand.java
+++ b/src/main/java/one/bbn/hadder/commands/general/InviteCommand.java
@ -1,58 +0,0 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package one.bbn.hadder.commands.general;
-
-import one.bbn.hadder.commands.Command;
-import one.bbn.hadder.commands.CommandEvent;
-import one.bbn.hadder.utils.MessageEditor;
-
-public class InviteCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent e) {
-        e.getTextChannel().sendMessage(
-                e.getMessageEditor().getMessage(
-                        MessageEditor.MessageType.INFO,
-                        "commands.general.invite.success.title",
-                        "",
-                        "commands.general.invite.success.description",
-                        "(https://discord.com/oauth2/authorize?client_id="
-                                + e.getJDA().getSelfUser().getId()
-                                + "&scope=bot&permissions=1043852663)")
-                        .build()).queue();
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"invite"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.general.invite.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}
--- a/src/main/java/one/bbn/hadder/commands/general/PingCommand.java
+++ b/src/main/java/one/bbn/hadder/commands/general/PingCommand.java
@ -1,53 +0,0 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package one.bbn.hadder.commands.general;
-
-import one.bbn.hadder.commands.Command;
-import one.bbn.hadder.commands.CommandEvent;
-import one.bbn.hadder.utils.MessageEditor;
-
-public class PingCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent e) {
-        e.getJDA().getRestPing().queue(ping -> e.getTextChannel().sendMessage(e.getMessageEditor()
-                .getMessage(MessageEditor.MessageType.INFO)
-                .setTitle("Ping")
-                .setDescription(String.valueOf(ping))
-                .build()).queue());
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"ping"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.general.ping.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}
--- a/src/main/java/one/bbn/hadder/commands/misc/CodeCommand.java
+++ b/src/main/java/one/bbn/hadder/commands/misc/CodeCommand.java
@ -1,82 +0,0 @@
-/*
- * Copyright 2019-2021 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package one.bbn.hadder.commands.misc;
-
-import one.bbn.hadder.commands.Command;
-import one.bbn.hadder.commands.CommandEvent;
-import one.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class CodeCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent e) {
-        if (args.length > 0) {
-            OkHttpClient client = new OkHttpClient();
-            Request request = new Request.Builder().url("https://canary.discord.com/api/v8/invite/" + args[0] + "?with_counts=true").addHeader("Authorization", "Bot " + e.getConfig().getBotToken()).build();
-
-            try {
-                Response response = client.newCall(request).execute();
-                JSONObject json = new JSONObject(response.body().string());
-                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                        "commands.misc.code.success.title",
-                        "commands.misc.code.success.description")
-                        .addField("Code", "[" + args[0] + "](https://discord.gg/" + args[0] + ")", true)
-                        .addField("Guild Name", json.getJSONObject("guild").getString("name"), true)
-                        .addBlankField(true)
-                        .addField("Verification Level", String.valueOf(json.getJSONObject("guild").getInt("verification_level")), true)
-                        .addField("Guild ID", json.getJSONObject("guild").getString("id"), true)
-                        .addBlankField(true)
-                        .addField("Members", String.valueOf(json.get("approximate_member_count")), true)
-                        .addBlankField(true)
-                        .addBlankField(true)
-                        .setThumbnail("https://cdn.discordapp.com/icons/" + json.getJSONObject("guild").getString("id") + "/" + json.getJSONObject("guild").getString("icon") + ".png")
-                        .build()).queue();
-            } catch (JSONException ex) {
-                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
-                        "commands.misc.code.error.title",
-                        "commands.misc.code.error.description").build()).queue();
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            }
-        } else e.getHelpCommand().sendHelp(this, e);
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"code", "invite-code", "ic"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.misc.code.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "[Invite-code]";
-    }
-
-    @Override
-    public String example() {
-        return "nPwjaJk";
-    }
-}
--- a/Show more
+++ b/Show more