diff --git a/src/Core/GeekbotCommandBase.cs b/src/Core/GeekbotCommandBase.cs
index ae964e7..801c53c 100644
--- a/src/Core/GeekbotCommandBase.cs
+++ b/src/Core/GeekbotCommandBase.cs
@@ -1,22 +1,17 @@
-using System.Collections.Generic;
 using System.Globalization;
 using System.Threading;
-using System.Threading.Tasks;
-using Discord;
 using Discord.Commands;
 using Geekbot.Core.Database.Models;
 using Geekbot.Core.ErrorHandling;
 using Geekbot.Core.GuildSettingsManager;
-using Sentry;
 
 namespace Geekbot.Core
 {
-    public class GeekbotCommandBase : ModuleBase<ICommandContext>
+    public class GeekbotCommandBase : TransactionModuleBase
     {
         protected readonly IGuildSettingsManager GuildSettingsManager;
         protected GuildSettingsModel GuildSettings;
         protected readonly IErrorHandler ErrorHandler;
-        protected ITransaction Transaction;
 
         protected GeekbotCommandBase(IErrorHandler errorHandler, IGuildSettingsManager guildSettingsManager)
         {
@@ -28,20 +23,6 @@ namespace Geekbot.Core
         {
             base.BeforeExecute(command);
 
-            // Transaction Setup
-            Transaction = SentrySdk.StartTransaction(new Transaction(command.Name, "Exec"));
-            Transaction.SetTags(new []
-            {
-                new KeyValuePair<string, string>("GuildId", Context.Guild.Id.ToString()),
-                new KeyValuePair<string, string>("Guild", Context.Guild.Name),
-            });
-            Transaction.User = new User()
-            {
-                Id = Context.User.Id.ToString(),
-                Username = Context.User.Username,
-            };
-            
-            // Command Setup
             var setupSpan = Transaction.StartChild("Setup");
             
             GuildSettings = GuildSettingsManager.GetSettings(Context?.Guild?.Id ?? 0);
@@ -50,19 +31,5 @@ namespace Geekbot.Core
             
             setupSpan.Finish();
         }
-
-        protected override void AfterExecute(CommandInfo command)
-        {
-            base.AfterExecute(command);
-            Transaction.Finish();
-        }
-
-        protected override Task<IUserMessage> ReplyAsync(string message = null, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null)
-        {
-            var replySpan = Transaction.StartChild("Reply");
-            var msg = base.ReplyAsync(message, isTTS, embed, options, allowedMentions, messageReference);
-            replySpan.Finish();
-            return msg;
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Core/TransactionModuleBase.cs b/src/Core/TransactionModuleBase.cs
new file mode 100644
index 0000000..111ae18
--- /dev/null
+++ b/src/Core/TransactionModuleBase.cs
@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Discord;
+using Discord.Commands;
+using Sentry;
+
+namespace Geekbot.Core
+{
+    public class TransactionModuleBase : ModuleBase<ICommandContext>
+    {
+        protected ITransaction Transaction;
+
+        protected override void BeforeExecute(CommandInfo command)
+        {
+            base.BeforeExecute(command);
+
+            // Transaction Setup
+            Transaction = SentrySdk.StartTransaction(new Transaction(command.Name, "Exec"));
+            Transaction.SetTags(new []
+            {
+                new KeyValuePair<string, string>("GuildId", Context.Guild.Id.ToString()),
+                new KeyValuePair<string, string>("Guild", Context.Guild.Name),
+            });
+            Transaction.User = new User()
+            {
+                Id = Context.User.Id.ToString(),
+                Username = Context.User.Username,
+            };
+        }
+
+        protected override void AfterExecute(CommandInfo command)
+        {
+            base.AfterExecute(command);
+            Transaction.Finish();
+        }
+
+        protected override Task<IUserMessage> ReplyAsync(string message = null, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null)
+        {
+            var replySpan = Transaction.StartChild("Reply");
+            var msg = base.ReplyAsync(message, isTTS, embed, options, allowedMentions, messageReference);
+            replySpan.Finish();
+            return msg;
+        }
+    }
+}
\ No newline at end of file