diff --git a/pom.xml b/pom.xml
index 2cc3470..e8a7bdd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,9 +14,8 @@
     
     <repositories>
         <repository>
-            <id>dv8tion</id>
-            <name>m2-dv8tion</name>
-            <url>https://m2.dv8tion.net/releases</url>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
         </repository>
         <repository>
             <id>jcenter</id>
@@ -26,11 +25,11 @@
     </repositories>
     
     <dependencies>
-        <dependency>
-            <groupId>net.dv8tion</groupId>
-            <artifactId>JDA</artifactId>
-            <version>4.3.0_307</version>
-        </dependency>
+	<dependency>
+	    <groupId>com.github.jagrosh</groupId>
+	    <artifactId>JDA</artifactId>
+	    <version>vortex-SNAPSHOT</version>
+	</dependency>
         <dependency>
             <groupId>com.jagrosh</groupId>
             <artifactId>jda-utilities</artifactId>
diff --git a/src/main/java/com/jagrosh/vortex/Listener.java b/src/main/java/com/jagrosh/vortex/Listener.java
index 60ef3b8..e4fad8e 100644
--- a/src/main/java/com/jagrosh/vortex/Listener.java
+++ b/src/main/java/com/jagrosh/vortex/Listener.java
@@ -30,6 +30,7 @@
 import net.dv8tion.jda.api.events.guild.GuildUnbanEvent;
 import net.dv8tion.jda.api.events.guild.member.*;
 import net.dv8tion.jda.api.events.guild.member.update.GuildMemberUpdateNicknameEvent;
+import net.dv8tion.jda.api.events.guild.member.update.GuildMemberUpdateTimeOutEvent;
 import net.dv8tion.jda.api.events.guild.voice.GuildVoiceJoinEvent;
 import net.dv8tion.jda.api.events.guild.voice.GuildVoiceLeaveEvent;
 import net.dv8tion.jda.api.events.guild.voice.GuildVoiceMoveEvent;
@@ -215,6 +216,11 @@
         {
             vortex.getDatabase().tempslowmodes.clearSlowmode(((TextChannelUpdateSlowmodeEvent) event).getChannel());
         }
+        else if (event instanceof GuildMemberUpdateTimeOutEvent)
+        {
+            // Signal the modlogger because someone was timed out
+            vortex.getModLogger().setNeedUpdate(((GuildMemberUpdateTimeOutEvent) event).getGuild());
+        }
         else if (event instanceof GuildJoinEvent)
         {
             Guild guild = ((GuildJoinEvent)event).getGuild();
diff --git a/src/main/java/com/jagrosh/vortex/Vortex.java b/src/main/java/com/jagrosh/vortex/Vortex.java
index 39032d6..7a6c890 100644
--- a/src/main/java/com/jagrosh/vortex/Vortex.java
+++ b/src/main/java/com/jagrosh/vortex/Vortex.java
@@ -80,7 +80,7 @@
         System.setProperty("config.file", System.getProperty("config.file", "application.conf"));
         config = ConfigFactory.load();
         waiter = new EventWaiter(Executors.newSingleThreadScheduledExecutor(r -> new Thread(r, "eventwaiter")), false);
-        threadpool = Executors.newScheduledThreadPool(100, r -> new Thread(r, "vortex"));
+        threadpool = Executors.newScheduledThreadPool(400, r -> new Thread(r, "vortex"));
         database = new Database(config.getString("database.host"), 
                                        config.getString("database.username"), 
                                        config.getString("database.password"));
@@ -109,7 +109,7 @@
                             new InviteCmd(),
                             new PingCommand(),
                             new RoleinfoCommand(),
-                            new ServerinfoCommand(),
+                            new ServerinfoCmd(),
                             new UserinfoCmd(),
 
                             // Moderation
@@ -140,6 +140,7 @@
                             new AvatarlogCmd(this),
                             new TimezoneCmd(this),
                             new ModroleCmd(this),
+                            new MuteroleCmd(this),
                             new PrefixCmd(this),
                             new SettingsCmd(this),
 
@@ -203,6 +204,7 @@
         threadpool.scheduleWithFixedDelay(() -> database.tempbans.checkUnbans(shards), 0, 2, TimeUnit.MINUTES);
         threadpool.scheduleWithFixedDelay(() -> database.tempmutes.checkUnmutes(shards, database.settings), 0, 45, TimeUnit.SECONDS);
         threadpool.scheduleWithFixedDelay(() -> database.tempslowmodes.checkSlowmode(shards), 0, 45, TimeUnit.SECONDS);
+        threadpool.scheduleWithFixedDelay(() -> database.premium.checkPremiumSubscriptions(shards), 5, 10, TimeUnit.HOURS);
     }
     
     
diff --git a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java
index 037df40..17faaa7 100644
--- a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java
+++ b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java
@@ -485,8 +485,8 @@
         LOG.trace("Found "+invites.size()+" invites.");
         for(String inviteCode : invites)
         {
-            LOG.info("Resolving invite in " + message.getGuild().getId() + ": " + inviteCode);
             long gid = inviteResolver.resolve(inviteCode, message.getJDA());
+            LOG.info("Resolving invite in " + message.getGuild().getId() + ": " + inviteCode + " -> " + gid);
             if(gid != message.getGuild().getIdLong() && !inviteWhitelist.contains(gid))
             {
                 currentStatus.addStrikes(settings.inviteStrikes);
diff --git a/src/main/java/com/jagrosh/vortex/automod/InviteResolver.java b/src/main/java/com/jagrosh/vortex/automod/InviteResolver.java
index 5d9d135..3b81262 100644
--- a/src/main/java/com/jagrosh/vortex/automod/InviteResolver.java
+++ b/src/main/java/com/jagrosh/vortex/automod/InviteResolver.java
@@ -16,8 +16,19 @@
 package com.jagrosh.vortex.automod;
 
 import com.jagrosh.vortex.utils.FixedCache;
+import java.io.IOException;
+import java.time.OffsetDateTime;
+import java.util.Collections;
 import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.entities.ChannelType;
+import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Invite;
+import net.dv8tion.jda.api.utils.MiscUtil;
+import net.dv8tion.jda.internal.entities.InviteImpl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,19 +38,46 @@
  */
 public class InviteResolver
 {
+    private final static String[] BASE_URLS = {"discordapp.com", "ptb.discordapp.com", "canary.discordapp.com", 
+        /*"discord.com",*/ "ptb.discord.com", "canary.discord.com", "discord.co", "watchanimeattheoffice.com", "discord.new"};
     private final Logger log = LoggerFactory.getLogger(InviteResolver.class);
     private final FixedCache<String,Long> cached = new FixedCache<>(5000);
+    private final OkHttpClient client = new OkHttpClient.Builder().build();
+    
+    public Invite resolveFull(String code, JDA jda)
+    {
+        return resolveFull(code, jda.getToken());
+    }
+    
+    public Invite resolveFull(String code, String token)
+    {
+        log.debug("Attempting to resolve " + code);
+        try
+        {
+            return getInvite(code, token);
+        }
+        catch(Exception ex)
+        {
+            return null;
+        }
+    }
     
     public long resolve(String code, JDA jda)
     {
+        return resolve(code, jda.getToken());
+    }
+    
+    public long resolve(String code, String token)
+    {
         log.debug("Attempting to resolve " + code);
         if(cached.contains(code))
             return cached.get(code);
         try
         {
-            Invite i = Invite.resolve(jda, code).complete(false);
-            cached.put(code, i.getGuild().getIdLong());
-            return i.getGuild().getIdLong();
+            long guildId = getInviteGuild(code, token);
+            //long guildId = Invite.resolve(jda, code).complete(false).getGuild().getIdLong();
+            cached.put(code, guildId);
+            return guildId;
         }
         catch(Exception ex)
         {
@@ -47,4 +85,69 @@
             return 0L;
         }
     }
+    
+    private long getInviteGuild(String code, String token) throws IOException
+    {
+        JSONObject json = getInviteJSON(code, token);
+        if(json != null)
+            return MiscUtil.parseSnowflake(json.getJSONObject("guild").getString("id"));
+        return 0L;
+    }
+    
+    private InviteImpl getInvite(String code, String token) throws IOException
+    {
+        JSONObject json = getInviteJSON(code, token);
+        if(json != null)
+        {   
+            Invite.Channel channel;
+            if(json.has("channel"))
+            {
+                JSONObject c = json.getJSONObject("channel");
+                channel = new InviteImpl.ChannelImpl(c.optLong("id"), c.optString("name"), c.optInt("type") == 0 ? ChannelType.TEXT : ChannelType.UNKNOWN);
+            }
+            else
+                channel = null;
+            Invite.Guild guild;
+            if(json.has("guild"))
+            {
+                JSONObject g = json.getJSONObject("guild");
+                guild = new InviteImpl.GuildImpl(g.optLong("id"), g.optString("icon"), g.optString("name"), g.optString("splash"), Guild.VerificationLevel.UNKNOWN, -1, -1, Collections.emptySet());
+            }
+            else
+                guild = null;
+            return new InviteImpl(null, code, false, null, 0, 0, false, OffsetDateTime.now(), 0, channel, guild, null, null, Invite.InviteType.GUILD);
+        }
+        return null;
+    }
+    
+    private JSONObject getInviteJSON(String code, String token) throws IOException
+    {
+        Response res = client.newCall(new Request.Builder().get()
+                .addHeader("Authorization", token)
+                .addHeader("User-Agent", "DiscordBot (VortexInviteResolver, 1.0)")
+                .url("https://" + rand(BASE_URLS) + "/api/invites/" + code)
+                .build()).execute();
+        if(res.isSuccessful())
+        {
+            return new JSONObject(res.body().string());
+        }
+        
+        // if it failed, log why (usually unknown invite or cloudflare issue)
+        try
+        {
+            String message = new JSONObject(res.body().string()).getString("message");
+            log.warn(String.format("Unsuccessful resolving '%s': %s", code, message));
+        }
+        catch(Exception ex)
+        {
+            log.warn(String.format("Unsuccessful resolving '%s' | Headers: %s | Body: %s", code, 
+                    res.headers().toMultimap().toString(), res.body() == null ? null : res.body().string()));
+        }
+        return null;
+    }
+    
+    private <T> T rand(T[] items)
+    {
+        return items[(int)(Math.random() * items.length)];
+    }
 }
diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/AntieveryoneCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/AntieveryoneCmd.java
index 84d7465..43105b0 100644
--- a/src/main/java/com/jagrosh/vortex/commands/automod/AntieveryoneCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/automod/AntieveryoneCmd.java
@@ -74,6 +74,9 @@
         
         vortex.getDatabase().automod.setEveryoneStrikes(event.getGuild(), numstrikes);
         event.replySuccess("Users will now receive `"+numstrikes+"` strikes for attempting to ping @\u0435veryone/here. " // cyrillic e
-                + "This also considers pingable roles called 'everyone' and 'here'. This will not affect users that actually ");
+                + "This also considers pingable roles called 'everyone' and 'here'. This will not affect users that actually "
+                + "have permission to ping everyone. Pinging oneself or bots do not count towards this total. Duplicate "
+                + "pings in the same message are also not counted towards this total (pinging the same person 3 times only "
+                + "counts as 1 ping).");
     }
 }
diff --git a/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java b/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java
new file mode 100644
index 0000000..0ef3c49
--- /dev/null
+++ b/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2022 John Grosh (john.a.grosh@gmail.com).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.jagrosh.vortex.commands.general;
+
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
+import java.time.format.DateTimeFormatter;
+import net.dv8tion.jda.api.*;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+
+/**
+ *
+ * @author John Grosh (john.a.grosh@gmail.com)
+ */
+public class ServerinfoCmd extends Command
+{
+    private final static String LINESTART = "\u25AB"; // â–«
+    private final static String GUILD_EMOJI = "\uD83D\uDDA5"; // 🖥
+    private final static String NO_REGION = "\u2754"; // �
+    
+    public ServerinfoCmd()
+    {
+        this.name = "serverinfo";
+        this.aliases = new String[]{"server","guildinfo"};
+        this.help = "shows server info";
+        this.botPermissions = new Permission[]{Permission.MESSAGE_EMBED_LINKS};
+        this.guildOnly = true;
+    }
+    
+    @Override
+    protected void execute(CommandEvent event) 
+    {
+        Guild guild = event.getGuild();
+        Member owner = guild.getOwner();
+        long onlineCount = guild.getMembers().stream().filter(u -> u.getOnlineStatus() != OnlineStatus.OFFLINE).count();
+        long botCount = guild.getMembers().stream().filter(m -> m.getUser().isBot()).count();
+        EmbedBuilder builder = new EmbedBuilder();
+        String title = (GUILD_EMOJI + " Information about **" + guild.getName() + "**:")
+                .replace("@everyone", "@\u0435veryone") // cyrillic e
+                .replace("@here", "@h\u0435re") // cyrillic e
+                .replace("discord.gg/", "dis\u0441ord.gg/"); // cyrillic c;
+        String str = LINESTART + "ID: **" + guild.getId() + "**\n"
+                + LINESTART + "Owner: " + (owner == null ? "Unknown" : "**" + owner.getUser().getName() + "**#" + owner.getUser().getDiscriminator()) + "\n";
+        if(!guild.getVoiceChannels().isEmpty())
+        {
+            Region reg = guild.getVoiceChannels().get(0).getRegion();
+            str += LINESTART + "Location: " + (reg.getEmoji() == null || reg.getEmoji().isEmpty() ? NO_REGION : reg.getEmoji()) + " **" + reg.getName() + "**\n";
+        }
+        str +=    LINESTART + "Creation: **" + guild.getTimeCreated().format(DateTimeFormatter.RFC_1123_DATE_TIME) + "**\n"
+                + LINESTART + "Users: **" + guild.getMemberCache().size() + "** (" + onlineCount + " online, " + botCount + " bots)\n"
+                + LINESTART + "Channels: **" + guild.getTextChannelCache().size() + "** Text, **" + guild.getVoiceChannelCache().size() + "** Voice, **" + guild.getCategoryCache().size() + "** Categories\n"
+                + LINESTART + "Verification: **" + guild.getVerificationLevel().name() + "**";
+        if(!guild.getFeatures().isEmpty())
+            str += "\n" + LINESTART + "Features: **" + String.join("**, **", guild.getFeatures()) + "**";
+        if(guild.getSplashId() != null)
+        {
+            builder.setImage(guild.getSplashUrl() + "?size=1024");
+            str += "\n" + LINESTART + "Splash: ";
+        }
+        if(guild.getIconUrl()!=null)
+            builder.setThumbnail(guild.getIconUrl());
+        builder.setColor(owner == null ? null : owner.getColor());
+        builder.setDescription(str);
+        event.reply(new MessageBuilder().append(title).setEmbed(builder.build()).build());
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/UnbanCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/UnbanCmd.java
index 85c10b0..6d8b88d 100644
--- a/src/main/java/com/jagrosh/vortex/commands/moderation/UnbanCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/moderation/UnbanCmd.java
@@ -25,7 +25,7 @@
 import com.jagrosh.vortex.utils.LogUtil;
 import java.util.LinkedList;
 import java.util.List;
-import net.dv8tion.jda.api.entities.Guild.Ban;
+//import net.dv8tion.jda.api.entities.Guild.Ban;
 
 /**
  *
@@ -54,25 +54,25 @@
         String reason = LogUtil.auditReasonFormat(event.getMember(), args.reason);
         StringBuilder builder = new StringBuilder();
         
-        event.getGuild().retrieveBanList().queue(list -> 
-        {
-            List<Ban> toUnban = new LinkedList<>();
-            args.members.forEach(m -> args.users.add(m.getUser()));
+        //event.getGuild().retrieveBanList().queue(list -> 
+        //{
+            List<Long> toUnban = new LinkedList<>();
+            args.members.forEach(m -> builder.append("\n").append(event.getClient().getError()).append(" ").append(FormatUtil.formatUser(m.getUser())).append(" is not banned!"));
             args.users.forEach(u -> 
             {
-                Ban ban = list.stream().filter(b -> b.getUser().getIdLong()==u.getIdLong()).findFirst().orElse(null);
-                if(ban==null)
-                    builder.append("\n").append(event.getClient().getError()).append(" ").append(FormatUtil.formatUser(u)).append(" is not banned!");
-                else
-                    toUnban.add(ban);
+                //Ban ban = list.stream().filter(b -> b.getUser().getIdLong()==u.getIdLong()).findFirst().orElse(null);
+                //if(ban==null)
+                //    builder.append("\n").append(event.getClient().getError()).append(" ").append(FormatUtil.formatUser(u)).append(" is not banned!");
+                //else
+                    toUnban.add(u.getIdLong());
             });
             args.ids.forEach(id -> 
             {
-                Ban ban = list.stream().filter(b -> b.getUser().getIdLong()==id).findFirst().orElse(null);
-                if(ban==null)
-                    builder.append("\n").append(event.getClient().getError()).append(" <@").append(id).append("> is not banned!");
-                else
-                    toUnban.add(ban);
+                //Ban ban = list.stream().filter(b -> b.getUser().getIdLong()==id).findFirst().orElse(null);
+                //if(ban==null)
+                //    builder.append("\n").append(event.getClient().getError()).append(" <@").append(id).append("> is not banned!");
+                //else
+                    toUnban.add(id);
             });
             args.unresolved.forEach(un -> builder.append("\n").append(event.getClient().getWarning()).append(" Could not resolve `").append(un).append("` to a user ID"));
             
@@ -87,21 +87,21 @@
             
             for(int i=0; i<toUnban.size(); i++)
             {
-                Ban ban = toUnban.get(i);
+                Long ban = toUnban.get(i);
                 boolean last = i+1 == toUnban.size();
-                event.getGuild().unban(ban.getUser()).reason(reason).queue(success -> 
+                event.getGuild().unban(Long.toString(ban)).reason(reason).queue(success -> 
                 {
-                    builder.append("\n").append(event.getClient().getSuccess()).append(" Successfully unbanned ").append(FormatUtil.formatUser(ban.getUser()));
+                    builder.append("\n").append(event.getClient().getSuccess()).append(" Successfully unbanned <@").append(ban).append(">");
                     if(last)
                         event.reply(builder.toString());
                 }, f -> 
                 {
-                    builder.append("\n").append(event.getClient().getError()).append(" Failed to unban ").append(FormatUtil.formatUser(ban.getUser()));
+                    builder.append("\n").append(event.getClient().getError()).append(" Failed to unban <@").append(ban).append(">");
                     if(last)
                         event.reply(builder.toString());
                 });
             }
 
-        }, f -> event.replyError("Failed to retreive the ban list."));
+        //}, f -> event.replyError("Failed to retreive the ban list."));
     }
 }
diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/VoicemoveCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/VoicemoveCmd.java
index ae181d8..6a9df0e 100644
--- a/src/main/java/com/jagrosh/vortex/commands/moderation/VoicemoveCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/moderation/VoicemoveCmd.java
@@ -39,6 +39,8 @@
         this.aliases = new String[]{"magnet"};
         this.help = "mass-moves voice channel users";
         this.arguments = "[channel]";
+        this.cooldown = 20;
+        this.cooldownScope = CooldownScope.GUILD;
     }
     
     @Override
@@ -91,6 +93,7 @@
         catch(Exception e) 
         {
             event.replyWarning(FormatUtil.filterEveryone("I could not connect to **"+vc.getName()+"**"));
+            event.getGuild().getAudioManager().closeAudioConnection();
             return;
         }
         vortex.getEventWaiter().waitForEvent(GuildVoiceMoveEvent.class,
@@ -104,6 +107,8 @@
                     event.replyWarning("You waited too long, "+event.getMember().getAsMention());
                 });
         event.reply("\uD83C\uDF9B Now, move me and I'll drag users to a new voice channel."); // 🎛
+        // failsafe to leave voice channel
+        event.getClient().getScheduleExecutor().schedule(() -> event.getGuild().getAudioManager().closeAudioConnection(), 2, TimeUnit.MINUTES);
     }
     
 }
diff --git a/src/main/java/com/jagrosh/vortex/commands/owner/PremiumCmd.java b/src/main/java/com/jagrosh/vortex/commands/owner/PremiumCmd.java
index fd04a01..cc6c565 100644
--- a/src/main/java/com/jagrosh/vortex/commands/owner/PremiumCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/owner/PremiumCmd.java
@@ -24,6 +24,7 @@
 import java.time.temporal.ChronoUnit;
 import java.util.stream.Collectors;
 import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.User;
 
 /**
  *
@@ -37,48 +38,121 @@
     {
         this.vortex = vortex;
         this.name = "premium";
-        this.help = "gives premium";
-        this.arguments = "<guildId> <time>";
+        this.help = "root command";
         this.ownerCommand = true;
         this.guildOnly = false;
         this.hidden = true;
-        this.children = new Command[]{ new PremiumInfoCmd() };
+        this.children = new Command[]{ new PremiumAddCmd(), new PremiumInfoCmd(), new PremiumUserCmd() };
     }
 
     @Override
     protected void execute(CommandEvent event)
     {
-        String[] parts = event.getArgs().split("\\s+", 2);
-        if(parts.length < 2)
+        String str = "Premium Commands";
+        for(Command c: children)
+            str += "\n`" + event.getClient().getPrefix() + name + " " + c.getName() + " " + c.getArguments() + "` - " + c.getHelp();
+        event.reply(str);
+    }
+    
+    private class PremiumUserCmd extends Command
+    {
+        private PremiumUserCmd()
         {
-            event.replyError("Too few arguments");
-            return;
+            this.name = "user";
+            this.help = "sets user for guild";
+            this.arguments = "<guildId> <userId>";
+            this.ownerCommand = true;
+            this.guildOnly = false;
+            this.hidden = true;
         }
-        int seconds = OtherUtil.parseTime(parts[1]);
-        if(seconds <= 0)
+
+        @Override
+        protected void execute(CommandEvent event)
         {
-            event.replyError("Invalid time");
-            return;
+            String[] parts = event.getArgs().split("\\s+", 2);
+            if(parts.length < 2)
+            {
+                event.replyError("Too few arguments");
+                return;
+            }
+            long guildid, userid;
+            try
+            {
+                guildid = Long.parseLong(parts[0]);
+                userid = Long.parseLong(parts[1]);
+            }
+            catch(NumberFormatException ex)
+            {
+                event.replyError("Invalid guild or user ID");
+                return;
+            }
+            Guild guild = vortex.getShardManager().getGuildById(guildid);
+            if(guild == null)
+            {
+                event.replyError("Guild " + guildid + " not found.");
+                return;
+            }
+            User user = vortex.getShardManager().getUserById(userid);
+            if(user == null)
+            {
+                event.replyError("User " + userid + " not found.");
+                return;
+            }
+            boolean result = vortex.getDatabase().premium.setUserForGuild(user, guild);
+            if(result)
+                event.replySuccess("Successfully set " + user.getAsMention() + " on " + guild.getName());
+            else
+                event.replyError("Could not set " + user.getAsMention() + " on " + guild.getName());
         }
-        Guild guild;
-        try
+    }
+    
+    private class PremiumAddCmd extends Command
+    {
+        private PremiumAddCmd()
         {
-            guild = vortex.getShardManager().getGuildById(Long.parseLong(parts[0]));
+            this.name = "add";
+            this.help = "adds premium time";
+            this.arguments = "<guildId> <time>";
+            this.ownerCommand = true;
+            this.guildOnly = false;
+            this.hidden = true;
         }
-        catch(NumberFormatException ex)
+
+        @Override
+        protected void execute(CommandEvent event)
         {
-            event.replyError("Invalid guild ID");
-            return;
+            String[] parts = event.getArgs().split("\\s+", 2);
+            if(parts.length < 2)
+            {
+                event.replyError("Too few arguments");
+                return;
+            }
+            int seconds = OtherUtil.parseTime(parts[1]);
+            if(seconds <= 0)
+            {
+                event.replyError("Invalid time");
+                return;
+            }
+            Guild guild;
+            try
+            {
+                guild = vortex.getShardManager().getGuildById(Long.parseLong(parts[0]));
+            }
+            catch(NumberFormatException ex)
+            {
+                event.replyError("Invalid guild ID");
+                return;
+            }
+            if(guild == null)
+            {
+                event.replyError("No guild found with ID `" + parts[0] + "`");
+                return;
+            }
+            PremiumInfo before = vortex.getDatabase().premium.getPremiumInfo(guild);
+            vortex.getDatabase().premium.addPremium(guild, PremiumManager.Level.PRO, seconds, ChronoUnit.SECONDS);
+            PremiumInfo after = vortex.getDatabase().premium.getPremiumInfo(guild);
+            event.replySuccess("Before: " + before + "\n" + event.getClient().getSuccess() + " After: " + after);
         }
-        if(guild == null)
-        {
-            event.replyError("No guild found with ID `" + parts[0] + "`");
-            return;
-        }
-        PremiumInfo before = vortex.getDatabase().premium.getPremiumInfo(guild);
-        vortex.getDatabase().premium.addPremium(guild, PremiumManager.Level.PRO, seconds, ChronoUnit.SECONDS);
-        PremiumInfo after = vortex.getDatabase().premium.getPremiumInfo(guild);
-        event.replySuccess("Before: " + before + "\n" + event.getClient().getSuccess() + " After: " + after);
     }
     
     private class PremiumInfoCmd extends Command
@@ -96,6 +170,7 @@
         protected void execute(CommandEvent event)
         {
             event.reply(vortex.getDatabase().premium.getPremiumGuildsInfo().entrySet().stream()
+                    .sorted((a,b) -> a.getValue().until.compareTo(b.getValue().until))
                     .map(pinfo -> 
                     {
                         Guild guild = vortex.getShardManager().getGuildById(pinfo.getKey());
diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/AvatarlogCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/AvatarlogCmd.java
index 83d52a1..5c0da15 100644
--- a/src/main/java/com/jagrosh/vortex/commands/settings/AvatarlogCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/settings/AvatarlogCmd.java
@@ -38,12 +38,17 @@
     @Override
     protected void showCurrentChannel(CommandEvent event)
     {
-        TextChannel tc = vortex.getDatabase().settings.getSettings(event.getGuild()).getAvatarLogChannel(event.getGuild());
-        if(tc==null)
-            event.replyWarning("Avatar Logs are not currently enabled on the server. Please include a channel name.");
+        if(vortex.getDatabase().premium.getPremiumInfo(event.getGuild()).level.isAtLeast(PremiumManager.Level.ULTRA))
+        {
+            TextChannel tc = vortex.getDatabase().settings.getSettings(event.getGuild()).getAvatarLogChannel(event.getGuild());
+            if(tc==null)
+                event.replyWarning("Avatar Logs are not currently enabled on the server. Please include a channel name.");
+            else
+                event.replySuccess("Avatar Logs are currently being sent in "+tc.getAsMention()
+                        +(event.getSelfMember().hasPermission(tc, REQUIRED_PERMS) ? "" : "\n"+event.getClient().getWarning()+String.format(REQUIRED_ERROR, tc.getAsMention())));
+        }
         else
-            event.replySuccess("Avatar Logs are currently being sent in "+tc.getAsMention()
-                    +(event.getSelfMember().hasPermission(tc, REQUIRED_PERMS) ? "" : "\n"+event.getClient().getWarning()+String.format(REQUIRED_ERROR, tc.getAsMention())));
+            event.reply(PremiumManager.Level.ULTRA.getRequirementMessage());
     }
 
     @Override
diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/MuteroleCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/MuteroleCmd.java
new file mode 100644
index 0000000..550009b
--- /dev/null
+++ b/src/main/java/com/jagrosh/vortex/commands/settings/MuteroleCmd.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2018 John Grosh (john.a.grosh@gmail.com).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.jagrosh.vortex.commands.settings;
+
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
+import com.jagrosh.jdautilities.commons.utils.FinderUtil;
+import com.jagrosh.vortex.Vortex;
+import com.jagrosh.vortex.utils.FormatUtil;
+import java.util.List;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Role;
+
+/**
+ *
+ * @author John Grosh (john.a.grosh@gmail.com)
+ */
+public class MuteroleCmd extends Command
+{
+    private final Vortex vortex;
+    
+    public MuteroleCmd(Vortex vortex)
+    {
+        this.vortex = vortex;
+        this.name = "muterole";
+        this.help = "sets the muted role";
+        this.aliases = new String[]{"mutedrole"};
+        this.arguments = "<role>";
+        this.category = new Category("Settings");
+        this.guildOnly = true;
+        this.userPermissions = new Permission[]{Permission.MANAGE_SERVER, Permission.BAN_MEMBERS};
+    }
+
+    @Override
+    protected void execute(CommandEvent event)
+    {
+        if(event.getArgs().isEmpty())
+        {
+            event.replyError("Please include the name of a role to use as the Muted role. If set to `none`, Vortex will use Timeouts instead of applying a role.");
+            return;
+        }
+        
+        else if(event.getArgs().equalsIgnoreCase("none") || event.getArgs().equalsIgnoreCase("off"))
+        {
+            vortex.getDatabase().settings.setMutedRole(event.getGuild(), null);
+            event.replySuccess("Vortex will use Timeouts instead of a Mute role.");
+            return;
+        }
+        
+        List<Role> roles = FinderUtil.findRoles(event.getArgs(), event.getGuild());
+        if(roles.isEmpty())
+            event.replyError("No roles found called `"+event.getArgs()+"`");
+        else if (roles.size()==1)
+        {
+            vortex.getDatabase().settings.setMutedRole(event.getGuild(), roles.get(0));
+            event.replySuccess("`"+roles.get(0).getName()+"` will now be applied when a user is Muted");
+        }
+        else
+            event.replyWarning(FormatUtil.listOfRoles(roles, event.getArgs()));
+    }
+}
diff --git a/src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java b/src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java
index 2a1831f..f1900fd 100644
--- a/src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java
@@ -21,6 +21,7 @@
 import com.jagrosh.vortex.Vortex;
 import com.jagrosh.vortex.commands.CommandExceptionListener.CommandErrorException;
 import com.jagrosh.vortex.commands.CommandExceptionListener.CommandWarningException;
+import com.jagrosh.vortex.database.managers.PremiumManager;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -48,12 +49,19 @@
         this.userPermissions = new Permission[]{Permission.MANAGE_SERVER};
         this.botPermissions = new Permission[]{Permission.MANAGE_SERVER};
         this.guildOnly = true;
-        this.cooldown = 60*5; // 5 minute cooldown for safety
+        this.cooldown = 60*10; // 10 minute cooldown for safety
     }
     
     @Override
     protected void execute(CommandEvent event)
     {
+        // require Vortex Plus for invite pruning
+        if(!vortex.getDatabase().premium.getPremiumInfo(event.getGuild()).level.isAtLeast(PremiumManager.Level.PLUS))
+        {
+            event.reply(PremiumManager.Level.PLUS.getRequirementMessage());
+            return;
+        }
+        
         int uses;
         if(event.getArgs().isEmpty())
             uses = 1;
diff --git a/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java b/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java
index cadd9d9..1cb538e 100644
--- a/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java
@@ -20,6 +20,7 @@
 import com.jagrosh.vortex.Constants;
 import com.jagrosh.vortex.Emoji;
 import com.jagrosh.vortex.Vortex;
+import com.jagrosh.vortex.automod.InviteResolver;
 import com.jagrosh.vortex.database.managers.PremiumManager;
 import com.jagrosh.vortex.utils.FormatUtil;
 import com.jagrosh.vortex.utils.OtherUtil;
@@ -46,6 +47,7 @@
     private final static String UNKNOWN_ID = "\uD83C\uDD94"; // 🆔
     private final static String LINESTART = "\u25AB"; // ▫
     
+    private final InviteResolver ir = new InviteResolver();
     private final Vortex vortex;
     
     public LookupCmd(Vortex vortex)
@@ -132,7 +134,7 @@
             str.append(Emoji.BADGE_NITRO);
         str.append("\n" + LINESTART + "Account Creation: **").append(TimeUtil.getDateTimeString(u.getTimeCreated())).append("**");
         eb.setDescription(str.toString());
-        event.reply(new MessageBuilder().append(FormatUtil.filterEveryone(text)).setEmbed(eb.build()).build());
+        event.reply(new MessageBuilder().append(FormatUtil.filterEveryone(text)).setEmbeds(eb.build()).build());
         return true;
     }
     
@@ -157,7 +159,7 @@
             {
                 try
                 {
-                    invite = Invite.resolve(event.getJDA(), invCode, true).complete(false);
+                    invite = ir.resolveFull(invCode, event.getJDA());
                 }
                 catch(Exception ignore) {}
             }
@@ -171,14 +173,13 @@
         Widget widget = null;
         try
         {
-            invite = Invite.resolve(event.getJDA(), inviteCode, true).complete(false);
+            invite = ir.resolveFull(inviteCode, event.getJDA());
         }
-        catch(RateLimitedException ratelimited)
+        catch(Exception ex)
         {
             event.reactWarning();
             return;
         }
-        catch(Exception ignore) {}
         if(invite != null)
         {
             Invite.Guild g = invite.getGuild();
@@ -208,7 +209,7 @@
 
                 return new MessageBuilder()
                         .append(UNKNOWN_ID + " Information about an unknown ID:")
-                        .setEmbed(new EmbedBuilder()
+                        .setEmbeds(new EmbedBuilder()
                                 .appendDescription(LINESTART + "Creation: " + "**"+TimeUtil.getTimeCreated(input).format(DateTimeFormatter.RFC_1123_DATE_TIME)+"**").build())
                         .build();
             }
@@ -248,6 +249,6 @@
                     + "\n" + LINESTART + "Inviter: " + (invite.getInviter() == null ? "N/A" : FormatUtil.formatFullUser(invite.getInviter()))
                     + (g.getSplashId() == null ? "" : "\n" + LINESTART + "Splash: "), false);
         }
-        return new MessageBuilder().append(FormatUtil.filterEveryone(text)).setEmbed(eb.build()).build();
+        return new MessageBuilder().append(FormatUtil.filterEveryone(text)).setEmbeds(eb.build()).build();
     }
 }
diff --git a/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java b/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java
index 1a7cd8a..02006a3 100644
--- a/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java
+++ b/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java
@@ -48,6 +48,7 @@
     
     public final static SQLColumn<Long> GUILD_ID = new LongColumn("GUILD_ID",false,0L,true);
     public final static SQLColumn<Long> MOD_ROLE_ID = new LongColumn("MOD_ROLE_ID",false,0L);
+    public final static SQLColumn<Long> MuTE_ROLE_ID = new LongColumn("MUTE_ROLE_ID",false,0L);
     
     public final static SQLColumn<Long> MODLOG_ID = new LongColumn("MODLOG_ID",false,0L);
     public final static SQLColumn<Long> SERVERLOG_ID = new LongColumn("SERVERLOG_ID",false,0L);
@@ -243,6 +244,26 @@
         });
     }
     
+    public void setMutedRole(Guild guild, Role role)
+    {
+        invalidateCache(guild);
+        readWrite(select(GUILD_ID.is(guild.getIdLong()), GUILD_ID, MuTE_ROLE_ID), rs -> 
+        {
+            if(rs.next())
+            {
+                MuTE_ROLE_ID.updateValue(rs, role==null ? 0L : role.getIdLong());
+                rs.updateRow();
+            }
+            else
+            {
+                rs.moveToInsertRow();
+                GUILD_ID.updateValue(rs, guild.getIdLong());
+                MuTE_ROLE_ID.updateValue(rs, role==null ? 0L : role.getIdLong());
+                rs.insertRow();
+            }
+        });
+    }
+    
     public void setModeratorRole(Guild guild, Role role)
     {
         invalidateCache(guild);
@@ -380,7 +401,7 @@
         private GuildSettings(ResultSet rs) throws SQLException
         {
             this.modRole = MOD_ROLE_ID.getValue(rs);
-            this.muteRole = 0;
+            this.muteRole = MuTE_ROLE_ID.getValue(rs);
             this.modlog = MODLOG_ID.getValue(rs);
             this.serverlog = SERVERLOG_ID.getValue(rs);
             this.messagelog = MESSAGELOG_ID.getValue(rs);
diff --git a/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java b/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java
index f09fb35..f775913 100644
--- a/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java
+++ b/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java
@@ -20,15 +20,22 @@
 import com.jagrosh.easysql.SQLColumn;
 import com.jagrosh.easysql.columns.*;
 import com.jagrosh.vortex.Constants;
+import com.jagrosh.vortex.utils.MultiBotManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalUnit;
 import java.util.*;
+import java.util.stream.Collectors;
 import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.entities.User;
 import org.json.JSONObject;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  *
@@ -39,8 +46,12 @@
     public static final SQLColumn<Long> GUILD_ID = new LongColumn("GUILD_ID", false, 0L, true);
     public static final SQLColumn<Instant> UNTIL = new InstantColumn("UNTIL", false, Instant.EPOCH);
     public static final SQLColumn<Integer> LEVEL = new IntegerColumn("LEVEL", false, 0);
+    public static final SQLColumn<Long> USER_ID  = new LongColumn("USER_ID", false, 0L);
     
+    private final long premiumGuildId = 147698382092238848L;
+    private final long premiumRoleId = 867194076813852692L;
     private final PremiumInfo NO_PREMIUM = new PremiumInfo();
+    private final Logger LOG = LoggerFactory.getLogger(PremiumManager.class);
     
     public PremiumManager(DatabaseConnector connector)
     {
@@ -90,6 +101,64 @@
                 .put("until", info.until == null ? 0 : info.until.getEpochSecond());
     }
     
+    public boolean setUserForGuild(User user, Guild guild)
+    {
+        return readWrite(selectAll(GUILD_ID.is(guild.getIdLong())), rs -> 
+        {
+            if(rs.next())
+            {
+                USER_ID.updateValue(rs, user.getIdLong());
+                rs.updateRow();
+                return true;
+            }
+            else
+                return false;
+        });
+    }
+    
+    public void checkPremiumSubscriptions(MultiBotManager shards)
+    {
+        Guild guild = shards.getGuildById(premiumGuildId);
+        if(guild == null)
+            return;
+        Role role = guild.getRoleById(premiumRoleId);
+        if(role == null)
+            return;
+        // get all the user IDs with a specific role
+        List<Long> users = guild.getMembersWithRoles(role).stream().map(m -> m.getIdLong()).collect(Collectors.toList());
+        // apply a minimum time of 40 days
+        List<Long> guilds = applyMinimumTimeBuffer(users, 40, ChronoUnit.DAYS);
+        LOG.info("Updated premium subscriptions for " + guilds.toString());
+    }
+    
+    /**
+     * Updates the time remaining for all guilds with a premium subscription, based on the user who is associated with
+     * the guild
+     * 
+     * @param users A list of users that have active premium subscriptions
+     * @param time The value of the minimum time
+     * @param unit The units of the minimum time
+     * @return A list of the guild IDs that got updated
+     */
+    public List<Long> applyMinimumTimeBuffer(List<Long> users, int time, TemporalUnit unit)
+    {
+        Instant targetTime = Instant.now().plus(time, unit);
+        List<Long> guilds = new ArrayList<>();
+        readWrite(selectAll(UNTIL.isLessThan(targetTime.getEpochSecond())), rs -> 
+        {
+            while(rs.next())
+            {
+                if(LEVEL.getValue(rs) > Level.NONE.ordinal() && users.contains(USER_ID.getValue(rs)))
+                {
+                    UNTIL.updateValue(rs, targetTime);
+                    rs.updateRow();
+                    guilds.add(GUILD_ID.getValue(rs));
+                }
+            }
+        });
+        return guilds;
+    }
+    
     public void addPremiumForever(Guild guild, Level level)
     {
         readWrite(selectAll(GUILD_ID.is(guild.getIdLong())), rs -> 
@@ -189,17 +258,20 @@
     {
         public final Level level;
         public final Instant until;
+        public final long user;
         
         private PremiumInfo(ResultSet rs) throws SQLException
         {
             this.level = Level.values()[LEVEL.getValue(rs)];
             this.until = UNTIL.getValue(rs);
+            this.user = USER_ID.getValue(rs);
         }
         
         private PremiumInfo()
         {
             level = Level.NONE;
             until = null;
+            user = 0L;
         }
         
         public String getFooterString()
diff --git a/src/main/java/com/jagrosh/vortex/logging/ModLogger.java b/src/main/java/com/jagrosh/vortex/logging/ModLogger.java
index 9853060..7f11eff 100644
--- a/src/main/java/com/jagrosh/vortex/logging/ModLogger.java
+++ b/src/main/java/com/jagrosh/vortex/logging/ModLogger.java
@@ -25,11 +25,13 @@
 import com.jagrosh.vortex.utils.LogUtil.ParsedAuditReason;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
@@ -52,7 +54,7 @@
     private final static Logger LOG = LoggerFactory.getLogger(ModLogger.class);
     private final HashMap<Long,Integer> caseNum = new HashMap<>();
     private final HashSet<Long> needsUpdate = new HashSet<>();
-    private final FixedCache<String, Message> banLogCache = new FixedCache<>(1000);
+    private final FixedCache<String, CompletableFuture<Message>> banLogCache = new FixedCache<>(1000);
     private final Vortex vortex;
     private boolean isStarted = false;
     
@@ -86,7 +88,7 @@
                             long time = System.currentTimeMillis();
                             update(vortex.getShardManager().getGuildById(gid), 40);
                             long diff = System.currentTimeMillis() - time;
-                            if(diff > 10000)
+                            if(diff > 15000)
                                 LOG.warn("Took " + diff + "ms to update " + gid);
                         });
                     } catch(Exception ex)
@@ -226,6 +228,7 @@
     
     // private methods
     
+    @SuppressWarnings("unchecked")
     private void update(Guild guild, int limit) // not async
     {
         if(guild==null)
@@ -235,17 +238,19 @@
         if(modlog==null || !modlog.canTalk() || !modlog.getGuild().getSelfMember().hasPermission(Permission.VIEW_AUDIT_LOGS))
             return;
         Role mRole = gs.getMutedRole(guild);
+        long auditDiff = 0;
         try
         {
             long time = System.currentTimeMillis();
-            List<AuditLogEntry> list = guild.retrieveAuditLogs().cache(false).limit(limit).submit().get(10, TimeUnit.SECONDS);
-            long diff = System.currentTimeMillis() - time;
+            List<AuditLogEntry> list = guild.retrieveAuditLogs().cache(false).limit(limit).submit().get(5, TimeUnit.SECONDS);
+            auditDiff = System.currentTimeMillis() - time;
             LOG.debug("Retrieved " + list.size() + " logs from " + guild.getId());
-            if(diff > 5000)
-                LOG.warn("Took " + diff + "ms to retrieve audit logs from " + guild.getId());
+            if(auditDiff > 5000)
+                LOG.warn("Took " + auditDiff + "ms to retrieve audit logs from " + guild.getId());
             for(AuditLogEntry ale: vortex.getDatabase().auditcache.filterUncheckedEntries(list)) 
             {
                 Action act = null;
+                long minutes = 0;
                 switch(ale.getType())
                 {
                     case BAN: 
@@ -257,6 +262,17 @@
                     case UNBAN: 
                         act = Action.UNBAN; 
                         break;
+                    case MEMBER_UPDATE:
+                        AuditLogChange change = ale.getChangeByKey("communication_disabled_until");
+                        if(change==null)
+                            break;
+                        try
+                        {
+                            minutes = ale.getTimeCreated().minusSeconds(30).until(OffsetDateTime.parse((String)change.getNewValue()), ChronoUnit.MINUTES);
+                        }
+                        catch (Exception ex) {}
+                        act = minutes == 0 ? Action.UNMUTE : Action.TEMPMUTE;
+                        break;
                     case MEMBER_ROLE_UPDATE:
                         if(mRole==null)
                             break;
@@ -287,7 +303,6 @@
                     if(ale.getJDA().getSelfUser().equals(mod) && act==Action.MUTE && AutoMod.RESTORE_MUTE_ROLE_AUDIT.equals(ale.getReason()))
                         continue; // restoring muted role shouldn't trigger a log entry
                     String reason = ale.getReason()==null ? "" : ale.getReason();
-                    int minutes = 0;
                     User target = vortex.getShardManager().getUserById(ale.getTargetIdLong());
                     if(target==null)
                         target = modlog.getJDA().retrieveUserById(ale.getTargetIdLong()).submit().get(5, TimeUnit.SECONDS);
@@ -312,17 +327,20 @@
                     String banCacheKey = banCacheKey(ale, mod);
                     if(act==Action.UNBAN) // check for softban
                     {
-                        Message banMsg = banLogCache.get(banCacheKey);
-                        if(banMsg!=null && banMsg.getTimeCreated().plusMinutes(2).isAfter(ale.getTimeCreated()))
+                        if(banLogCache.contains(banCacheKey))
                         {
-                            // This is a softban, because the user was banned by the same mod within the past 2 minutes
-                            // We need to edit the existing modlog entry instead of making a new one
-                            banMsg.editMessage(banMsg.getContentRaw()
-                                    .replaceFirst(Action.BAN.getEmoji(), Action.SOFTBAN.getEmoji())
-                                    .replaceFirst(Action.BAN.getVerb(), Action.SOFTBAN.getVerb())).queue();
-                            continue;
+                            Message banMsg = banLogCache.get(banCacheKey).get(5, TimeUnit.SECONDS);
+                            if(banMsg != null && banMsg.getTimeCreated().plusMinutes(2).isAfter(ale.getTimeCreated()))
+                            {
+                                // This is a softban, because the user was banned by the same mod within the past 2 minutes
+                                // We need to edit the existing modlog entry instead of making a new one
+                                banMsg.editMessage(banMsg.getContentRaw()
+                                        .replaceFirst(Action.BAN.getEmoji(), Action.SOFTBAN.getEmoji())
+                                        .replaceFirst(Action.BAN.getVerb(), Action.SOFTBAN.getVerb())).queue();
+                                continue;
+                            }
+                            vortex.getDatabase().tempbans.clearBan(guild, ale.getTargetIdLong());
                         }
-                        vortex.getDatabase().tempbans.clearBan(guild, ale.getTargetIdLong());
                     }
                     if(act==Action.UNMUTE)
                     {
@@ -332,7 +350,7 @@
                             LogUtil.modlogTimeFormat(ale.getTimeCreated(), timezone, getCaseNumber(modlog), mod, act, minutes, target, reason) :
                             LogUtil.modlogUserFormat(ale.getTimeCreated(), timezone, getCaseNumber(modlog), mod, act, target, reason));
                     if(act==Action.BAN)
-                        banLogCache.put(banCacheKey, modlog.sendMessage(msg).submit().get(4, TimeUnit.SECONDS));
+                        banLogCache.put(banCacheKey, modlog.sendMessage(msg).submit());
                     else
                         modlog.sendMessage(msg).queue();
                 }
@@ -340,7 +358,7 @@
         }
         catch (TimeoutException ex)
         {
-            LOG.warn("Retreiving audit logs for "+guild+" took longer than 10 seconds!");
+            LOG.warn("Retreiving audit logs for " + guild + " took longer than 5 seconds! Audit: " + auditDiff + "ms, Msg: " + ex.getMessage());
         }
         catch(Exception ex)
         {
diff --git a/src/main/java/com/jagrosh/vortex/utils/LogUtil.java b/src/main/java/com/jagrosh/vortex/utils/LogUtil.java
index a916c22..2384176 100644
--- a/src/main/java/com/jagrosh/vortex/utils/LogUtil.java
+++ b/src/main/java/com/jagrosh/vortex/utils/LogUtil.java
@@ -20,11 +20,9 @@
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayDeque;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
@@ -67,7 +65,7 @@
                 reasonF(reason));
     }
     
-    public static String modlogTimeFormat(OffsetDateTime time, ZoneId zone, int caseNum, User moderator, Action action, int minutes, User target, String reason)
+    public static String modlogTimeFormat(OffsetDateTime time, ZoneId zone, int caseNum, User moderator, Action action, long minutes, User target, String reason)
     {
         return String.format(MODLOG_TIME_FORMAT, timeF(time, zone), caseNum, action.getEmoji(), moderator.getName(), 
                 moderator.getDiscriminator(), action.getVerb(), target.getName(), target.getDiscriminator(), target.getId(), 
diff --git a/src/test/java/com/jagrosh/vortex/InviteTest.java b/src/test/java/com/jagrosh/vortex/InviteTest.java
new file mode 100644
index 0000000..05c092c
--- /dev/null
+++ b/src/test/java/com/jagrosh/vortex/InviteTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021 John Grosh (john.a.grosh@gmail.com).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.jagrosh.vortex;
+
+import com.jagrosh.vortex.automod.InviteResolver;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author John Grosh (john.a.grosh@gmail.com)
+ */
+public class InviteTest
+{
+    @Test
+    public void inviteTest() 
+    {
+        InviteResolver ir = new InviteResolver();
+        
+        long validId = ir.resolve("0p9LSGoRLu6Pet0k", "");
+        assertEquals(validId, 147698382092238848L);
+        
+        long invalidId = ir.resolve("discord-not-a-real-code", "");
+        assertEquals(invalidId, 0L);
+    }
+}