diff --git a/src/client/component/binding.cpp b/src/client/component/binding.cpp
index 4013ca12..153377b2 100644
--- a/src/client/component/binding.cpp
+++ b/src/client/component/binding.cpp
@@ -1 +1,138 @@
-#include <std_include.hpp>
\ No newline at end of file
+#include <std_include.hpp>
+#include "loader/component_loader.hpp"
+#include "game/game.hpp"
+
+#include <utils/hook.hpp>
+#include <utils/string.hpp>
+
+namespace binding
+{
+	namespace
+	{
+		std::vector<std::string> custom_binds = {};
+
+		utils::hook::detour cl_execute_key_hook;
+
+		int get_num_keys()
+		{
+			return SELECT_VALUE(102, 103);
+		}
+
+		int key_write_bindings_to_buffer_stub(int /*localClientNum*/, char* buffer, const int buffer_size)
+		{
+			auto bytes_used = 0;
+			const auto buffer_size_align = static_cast<std::int32_t>(buffer_size) - 4;
+
+			for (auto key_index = 0; key_index < 256; ++key_index)
+			{
+				const auto* const key_button = game::Key_KeynumToString(key_index, 0, 1);
+				auto value = game::playerKeys->keys[key_index].binding;
+
+				if (value && value < get_num_keys())
+				{
+					const auto len = sprintf_s(&buffer[bytes_used], (buffer_size_align - bytes_used),
+						"bind %s \"%s\"\n", key_button, game::command_whitelist[value]);
+
+					if (len < 0)
+					{
+						return bytes_used;
+					}
+
+					bytes_used += len;
+				}
+				else if (value >= get_num_keys())
+				{
+					value -= get_num_keys();
+					if (static_cast<size_t>(value) < custom_binds.size() && !custom_binds[value].empty())
+					{
+						const auto len = sprintf_s(&buffer[bytes_used], (buffer_size_align - bytes_used),
+							"bind %s \"%s\"\n", key_button, custom_binds[value].data());
+
+						if (len < 0)
+						{
+							return bytes_used;
+						}
+
+						bytes_used += len;
+					}
+				}
+			}
+
+			buffer[bytes_used] = 0;
+			return bytes_used;
+		}
+
+		int get_binding_for_custom_command(const char* command)
+		{
+			auto index = 0;
+			for (auto& bind : custom_binds)
+			{
+				if (bind == command)
+				{
+					return index;
+				}
+				index++;
+			}
+
+			custom_binds.emplace_back(command);
+			index = static_cast<unsigned int>(custom_binds.size()) - 1;
+
+			return index;
+		}
+
+		int key_get_binding_for_cmd_stub(const char* command)
+		{
+			// original binds
+			for (auto i = 0; i <= get_num_keys(); i++)
+			{
+				if (game::command_whitelist[i] && !strcmp(command, game::command_whitelist[i]))
+				{
+					return i;
+				}
+			}
+
+			// custom binds
+			return get_num_keys() + get_binding_for_custom_command(command);
+		}
+
+		void cl_execute_key_stub(const int local_client_num, int key, const int down, const int time)
+		{
+			if (key >= get_num_keys())
+			{
+				key -= get_num_keys();
+
+				if (static_cast<size_t>(key) < custom_binds.size() && !custom_binds[key].empty())
+				{
+					game::Cbuf_AddText(local_client_num, utils::string::va("%s\n", custom_binds[key].data()));
+				}
+
+				return;
+			}
+
+			cl_execute_key_hook.invoke<void>(local_client_num, key, down, time);
+		}
+	}
+
+	class component final : public component_interface
+	{
+	public:
+		void post_unpack() override
+		{
+			if (game::environment::is_dedi())
+			{
+				return;
+			}
+
+			// write all bindings to config file
+			utils::hook::call(SELECT_VALUE(0x1401881DB, 0x14025032F), key_write_bindings_to_buffer_stub); // H1(1.4)
+
+			// links a custom command to an index
+			utils::hook::jump(SELECT_VALUE(0x140343C00, 0x1404041E0), key_get_binding_for_cmd_stub); // H1(1.4)
+
+			// execute custom binds
+			cl_execute_key_hook.create(SELECT_VALUE(0x140183C70, 0x14024ACF0), &cl_execute_key_stub); // H1(1.4)
+		}
+	};
+}
+
+REGISTER_COMPONENT(binding::component)
\ No newline at end of file
diff --git a/src/client/game/symbols.hpp b/src/client/game/symbols.hpp
index 4634bdb4..8baaf149 100644
--- a/src/client/game/symbols.hpp
+++ b/src/client/game/symbols.hpp
@@ -209,7 +209,7 @@ namespace game
 	WEAK symbol<CmdArgs> sv_cmd_args{ 0, 0x14946BA20 }; // H1(1.4)
 
 
-	WEAK symbol<const char*> command_whitelist{ 0x141079A60, 0x14120C6D0 }; // H1(1.4)
+	WEAK symbol<const char*> command_whitelist{ 0x141079A60, 0x14120C360 }; // H1(1.4)
 
 	WEAK symbol<const char*> g_assetNames{ 0, 0x140BEF280 };
 	WEAK symbol<int> g_poolSize{ 0, 0x140FEADF0 }; // H1(1.4)