diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java
index 636c5c4..e17eba6 100644
--- a/src/main/java/com/bbn/hadder/Hadder.java
+++ b/src/main/java/com/bbn/hadder/Hadder.java
@@ -56,7 +56,7 @@ public class Hadder {
                         new InviteCommand(),
                         new NickCommand(),
                         new GuildPrefixCommand(),
-                        new AddRoleCommand()), config);
+                        new RoleCommand()), config);
        
         builder.addEventListeners(
                 new MentionListener(rethink),
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/AddRoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/AddRoleCommand.java
deleted file mode 100644
index 5e6da5d..0000000
--- a/src/main/java/com/bbn/hadder/commands/moderation/AddRoleCommand.java
+++ /dev/null
@@ -1,67 +0,0 @@
-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.EmbedBuilder;
-import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.Member;
-import net.dv8tion.jda.api.entities.Role;
-
-public class AddRoleCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getMember().hasPermission(Permission.MANAGE_ROLES)) {
-            if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() == 1) {
-                for (Member member : event.getMessage().getMentionedMembers()) {
-                    if (event.getGuild().getSelfMember().canInteract(member)) {
-                        if (!member.getRoles().contains(event.getMessage().getMentionedRoles().get(0))) {
-                            event.getGuild().addRoleToMember(member, event.getMessage().getMentionedRoles().get(0))
-                                    .reason("Role Command executed by " + event.getAuthor().getAsTag()).queue();
-                        }
-                    }
-                }
-                event.getChannel().sendMessage(
-                        new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO,
-                                new EmbedBuilder().setTitle("Successfully added all " +
-                                        event.getMessage().getMentionedMembers().size() +
-                                        " Members the " + event.getMessage().getMentionedRoles().get(0).getName() + " Role")).build()).queue();
-            } else if (event.getMessage().getMentionedRoles().size() > 1) {
-                for (Role role : event.getMessage().getMentionedRoles()) {
-                    if (role == event.getMessage().getMentionedRoles().get(event.getMessage().getMentionedRoles().size() - 1)) {
-                        if (event.getGuild().getSelfMember().canInteract(role)) {
-                            int highestrole = 0;
-                            for (Role testrole : event.getGuild().getSelfMember().getRoles()) {
-                                if (testrole.getPosition()>highestrole) {
-                                    highestrole=testrole.getPosition();
-                                }
-                            }
-                            for (Member member : event.getGuild().getMembers()) {
-                                if (member.getRoles().contains(role)) {
-                                    event.getGuild().addRoleToMember(member, event.getMessage().getMentionedRoles().get(0))
-                                            .reason("Role Command executed by " + event.getAuthor().getAsTag()).queue();
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"addrole", "addroles"};
-    }
-
-    @Override
-    public String description() {
-        return null;
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-}
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java
new file mode 100644
index 0000000..75f8f99
--- /dev/null
+++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java
@@ -0,0 +1,77 @@
+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.EmbedBuilder;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Role;
+
+public class RoleCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        switch (args[0].toLowerCase()) {
+            case "add":
+                if (event.getMember().hasPermission(Permission.MANAGE_ROLES)) {
+                    if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() == 1) {
+                        for (Member member : event.getMessage().getMentionedMembers()) {
+                            if (event.getGuild().getSelfMember().canInteract(member)) {
+                                if (!member.getRoles().contains(event.getMessage().getMentionedRoles().get(0))) {
+                                    event.getGuild().addRoleToMember(member, event.getMessage().getMentionedRoles().get(0))
+                                            .reason("Role Command executed by " + event.getAuthor().getAsTag()).queue();
+                                }
+                            }
+                        }
+                        event.getChannel().sendMessage(
+                                new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO,
+                                        new EmbedBuilder().setTitle("Successfully added all " +
+                                                event.getMessage().getMentionedMembers().size() +
+                                                " Members the " + event.getMessage().getMentionedRoles().get(0).getName() + " Role")).build()).queue();
+                    } else if (event.getMessage().getMentionedRoles().size() > 1) {
+                        for (Role role : event.getMessage().getMentionedRoles()) {
+                            if (role == event.getMessage().getMentionedRoles().get(event.getMessage().getMentionedRoles().size() - 1)) {
+                                if (event.getGuild().getSelfMember().canInteract(role)) {
+                                    int highestrole = 0;
+                                    for (Role testrole : event.getGuild().getSelfMember().getRoles()) {
+                                        if (testrole.getPosition()>highestrole) {
+                                            highestrole=testrole.getPosition();
+                                        }
+                                    }
+                                    for (Member member : event.getGuild().getMembers()) {
+                                        if (member.getRoles().contains(role)) {
+                                            event.getGuild().addRoleToMember(member, event.getMessage().getMentionedRoles().get(0))
+                                                    .reason("Role Command executed by " + event.getAuthor().getAsTag()).queue();
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                break;
+
+            case "remove":
+
+
+                break;
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"addrole", "addroles"};
+    }
+
+    @Override
+    public String description() {
+        return null;
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+}