diff --git a/src/console/Client.cpp b/src/console/Client.cpp
index 548010d..8d56b0b 100644
--- a/src/console/Client.cpp
+++ b/src/console/Client.cpp
@@ -1,10 +1,24 @@
 #include "console/Client.hpp"
-#include "CVar.hpp"
+#include "CommandHandlers.hpp"
+#include "console/CVar.hpp"
+#include "console/Command.hpp"
 
 static const char* s_filename;
 
+void ConsoleInitializeCommonCommand() {
+    ConsoleCommandRegister("quit",      ConsoleCommand_Quit,    DEFAULT,    NOHELP);
+    ConsoleCommandRegister("ver",       ConsoleCommand_Ver,     DEFAULT,    NOHELP);
+    ConsoleCommandRegister("setmap",    ConsoleCommand_SetMap,  DEFAULT,    NOHELP);
+}
+
+void ConsoleInitializeDebugCommand() {
+    // Unknown without debug build
+}
+
 void ConsoleInitializeClientCommand() {
-    // TODO
+    ConsoleCommandInitialize();
+    ConsoleInitializeCommonCommand();
+    ConsoleInitializeDebugCommand();
 }
 
 void ConsoleInitializeClientCVar(const char* filename) {
diff --git a/src/console/Client.hpp b/src/console/Client.hpp
index 3ace87d..1a04b92 100644
--- a/src/console/Client.hpp
+++ b/src/console/Client.hpp
@@ -3,6 +3,6 @@
 
 void ConsoleInitializeClientCommand();
 
-void ConsoleInitializeClientCVar(const char* a1);
+void ConsoleInitializeClientCVar(const char* filename);
 
 #endif
diff --git a/src/console/Command.cpp b/src/console/Command.cpp
index 0d31b38..22ee9dd 100644
--- a/src/console/Command.cpp
+++ b/src/console/Command.cpp
@@ -1,4 +1,5 @@
 #include "console/Command.hpp"
+#include "console/CommandHandlers.hpp"
 #include <storm/Error.hpp>
 
 int32_t ValidateFileName(const char* filename) {
@@ -68,19 +69,3 @@ void ConsoleCommandUnregister(const char* command) {
         }
     }
 }
-
-int32_t ConsoleCommand_Help(const char* command, const char* arguments) {
-    // TODO
-    return 0;
-}
-
-int32_t ConsoleCommand_Quit(const char* command, const char* arguments) {
-    // TODO
-    // ConsolePostClose()
-    return 0;
-}
-
-int32_t ConsoleCommand_Ver(const char* command, const char* arguments) {
-    // TODO
-    return 0;
-}
diff --git a/src/console/Command.hpp b/src/console/Command.hpp
index 11f67a8..05d71c5 100644
--- a/src/console/Command.hpp
+++ b/src/console/Command.hpp
@@ -48,10 +48,4 @@ int32_t ConsoleCommandRegister(const char* command, int32_t (*handler)(const cha
 
 void ConsoleCommandUnregister(const char* command);
 
-int32_t ConsoleCommand_Help(const char* command, const char* arguments);
-
-int32_t ConsoleCommand_Quit(const char* command, const char* arguments);
-
-int32_t ConsoleCommand_Ver(const char* command, const char* arguments);
-
 #endif
diff --git a/src/console/CommandHandlers.cpp b/src/console/CommandHandlers.cpp
new file mode 100644
index 0000000..4ce918c
--- /dev/null
+++ b/src/console/CommandHandlers.cpp
@@ -0,0 +1,24 @@
+#include "console/CommandHandlers.hpp"
+
+int32_t ConsoleCommand_Help(const char* command, const char* arguments) {
+    // TODO
+
+    return 0;
+}
+
+int32_t ConsoleCommand_Quit(const char* command, const char* arguments) {
+    // TODO
+    // ConsolePostClose()
+
+    return 0;
+}
+
+int32_t ConsoleCommand_SetMap(const char* command, const char* arguments) {
+    return 1;
+}
+
+int32_t ConsoleCommand_Ver(const char* command, const char* arguments) {
+    // TODO
+
+    return 0;
+}
diff --git a/src/console/CommandHandlers.hpp b/src/console/CommandHandlers.hpp
new file mode 100644
index 0000000..910dbfb
--- /dev/null
+++ b/src/console/CommandHandlers.hpp
@@ -0,0 +1,14 @@
+#ifndef CONSOLE_COMMAND_HANDLERS_HPP
+#define CONSOLE_COMMAND_HANDLERS_HPP
+
+#include <cstdint>
+
+int32_t ConsoleCommand_Help(const char* command, const char* arguments);
+
+int32_t ConsoleCommand_Quit(const char* command, const char* arguments);
+
+int32_t ConsoleCommand_SetMap(const char* command, const char* arguments);
+
+int32_t ConsoleCommand_Ver(const char* command, const char* arguments);
+
+#endif