diff --git a/src/Discord.Net.Commands/CommandService.cs b/src/Discord.Net.Commands/CommandService.cs
index 814277b04..03e2d2648 100644
--- a/src/Discord.Net.Commands/CommandService.cs
+++ b/src/Discord.Net.Commands/CommandService.cs
@@ -176,12 +176,16 @@ namespace Discord.Commands
                 return false;
         }
 
-        public SearchResult Search(IUserMessage message, int argPos) => Search(message, message.Content.Substring(argPos));
-        public SearchResult Search(IUserMessage message, string input)
+        public SearchResult Search(IUserMessage message, int argPos, bool caseInsensitive = true) => Search(message, message.Content.Substring(argPos), caseInsensitive);
+        public SearchResult Search(IUserMessage message, string input, bool caseInsensitive = true)
         {
-            string lowerInput = input.ToLowerInvariant();
-            var matches = _map.GetCommands(input).ToImmutableArray();
-            
+            ImmutableArray<Command> matches;
+
+            if (caseInsensitive)
+                matches = _map.GetCommands(input.ToLowerInvariant()).ToImmutableArray();
+            else
+                matches = _map.GetCommands(input).ToImmutableArray();
+
             if (matches.Length > 0)
                 return SearchResult.FromSuccess(input, matches);
             else
diff --git a/src/Discord.Net/Extensions/FindEntityExtensions.cs b/src/Discord.Net/Extensions/FindEntityExtensions.cs
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/src/Discord.Net/Extensions/FindEntityExtensions.cs
@@ -0,0 +1 @@
+