diff --git a/src/class/Util.ts b/src/class/Util.ts
index 24b0cd1..cd48333 100644
--- a/src/class/Util.ts
+++ b/src/class/Util.ts
@@ -38,50 +38,30 @@ export default class Util {
 
   /**
    * Resolves a command
-   * @param command Parent command label
-   * @param args Use to resolve subcommands
+   * @param query Command input
    * @param message Only used to check for errors
    */
-  public resolveCommand(command: string, args?: string[], message?: Message): Promise<{cmd: Command, args: string[] }> {
+  public resolveCommand(query: string | string[], message?: Message): Promise<{cmd: Command, args: string[] }> {
     try {
       let resolvedCommand: Command;
+      if (typeof query === 'string') query = query.split(' ');
+      query = query.map((q) => q.toLowerCase());
+      const commands = this.client.commands.toArray();
+      resolvedCommand = commands.find((c) => c.name === query[0] || c.aliases.includes(query[0]));
 
-      if (this.client.commands.has(command)) resolvedCommand = this.client.commands.get(command);
-      else {
-        for (const cmd of this.client.commands.toArray()) {
-          if (cmd.aliases.includes(command)) { resolvedCommand = cmd; break; }
-        }
+      if (!resolvedCommand) return Promise.resolve(null);
+      query.shift();
+      while (resolvedCommand.subcommands.size) {
+        const subCommands = resolvedCommand.subcommands.toArray();
+        const found = subCommands.find((c) => c.name === query[0] || c.aliases.includes(query[0]));
+        if (!found) break;
+        resolvedCommand = found;
+        query.shift();
       }
-      if (!resolvedCommand) return Promise.resolve({ cmd: null, args });
-
-      let parentLabel = '';
-      let hasSubCommands = true;
-      while (hasSubCommands) {
-        if (!resolvedCommand.subcommands.size) {
-          hasSubCommands = false; break;
-        } else if (!args[0]) {
-          hasSubCommands = false; break;
-        } else if (resolvedCommand.subcommands.has(args[0])) {
-          parentLabel += `${resolvedCommand.name} `;
-          resolvedCommand = resolvedCommand.subcommands.get(args[0]); args.shift();
-        } else {
-          const subcommandArray = resolvedCommand.subcommands.toArray();
-          for (const subCmd of subcommandArray) {
-            if (subCmd.aliases.includes(args[0])) {
-              parentLabel += `${resolvedCommand.name} `; resolvedCommand = subCmd; args.shift(); break;
-            }
-            if (subcommandArray.findIndex((v) => v === subCmd) === subcommandArray.length - 1) {
-              hasSubCommands = false; break;
-            }
-          }
-        }
-      }
-      const finalCommand = resolvedCommand;
-      finalCommand.parentName = parentLabel;
-
-      return Promise.resolve({ cmd: finalCommand, args });
+      return Promise.resolve({ cmd: resolvedCommand, args: query });
     } catch (error) {
-      this.handleError(error, message);
+      if (message) this.handleError(error, message);
+      else this.handleError(error);
       return Promise.reject(error);
     }
   }
@@ -107,9 +87,7 @@ export default class Util {
       }
       await this.client.createMessage('595788220764127272', info);
       const msg = message.content.slice(this.client.config.prefix.length).trim().split(/ +/g);
-      const label = msg[0];
-      const args = msg.slice(1);
-      if (command) this.resolveCommand(label, args).then((c) => { c.cmd.enabled = false; });
+      if (command) this.resolveCommand(msg).then((c) => { c.cmd.enabled = false; });
       if (message) message.channel.createMessage(`***${this.client.stores.emojis.error} An unexpected error has occured - please contact a member of the Engineering Team.${command ? ' This command has been disabled.' : ''}***`);
     } catch (err) {
       this.client.signale.error(err);
diff --git a/src/commands/help.ts b/src/commands/help.ts
index d597f3f..9db8143 100644
--- a/src/commands/help.ts
+++ b/src/commands/help.ts
@@ -44,7 +44,7 @@ export default class Help extends Command {
         if (cmdPages.length === 1) return message.channel.createMessage({ embed: cmdPages[0] });
         return createPaginationEmbed(message, this.client, cmdPages);
       }
-      const { cmd } = await this.client.util.resolveCommand(args[0], args.slice(1), message);
+      const { cmd } = await this.client.util.resolveCommand(args, message);
       if (!cmd) return message.channel.createMessage(`${this.client.stores.emojis.error} **Command not found!**`);
       const perms: string[] = [];
       let allowedRoles = cmd.permissions && cmd.permissions.roles && cmd.permissions.roles.map((r) => `<@&${r}>`).join(', ');
diff --git a/src/events/messageCreate.ts b/src/events/messageCreate.ts
index 69dda08..4f0f605 100644
--- a/src/events/messageCreate.ts
+++ b/src/events/messageCreate.ts
@@ -14,9 +14,7 @@ export default class {
         if (message.author.bot) return;
         if (message.content.indexOf(this.client.config.prefix) !== 0) return;
         const noPrefix: string[] = message.content.slice(this.client.config.prefix.length).trim().split(/ +/g);
-        const command: string = noPrefix[0].toLowerCase();
-        const args: string[] = noPrefix.slice(1);
-        const resolved = await this.client.util.resolveCommand(command, args, message);
+        const resolved = await this.client.util.resolveCommand(noPrefix, message);
         if (!resolved.cmd) return;
         if (resolved.cmd.guildOnly && !(message.channel instanceof TextChannel)) return;
         let hasUserPerms: boolean;