diff --git a/src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java b/src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java
new file mode 100644
index 0000000..226f93f
--- /dev/null
+++ b/src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java
@@ -0,0 +1,21 @@
+package buttondevteam.discordplugin.commands;
+
+import sx.blah.discord.handle.obj.IMessage;
+
+public class ConnectCommand extends DiscordCommandBase {
+
+	@Override
+	public String getCommandName() {
+		return "connect";
+	}
+
+	@Override
+	public void run(IMessage message, String args) { // TODO: Throws?
+		try {
+			message.getChannel().sendMessage("Connect command WIP.");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+}
diff --git a/src/main/java/buttondevteam/discordplugin/commands/DiscordCommandBase.java b/src/main/java/buttondevteam/discordplugin/commands/DiscordCommandBase.java
index 2c4d685..a814b78 100644
--- a/src/main/java/buttondevteam/discordplugin/commands/DiscordCommandBase.java
+++ b/src/main/java/buttondevteam/discordplugin/commands/DiscordCommandBase.java
@@ -1,7 +1,20 @@
 package buttondevteam.discordplugin.commands;
 
+import java.util.HashMap;
+
+import sx.blah.discord.handle.obj.IMessage;
+
 public abstract class DiscordCommandBase {
 	public abstract String getCommandName();
 
-	public abstract void Run();
+	public abstract void run(IMessage message, String args);
+
+	private static final HashMap<String, DiscordCommandBase> commands = new HashMap<String, DiscordCommandBase>();
+	static {
+		commands.put("connect", new ConnectCommand()); // TODO: API for adding commands?
+	}
+
+	public static final void runCommand(IMessage message) {
+
+	}
 }