new file mode 100644
--- /dev/null
+++ b/scn2k/command_handler.cc
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2009 Thibaut GIRKA <thib@sitedehib.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <map>
+#include <stdlib.h>
+
+#include "scn2k.h"
+
+#define CMDMAP_DEBUG 1
+
+void CommandHandler::RegisterCommand(int cmd1, int cmd2, int cmd3, const char* descr, CmdImpl func)
+{
+	if (descr == NULL && func == NULL)
+		return;
+	SimpleCmd cmd(cmd1, cmd2, cmd3);
+	CommandInfo info;
+	info.function = func;
+	info.descr = descr;
+
+#ifdef CMDMAP_DEBUG
+	CommandMap::iterator it;
+	it = command_map.find(cmd);
+	if (it != command_map.end()) {
+		printf("ERROR: Command '%s' already registered as '%s'!\n", descr, it->second.descr);
+		abort();
+	}
+#endif
+
+	command_map[cmd] = info;
+}
+
+bool CommandHandler::Exec(Cmd &cmd) {
+	CommandMap::iterator it;
+
+	it = command_map.find(cmd);
+	if (it == command_map.end()) {
+		//printf("Unrecognized opcode %d %d %d\n", cmd.cmd1, cmd.cmd2, cmd.cmd3); //Debug
+		return false;
+	}
+	else {
+		CmdImpl func = it->second.function;
+		if (func == NULL) printf("Function %s not implemented yet\n", it->second.descr);
+		else (this->*func)(cmd);
+		return true;
+	}
+}
+