diff --git a/Cargo.toml b/Cargo.toml
index aabe7fe..080237f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,7 @@
 [workspace]
 members = [
     "arma/server/extension",
+    "bin/icom",
     "lib/models",
     "lib/repositories",
     "lib/services",
diff --git a/README.md b/README.md
index 0ae66ab..7d1392a 100644
--- a/README.md
+++ b/README.md
@@ -271,13 +271,13 @@ Logs are automatically created in `@forge_server/logs/`:
 
 ## License
 
-[Your License Here]
+View the License [here](LICENSE.md).
 
 ## Support
 
 - **Issues**: [Gitea Issues](https://gitea.innovativedevsolutions.org/IDSolutions/forge/issues)
 - **Documentation**: See individual module READMEs
-- **Architecture**: [FORGE_Architecture_Diagram.md](FORGE_Architecture_Diagram.md)
+- **Architecture**: [Diagram](Architecture_Diagram.md)
 
 ## Roadmap
 
diff --git a/arma/client/.hemtt/launch.toml b/arma/client/.hemtt/launch.toml
index 1e2e390..136dc12 100644
--- a/arma/client/.hemtt/launch.toml
+++ b/arma/client/.hemtt/launch.toml
@@ -3,11 +3,19 @@ workshop = [
     "450814997",  # CBA_A3
     "3499977893", # Advanced Dev Tools
     "623475643",  # 3DEN Enhanced
+    "3023395342", # 3DEN Attributes Fast Load
 ]
 presets = []
 dlc = []
 optionals = []
-parameters = []
+parameters = [
+    "-skipIntro",
+    "-noSplash",
+    "-showScriptErrors",
+    "-debug",
+    "-filePatching",
+    "-world=empty",
+]
 
 [ace]
 extends = "default"
diff --git a/arma/client/.hemtt/project.toml b/arma/client/.hemtt/project.toml
index 7c308fc..1beed3e 100644
--- a/arma/client/.hemtt/project.toml
+++ b/arma/client/.hemtt/project.toml
@@ -11,10 +11,10 @@ git_hash = 0
 include = [
     "mod.cpp",
     "meta.cpp",
-    "logo_forge_client.png",
-    "logo_forge_client_over.png",
-    "logo_forge_client_ca.paa",
-    "logo_forge_client_over_ca.paa",
+    "icon_64_ca.paa",
+    "icon_128_ca.paa",
+    "icon_128_highlight_ca.paa",
+    "title_ca.paa",
     "LICENSE.md",
     "README.md",
 ]
diff --git a/arma/client/addons/actor/XEH_postInitClient.sqf b/arma/client/addons/actor/XEH_postInitClient.sqf
index d22f14d..df53600 100644
--- a/arma/client/addons/actor/XEH_postInitClient.sqf
+++ b/arma/client/addons/actor/XEH_postInitClient.sqf
@@ -8,21 +8,52 @@ removeBackpack player;
 removeGoggles player;
 removeHeadgear player;
 
-SETPVAR(player,FORGE_actorIsLoaded,false);
+SETPVAR(player,FORGE_isLoaded,false);
 cutText ["Loading In...", "BLACK", 1];
 
+player addEventHandler ["Killed", {
+    params ["_unit", "_killer", "_instigator", "_useEffects"];
+    [SRPC(economy,onKilled), [_unit]] call CFUNC(serverEvent);
+}];
+
+player addEventHandler ["Respawn", {
+    params ["_unit", "_corpse"];
+
+    private _uid = getPlayerUID player;
+    [SRPC(economy,onRespawn), [_unit, _corpse, _uid]] call CFUNC(serverEvent);
+}];
+
 if (isNil QGVAR(ActorClass)) then { [] call FUNC(initActorClass); };
 
 [QGVAR(initActor), {
     GVAR(ActorClass) call ["init", []];
 }] call CFUNC(addEventHandler);
 
+[QGVAR(onActorRespawn), {
+    params [["_loadout", [], [[]]], ["_medSpawnPos", [0,0,0], [[]]], ["_medSpawnDir", 0, [0]]];
+
+    private _message = ["warning", "Medical Alert", "You have been revived at a medical facility.", 5000];
+    EGVAR(notifications,NotificationClass) call ["create", _message];
+
+    player setUnitLoadout _loadout;
+    player setPosATL _medSpawnPos;
+    player setDir _medSpawnDir;
+    player switchMove "Acts_LyingWounded_loop";
+
+    ["Initialize", [player, [], false, true, true, true, true, true, false, false]] call BFUNC(EGSpectator);
+
+    [SRPC(economy,onHealed), [player]] call CFUNC(serverEvent);
+}] call CFUNC(addEventHandler);
+
+[QGVAR(onActorHealed), {
+    player switchMove "";
+    ["Terminate"] call BFUNC(EGSpectator);
+}] call CFUNC(addEventHandler);
+
 [QGVAR(responseInitActor), {
     params [["_data", createHashMap, [createHashMap]]];
 
     GVAR(ActorClass) call ["sync", [_data, true]];
-
-    SETPVAR(player,FORGE_isLoaded,true);
     cutText ["", "PLAIN", 1];
 }] call CFUNC(addEventHandler);
 
@@ -35,7 +66,7 @@ if (isNil QGVAR(ActorClass)) then { [] call FUNC(initActorClass); };
 [QGVAR(initActor), []] call CFUNC(localEvent);
 
 [{
-    GETVAR(player,FORGE_actorIsLoaded,false)
+    GETVAR(player,FORGE_isLoaded,false)
 }, {
     private _holster = GVAR(ActorClass) call ["get", ["holster", true]];
     if (_holster) then { [player] call AFUNC(weaponselect,putWeaponAway); };
diff --git a/arma/client/addons/actor/XEH_preInit.sqf b/arma/client/addons/actor/XEH_preInit.sqf
index 8d45ad6..630ca03 100644
--- a/arma/client/addons/actor/XEH_preInit.sqf
+++ b/arma/client/addons/actor/XEH_preInit.sqf
@@ -8,3 +8,18 @@ private _category = [QUOTE(MOD_NAME), LLSTRING(displayName)];
 
 #include "initSettings.inc.sqf"
 #include "initKeybinds.inc.sqf"
+
+["ace_refuel_started", {
+    params ["_source", "_target", "", "_unit"];
+    [SRPC(economy,FuelStart), [_source, _target, _unit]] call CFUNC(serverEvent);
+}] call CFUNC(addEventHandler);
+
+["ace_refuel_tick", {
+    params ["_source", "_target", "_amount"];
+    [SRPC(economy,FuelTick), [_source, _target, _amount]] call CFUNC(serverEvent);
+}] call CFUNC(addEventHandler);
+
+["ace_refuel_stopped", {
+    params ["_source", "_target"];
+    [SRPC(economy,FuelStop), [_source, _target]] call CFUNC(serverEvent);
+}] call CFUNC(addEventHandler);
diff --git a/arma/client/addons/actor/functions/fnc_handleUIEvents.sqf b/arma/client/addons/actor/functions/fnc_handleUIEvents.sqf
index bcde6ec..415a5f2 100644
--- a/arma/client/addons/actor/functions/fnc_handleUIEvents.sqf
+++ b/arma/client/addons/actor/functions/fnc_handleUIEvents.sqf
@@ -27,12 +27,14 @@ diag_log format ["[FORGE:Client:Actor] Handling UI event: %1 with data: %2", _ev
 
 switch (_event) do {
     case "actor::get::actions": { GVAR(ActorClass) call ["getNearbyActions", [_control]]; };
-    // case "actor::open::bank": { [] spawn EFUNC(bank,openUI); };
+    case "actor::open::atm": { [true] spawn EFUNC(bank,openUI); };
     case "actor::open::bank": { [] spawn EFUNC(bank,openUI); };
     case "actor::open::device": { hint "Device interaction is not yet implemented."; };                           // TODO: Implement device interaction
     case "actor::open::garage": { hint "Garage interaction is not yet implemented."; };                           // TODO: Implement garage interaction
+    case "actor::open::vgarage": { [] spawn EFUNC(garage,openVG); };
     case "actor::open::org": { [] spawn EFUNC(org,openUI); };
     case "actor::open::locker": { hint "Locker interaction is not yet implemented."; };                           // TODO: Implement locker interaction
+    case "actor::open::vlocker": { ["Open", [false, FORGE_Locker_Box, player]] spawn BFUNC(arsenal) };
     // case "actor::open::phone": { [] spawn EFUNC(phone,openUI) };
     case "actor::open::phone": { hint "Phone interaction is not yet implemented."; };                             // TODO: Implement phone interaction
     case "actor::open::iplayer": { hint "Player interaction is not yet implemented." };                           // TODO: Implement player interaction
diff --git a/arma/client/addons/actor/functions/fnc_initActorClass.sqf b/arma/client/addons/actor/functions/fnc_initActorClass.sqf
index b0119ec..1e008cc 100644
--- a/arma/client/addons/actor/functions/fnc_initActorClass.sqf
+++ b/arma/client/addons/actor/functions/fnc_initActorClass.sqf
@@ -64,7 +64,6 @@ GVAR(ActorClass) = createHashMapObject [[
         private _actor = _self get "actor";
         private _isLoaded = _self get "isLoaded";
 
-        if !(_isLoaded) then { _self set ["isLoaded", true]; };
         if (_data isEqualTo createHashMap) exitWith {
             diag_log "[FORGE:Client:Actor] Empty data received for sync, skipping.";
         };
@@ -82,12 +81,12 @@ GVAR(ActorClass) = createHashMapObject [[
                     default {};
                 };
             };
-
         } forEach _data;
 
         _self set ["actor", _actor];
+        SETPVAR(player,FORGE_isLoaded,true);
 
-        SETPVAR(player,FORGE_actorIsLoaded,true);
+        if !(_isLoaded) then { _self set ["isLoaded", true]; };
         diag_log "[FORGE:Client:Actor] Sync completed";
     }],
     ["get", {
diff --git a/arma/client/addons/actor/initSettings.inc.sqf b/arma/client/addons/actor/initSettings.inc.sqf
index 3ff3391..08775e9 100644
--- a/arma/client/addons/actor/initSettings.inc.sqf
+++ b/arma/client/addons/actor/initSettings.inc.sqf
@@ -14,11 +14,11 @@
 [
     QGVAR(enableVA), "CHECKBOX",
     [LSTRING(enableVA), LSTRING(enableVATooltip)],
-    _category, false, true
+    _category, true, true
 ] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableVG), "CHECKBOX",
     [LSTRING(enableVG), LSTRING(enableVGTooltip)],
-    _category, false, true
+    _category, true, true
 ] call CBA_fnc_addSetting;
diff --git a/arma/client/addons/actor/ui/_site/script.js b/arma/client/addons/actor/ui/_site/script.js
index 7f0a62f..88b4334 100644
--- a/arma/client/addons/actor/ui/_site/script.js
+++ b/arma/client/addons/actor/ui/_site/script.js
@@ -47,6 +47,13 @@ const actions = {
 //=============================================================================
 
 const baseMenuItems = [
+    {
+        id: "atm",
+        title: "ATM",
+        description: "Access the ATM",
+        icon: "",
+        action: "actor::open::atm",
+    },
     {
         id: "bank",
         title: "Banking Services",
@@ -111,7 +118,7 @@ const actionDefinitions = {
         title: "Virtual Arsenal",
         description: "Access your virtual arsenal",
         icon: "",
-        action: "actor::open::arsenal",
+        action: "actor::open::vlocker",
     },
     vg: {
         id: "vg",
@@ -141,7 +148,7 @@ function actorReducer(state = initialState, action) {
             actionArray.forEach((actionItem) => {
                 if (Array.isArray(actionItem) && actionItem.length === 2) {
                     const [type, value] = actionItem;
-                    const definition = state.actionDefinitions[value];
+                    const definition = state.actionDefinitions[type];
                     if (definition) {
                         newMenuItems.push(definition);
                     } else {
diff --git a/arma/client/addons/bank/XEH_postInitClient.sqf b/arma/client/addons/bank/XEH_postInitClient.sqf
index 92b0995..ee3a2c2 100644
--- a/arma/client/addons/bank/XEH_postInitClient.sqf
+++ b/arma/client/addons/bank/XEH_postInitClient.sqf
@@ -10,9 +10,6 @@ if (isNil QGVAR(BankClass)) then { [] call FUNC(initBankClass); };
     params [["_data", createHashMap, [createHashMap]]];
 
     GVAR(BankClass) call ["sync", [_data, true]];
-
-    SETPVAR(player,FORGE_isLoaded,true);
-    cutText ["", "PLAIN", 1];
 }] call CFUNC(addEventHandler);
 
 [QGVAR(responseSyncBank), {
diff --git a/arma/client/addons/bank/config.cpp b/arma/client/addons/bank/config.cpp
index efc69e3..bce4c33 100644
--- a/arma/client/addons/bank/config.cpp
+++ b/arma/client/addons/bank/config.cpp
@@ -3,7 +3,7 @@
 class CfgPatches {
     class ADDON {
         author = AUTHOR;
-        authors[] = {"J.Schmidt"};
+        authors[] = {"IDSolutions"};
         url = ECSTRING(main,url);
         name = COMPONENT_NAME;
         requiredVersion = REQUIRED_VERSION;
diff --git a/arma/client/addons/bank/functions/fnc_handleUIEvents.sqf b/arma/client/addons/bank/functions/fnc_handleUIEvents.sqf
index 6ac4f9a..0d0ec69 100644
--- a/arma/client/addons/bank/functions/fnc_handleUIEvents.sqf
+++ b/arma/client/addons/bank/functions/fnc_handleUIEvents.sqf
@@ -23,11 +23,89 @@ private _event = _alert get "event";
 private _data = _alert get "data";
 private _display = displayChild findDisplay 46;
 
+private _uid = GVAR(BankClass) get "uid";
+private _account = GVAR(BankClass) get "account";
+private _cash = _account get "cash";
+private _bank = _account get "bank";
+private _pin = _account get "pin";
+
 diag_log format ["[FORGE:Client:Bank] Handling UI event: %1 with data: %2", _event, _data];
 
 switch (_event) do {
-    case "bank::close": { _display closeDisplay 1; };
-    default { hint format ["Unhandled UI event: %1", _event]; };
+    // ========================================================================
+    // DATA REQUESTS
+    // ========================================================================
+    case "bank::sync": {
+        private _org = 0; // TODO: Get org balance
+        private _players = SREG(bank,NameRegistry);
+        private _accountData = createHashMapFromArray [
+            ["uid", _uid],
+            ["cash", _cash],
+            ["bank", _bank],
+            ["org", _org],
+            ["pin", _pin],
+            ["players", _players]
+        ];
+
+        _control ctrlWebBrowserAction ["ExecJS", format ["syncDataFromArma(%1)", toJSON _accountData]];
+    };
+
+    // ========================================================================
+    // BANK OPERATIONS
+    // ========================================================================
+    case "bank::deposit": {
+        private _amount = _data get "amount";
+        if (_amount > _cash) exitWith { hint "Insufficient cash!"; };
+
+        [SRPC(bank,requestDeposit), [_uid, _amount]] call CFUNC(serverEvent);
+    };
+    case "bank::withdraw": {
+        private _amount = _data get "amount";
+        if (_amount > _bank) exitWith { hint "Insufficient funds!"; };
+
+        [SRPC(bank,requestWithdraw), [_uid, _amount]] call CFUNC(serverEvent);
+    };
+    case "bank::transfer": {
+        private _amount = _data get "amount";
+        private _from = _data get "from";
+        private _target = _data get "target";
+
+        // Prevent self-transfers
+        if (_target isEqualTo _uid) exitWith {
+            hint "Cannot transfer to yourself!";
+            diag_log "[FORGE:Client:Bank] Attempted self-transfer blocked";
+        };
+
+        private _fromAmount = _account get _from;
+        if (_amount > _fromAmount) exitWith { hint "Insufficient funds!"; };
+
+        [SRPC(bank,requestTransfer), [_uid, _target, _from, _amount]] call CFUNC(serverEvent);
+    };
+    case "bank::close": {
+        _display closeDisplay 1;
+    };
+
+    // ========================================================================
+    // ATM OPERATIONS
+    // ========================================================================
+    case "atm::withdraw": {
+        private _amount = _data get "amount";
+        if (_amount > _bank) exitWith { hint "Insufficient funds!"; };
+
+        [SRPC(bank,requestWithdraw), [_uid, _amount]] call CFUNC(serverEvent);
+    };
+    case "atm::deposit": {
+        private _amount = _data get "amount";
+        if (_amount > _cash) exitWith { hint "Insufficient cash!"; };
+
+        [SRPC(bank,requestDeposit), [_uid, _amount]] call CFUNC(serverEvent);
+    };
+    case "atm::close": {
+        _display closeDisplay 1;
+    };
+    default {
+        diag_log format ["[FORGE:Client:Bank] Unhandled UI event: %1", _event];
+    };
 };
 
 true;
diff --git a/arma/client/addons/bank/functions/fnc_initBankClass.sqf b/arma/client/addons/bank/functions/fnc_initBankClass.sqf
index edd6258..6776935 100644
--- a/arma/client/addons/bank/functions/fnc_initBankClass.sqf
+++ b/arma/client/addons/bank/functions/fnc_initBankClass.sqf
@@ -25,19 +25,14 @@ GVAR(BankClass) = createHashMapObject [[
         _self set ["isLoaded", false];
         _self set ["lastSave", time];
 
-        private _actor = EGVAR(actor,ActorClass) get "actor";
-        private _phone_number = _actor get "phone_number";
-        private _email = _actor get "email";
-
         private _account = createHashMap;
         _account set ["uid", (getPlayerUID player)];
         _account set ["name", (name player)];
         _account set ["bank", 0];
         _account set ["cash", 0];
         _account set ["earnings", 0];
+        _account set ["pin", 1234];
         _account set ["transactions", []];
-        _account set ["phone_number", _phone_number];
-        _account set ["email", _email];
 
         _self set ["account", _account];
     }],
@@ -64,7 +59,6 @@ GVAR(BankClass) = createHashMapObject [[
         private _account = _self get "account";
         private _isLoaded = _self get "isLoaded";
 
-        if !(_isLoaded) then { _self set ["isLoaded", true]; };
         if (_data isEqualTo createHashMap) exitWith {
             diag_log "[FORGE:Client:Bank] Empty data received for sync, skipping.";
         };
@@ -74,6 +68,8 @@ GVAR(BankClass) = createHashMapObject [[
         } forEach _data;
 
         _self set ["account", _account];
+
+        if !(_isLoaded) then { _self set ["isLoaded", true]; };
         diag_log "[FORGE:Client:Bank] Sync completed";
     }],
     ["get", {
diff --git a/arma/client/addons/bank/functions/fnc_openUI.sqf b/arma/client/addons/bank/functions/fnc_openUI.sqf
index bf40ab3..6a65db4 100644
--- a/arma/client/addons/bank/functions/fnc_openUI.sqf
+++ b/arma/client/addons/bank/functions/fnc_openUI.sqf
@@ -16,6 +16,8 @@
  * Public: No
  */
 
+params [["_isATM", false, [false]]];
+
 private _display = (findDisplay 46) createDisplay "RscBank";
 private _ctrl = (_display displayCtrl 1002);
 
@@ -25,7 +27,11 @@ _ctrl ctrlAddEventHandler ["JSDialog", {
     [_control, _isConfirmDialog, _message] call FUNC(handleUIEvents);
 }];
 
-_ctrl ctrlWebBrowserAction ["LoadFile", QPATHTOF2(ui\_site\index.html)];
+if (_isATM) then {
+    _ctrl ctrlWebBrowserAction ["LoadFile", QPATHTOF2(ui\_site\atm.html)];
+} else {
+    _ctrl ctrlWebBrowserAction ["LoadFile", QPATHTOF2(ui\_site\bank.html)];
+};
 // _ctrl ctrlWebBrowserAction ["OpenDevConsole"];
 
 true;
diff --git a/arma/client/addons/bank/ui/_site/atm.html b/arma/client/addons/bank/ui/_site/atm.html
index 6fba7a5..42b5df9 100644
--- a/arma/client/addons/bank/ui/_site/atm.html
+++ b/arma/client/addons/bank/ui/_site/atm.html
@@ -5,7 +5,8 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>ATM</title>
-    <link rel="stylesheet" href="atm.css" />
+    <!-- <script src="store.js"></script> -->
+    <!-- <link rel="stylesheet" href="atm.css" /> -->
     <!--
         Dynamic Resource Loading
         The following script loads CSS and JavaScript files dynamically using the A3API
@@ -14,19 +15,26 @@
     <script>
         Promise.all([
             A3API.RequestFile(
-                "forge\\forge_client\\addons\\actor\\ui\\_site\\atm.css",
+                "forge\\forge_client\\addons\\bank\\ui\\_site\\atm.css",
             ),
             A3API.RequestFile(
-                "forge\\forge_client\\addons\\actor\\ui\\_site\\atm.js",
+                "forge\\forge_client\\addons\\bank\\ui\\_site\\store.js",
             ),
-        ]).then(([css, js]) => {
+            A3API.RequestFile(
+                "forge\\forge_client\\addons\\bank\\ui\\_site\\atm.js",
+            ),
+        ]).then(([css, storeJs, atmJs]) => {
             const style = document.createElement("style");
             style.textContent = css;
             document.head.appendChild(style);
 
-            const script = document.createElement("script");
-            script.text = js;
-            document.head.appendChild(script);
+            const store = document.createElement("script");
+            store.text = storeJs;
+            document.head.appendChild(store);
+
+            const atm = document.createElement("script");
+            atm.text = atmJs;
+            document.head.appendChild(atm);
         });
     </script>
 </head>
@@ -64,19 +72,8 @@
                             <span class="pin-dot"></span>
                             <span class="pin-dot"></span>
                         </div>
-                        <div class="keypad">
-                            <button class="key-btn" onclick="enterPin('1')">1</button>
-                            <button class="key-btn" onclick="enterPin('2')">2</button>
-                            <button class="key-btn" onclick="enterPin('3')">3</button>
-                            <button class="key-btn" onclick="enterPin('4')">4</button>
-                            <button class="key-btn" onclick="enterPin('5')">5</button>
-                            <button class="key-btn" onclick="enterPin('6')">6</button>
-                            <button class="key-btn" onclick="enterPin('7')">7</button>
-                            <button class="key-btn" onclick="enterPin('8')">8</button>
-                            <button class="key-btn" onclick="enterPin('9')">9</button>
-                            <button class="key-btn key-clear" onclick="clearPin()">Clear</button>
-                            <button class="key-btn" onclick="enterPin('0')">0</button>
-                            <button class="key-btn key-enter" onclick="submitPin()">Enter</button>
+                        <div class="keypad" id="keypad">
+                            <!-- Keypad buttons will be generated by JavaScript -->
                         </div>
                     </div>
                 </div>
@@ -95,19 +92,15 @@
                     </div>
                     <div class="menu-options">
                         <button class="menu-btn" onclick="showView('withdrawView')">
-                            <!-- <span class="menu-icon">💵</span> -->
                             <span class="menu-text">Withdraw</span>
                         </button>
-                        <button class="menu-btn" onclick="showView('depositView')">
-                            <!-- <span class="menu-icon">💰</span> -->
-                            <span class="menu-text">Deposit</span>
-                        </button>
-                        <button class="menu-btn" onclick="showView('transferView')">
-                            <!-- <span class="menu-icon">↔️</span> -->
-                            <span class="menu-text">Transfer</span>
-                        </button>
+                        <!-- <button class="menu-btn" onclick="showView('depositView')"> -->
+                        <!-- <span class="menu-text">Deposit</span> -->
+                        <!-- </button> -->
+                        <!-- <button class="menu-btn" onclick="showView('transferView')"> -->
+                        <!-- <span class="menu-text">Transfer</span> -->
+                        <!-- </button> -->
                         <button class="menu-btn" onclick="showView('balanceView')">
-                            <!-- <span class="menu-icon">📊</span> -->
                             <span class="menu-text">Balance</span>
                         </button>
                     </div>
@@ -143,7 +136,7 @@
                 </div>
 
                 <!-- Deposit Screen -->
-                <div class="atm-view" id="depositView" style="display: none;">
+                <!-- <div class="atm-view" id="depositView" style="display: none;">
                     <h3>Deposit Cash</h3>
                     <div class="deposit-display">
                         <div class="deposit-info">
@@ -166,10 +159,10 @@
                             Back
                         </button>
                     </div>
-                </div>
+                </div> -->
 
                 <!-- Transfer Screen -->
-                <div class="atm-view" id="transferView" style="display: none;">
+                <!-- <div class="atm-view" id="transferView" style="display: none;">
                     <h3>Transfer Funds</h3>
                     <div class="transfer-display">
                         <div class="transfer-form">
@@ -193,7 +186,7 @@
                             Back
                         </button>
                     </div>
-                </div>
+                </div> -->
 
                 <!-- Balance Screen -->
                 <div class="atm-view" id="balanceView" style="display: none;">
@@ -236,7 +229,7 @@
                         <h3>Transaction Failed</h3>
                         <p id="errorMessage">An error occurred</p>
                     </div>
-                    <button class="atm-btn atm-btn-secondary" onclick="showView('menuView')">
+                    <button class="atm-btn atm-btn-secondary" onclick="goBackFromError()">
                         Back
                     </button>
                 </div>
@@ -249,7 +242,7 @@
         </div>
     </div>
 
-    <script src="atm.js"></script>
+    <!-- <script src="atm.js"></script> -->
 </body>
 
 </html>
diff --git a/arma/client/addons/bank/ui/_site/atm.js b/arma/client/addons/bank/ui/_site/atm.js
index 89ed2df..2ec2fb6 100644
--- a/arma/client/addons/bank/ui/_site/atm.js
+++ b/arma/client/addons/bank/ui/_site/atm.js
@@ -3,18 +3,17 @@
  * Handles banking transactions with PIN authentication
  */
 
-// Mock data
-const mockData = {
-    cash: 2500,
-    bank: 45750,
-    pin: '1234' // For demo purposes
-};
+// ============================================================================
+// STATE
+// ============================================================================
 
-// State
 let enteredPin = '';
 let currentView = 'welcomeView';
+let previousView = 'welcomeView';
+// ============================================================================
+// VIEW MANAGEMENT
+// ============================================================================
 
-// View Management
 function showView(viewId) {
     // Hide all views
     document.querySelectorAll('.atm-view').forEach(view => {
@@ -25,6 +24,7 @@ function showView(viewId) {
     const view = document.getElementById(viewId);
     if (view) {
         view.style.display = 'flex';
+        previousView = currentView;
         currentView = viewId;
 
         // Update balance displays when showing certain views
@@ -34,7 +34,52 @@ function showView(viewId) {
     }
 }
 
-// PIN Entry
+// ============================================================================
+// PIN AUTHENTICATION
+// ============================================================================
+
+function generateKeypad() {
+    const keypad = document.getElementById('keypad');
+    if (!keypad) return;
+
+    // Define keypad layout
+    const keys = [
+        { value: '1', label: '1', type: 'number' },
+        { value: '2', label: '2', type: 'number' },
+        { value: '3', label: '3', type: 'number' },
+        { value: '4', label: '4', type: 'number' },
+        { value: '5', label: '5', type: 'number' },
+        { value: '6', label: '6', type: 'number' },
+        { value: '7', label: '7', type: 'number' },
+        { value: '8', label: '8', type: 'number' },
+        { value: '9', label: '9', type: 'number' },
+        { value: 'clear', label: 'Clear', type: 'action', class: 'key-clear' },
+        { value: '0', label: '0', type: 'number' },
+        { value: 'enter', label: 'Enter', type: 'action', class: 'key-enter' }
+    ];
+
+    // Clear existing keypad
+    keypad.innerHTML = '';
+
+    // Generate buttons
+    keys.forEach(key => {
+        const button = document.createElement('button');
+        button.className = `key-btn${key.class ? ' ' + key.class : ''}`;
+        button.textContent = key.label;
+
+        // Add click handler
+        if (key.type === 'number') {
+            button.onclick = () => enterPin(key.value);
+        } else if (key.value === 'clear') {
+            button.onclick = () => clearPin();
+        } else if (key.value === 'enter') {
+            button.onclick = () => submitPin();
+        }
+
+        keypad.appendChild(button);
+    });
+}
+
 function enterPin(digit) {
     if (enteredPin.length < 4) {
         enteredPin += digit;
@@ -65,7 +110,8 @@ function submitPin() {
     }
 
     // In a real implementation, this would validate with the server
-    if (enteredPin === mockData.pin) {
+    const currentState = store.getState();
+    if (enteredPin === currentState.pin) {
         enteredPin = '';
         updatePinDisplay();
         showView('menuView');
@@ -75,40 +121,48 @@ function submitPin() {
     }
 }
 
-// Balance Updates
+// ============================================================================
+// BALANCE MANAGEMENT
+// ============================================================================
+
 function updateBalances() {
+    const currentState = store.getState();
+
     // Update all balance displays
     const cashElements = ['cashBalance', 'cashBalanceDetail', 'availableCash'];
     const bankElements = ['bankBalance', 'bankBalanceDetail'];
 
     cashElements.forEach(id => {
         const el = document.getElementById(id);
-        if (el) el.textContent = `$${mockData.cash.toLocaleString()}`;
+        if (el) el.textContent = `$${currentState.accounts.cash.toLocaleString()}`;
     });
 
     bankElements.forEach(id => {
         const el = document.getElementById(id);
-        if (el) el.textContent = `$${mockData.bank.toLocaleString()}`;
+        if (el) el.textContent = `$${currentState.accounts.bank.toLocaleString()}`;
     });
 
     const totalEl = document.getElementById('totalBalance');
     if (totalEl) {
-        const total = mockData.cash + mockData.bank;
+        const total = currentState.accounts.cash + currentState.accounts.bank;
         totalEl.textContent = `$${total.toLocaleString()}`;
     }
 }
 
-// Withdraw Functions
+// ============================================================================
+// WITHDRAW OPERATIONS
+// ============================================================================
+
 function withdrawAmount(amount) {
-    if (amount > mockData.bank) {
+    const currentState = store.getState();
+
+    if (amount > currentState.accounts.bank) {
         showError('Insufficient funds');
         return;
     }
 
-    mockData.bank -= amount;
-    mockData.cash += amount;
-
-    // sendEvent('atm::withdraw', { amount: amount });
+    store.dispatch(withdraw(amount));
+    sendEvent('atm::withdraw', { amount: amount });
     showSuccess(`Withdrew $${amount.toLocaleString()}`);
 }
 
@@ -121,20 +175,26 @@ function withdrawCustom() {
         return;
     }
 
-    if (amount > mockData.bank) {
+    const currentState = store.getState();
+    if (amount > currentState.accounts.bank) {
         showError('Insufficient funds');
         return;
     }
 
-    mockData.bank -= amount;
-    mockData.cash += amount;
-
-    // sendEvent('atm::withdraw', { amount: amount });
+    store.dispatch(withdraw(amount));
+    sendEvent('atm::withdraw', { amount: amount });
     input.value = '';
     showSuccess(`Withdrew $${amount.toLocaleString()}`);
 }
 
-// Deposit Functions
+// ============================================================================
+// DEPOSIT OPERATIONS
+// ============================================================================
+
+/**
+ * Deposits specified amount into bank account
+ * @deprecated Use store actions instead
+ */
 function depositAmount() {
     const input = document.getElementById('depositInput');
     const amount = parseFloat(input.value);
@@ -144,34 +204,42 @@ function depositAmount() {
         return;
     }
 
-    if (amount > mockData.cash) {
+    const currentState = store.getState();
+    if (amount > currentState.accounts.cash) {
         showError('Insufficient cash');
         return;
     }
 
-    mockData.cash -= amount;
-    mockData.bank += amount;
-
-    // sendEvent('atm::deposit', { amount: amount });
+    store.dispatch(deposit(amount));
+    sendEvent('atm::deposit', { amount: amount });
     input.value = '';
     showSuccess(`Deposited $${amount.toLocaleString()}`);
 }
-
+/**
+ * Deposits all available cash into bank account
+ * @deprecated Use store actions instead
+ */
 function depositAll() {
-    if (mockData.cash <= 0) {
+    const currentState = store.getState();
+
+    if (currentState.accounts.cash <= 0) {
         showError('No cash to deposit');
         return;
     }
 
-    const amount = mockData.cash;
-    mockData.cash = 0;
-    mockData.bank += amount;
-
-    // sendEvent('atm::deposit', { amount: amount });
+    const amount = currentState.accounts.cash;
+    store.dispatch(deposit(amount));
+    sendEvent('atm::deposit', { amount: amount });
     showSuccess(`Deposited $${amount.toLocaleString()}`);
 }
 
-// Transfer Function
+// ============================================================================
+// TRANSFER OPERATIONS
+// ============================================================================
+/**
+ * Transfers specified amount from bank account to player account
+ * @deprecated Use store actions instead
+ */
 function transferFunds() {
     const playerIdInput = document.getElementById('transferPlayerId');
     const amountInput = document.getElementById('transferAmount');
@@ -189,17 +257,17 @@ function transferFunds() {
         return;
     }
 
-    if (amount > mockData.bank) {
+    const currentState = store.getState();
+    if (amount > currentState.accounts.bank) {
         showError('Insufficient funds');
         return;
     }
 
-    mockData.bank -= amount;
-
-    // sendEvent('atm::transfer', {
-    //     playerId: playerId,
-    //     amount: amount
-    // });
+    store.dispatch(transfer('bank', amount, 'player'));
+    sendEvent('atm::transfer', {
+        playerId: playerId,
+        amount: amount
+    });
 
     playerIdInput.value = '';
     amountInput.value = '';
@@ -207,7 +275,10 @@ function transferFunds() {
     showSuccess(`Transferred $${amount.toLocaleString()} to Player ${playerId}`);
 }
 
-// Result Screens
+// ============================================================================
+// RESULT SCREENS
+// ============================================================================
+
 function showSuccess(message) {
     document.getElementById('successMessage').textContent = message;
     showView('successView');
@@ -219,15 +290,36 @@ function showError(message) {
     showView('errorView');
 }
 
-// Exit ATM
+function goBackFromError() {
+    // If error happened during PIN entry, go back to PIN view
+    // Otherwise go back to menu view
+    if (previousView === 'pinView') {
+        showView('pinView');
+    } else {
+        showView('menuView');
+    }
+}
+
+// ============================================================================
+// ATM CONTROL
+// ============================================================================
+
 function exitATM() {
     enteredPin = '';
     updatePinDisplay();
-    sendEvent('atm::exit', {});
+    sendEvent('atm::close', {});
     showView('welcomeView');
 }
 
-// Send event to Arma
+// ============================================================================
+// ARMA 3 INTEGRATION
+// ============================================================================
+
+/**
+ * Sends an event to Arma 3
+ * @param {string} event - Event name
+ * @param {Object} data - Event data
+ */
 function sendEvent(event, data) {
     if (typeof A3API !== 'undefined') {
         A3API.SendAlert(JSON.stringify({
@@ -239,20 +331,20 @@ function sendEvent(event, data) {
     }
 }
 
-// Update ATM data from external source
-function updateATMData(data) {
-    if (data.cash !== undefined) {
-        mockData.cash = data.cash;
-    }
-    if (data.bank !== undefined) {
-        mockData.bank = data.bank;
-    }
-    updateBalances();
-}
+// ============================================================================
+// INITIALIZATION
+// ============================================================================
 
-// Initialize
 function initATM() {
-    console.log('ATM interface initializing...');
+    // Subscribe to store updates
+    if (typeof store !== 'undefined') {
+        store.subscribe(() => {
+            updateBalances();
+        });
+    }
+
+    // Generate keypad
+    generateKeypad();
 
     // Show welcome screen
     showView('welcomeView');
@@ -260,7 +352,7 @@ function initATM() {
     // Update initial balances
     updateBalances();
 
-    console.log('ATM interface initialized');
+    console.log('[ATM] Interface initialized');
 }
 
 // Auto-initialize
@@ -270,8 +362,12 @@ if (document.readyState === 'loading') {
     initATM();
 }
 
-// Expose functions globally
+// ============================================================================
+// GLOBAL EXPORTS
+// ============================================================================
+
 window.showView = showView;
+window.generateKeypad = generateKeypad;
 window.enterPin = enterPin;
 window.clearPin = clearPin;
 window.submitPin = submitPin;
@@ -280,5 +376,5 @@ window.withdrawCustom = withdrawCustom;
 window.depositAmount = depositAmount;
 window.depositAll = depositAll;
 window.transferFunds = transferFunds;
+window.goBackFromError = goBackFromError;
 window.exitATM = exitATM;
-window.updateATMData = updateATMData;
diff --git a/arma/client/addons/bank/ui/_site/bank.css b/arma/client/addons/bank/ui/_site/bank.css
new file mode 100644
index 0000000..1c53a31
--- /dev/null
+++ b/arma/client/addons/bank/ui/_site/bank.css
@@ -0,0 +1,449 @@
+* {
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+}
+
+body {
+    height: 100vh;
+    width: 100vw;
+    background: rgba(0, 0, 0, 0.7);
+    font-family: Arial, sans-serif;
+    color: rgba(200, 220, 240, 0.95);
+    overflow: hidden;
+}
+
+.bank-container {
+    height: 100vh;
+    width: 100vw;
+    padding: 2rem;
+    display: flex;
+    flex-direction: column;
+    gap: 1.5rem;
+}
+
+.bank-header {
+    display: flex;
+    align-items: center;
+    gap: 1.5rem;
+    padding: 1.25rem 1.5rem;
+    background: rgba(15, 20, 30, 0.9);
+    border: 1px solid rgba(100, 150, 200, 0.4);
+    border-radius: 4px;
+    box-shadow:
+        0 0 20px rgba(100, 150, 200, 0.15),
+        0 4px 16px rgba(0, 0, 0, 0.8);
+}
+
+.bank-logo {
+    width: 60px;
+    height: 60px;
+    background: rgba(20, 30, 45, 0.8);
+    border: 2px solid rgba(100, 150, 200, 0.5);
+    border-radius: 4px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.logo-icon {
+    font-size: 2rem;
+}
+
+.bank-info {
+    flex: 1;
+}
+
+.bank-title {
+    font-size: 1.5rem;
+    font-weight: 600;
+    letter-spacing: 0.5px;
+    text-transform: uppercase;
+    color: rgba(200, 220, 255, 1);
+    margin-bottom: 0.25rem;
+}
+
+.bank-subtitle {
+    font-size: 0.875rem;
+    color: rgba(140, 160, 180, 0.8);
+    letter-spacing: 0.5px;
+}
+
+.header-actions {
+    display: flex;
+    gap: 0.75rem;
+}
+
+.action-btn {
+    padding: 0.625rem 1.25rem;
+    background: rgba(20, 30, 45, 0.7);
+    border: 1px solid rgba(100, 150, 200, 0.4);
+    border-radius: 4px;
+    color: rgba(200, 220, 240, 0.95);
+    font-size: 0.875rem;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+    cursor: pointer;
+    transition: all 0.15s ease;
+
+    &:hover {
+        background: rgba(30, 45, 70, 0.9);
+        border-color: rgba(150, 200, 255, 0.7);
+        box-shadow:
+            0 0 15px rgba(100, 150, 200, 0.2),
+            inset 0 0 20px rgba(100, 150, 200, 0.05);
+    }
+
+    &-primary {
+        background: rgba(100, 150, 200, 0.2);
+        border-color: rgba(100, 150, 200, 0.5);
+        width: 100%;
+        margin-top: 0.5rem;
+
+        &:hover {
+            background: rgba(100, 150, 200, 0.3);
+            border-color: rgba(150, 200, 255, 0.7);
+        }
+    }
+}
+
+.close-btn {
+    border-color: rgba(200, 100, 100, 0.4);
+
+    &:hover {
+        border-color: rgba(255, 100, 100, 0.7);
+        box-shadow:
+            0 0 15px rgba(200, 100, 100, 0.2),
+            inset 0 0 20px rgba(200, 100, 100, 0.05);
+    }
+}
+
+.bank-content {
+    flex: 1;
+    display: grid;
+    grid-template-columns: 300px 1fr 350px;
+    gap: 1.5rem;
+    overflow: hidden;
+}
+
+.bank-panel {
+    background: rgba(15, 20, 30, 0.9);
+    border: 1px solid rgba(100, 150, 200, 0.4);
+    border-left: 3px solid rgba(100, 150, 200, 0.5);
+    border-radius: 4px;
+    display: flex;
+    flex-direction: column;
+    box-shadow:
+        0 0 20px rgba(100, 150, 200, 0.1),
+        0 4px 16px rgba(0, 0, 0, 0.6);
+
+    &-main {
+        grid-column: 2;
+    }
+}
+
+.panel-header {
+    padding: 1.25rem 1.5rem;
+    border-bottom: 1px solid rgba(100, 150, 200, 0.2);
+}
+
+.panel-title {
+    font-size: 1rem;
+    font-weight: 600;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+    color: rgba(200, 220, 255, 1);
+}
+
+.panel-content {
+    flex: 1;
+    padding: 1.5rem;
+    overflow-y: auto;
+
+    &::-webkit-scrollbar {
+        width: 8px;
+
+        &-track {
+            background: rgba(15, 20, 30, 0.5);
+            border-radius: 4px;
+        }
+
+        &-thumb {
+            background: rgba(100, 150, 200, 0.3);
+            border-radius: 4px;
+
+            &:hover {
+                background: rgba(100, 150, 200, 0.5);
+            }
+        }
+    }
+}
+
+.account-card {
+    padding: 1.25rem;
+    margin-bottom: 1rem;
+    background: rgba(20, 30, 45, 0.6);
+    border: 1px solid rgba(100, 150, 200, 0.3);
+    border-left: 3px solid rgba(100, 150, 200, 0.4);
+    border-radius: 4px;
+    transition: all 0.15s ease;
+
+    &:last-child {
+        margin-bottom: 0;
+    }
+
+    .account-header {
+        display: flex;
+        align-items: center;
+        gap: 1rem;
+        margin-bottom: 1rem;
+
+        .account-info {
+            display: flex;
+            flex-direction: column;
+            gap: 0.25rem;
+
+            .account-name {
+                font-size: 1rem;
+                font-weight: 600;
+                color: rgba(200, 220, 255, 1);
+            }
+
+            .account-type {
+                font-size: 0.75rem;
+                color: rgba(140, 160, 180, 0.8);
+            }
+        }
+    }
+
+    .account-balance {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding-top: 1rem;
+        border-top: 1px solid rgba(100, 150, 200, 0.2);
+
+        .balance-label {
+            font-size: 0.75rem;
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+            color: rgba(140, 160, 180, 0.8);
+        }
+
+        .balance-amount {
+            font-size: 1.25rem;
+            font-weight: 600;
+            color: rgba(100, 200, 150, 1);
+        }
+    }
+}
+
+.action-section {
+    margin-bottom: 2rem;
+
+    &:last-child {
+        margin-bottom: 0;
+    }
+
+    .section-title {
+        font-size: 0.875rem;
+        font-weight: 600;
+        text-transform: uppercase;
+        letter-spacing: 0.5px;
+        color: rgba(180, 200, 220, 0.9);
+        margin-bottom: 1rem;
+    }
+
+    .transfer-form {
+        display: flex;
+        flex-direction: column;
+        gap: 1rem;
+
+        .form-group {
+            display: flex;
+            flex-direction: column;
+            gap: 0.5rem;
+
+            .form-label {
+                font-size: 0.75rem;
+                text-transform: uppercase;
+                letter-spacing: 0.5px;
+                color: rgba(140, 160, 180, 0.9);
+            }
+
+            .form-select,
+            .form-input {
+                padding: 0.75rem 1rem;
+                background: rgba(20, 30, 45, 0.7);
+                border: 1px solid rgba(100, 150, 200, 0.3);
+                border-radius: 4px;
+                color: rgba(200, 220, 240, 0.95);
+                font-size: 0.875rem;
+                transition: all 0.15s ease;
+
+                &:focus {
+                    outline: none;
+                    border-color: rgba(150, 200, 255, 0.6);
+                    box-shadow:
+                        0 0 15px rgba(100, 150, 200, 0.15),
+                        inset 0 0 20px rgba(100, 150, 200, 0.05);
+                }
+            }
+
+            .form-select {
+                padding-right: 2.5rem;
+                appearance: none;
+                background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='8' viewBox='0 0 12 8'%3E%3Cpath fill='%2396C8FF' d='M1 1l5 5 5-5'/%3E%3C/svg%3E");
+                background-repeat: no-repeat;
+                background-position: right 1rem center;
+                background-size: 12px 8px;
+                cursor: pointer;
+            }
+
+            .form-input {
+                &::placeholder {
+                    color: rgba(100, 120, 140, 0.6);
+                }
+            }
+        }
+    }
+}
+
+input[type=number] {
+    -moz-appearance: textfield;
+    appearance: textfield;
+    margin: 0;
+
+    &::-webkit-inner-spin-button,
+    &::-webkit-outer-spin-button {
+        -webkit-appearance: none;
+        margin: 0;
+    }
+}
+
+.quick-actions {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
+    gap: 1rem;
+
+    .quick-action-btn {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        gap: 0.75rem;
+        padding: 1.25rem;
+        background: rgba(20, 30, 45, 0.6);
+        border: 1px solid rgba(100, 150, 200, 0.3);
+        border-radius: 4px;
+        cursor: pointer;
+        transition: all 0.15s ease;
+
+        &:hover {
+            background: rgba(30, 45, 70, 0.8);
+            border-color: rgba(150, 200, 255, 0.5);
+            box-shadow:
+                0 0 15px rgba(100, 150, 200, 0.15),
+                inset 0 0 20px rgba(100, 150, 200, 0.05);
+        }
+
+        .quick-action-label {
+            font-size: 0.75rem;
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+            text-align: center;
+            color: rgba(180, 200, 220, 0.9);
+        }
+    }
+}
+
+.transaction-list {
+    display: flex;
+    flex-direction: column;
+    gap: 0.75rem;
+
+    .transaction-item {
+        padding: 1rem;
+        background: rgba(20, 30, 45, 0.6);
+        border: 1px solid rgba(100, 150, 200, 0.2);
+        border-left: 3px solid rgba(100, 150, 200, 0.4);
+        border-radius: 4px;
+        transition: all 0.15s ease;
+    }
+
+    .transaction-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 0.5rem;
+
+        .transaction-type {
+            padding: 0.25rem 0.625rem;
+            border-radius: 3px;
+            font-size: 0.7rem;
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+            font-weight: 600;
+
+            &.deposit {
+                background: rgba(100, 200, 150, 0.2);
+                border: 1px solid rgba(100, 200, 150, 0.4);
+                color: rgba(150, 255, 200, 0.9);
+            }
+
+            &.withdrawal {
+                background: rgba(200, 150, 100, 0.2);
+                border: 1px solid rgba(200, 150, 100, 0.4);
+                color: rgba(255, 200, 150, 0.9);
+            }
+
+            &.transfer {
+                background: rgba(100, 150, 200, 0.2);
+                border: 1px solid rgba(100, 150, 200, 0.4);
+                color: rgba(150, 200, 255, 0.9);
+            }
+        }
+
+        .transaction-amount {
+            font-size: 1rem;
+            font-weight: 600;
+
+            &.positive {
+                color: rgba(100, 200, 150, 1);
+            }
+
+            &.negative {
+                color: rgba(220, 100, 100, 1);
+            }
+        }
+    }
+
+    .transaction-details {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        .transaction-time {
+            font-size: 0.7rem;
+            color: rgba(100, 150, 200, 0.7);
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+        }
+    }
+}
+
+@media (max-width: 1400px) {
+    .bank-content {
+        grid-template-columns: 280px 1fr 300px;
+    }
+}
+
+@media (max-width: 1200px) {
+    .bank-content {
+        grid-template-columns: 1fr;
+        grid-template-rows: auto 1fr auto;
+    }
+
+    .panel-main {
+        grid-column: 1;
+    }
+}
diff --git a/arma/client/addons/bank/ui/_site/index.html b/arma/client/addons/bank/ui/_site/bank.html
similarity index 56%
rename from arma/client/addons/bank/ui/_site/index.html
rename to arma/client/addons/bank/ui/_site/bank.html
index 0e64929..c565653 100644
--- a/arma/client/addons/bank/ui/_site/index.html
+++ b/arma/client/addons/bank/ui/_site/bank.html
@@ -5,7 +5,8 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Banking Services</title>
-    <!-- <link rel="stylesheet" href="style.css" /> -->
+    <!-- <script src="store.js"></script> -->
+    <!-- <link rel="stylesheet" href="bank.css" /> -->
     <!--
         Dynamic Resource Loading
         The following script loads CSS and JavaScript files dynamically using the A3API
@@ -14,19 +15,26 @@
     <script>
         Promise.all([
             A3API.RequestFile(
-                "forge\\forge_client\\addons\\bank\\ui\\_site\\style.css",
+                "forge\\forge_client\\addons\\bank\\ui\\_site\\bank.css",
             ),
             A3API.RequestFile(
-                "forge\\forge_client\\addons\\bank\\ui\\_site\\script.js",
+                "forge\\forge_client\\addons\\bank\\ui\\_site\\store.js",
             ),
-        ]).then(([css, js]) => {
+            A3API.RequestFile(
+                "forge\\forge_client\\addons\\bank\\ui\\_site\\bank.js",
+            ),
+        ]).then(([css, storeJs, bankJs]) => {
             const style = document.createElement("style");
             style.textContent = css;
             document.head.appendChild(style);
 
-            const script = document.createElement("script");
-            script.text = js;
-            document.head.appendChild(script);
+            const store = document.createElement("script");
+            store.text = storeJs;
+            document.head.appendChild(store);
+
+            const bank = document.createElement("script");
+            bank.text = bankJs;
+            document.head.appendChild(bank);
         });
     </script>
 </head>
@@ -36,7 +44,7 @@
         <!-- Header Section -->
         <div class="bank-header">
             <div class="bank-logo">
-                <!-- <div class="logo-icon">💳</div> -->
+                <!-- <img class="logo-icon" src="public/fdic.png" alt="Bank Logo" width="50"> -->
             </div>
             <div class="bank-info">
                 <h1 class="bank-title">Banking Services</h1>
@@ -56,9 +64,8 @@
                 </div>
                 <div class="panel-content">
                     <!-- Cash Account -->
-                    <div class="account-card active" data-account="cash">
+                    <div class="account-card">
                         <div class="account-header">
-                            <!-- <span class="account-icon">💵</span> -->
                             <div class="account-info">
                                 <span class="account-name">Cash</span>
                                 <span class="account-type">Physical Currency</span>
@@ -71,9 +78,8 @@
                     </div>
 
                     <!-- Bank Account -->
-                    <div class="account-card" data-account="bank">
+                    <div class="account-card">
                         <div class="account-header">
-                            <!-- <span class="account-icon">🏦</span> -->
                             <div class="account-info">
                                 <span class="account-name">Bank Account</span>
                                 <span class="account-type">Savings • Protected</span>
@@ -86,9 +92,8 @@
                     </div>
 
                     <!-- Organization Account -->
-                    <div class="account-card" data-account="org">
+                    <div class="account-card">
                         <div class="account-header">
-                            <span class="account-icon">🏢</span>
                             <div class="account-info">
                                 <span class="account-name">Organization</span>
                                 <span class="account-type">Shared • View Only</span>
@@ -115,26 +120,20 @@
                             <div class="form-group">
                                 <label class="form-label">From</label>
                                 <select class="form-select" id="transferFrom">
-                                    <option value="cash">Cash ($2,500)</option>
-                                    <option value="bank" selected>Bank Account ($45,750)</option>
-                                </select>
-                            </div>
-                            <div class="form-group">
-                                <label class="form-label">To</label>
-                                <select class="form-select" id="transferTo">
+                                    <option value="bank" selected>Bank Account</option>
                                     <option value="cash">Cash</option>
-                                    <option value="bank">Bank Account</option>
-                                    <option value="player">Player</option>
                                 </select>
                             </div>
                             <div class="form-group">
                                 <label class="form-label">Amount</label>
-                                <input type="number" class="form-input" id="transferAmount" placeholder="0.00" min="0"
+                                <input type="number" class="form-input" id="amount" placeholder="0.00" min="0"
                                     step="0.01">
                             </div>
                             <div class="form-group" id="playerIdGroup" style="display: none;">
-                                <label class="form-label">Player ID</label>
-                                <input type="text" class="form-input" id="playerId" placeholder="Enter player ID">
+                                <label class="form-label">Select Player</label>
+                                <select class="form-select" id="playerId">
+                                    <option value="" disabled selected>Select a player...</option>
+                                </select>
                             </div>
                         </div>
                     </div>
@@ -143,22 +142,18 @@
                     <div class="action-section">
                         <h3 class="section-title">Quick Access</h3>
                         <div class="quick-actions">
+                            <button class="quick-action-btn" data-action="deposit-amount">
+                                <span class="quick-action-label">Deposit</span>
+                            </button>
                             <button class="quick-action-btn" data-action="deposit">
-                                <!-- <span class="quick-action-icon">⬇️</span> -->
                                 <span class="quick-action-label">Deposit All Cash</span>
                             </button>
                             <button class="quick-action-btn" data-action="withdraw">
-                                <!-- <span class="quick-action-icon">⬆️</span> -->
                                 <span class="quick-action-label">Withdraw</span>
                             </button>
                             <button class="quick-action-btn" id="transferBtn">
-                                <!-- <span class="quick-action-icon">➡️</span> -->
                                 <span class="quick-action-label">Transfer Funds</span>
                             </button>
-                            <button class="quick-action-btn" data-action="statement">
-                                <!-- <span class="quick-action-icon">📄</span> -->
-                                <span class="quick-action-label">View Statement</span>
-                            </button>
                         </div>
                     </div>
                 </div>
@@ -171,67 +166,14 @@
                 </div>
                 <div class="panel-content">
                     <div class="transaction-list">
-                        <div class="transaction-item">
-                            <div class="transaction-header">
-                                <span class="transaction-type deposit">Deposit</span>
-                                <span class="transaction-amount positive">+$5,000</span>
-                            </div>
-                            <div class="transaction-details">
-                                <span class="transaction-desc">From Cash</span>
-                                <span class="transaction-time">2 hours ago</span>
-                            </div>
-                        </div>
 
-                        <div class="transaction-item">
-                            <div class="transaction-header">
-                                <span class="transaction-type withdrawal">Withdrawal</span>
-                                <span class="transaction-amount negative">-$1,200</span>
-                            </div>
-                            <div class="transaction-details">
-                                <span class="transaction-desc">To Cash</span>
-                                <span class="transaction-time">5 hours ago</span>
-                            </div>
-                        </div>
-
-                        <div class="transaction-item">
-                            <div class="transaction-header">
-                                <span class="transaction-type transfer">Transfer</span>
-                                <span class="transaction-amount negative">-$500</span>
-                            </div>
-                            <div class="transaction-details">
-                                <span class="transaction-desc">To Player #1234</span>
-                                <span class="transaction-time">1 day ago</span>
-                            </div>
-                        </div>
-
-                        <div class="transaction-item">
-                            <div class="transaction-header">
-                                <span class="transaction-type deposit">Deposit</span>
-                                <span class="transaction-amount positive">+$10,000</span>
-                            </div>
-                            <div class="transaction-details">
-                                <span class="transaction-desc">Mission Reward</span>
-                                <span class="transaction-time">2 days ago</span>
-                            </div>
-                        </div>
-
-                        <div class="transaction-item">
-                            <div class="transaction-header">
-                                <span class="transaction-type transfer">Transfer</span>
-                                <span class="transaction-amount positive">+$2,000</span>
-                            </div>
-                            <div class="transaction-details">
-                                <span class="transaction-desc">From Player #5678</span>
-                                <span class="transaction-time">3 days ago</span>
-                            </div>
-                        </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 
-    <!-- <script src="script.js"></script> -->
+    <!-- <script src="bank.js"></script> -->
 </body>
 
 </html>
diff --git a/arma/client/addons/bank/ui/_site/bank.js b/arma/client/addons/bank/ui/_site/bank.js
new file mode 100644
index 0000000..da4db1f
--- /dev/null
+++ b/arma/client/addons/bank/ui/_site/bank.js
@@ -0,0 +1,281 @@
+/**
+ * Banking Interface
+ * Handles transfers, deposits, withdrawals, and account management
+ */
+
+// ============================================================================
+// INITIALIZATION
+// ============================================================================
+
+function initBank() {
+    setupEventHandlers();
+
+    // Subscribe to store updates
+    if (typeof store !== 'undefined') {
+        store.subscribe(() => {
+            updateBalances();
+            renderTransactions();
+        });
+    }
+
+    // Initial render
+    updateBalances();
+    renderTransactions();
+
+    console.log('[Bank] Interface initialized');
+}
+
+// ============================================================================
+// EVENT HANDLERS
+// ============================================================================
+
+function setupEventHandlers() {
+    // Close button
+    const closeBtn = document.querySelector('.close-btn');
+    if (closeBtn) {
+        closeBtn.addEventListener('click', () => {
+            sendEvent('bank::close', {});
+        });
+    }
+
+    // Transfer form
+    const transferBtn = document.getElementById('transferBtn');
+    const transferFrom = document.getElementById('transferFrom');
+    const amount = document.getElementById('amount');
+    const playerId = document.getElementById('playerId');
+    const playerIdGroup = document.getElementById('playerIdGroup');
+
+    // Always show player ID field since transfer is only to players
+    if (playerIdGroup) {
+        playerIdGroup.style.display = 'flex';
+    }
+
+    // Transfer button
+    if (transferBtn) {
+        transferBtn.addEventListener('click', () => {
+            const from = transferFrom.value;
+            const transferAmount = parseFloat(amount.value);
+
+            if (!transferAmount || transferAmount <= 0) {
+                console.log('Please enter a valid amount');
+                return;
+            }
+
+            if (!playerId.value) {
+                console.log('Please enter a player ID');
+                return;
+            }
+
+            const currentState = store.getState();
+            const fromAccountBalance = currentState.accounts[from];
+
+            if (transferAmount > fromAccountBalance) {
+                console.log('Insufficient funds');
+                return;
+            }
+
+            const transferData = {
+                from: from,
+                amount: transferAmount,
+                target: playerId.value
+            };
+
+            sendEvent('bank::transfer', transferData);
+
+            // Dispatch to store to update UI
+            store.dispatch(transfer(from, transferAmount, 'player'));
+
+            // Clear form
+            amount.value = '';
+            playerId.value = '';
+        });
+    }
+
+    // Quick action buttons
+    const quickActionBtns = document.querySelectorAll('.quick-action-btn');
+    quickActionBtns.forEach(btn => {
+        btn.addEventListener('click', () => {
+            const action = btn.dataset.action;
+            const currentState = store.getState();
+
+            switch (action) {
+                case 'deposit-amount':
+                    const depositAmountStr = document.getElementById('amount').value;
+                    if (depositAmountStr && parseFloat(depositAmountStr) > 0) {
+                        const depositAmount = parseFloat(depositAmountStr);
+                        if (depositAmount > currentState.accounts.cash) {
+                            console.log('Insufficient cash');
+                            return;
+                        }
+                        sendEvent('bank::deposit', { amount: depositAmount });
+                        store.dispatch(deposit(depositAmount));
+                        document.getElementById('amount').value = '';
+                    } else {
+                        console.log('Please enter a valid amount');
+                    }
+                    break;
+                case 'deposit':
+                    const cashBalance = currentState.accounts.cash;
+                    if (cashBalance <= 0) {
+                        console.log('No cash to deposit');
+                        return;
+                    }
+                    sendEvent('bank::deposit', { amount: cashBalance });
+                    store.dispatch(deposit(cashBalance));
+                    break;
+                case 'withdraw':
+                    const amountStr = document.getElementById('amount').value;
+                    if (amountStr && parseFloat(amountStr) > 0) {
+                        const withdrawAmount = parseFloat(amountStr);
+                        sendEvent('bank::withdraw', { amount: withdrawAmount });
+                        store.dispatch(withdraw(withdrawAmount));
+                        document.getElementById('amount').value = '';
+                    } else {
+                        console.log('Please enter a valid amount');
+                    }
+                    break;
+                default:
+                    console.log('Invalid action');
+                    break;
+            }
+        });
+    });
+}
+
+// ============================================================================
+// UI UPDATES
+// ============================================================================
+
+function updateBalances() {
+    const currentState = store.getState();
+    const balanceElements = document.querySelectorAll('.balance-amount');
+
+    // The HTML structure has 3 account cards.
+    // 0: Cash, 1: Bank, 2: Org
+    if (balanceElements.length >= 3) {
+        balanceElements[0].textContent = `$${currentState.accounts.cash.toLocaleString()}`;
+        balanceElements[1].textContent = `$${currentState.accounts.bank.toLocaleString()}`;
+        balanceElements[2].textContent = `$${currentState.accounts.org.toLocaleString()}`;
+    }
+
+    // Update form options
+    const transferFrom = document.getElementById('transferFrom');
+
+    if (transferFrom) {
+        const currentSelection = transferFrom.value;
+        transferFrom.innerHTML = `
+            <option value="cash">Cash</option>
+            <option value="bank" selected>Bank Account</option>
+        `;
+        if (currentSelection && (currentSelection === 'cash' || currentSelection === 'bank')) {
+            transferFrom.value = currentSelection;
+        }
+    }
+
+    // Update player list
+    const playerSelect = document.getElementById('playerId');
+    if (playerSelect && currentState.accounts.players) {
+        const currentPlayerSelection = playerSelect.value;
+        const players = currentState.accounts.players;
+        const currentPlayerUid = currentState.uid;
+
+        // Clear existing options
+        playerSelect.innerHTML = '<option value="">Select Player...</option>';
+
+        // Handle hashmap structure from Arma (UID -> {name, uid})
+        if (players && typeof players === 'object') {
+            // Convert hashmap to array and iterate
+            Object.keys(players).forEach(uid => {
+                // Skip current player to prevent self-transfers
+                if (uid === currentPlayerUid) {
+                    return;
+                }
+
+                const playerData = players[uid];
+                if (playerData && playerData.name) {
+                    const option = document.createElement('option');
+                    option.value = uid;
+                    option.textContent = playerData.name;
+                    playerSelect.appendChild(option);
+                }
+            });
+        }
+
+        if (currentPlayerSelection) {
+            // Verify if the selected player is still in the list
+            const optionExists = Array.from(playerSelect.options).some(opt => opt.value === currentPlayerSelection);
+            if (optionExists) {
+                playerSelect.value = currentPlayerSelection;
+            }
+        }
+    }
+}
+
+function renderTransactions() {
+    const transactionList = document.querySelector('.transaction-list');
+    if (!transactionList) return;
+
+    transactionList.innerHTML = '';
+
+    const currentState = store.getState();
+
+    currentState.transactions.forEach((transaction, index) => {
+        const item = document.createElement('div');
+        item.className = 'transaction-item';
+
+        // Deposits are gains (green), Withdrawals and Transfers are losses (red)
+        const isGain = transaction.type === 'Deposit';
+        const amountClass = isGain ? 'positive' : 'negative';
+        const displayAmount = isGain ? `+$${transaction.amount.toLocaleString()}` : `-$${Math.abs(transaction.amount).toLocaleString()}`;
+
+        // Map transaction types to CSS classes
+        const typeClassMap = {
+            'Deposit': 'deposit',
+            'Withdraw': 'withdrawal',
+            'Transfer': 'transfer'
+        };
+        const typeClass = typeClassMap[transaction.type] || transaction.type.toLowerCase();
+
+        item.innerHTML = `
+            <div class="transaction-header">
+                <span class="transaction-type ${typeClass}">${transaction.type}</span>
+                <span class="transaction-amount ${amountClass}">${displayAmount}</span>
+            </div>
+            <div class="transaction-details">
+                <span class="transaction-time">${transaction.date}</span>
+            </div>
+        `;
+
+        transactionList.appendChild(item);
+    });
+}
+
+// ============================================================================
+// ARMA 3 INTEGRATION
+// ============================================================================
+
+/**
+ * Sends an event to Arma 3
+ * @param {string} event - Event name
+ * @param {Object} data - Event data
+ */
+function sendEvent(event, data) {
+    if (typeof A3API !== 'undefined') {
+        A3API.SendAlert(JSON.stringify({
+            event: event,
+            data: data
+        }));
+    } else {
+        console.log('Event:', event, 'Data:', data);
+    }
+}
+
+// ============================================================================
+// AUTO-INITIALIZE
+// ============================================================================
+
+if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', initBank);
+} else {
+    initBank();
+}
diff --git a/arma/client/addons/bank/ui/_site/public/fdic.png b/arma/client/addons/bank/ui/_site/public/fdic.png
new file mode 100644
index 0000000..579e749
Binary files /dev/null and b/arma/client/addons/bank/ui/_site/public/fdic.png differ
diff --git a/arma/client/addons/bank/ui/_site/public/fdic_co.paa b/arma/client/addons/bank/ui/_site/public/fdic_co.paa
new file mode 100644
index 0000000..45fe964
Binary files /dev/null and b/arma/client/addons/bank/ui/_site/public/fdic_co.paa differ
diff --git a/arma/client/addons/bank/ui/_site/public/fms.png b/arma/client/addons/bank/ui/_site/public/fms.png
new file mode 100644
index 0000000..553b09a
Binary files /dev/null and b/arma/client/addons/bank/ui/_site/public/fms.png differ
diff --git a/arma/client/addons/bank/ui/_site/public/fms_co.paa b/arma/client/addons/bank/ui/_site/public/fms_co.paa
new file mode 100644
index 0000000..9d32a24
Binary files /dev/null and b/arma/client/addons/bank/ui/_site/public/fms_co.paa differ
diff --git a/arma/client/addons/bank/ui/_site/public/gms.png b/arma/client/addons/bank/ui/_site/public/gms.png
new file mode 100644
index 0000000..a4717b2
Binary files /dev/null and b/arma/client/addons/bank/ui/_site/public/gms.png differ
diff --git a/arma/client/addons/bank/ui/_site/public/gms_co.paa b/arma/client/addons/bank/ui/_site/public/gms_co.paa
new file mode 100644
index 0000000..ddc6d35
Binary files /dev/null and b/arma/client/addons/bank/ui/_site/public/gms_co.paa differ
diff --git a/arma/client/addons/bank/ui/_site/script.js b/arma/client/addons/bank/ui/_site/script.js
deleted file mode 100644
index b1cd040..0000000
--- a/arma/client/addons/bank/ui/_site/script.js
+++ /dev/null
@@ -1,248 +0,0 @@
-/**
- * Banking Interface
- * Handles transfers, deposits, withdrawals, and account management
- */
-
-// Mock data
-const mockData = {
-    accounts: {
-        cash: { name: "Cash", balance: 2500, type: "Physical Currency" },
-        bank: { name: "Bank Account", balance: 45750, type: "Savings • Protected" },
-        org: { name: "Organization", balance: 125000, type: "Shared • View Only", readOnly: true }
-    },
-    transactions: [
-        { type: "deposit", amount: 5000, desc: "From Cash", time: "2 hours ago" },
-        { type: "withdrawal", amount: -1200, desc: "To Cash", time: "5 hours ago" },
-        { type: "transfer", amount: -500, desc: "To Player #1234", time: "1 day ago" },
-        { type: "deposit", amount: 10000, desc: "Mission Reward", time: "2 days ago" },
-        { type: "transfer", amount: 2000, desc: "From Player #5678", time: "3 days ago" }
-    ]
-};
-
-// State
-let selectedAccount = 'cash';
-
-// Initialize
-function initBank() {
-    console.log('Banking interface initializing...');
-
-    setupEventHandlers();
-    updateBalances();
-
-    console.log('Banking interface initialized');
-}
-
-// Event Handlers
-function setupEventHandlers() {
-    // Close button
-    const closeBtn = document.querySelector('.close-btn');
-    if (closeBtn) {
-        closeBtn.addEventListener('click', () => {
-            console.log('Closing bank...');
-            sendEvent('bank::close', {});
-        });
-    }
-
-    // Account card selection
-    const accountCards = document.querySelectorAll('.account-card');
-    accountCards.forEach(card => {
-        card.addEventListener('click', () => {
-            accountCards.forEach(c => c.classList.remove('active'));
-            card.classList.add('active');
-            selectedAccount = card.dataset.account;
-            console.log('Selected account:', selectedAccount);
-        });
-    });
-
-    // Transfer form
-    const transferBtn = document.getElementById('transferBtn');
-    const transferFrom = document.getElementById('transferFrom');
-    const transferTo = document.getElementById('transferTo');
-    const transferAmount = document.getElementById('transferAmount');
-    const playerId = document.getElementById('playerId');
-    const playerIdGroup = document.getElementById('playerIdGroup');
-
-    // Show/hide player ID field
-    if (transferTo) {
-        transferTo.addEventListener('change', () => {
-            if (transferTo.value === 'player') {
-                playerIdGroup.style.display = 'flex';
-            } else {
-                playerIdGroup.style.display = 'none';
-            }
-        });
-    }
-
-    // Transfer button
-    if (transferBtn) {
-        transferBtn.addEventListener('click', () => {
-            const from = transferFrom.value;
-            const to = transferTo.value;
-            const amount = parseFloat(transferAmount.value);
-
-            if (!amount || amount <= 0) {
-                alert('Please enter a valid amount');
-                return;
-            }
-
-            if (from === to) {
-                alert('Source and destination must be different');
-                return;
-            }
-
-            const fromAccount = mockData.accounts[from];
-            if (amount > fromAccount.balance) {
-                alert('Insufficient funds');
-                return;
-            }
-
-            if (to === 'player' && !playerId.value) {
-                alert('Please enter a player ID');
-                return;
-            }
-
-            const transferData = {
-                from: from,
-                to: to,
-                amount: amount,
-                playerId: to === 'player' ? playerId.value : null
-            };
-
-            console.log('Transfer request:', transferData);
-            sendEvent('bank::transfer', transferData);
-
-            // Clear form
-            transferAmount.value = '';
-            if (to === 'player') playerId.value = '';
-        });
-    }
-
-    // Quick action buttons
-    const quickActionBtns = document.querySelectorAll('.quick-action-btn');
-    quickActionBtns.forEach(btn => {
-        btn.addEventListener('click', () => {
-            const action = btn.dataset.action;
-            console.log('Quick action:', action);
-
-            switch (action) {
-                case 'deposit':
-                    const cashBalance = mockData.accounts.cash.balance;
-                    if (cashBalance <= 0) {
-                        alert('No cash to deposit');
-                        return;
-                    }
-                    sendEvent('bank::deposit', { amount: cashBalance });
-                    break;
-                case 'withdraw':
-                    const amount = prompt('Enter amount to withdraw:');
-                    if (amount && parseFloat(amount) > 0) {
-                        sendEvent('bank::withdraw', { amount: parseFloat(amount) });
-                    }
-                    break;
-                case 'statement':
-                    sendEvent('bank::statement', {});
-                    break;
-            }
-        });
-    });
-
-    // Transaction items
-    const transactionItems = document.querySelectorAll('.transaction-item');
-    transactionItems.forEach((item, index) => {
-        item.addEventListener('click', () => {
-            console.log('Transaction clicked:', mockData.transactions[index]);
-            sendEvent('bank::transaction::view', { transaction: mockData.transactions[index] });
-        });
-    });
-}
-
-// Update balances
-function updateBalances() {
-    const balanceElements = document.querySelectorAll('.balance-amount');
-    balanceElements[0].textContent = `$${mockData.accounts.cash.balance.toLocaleString()}`;
-    balanceElements[1].textContent = `$${mockData.accounts.bank.balance.toLocaleString()}`;
-    balanceElements[2].textContent = `$${mockData.accounts.org.balance.toLocaleString()}`;
-
-    // Update form options
-    const transferFrom = document.getElementById('transferFrom');
-    const transferTo = document.getElementById('transferTo');
-
-    if (transferFrom) {
-        transferFrom.innerHTML = `
-            <option value="cash">Cash ($${mockData.accounts.cash.balance.toLocaleString()})</option>
-            <option value="bank" selected>Bank Account ($${mockData.accounts.bank.balance.toLocaleString()})</option>
-        `;
-    }
-}
-
-// Update bank data
-function updateBankData(data) {
-    if (data.accounts) {
-        Object.assign(mockData.accounts, data.accounts);
-        updateBalances();
-    }
-
-    if (data.transactions) {
-        // Update transaction list
-        mockData.transactions = data.transactions;
-        // Re-render transaction list
-        renderTransactions();
-    }
-}
-
-// Render transactions
-function renderTransactions() {
-    const transactionList = document.querySelector('.transaction-list');
-    if (!transactionList) return;
-
-    transactionList.innerHTML = '';
-
-    mockData.transactions.forEach((transaction, index) => {
-        const item = document.createElement('div');
-        item.className = 'transaction-item';
-
-        const isPositive = transaction.amount > 0;
-        const amountClass = isPositive ? 'positive' : 'negative';
-        const displayAmount = isPositive ? `+$${transaction.amount.toLocaleString()}` : `-$${Math.abs(transaction.amount).toLocaleString()}`;
-
-        item.innerHTML = `
-            <div class="transaction-header">
-                <span class="transaction-type ${transaction.type}">${transaction.type}</span>
-                <span class="transaction-amount ${amountClass}">${displayAmount}</span>
-            </div>
-            <div class="transaction-details">
-                <span class="transaction-desc">${transaction.desc}</span>
-                <span class="transaction-time">${transaction.time}</span>
-            </div>
-        `;
-
-        item.addEventListener('click', () => {
-            console.log('Transaction clicked:', transaction);
-            sendEvent('bank::transaction::view', { transaction: transaction });
-        });
-
-        transactionList.appendChild(item);
-    });
-}
-
-// Send event to Arma
-function sendEvent(event, data) {
-    if (typeof A3API !== 'undefined') {
-        A3API.SendAlert(JSON.stringify({
-            event: event,
-            data: data
-        }));
-    } else {
-        console.log('Event:', event, 'Data:', data);
-    }
-}
-
-// Auto-initialize
-if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', initBank);
-} else {
-    initBank();
-}
-
-// Expose functions globally
-window.updateBankData = updateBankData;
diff --git a/arma/client/addons/bank/ui/_site/store.js b/arma/client/addons/bank/ui/_site/store.js
new file mode 100644
index 0000000..ace8a45
--- /dev/null
+++ b/arma/client/addons/bank/ui/_site/store.js
@@ -0,0 +1,270 @@
+/**
+ * Banking Application Store
+ * Redux-like state management for bank and ATM interfaces
+ */
+
+// ============================================================================
+// REDUX CORE IMPLEMENTATION
+// ============================================================================
+
+/**
+ * Creates a Redux-like store.
+ * @param {Function} reducer - A function that returns the next state tree
+ * @returns {Object} The store object with methods: getState, dispatch, subscribe
+ */
+function createStore(reducer) {
+    let state;
+    let listeners = [];
+
+    const getState = () => state;
+
+    const dispatch = (action) => {
+        state = reducer(state, action);
+        listeners.forEach(listener => listener());
+    };
+
+    const subscribe = (listener) => {
+        listeners.push(listener);
+        return () => {
+            listeners = listeners.filter(l => l !== listener);
+        };
+    };
+
+    // Initialize state
+    dispatch({});
+
+    return { getState, dispatch, subscribe };
+}
+
+// ============================================================================
+// STATE
+// ============================================================================
+
+const initialState = {
+    uid: '',
+    accounts: {
+        bank: 0,
+        cash: 0,
+        org: 0
+    },
+    pin: '1234',
+    transactions: []
+};
+
+// ============================================================================
+// ACTION TYPES
+// ============================================================================
+
+const DEPOSIT = 'DEPOSIT';
+const WITHDRAW = 'WITHDRAW';
+const TRANSFER = 'TRANSFER';
+const UPDATE_ACCOUNTS = 'UPDATE_ACCOUNTS';
+const UPDATE_PIN = 'UPDATE_PIN';
+
+// ============================================================================
+// ACTION CREATORS
+// ============================================================================
+
+const deposit = (amount) => ({
+    type: DEPOSIT,
+    payload: amount
+});
+
+const withdraw = (amount) => ({
+    type: WITHDRAW,
+    payload: amount
+});
+
+const transfer = (from, amount, target) => ({
+    type: TRANSFER,
+    from: from,
+    payload: amount,
+    target: target
+});
+
+const updateAccounts = (accounts) => ({
+    type: UPDATE_ACCOUNTS,
+    payload: accounts
+});
+
+const updatePin = (pin) => ({
+    type: UPDATE_PIN,
+    payload: pin
+});
+
+// ============================================================================
+// REDUCER
+// ============================================================================
+
+function appReducer(state = initialState, action) {
+    switch (action.type) {
+        case DEPOSIT:
+            if (state.accounts.cash < action.payload) {
+                console.warn('Insufficient cash!');
+                return state;
+            }
+            return {
+                ...state,
+                accounts: {
+                    ...state.accounts,
+                    bank: state.accounts.bank + action.payload,
+                    cash: state.accounts.cash - action.payload
+                },
+                transactions: [
+                    ...state.transactions,
+                    {
+                        type: 'Deposit',
+                        amount: action.payload,
+                        date: new Date().toLocaleString()
+                    }
+                ]
+            };
+
+        case WITHDRAW:
+            if (state.accounts.bank < action.payload) {
+                console.warn('Insufficient funds!');
+                return state;
+            }
+            return {
+                ...state,
+                accounts: {
+                    ...state.accounts,
+                    bank: state.accounts.bank - action.payload,
+                    cash: state.accounts.cash + action.payload
+                },
+                transactions: [
+                    ...state.transactions,
+                    {
+                        type: 'Withdraw',
+                        amount: action.payload,
+                        date: new Date().toLocaleString()
+                    }
+                ]
+            };
+
+        case TRANSFER:
+            const fromAccount = action.from;
+            if (state.accounts[fromAccount] < action.payload) {
+                console.warn('Insufficient funds!');
+                return state;
+            }
+
+            const newAccounts = { ...state.accounts };
+            newAccounts[fromAccount] -= action.payload;
+
+            return {
+                ...state,
+                accounts: newAccounts,
+                transactions: [
+                    ...state.transactions,
+                    {
+                        type: 'Transfer',
+                        amount: action.payload,
+                        from: fromAccount,
+                        target: action.target,
+                        date: new Date().toLocaleString()
+                    }
+                ]
+            };
+
+        case UPDATE_ACCOUNTS:
+            return {
+                ...state,
+                accounts: {
+                    ...state.accounts,
+                    ...action.payload
+                }
+            };
+
+        case UPDATE_PIN:
+            return {
+                ...state,
+                pin: String(action.payload)
+            };
+
+        case 'SET_UID':
+            return {
+                ...state,
+                uid: action.payload
+            };
+
+        default:
+            return state;
+    }
+}
+
+// ============================================================================
+// STORE INSTANCE
+// ============================================================================
+
+const store = createStore(appReducer);
+
+// ============================================================================
+// ARMA 3 INTEGRATION
+// ============================================================================
+
+/**
+ * Sends an event to Arma 3
+ * @param {string} event - Event name
+ * @param {Object} data - Event data
+ */
+function sendEvent(event, data) {
+    if (typeof A3API !== 'undefined') {
+        A3API.SendAlert(JSON.stringify({
+            event: event,
+            data: data
+        }));
+    } else {
+        console.log('Event:', event, 'Data:', data);
+    }
+}
+
+/**
+ * Syncs account data from Arma 3 into the store
+ * @param {Object} data - Account data from Arma 3
+ */
+function syncDataFromArma(data) {
+    if (data && typeof data === 'object') {
+        const accounts = {};
+
+        if (data.cash !== undefined) accounts.cash = data.cash;
+        if (data.bank !== undefined) accounts.bank = data.bank;
+        if (data.org !== undefined) accounts.org = data.org;
+        if (data.players !== undefined) accounts.players = data.players;
+
+        if (Object.keys(accounts).length > 0) {
+            store.dispatch(updateAccounts(accounts));
+        }
+
+        // Update UID if provided
+        if (data.uid !== undefined && data.uid !== store.getState().uid) {
+            store.dispatch({ type: 'SET_UID', payload: data.uid });
+        }
+
+        // Update pin if provided
+        if (data.pin !== undefined) {
+            store.dispatch(updatePin(data.pin));
+        }
+
+        console.log('[Store] Synced data from Arma:', store.getState().accounts);
+    } else {
+        console.warn('[Store] Invalid data received:', data);
+    }
+}
+
+// ============================================================================
+// INITIALIZATION
+// ============================================================================
+
+// Request initial data from Arma on load
+if (typeof A3API !== 'undefined') {
+    // Delay request slightly to ensure everything is loaded
+    setTimeout(() => {
+        sendEvent('bank::sync', {});
+    }, 100);
+}
+
+// Expose sync function globally for Arma to call
+if (typeof window !== 'undefined') {
+    window.syncDataFromArma = syncDataFromArma;
+}
diff --git a/arma/client/addons/bank/ui/_site/style.css b/arma/client/addons/bank/ui/_site/style.css
deleted file mode 100644
index 6974c7e..0000000
--- a/arma/client/addons/bank/ui/_site/style.css
+++ /dev/null
@@ -1,471 +0,0 @@
-* {
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
-}
-
-body {
-    height: 100vh;
-    width: 100vw;
-    background: rgba(0, 0, 0, 0.7);
-    font-family: Arial, sans-serif;
-    color: rgba(200, 220, 240, 0.95);
-    overflow: hidden;
-}
-
-.bank-container {
-    height: 100vh;
-    width: 100vw;
-    padding: 2rem;
-    display: flex;
-    flex-direction: column;
-    gap: 1.5rem;
-}
-
-/* Header Section */
-.bank-header {
-    display: flex;
-    align-items: center;
-    gap: 1.5rem;
-    padding: 1.25rem 1.5rem;
-    background: rgba(15, 20, 30, 0.9);
-    border: 1px solid rgba(100, 150, 200, 0.4);
-    border-radius: 4px;
-    box-shadow:
-        0 0 20px rgba(100, 150, 200, 0.15),
-        0 4px 16px rgba(0, 0, 0, 0.8);
-}
-
-.bank-logo {
-    width: 60px;
-    height: 60px;
-    background: rgba(20, 30, 45, 0.8);
-    border: 2px solid rgba(100, 150, 200, 0.5);
-    border-radius: 4px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.logo-icon {
-    font-size: 2rem;
-}
-
-.bank-info {
-    flex: 1;
-}
-
-.bank-title {
-    font-size: 1.5rem;
-    font-weight: 600;
-    letter-spacing: 0.5px;
-    text-transform: uppercase;
-    color: rgba(200, 220, 255, 1);
-    margin-bottom: 0.25rem;
-}
-
-.bank-subtitle {
-    font-size: 0.875rem;
-    color: rgba(140, 160, 180, 0.8);
-    letter-spacing: 0.5px;
-}
-
-.header-actions {
-    display: flex;
-    gap: 0.75rem;
-}
-
-.action-btn {
-    padding: 0.625rem 1.25rem;
-    background: rgba(20, 30, 45, 0.7);
-    border: 1px solid rgba(100, 150, 200, 0.4);
-    border-radius: 4px;
-    color: rgba(200, 220, 240, 0.95);
-    font-size: 0.875rem;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    cursor: pointer;
-    transition: all 0.15s ease;
-}
-
-.action-btn:hover {
-    background: rgba(30, 45, 70, 0.9);
-    border-color: rgba(150, 200, 255, 0.7);
-    box-shadow:
-        0 0 15px rgba(100, 150, 200, 0.2),
-        inset 0 0 20px rgba(100, 150, 200, 0.05);
-}
-
-.action-btn-primary {
-    background: rgba(100, 150, 200, 0.2);
-    border-color: rgba(100, 150, 200, 0.5);
-    width: 100%;
-    margin-top: 0.5rem;
-}
-
-.action-btn-primary:hover {
-    background: rgba(100, 150, 200, 0.3);
-    border-color: rgba(150, 200, 255, 0.7);
-}
-
-.close-btn {
-    border-color: rgba(200, 100, 100, 0.4);
-}
-
-.close-btn:hover {
-    border-color: rgba(255, 100, 100, 0.7);
-    box-shadow:
-        0 0 15px rgba(200, 100, 100, 0.2),
-        inset 0 0 20px rgba(200, 100, 100, 0.05);
-}
-
-/* Main Content */
-.bank-content {
-    flex: 1;
-    display: grid;
-    grid-template-columns: 300px 1fr 350px;
-    gap: 1.5rem;
-    overflow: hidden;
-}
-
-/* Panels */
-.bank-panel {
-    background: rgba(15, 20, 30, 0.9);
-    border: 1px solid rgba(100, 150, 200, 0.4);
-    border-left: 3px solid rgba(100, 150, 200, 0.5);
-    border-radius: 4px;
-    display: flex;
-    flex-direction: column;
-    box-shadow:
-        0 0 20px rgba(100, 150, 200, 0.1),
-        0 4px 16px rgba(0, 0, 0, 0.6);
-}
-
-.panel-main {
-    grid-column: 2;
-}
-
-.panel-header {
-    padding: 1.25rem 1.5rem;
-    border-bottom: 1px solid rgba(100, 150, 200, 0.2);
-}
-
-.panel-title {
-    font-size: 1rem;
-    font-weight: 600;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    color: rgba(200, 220, 255, 1);
-}
-
-.panel-content {
-    flex: 1;
-    padding: 1.5rem;
-    overflow-y: auto;
-}
-
-/* Custom Scrollbar */
-.panel-content::-webkit-scrollbar {
-    width: 8px;
-}
-
-.panel-content::-webkit-scrollbar-track {
-    background: rgba(15, 20, 30, 0.5);
-    border-radius: 4px;
-}
-
-.panel-content::-webkit-scrollbar-thumb {
-    background: rgba(100, 150, 200, 0.3);
-    border-radius: 4px;
-}
-
-.panel-content::-webkit-scrollbar-thumb:hover {
-    background: rgba(100, 150, 200, 0.5);
-}
-
-/* Account Cards */
-.account-card {
-    padding: 1.25rem;
-    margin-bottom: 1rem;
-    background: rgba(20, 30, 45, 0.6);
-    border: 1px solid rgba(100, 150, 200, 0.3);
-    border-left: 3px solid rgba(100, 150, 200, 0.4);
-    border-radius: 4px;
-    cursor: pointer;
-    transition: all 0.15s ease;
-}
-
-.account-card:last-child {
-    margin-bottom: 0;
-}
-
-.account-card:hover {
-    background: rgba(30, 45, 70, 0.7);
-    border-left-color: rgba(150, 200, 255, 0.7);
-    box-shadow:
-        0 0 15px rgba(100, 150, 200, 0.15),
-        inset 0 0 20px rgba(100, 150, 200, 0.05);
-}
-
-.account-card.active {
-    background: rgba(30, 45, 70, 0.8);
-    border-left-color: rgba(100, 200, 150, 0.8);
-    box-shadow:
-        0 0 20px rgba(100, 200, 150, 0.2),
-        inset 0 0 25px rgba(100, 200, 150, 0.05);
-}
-
-.account-header {
-    display: flex;
-    align-items: center;
-    gap: 1rem;
-    margin-bottom: 1rem;
-}
-
-.account-icon {
-    font-size: 1.75rem;
-}
-
-.account-info {
-    display: flex;
-    flex-direction: column;
-    gap: 0.25rem;
-}
-
-.account-name {
-    font-size: 1rem;
-    font-weight: 600;
-    color: rgba(200, 220, 255, 1);
-}
-
-.account-type {
-    font-size: 0.75rem;
-    color: rgba(140, 160, 180, 0.8);
-}
-
-.account-balance {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding-top: 1rem;
-    border-top: 1px solid rgba(100, 150, 200, 0.2);
-}
-
-.balance-label {
-    font-size: 0.75rem;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    color: rgba(140, 160, 180, 0.8);
-}
-
-.balance-amount {
-    font-size: 1.25rem;
-    font-weight: 600;
-    color: rgba(100, 200, 150, 1);
-}
-
-/* Action Section */
-.action-section {
-    margin-bottom: 2rem;
-}
-
-.action-section:last-child {
-    margin-bottom: 0;
-}
-
-.section-title {
-    font-size: 0.875rem;
-    font-weight: 600;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    color: rgba(180, 200, 220, 0.9);
-    margin-bottom: 1rem;
-}
-
-/* Transfer Form */
-.transfer-form {
-    display: flex;
-    flex-direction: column;
-    gap: 1rem;
-}
-
-.form-group {
-    display: flex;
-    flex-direction: column;
-    gap: 0.5rem;
-}
-
-.form-label {
-    font-size: 0.75rem;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    color: rgba(140, 160, 180, 0.9);
-}
-
-.form-select,
-.form-input {
-    padding: 0.75rem 1rem;
-    background: rgba(20, 30, 45, 0.7);
-    border: 1px solid rgba(100, 150, 200, 0.3);
-    border-radius: 4px;
-    color: rgba(200, 220, 240, 0.95);
-    font-size: 0.875rem;
-    transition: all 0.15s ease;
-}
-
-.form-select:focus,
-.form-input:focus {
-    outline: none;
-    border-color: rgba(150, 200, 255, 0.6);
-    box-shadow:
-        0 0 15px rgba(100, 150, 200, 0.15),
-        inset 0 0 20px rgba(100, 150, 200, 0.05);
-}
-
-.form-input::placeholder {
-    color: rgba(100, 120, 140, 0.6);
-}
-
-/* Quick Actions */
-.quick-actions {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
-    gap: 1rem;
-}
-
-.quick-action-btn {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    gap: 0.75rem;
-    padding: 1.25rem;
-    background: rgba(20, 30, 45, 0.6);
-    border: 1px solid rgba(100, 150, 200, 0.3);
-    border-radius: 4px;
-    cursor: pointer;
-    transition: all 0.15s ease;
-}
-
-.quick-action-btn:hover {
-    background: rgba(30, 45, 70, 0.8);
-    border-color: rgba(150, 200, 255, 0.5);
-    box-shadow:
-        0 0 15px rgba(100, 150, 200, 0.15),
-        inset 0 0 20px rgba(100, 150, 200, 0.05);
-}
-
-.quick-action-icon {
-    font-size: 2rem;
-}
-
-.quick-action-label {
-    font-size: 0.75rem;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    text-align: center;
-    color: rgba(180, 200, 220, 0.9);
-}
-
-/* Transaction List */
-.transaction-list {
-    display: flex;
-    flex-direction: column;
-    gap: 0.75rem;
-}
-
-.transaction-item {
-    padding: 1rem;
-    background: rgba(20, 30, 45, 0.6);
-    border: 1px solid rgba(100, 150, 200, 0.2);
-    border-left: 3px solid rgba(100, 150, 200, 0.4);
-    border-radius: 4px;
-    transition: all 0.15s ease;
-}
-
-.transaction-item:hover {
-    background: rgba(30, 45, 70, 0.7);
-    border-left-color: rgba(150, 200, 255, 0.6);
-}
-
-.transaction-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 0.5rem;
-}
-
-.transaction-type {
-    padding: 0.25rem 0.625rem;
-    border-radius: 3px;
-    font-size: 0.7rem;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    font-weight: 600;
-}
-
-.transaction-type.deposit {
-    background: rgba(100, 200, 150, 0.2);
-    border: 1px solid rgba(100, 200, 150, 0.4);
-    color: rgba(150, 255, 200, 0.9);
-}
-
-.transaction-type.withdrawal {
-    background: rgba(200, 150, 100, 0.2);
-    border: 1px solid rgba(200, 150, 100, 0.4);
-    color: rgba(255, 200, 150, 0.9);
-}
-
-.transaction-type.transfer {
-    background: rgba(100, 150, 200, 0.2);
-    border: 1px solid rgba(100, 150, 200, 0.4);
-    color: rgba(150, 200, 255, 0.9);
-}
-
-.transaction-amount {
-    font-size: 1rem;
-    font-weight: 600;
-}
-
-.transaction-amount.positive {
-    color: rgba(100, 200, 150, 1);
-}
-
-.transaction-amount.negative {
-    color: rgba(200, 150, 100, 1);
-}
-
-.transaction-details {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-
-.transaction-desc {
-    font-size: 0.875rem;
-    color: rgba(180, 200, 220, 0.9);
-}
-
-.transaction-time {
-    font-size: 0.7rem;
-    color: rgba(100, 150, 200, 0.7);
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-}
-
-/* Responsive adjustments */
-@media (max-width: 1400px) {
-    .bank-content {
-        grid-template-columns: 280px 1fr 300px;
-    }
-}
-
-@media (max-width: 1200px) {
-    .bank-content {
-        grid-template-columns: 1fr;
-        grid-template-rows: auto 1fr auto;
-    }
-
-    .panel-main {
-        grid-column: 1;
-    }
-}
diff --git a/arma/client/addons/common/CfgVehicles.hpp b/arma/client/addons/common/CfgVehicles.hpp
new file mode 100644
index 0000000..61587be
--- /dev/null
+++ b/arma/client/addons/common/CfgVehicles.hpp
@@ -0,0 +1,12 @@
+class CfgVehicles {
+    class Land_Bodybag_01_black_F;
+    class forge_bodyBag: Land_Bodybag_01_black_F {
+        maximumLoad = 2000;
+        transportMaxWeapons = 500;
+        transportMaxMagazines = 2000;
+        transportMaxItems = 1000;
+        ace_dragging_canCarry = 1;
+        ace_dragging_carryPosition[] = {0, 0.5, 1.2};
+        ace_dragging_carryDirection = 90;
+    };
+};
diff --git a/arma/client/addons/common/config.cpp b/arma/client/addons/common/config.cpp
index 595b77a..2ae3066 100644
--- a/arma/client/addons/common/config.cpp
+++ b/arma/client/addons/common/config.cpp
@@ -17,3 +17,4 @@ class CfgPatches {
 };
 
 #include "CfgEventHandlers.hpp"
+#include "CfgVehicles.hpp"
diff --git a/arma/client/addons/garage/$PBOPREFIX$ b/arma/client/addons/garage/$PBOPREFIX$
new file mode 100644
index 0000000..61c8412
--- /dev/null
+++ b/arma/client/addons/garage/$PBOPREFIX$
@@ -0,0 +1 @@
+forge\forge_client\addons\garage
diff --git a/arma/client/addons/garage/CfgEventHandlers.hpp b/arma/client/addons/garage/CfgEventHandlers.hpp
new file mode 100644
index 0000000..c6e25db
--- /dev/null
+++ b/arma/client/addons/garage/CfgEventHandlers.hpp
@@ -0,0 +1,19 @@
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
+    };
+};
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
+        clientInit = QUOTE(call COMPILE_SCRIPT(XEH_preInitClient));
+    };
+};
+
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
+        clientInit = QUOTE(call COMPILE_SCRIPT(XEH_postInitClient));
+    };
+};
diff --git a/arma/client/addons/garage/README.md b/arma/client/addons/garage/README.md
new file mode 100644
index 0000000..5378813
--- /dev/null
+++ b/arma/client/addons/garage/README.md
@@ -0,0 +1,4 @@
+forge_client_garage
+===================
+
+Description for this addon
diff --git a/arma/client/addons/garage/XEH_PREP.hpp b/arma/client/addons/garage/XEH_PREP.hpp
new file mode 100644
index 0000000..98bd123
--- /dev/null
+++ b/arma/client/addons/garage/XEH_PREP.hpp
@@ -0,0 +1,3 @@
+PREP(initGarageClass);
+PREP(initVGClass);
+PREP(openVG);
diff --git a/arma/client/addons/garage/XEH_postInit.sqf b/arma/client/addons/garage/XEH_postInit.sqf
new file mode 100644
index 0000000..421c54b
--- /dev/null
+++ b/arma/client/addons/garage/XEH_postInit.sqf
@@ -0,0 +1 @@
+#include "script_component.hpp"
diff --git a/arma/client/addons/garage/XEH_postInitClient.sqf b/arma/client/addons/garage/XEH_postInitClient.sqf
new file mode 100644
index 0000000..d678a9b
--- /dev/null
+++ b/arma/client/addons/garage/XEH_postInitClient.sqf
@@ -0,0 +1,48 @@
+#include "script_component.hpp"
+
+if (isNil QGVAR(GarageClass)) then { [] call FUNC(initGarageClass); };
+if (isNil QGVAR(VGarageClass)) then { [] call FUNC(initVGClass); };
+
+[QGVAR(initGarage), {
+    GVAR(GarageClass) call ["init", []];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(responseInitGarage), {
+    params [["_data", createHashMap, [createHashMap]]];
+
+    GVAR(GarageClass) call ["sync", [_data, true]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(responseSyncGarage), {
+    params [["_data", createHashMap, [createHashMap, []]], ["_jip", false, [false]]];
+
+    GVAR(GarageClass) call ["sync", [_data, _jip]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(initVG), {
+    GVAR(VGarageClass) call ["init", []];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(responseInitVG), {
+    params [["_data", createHashMap, [createHashMap]]];
+
+    GVAR(VGarageClass) call ["sync", [_data, true]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(responseSyncVG), {
+    params [["_data", createHashMap, [createHashMap, []]], ["_jip", false, [false]]];
+
+    GVAR(VGarageClass) call ["sync", [_data, _jip]];
+}] call CFUNC(addEventHandler);
+
+[{
+    EGVAR(bank,BankClass) get "isLoaded";
+}, {
+    [QGVAR(initGarage), []] call CFUNC(localEvent);
+}] call CFUNC(waitUntilAndExecute);
+
+[{
+    GVAR(GarageClass) get "isLoaded";
+}, {
+    [QGVAR(initVG), []] call CFUNC(localEvent);
+}] call CFUNC(waitUntilAndExecute);
diff --git a/arma/client/addons/garage/XEH_preInit.sqf b/arma/client/addons/garage/XEH_preInit.sqf
new file mode 100644
index 0000000..2c2e472
--- /dev/null
+++ b/arma/client/addons/garage/XEH_preInit.sqf
@@ -0,0 +1,17 @@
+#include "script_component.hpp"
+
+PREP_RECOMPILE_START;
+#include "XEH_PREP.hpp"
+PREP_RECOMPILE_END;
+
+// private _category = [QUOTE(MOD_NAME), LLSTRING(displayName)];
+
+// #include "initSettings.inc.sqf"
+// #include "initKeybinds.inc.sqf"
+
+GVAR(Cars) = [];
+GVAR(Armor) = [];
+GVAR(Helis) = [];
+GVAR(Planes) = [];
+GVAR(Naval) = [];
+GVAR(Other) = [];
diff --git a/arma/client/addons/garage/XEH_preInitClient.sqf b/arma/client/addons/garage/XEH_preInitClient.sqf
new file mode 100644
index 0000000..421c54b
--- /dev/null
+++ b/arma/client/addons/garage/XEH_preInitClient.sqf
@@ -0,0 +1 @@
+#include "script_component.hpp"
diff --git a/arma/client/addons/garage/XEH_preStart.sqf b/arma/client/addons/garage/XEH_preStart.sqf
new file mode 100644
index 0000000..0228885
--- /dev/null
+++ b/arma/client/addons/garage/XEH_preStart.sqf
@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
diff --git a/arma/client/addons/garage/config.cpp b/arma/client/addons/garage/config.cpp
new file mode 100644
index 0000000..595b77a
--- /dev/null
+++ b/arma/client/addons/garage/config.cpp
@@ -0,0 +1,19 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        author = AUTHOR;
+        authors[] = {"IDSolutions"};
+        url = ECSTRING(main,url);
+        name = COMPONENT_NAME;
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "forge_client_main"
+        };
+        units[] = {};
+        weapons[] = {};
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgEventHandlers.hpp"
diff --git a/arma/client/addons/garage/functions/fnc_handleUIEvents.sqf b/arma/client/addons/garage/functions/fnc_handleUIEvents.sqf
new file mode 100644
index 0000000..c30fc0b
--- /dev/null
+++ b/arma/client/addons/garage/functions/fnc_handleUIEvents.sqf
@@ -0,0 +1,17 @@
+#include "..\script_component.hpp"
+
+/*
+ * Author: IDSolutions
+ * Handles the UI events.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [] call forge_client_garage_fnc_handleUIEvents;
+ *
+ * Public: No
+ */
diff --git a/arma/client/addons/garage/functions/fnc_initGarageClass.sqf b/arma/client/addons/garage/functions/fnc_initGarageClass.sqf
new file mode 100644
index 0000000..03e036a
--- /dev/null
+++ b/arma/client/addons/garage/functions/fnc_initGarageClass.sqf
@@ -0,0 +1,73 @@
+#include "..\script_component.hpp"
+
+/*
+ * Author: IDSolutions
+ * Initializes the garage class.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [] call forge_client_garage_fnc_initGarageClass;
+ *
+ * Public: No
+ */
+
+#pragma hemtt ignore_variables ["_self"]
+GVAR(GarageClass) = createHashMapObject [[
+    ["#type", "IGarageClass"],
+    ["#create", {
+        _self set ["uid", (getPlayerUID player)];
+        _self set ["garage", createHashMap];
+        _self set ["isLoaded", false];
+        _self set ["lastSave", time];
+    }],
+    ["init", {
+        private _uid = _self get "uid";
+        private _garage = _self get "garage";
+
+        [SRPC(garage,requestInitGarage), [_uid, _garage]] call CFUNC(serverEvent);
+
+        systemChat format ["Garage loaded for %1", (name player)];
+        diag_log "[FORGE:Client:Garage] Garage Class Initialized!";
+    }],
+    ["save", {
+        params [["_sync", false, [false]]];
+
+        private _uid = _self get "uid";
+        [SRPC(garage,requestSaveGarage), [_uid, _sync]] call CFUNC(serverEvent);
+
+        _self set ["lastSave", time];
+    }],
+    ["sync", {
+        params [["_data", createHashMap, [createHashMap]], ["_sync", false, [false]]];
+
+        private _garage = _self get "garage";
+        private _isLoaded = _self get "isLoaded";
+
+        if (_data isEqualTo createHashMap) exitWith {
+            diag_log "[FORGE:Client:Garage] Empty data received for sync, skipping.";
+        };
+
+        {
+            _garage set [_x, _y];
+        } forEach _data;
+
+        _self set ["garage", _garage];
+
+        if !(_isLoaded) then { _self set ["isLoaded", true]; };
+        diag_log "[FORGE:Client:Garage] Sync completed";
+    }],
+    ["get", {
+        params [["_key", "", [""]], ["_default", nil, [[], "", 0, false, createHashMap]]];
+
+        private _garage = _self get "garage";
+        _garage getOrDefault [_key, _default];
+    }]
+]];
+
+SETVAR(player,FORGE_GarageClass,GVAR(GarageClass));
+GVAR(GarageClass)
diff --git a/arma/client/addons/garage/functions/fnc_initVGClass.sqf b/arma/client/addons/garage/functions/fnc_initVGClass.sqf
new file mode 100644
index 0000000..ee58b6f
--- /dev/null
+++ b/arma/client/addons/garage/functions/fnc_initVGClass.sqf
@@ -0,0 +1,116 @@
+#include "..\script_component.hpp"
+
+/*
+ * File: fnc_initVGarageClass.sqf
+ * Author: IDSolutions
+ * Date: 2025-12-16
+ * Last Update: 2025-12-19
+ * Public: No
+ *
+ * Description:
+ *     Initializes the Virtual Garage class for managing player garage unlocks.
+ *     Provides methods for syncing, saving, and applying virtual items to BIS Garage.
+ *
+ * Parameter(s):
+ *     None
+ *
+ * Returns:
+ *     vGarage class object [HASHMAP OBJECT]
+ *
+ * Example(s):
+ *     [] call forge_client_locker_fnc_initVGClass;
+ */
+
+#pragma hemtt ignore_variables ["_self"]
+GVAR(VGarageClass) = createHashMapObject [[
+    ["#type", "IVGarageClass"],
+    ["#create", {
+        _self set ["uid", (getPlayerUID player)];
+        _self set ["vGarage", createHashMap];
+        _self set ["isLoaded", false];
+        _self set ["lastSave", time];
+
+        private _vGarage = createHashMap;
+        _vGarage set ["cars", ["B_Quadbike_01_F"]];
+        _vGarage set ["armor", []];
+        _vGarage set ["helis", []];
+        _vGarage set ["planes", []];
+        _vGarage set ["naval", []];
+        _vGarage set ["other", []];
+
+        _self set ["vGarage", _vGarage];
+    }],
+    ["init", {
+        private _uid = _self get "uid";
+        private _vGarage = _self get "vGarage";
+
+        [SRPC(garage,requestInitVG), [_uid, _vGarage]] call CFUNC(serverEvent);
+
+        systemChat format ["VGarage loaded for %1", (name player)];
+        diag_log "[FORGE:Client:VGarage] VGarage Class Initialized!";
+    }],
+    ["save", {
+        params [["_sync", false, [false]]];
+
+        private _uid = _self get "uid";
+        [SRPC(garage,requestSaveVG), [_uid, _sync]] call CFUNC(serverEvent);
+
+        _self set ["lastSave", time];
+    }],
+    ["sync", {
+        params [["_data", createHashMap, [createHashMap]], ["_jip", false, [false]]];
+
+        private _vGarage = _self get "vGarage";
+        private _isLoaded = _self get "isLoaded";
+
+        if (_data isEqualTo createHashMap) exitWith { diag_log "[FORGE:Client:VGarage] Empty data received for sync, skipping."; };
+
+        {
+            _vGarage set [_x, _y];
+
+            if (_jip) then {
+                switch (_x) do {
+                    case "cars": { _self call ["apply", ["cars"]]; };
+                    case "armor": { _self call ["apply", ["armor"]]; };
+                    case "helis": { _self call ["apply", ["helis"]]; };
+                    case "planes": { _self call ["apply", ["planes"]]; };
+                    case "naval": { _self call ["apply", ["naval"]]; };
+                    case "other": { _self call ["apply", ["other"]]; };
+                    default {};
+                };
+            };
+        } forEach _data;
+
+        _self set ["vGarage", _vGarage];
+
+        if !(_isLoaded) then { _self set ["isLoaded", true]; };
+        diag_log "[FORGE:Client:VGarage] Sync completed";
+    }],
+    ["get", {
+        params [["_key", "", [""]], ["_default", nil, [[], "", 0, false, createHashMap]]];
+
+        private _vGarage = _self get "vGarage";
+        _vGarage getOrDefault [_key, _default];
+    }],
+    ["apply", {
+        params [["_key", "", [""]]];
+
+        private _vehicles = _self call ["get", [_key, []]];
+        private _array = switch (_key) do {
+            case "cars": { GVAR(Cars) };
+            case "armor": { GVAR(Armor) };
+            case "helis": { GVAR(Helis) };
+            case "planes": { GVAR(Planes) };
+            case "naval": { GVAR(Naval) };
+            case "other": { GVAR(Other) };
+            default { [] };
+        };
+
+        {
+            _array append [getText (configFile >> "CfgVehicles" >> _x >> "model"), [configFile >> "CfgVehicles" >> _x]];
+        } forEach _vehicles;
+    }]
+]];
+
+SETVAR(player,FORGE_VGarageClass,GVAR(VGarageClass));
+GVAR(VGarageClass)
diff --git a/arma/client/addons/garage/functions/fnc_openUI.sqf b/arma/client/addons/garage/functions/fnc_openUI.sqf
new file mode 100644
index 0000000..fb8d799
--- /dev/null
+++ b/arma/client/addons/garage/functions/fnc_openUI.sqf
@@ -0,0 +1,17 @@
+#include "..\script_component.hpp"
+
+/*
+ * Author: IDSolutions
+ * Opens the garage UI.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [] call forge_client_garage_fnc_openUI;
+ *
+ * Public: No
+ */
diff --git a/arma/client/addons/garage/functions/fnc_openVG.sqf b/arma/client/addons/garage/functions/fnc_openVG.sqf
new file mode 100644
index 0000000..9cf71d8
--- /dev/null
+++ b/arma/client/addons/garage/functions/fnc_openVG.sqf
@@ -0,0 +1,83 @@
+#include "..\script_component.hpp"
+
+/*
+ * File: fnc_initVG.sqf
+ * Author: IDSolutions
+ * Date: 2025-12-16
+ * Last Update: 2025-12-17
+ * Public: No
+ *
+ * Description:
+ *     No description added yet.
+ *
+ * Parameter(s):
+ *     N/A
+ *
+ * Returns:
+ *     Something [BOOL]
+ *
+ * Example(s):
+ *     [parameter] call forge_x_component_fnc_myFunction
+ */
+
+private _locations = (missionConfigFile >> "FORGE_CfgGarages" >> "locations") call BFUNC(getCfgData);
+{
+	FORGE_VehSpawnPos = (_x select 1) getPos [5, (_x select 2)];
+    true;
+} count _locations;
+
+BIS_fnc_garage_center = createVehicle ["Land_HelipadEmpty_F", FORGE_VehSpawnPos, [], 0, "NONE"];
+
+[missionNamespace, "garageOpened", {
+	params ["_display", "_toggleSpace"];
+
+	missionNamespace setVariable ["BIS_fnc_garage_data", [
+		GVAR(Cars),
+		GVAR(Armor),
+		GVAR(Helis),
+		GVAR(Planes),
+		GVAR(Naval),
+		GVAR(Other)
+	]];
+
+	{
+		lbClear (_display displayCtrl (960 + _forEachIndex));
+	} forEach BIS_fnc_garage_data;
+
+	["ListAdd", [_display]] call BFUNC(garage);
+}] call BFUNC(addScriptedEventHandler);
+
+BIS_fnc_garage_centerType = getText (configFile >> "CfgVehicles" >> "B_Quadbike_01_F" >> "model");
+
+["Open", true] call BFUNC(garage);
+
+[missionNamespace, "garageClosed", {
+	private _nearestObjects = BIS_fnc_garage_center nearEntities [["Car","Tank","Air","Ship"], 15];
+
+	if (!isNil "_nearestObjects") then {
+		private _obj = _nearestObjects select 0;
+		private _veh = typeOf _obj;
+		private _textures = getObjectTextures _obj;
+		private _animationNames = animationNames _obj;
+
+		{ deleteVehicle _x } forEach _nearestObjects;
+		private _createVehicle = createVehicle [_veh, FORGE_VehSpawnPos, [], 0, "CAN_COLLIDE"];
+
+		if (_textures isNotEqualTo []) then {
+			private _count = 0;
+			{
+				_createVehicle setObjectTextureGlobal [_count, _x];
+				_count = _count + 1;
+			} forEach _textures;
+		};
+
+		if (_animationNames isNotEqualTo []) then {
+			private _animationPhase = [];
+
+			for "_i" from 0 to count _animationNames -1 do {
+				_animationPhase pushBack [_animationNames select _i, _obj animationPhase (_animationNames select _i)];
+				{ _createVehicle animate _x; } forEach _animationPhase;
+			};
+		};
+	};
+}] call BFUNC(addScriptedEventHandler);
diff --git a/arma/client/addons/garage/script_component.hpp b/arma/client/addons/garage/script_component.hpp
new file mode 100644
index 0000000..cdb1497
--- /dev/null
+++ b/arma/client/addons/garage/script_component.hpp
@@ -0,0 +1,9 @@
+#define COMPONENT garage
+#define COMPONENT_BEAUTIFIED Garage
+#include "\forge\forge_client\addons\main\script_mod.hpp"
+
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define ENABLE_PERFORMANCE_COUNTERS
+
+#include "\forge\forge_client\addons\main\script_macros.hpp"
diff --git a/arma/client/addons/garage/stringtable.xml b/arma/client/addons/garage/stringtable.xml
new file mode 100644
index 0000000..32789f3
--- /dev/null
+++ b/arma/client/addons/garage/stringtable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="FFE">
+    <Package name="Garage">
+        <Key ID="STR_forge_client_garage_displayName">
+            <English>Garage</English>
+        </Key>
+    </Package>
+</Project>
diff --git a/arma/client/addons/garage/ui/RscCommon.hpp b/arma/client/addons/garage/ui/RscCommon.hpp
new file mode 100644
index 0000000..8b57936
--- /dev/null
+++ b/arma/client/addons/garage/ui/RscCommon.hpp
@@ -0,0 +1,98 @@
+// Control types
+#define CT_STATIC           0
+#define CT_BUTTON           1
+#define CT_EDIT             2
+#define CT_SLIDER           3
+#define CT_COMBO            4
+#define CT_LISTBOX          5
+#define CT_TOOLBOX          6
+#define CT_CHECKBOXES       7
+#define CT_PROGRESS         8
+#define CT_HTML             9
+#define CT_STATIC_SKEW      10
+#define CT_ACTIVETEXT       11
+#define CT_TREE             12
+#define CT_STRUCTURED_TEXT  13
+#define CT_CONTEXT_MENU     14
+#define CT_CONTROLS_GROUP   15
+#define CT_SHORTCUTBUTTON   16
+#define CT_HITZONES         17
+#define CT_XKEYDESC         40
+#define CT_XBUTTON          41
+#define CT_XLISTBOX         42
+#define CT_XSLIDER          43
+#define CT_XCOMBO           44
+#define CT_ANIMATED_TEXTURE 45
+#define CT_OBJECT           80
+#define CT_OBJECT_ZOOM      81
+#define CT_OBJECT_CONTAINER 82
+#define CT_OBJECT_CONT_ANIM 83
+#define CT_LINEBREAK        98
+#define CT_USER             99
+#define CT_MAP              100
+#define CT_MAP_MAIN         101
+#define CT_LISTNBOX         102
+#define CT_ITEMSLOT         103
+#define CT_CHECKBOX         77
+
+// Static styles
+#define ST_POS            0x0F
+#define ST_HPOS           0x03
+#define ST_VPOS           0x0C
+#define ST_LEFT           0x00
+#define ST_RIGHT          0x01
+#define ST_CENTER         0x02
+#define ST_DOWN           0x04
+#define ST_UP             0x08
+#define ST_VCENTER        0x0C
+
+#define ST_TYPE           0xF0
+#define ST_SINGLE         0x00
+#define ST_MULTI          0x10
+#define ST_TITLE_BAR      0x20
+#define ST_PICTURE        0x30
+#define ST_FRAME          0x40
+#define ST_BACKGROUND     0x50
+#define ST_GROUP_BOX      0x60
+#define ST_GROUP_BOX2     0x70
+#define ST_HUD_BACKGROUND 0x80
+#define ST_TILE_PICTURE   0x90
+#define ST_WITH_RECT      0xA0
+#define ST_LINE           0xB0
+#define ST_UPPERCASE      0xC0
+#define ST_LOWERCASE      0xD0
+
+#define ST_SHADOW         0x100
+#define ST_NO_RECT        0x200
+#define ST_KEEP_ASPECT_RATIO  0x800
+
+// Slider styles
+#define SL_DIR            0x400
+#define SL_VERT           0
+#define SL_HORZ           0x400
+
+#define SL_TEXTURES       0x10
+
+// progress bar
+#define ST_VERTICAL       0x01
+#define ST_HORIZONTAL     0
+
+// Listbox styles
+#define LB_TEXTURES       0x10
+#define LB_MULTI          0x20
+
+// Tree styles
+#define TR_SHOWROOT       1
+#define TR_AUTOCOLLAPSE   2
+
+// Default text sizes
+#define GUI_TEXT_SIZE_SMALL		(GUI_GRID_H * 0.8)
+#define GUI_TEXT_SIZE_MEDIUM		(GUI_GRID_H * 1)
+#define GUI_TEXT_SIZE_LARGE		(GUI_GRID_H * 1.2)
+
+// Pixel grid
+#define pixelScale	0.50
+#define GRID_W (pixelW * pixelGrid * pixelScale)
+#define GRID_H (pixelH * pixelGrid * pixelScale)
+
+class RscText;
diff --git a/arma/client/addons/garage/ui/RscGarage.hpp b/arma/client/addons/garage/ui/RscGarage.hpp
new file mode 100644
index 0000000..2507825
--- /dev/null
+++ b/arma/client/addons/garage/ui/RscGarage.hpp
@@ -0,0 +1,21 @@
+class RscGarage {
+    idd = 1000;
+    fadeIn = 0;
+    fadeOut = 0;
+    duration = 1e011;
+    onLoad = "uiNamespace setVariable ['RscGarage', _this select 0]";
+    onUnLoad = "uinamespace setVariable ['RscGarage', nil]";
+
+    class controlsBackground {};
+    class controls {
+        class IFrame: RscText {
+            type = 106;
+            idc = 1001;
+            x = "safeZoneXAbs";
+            y = "safeZoneY";
+            w = "safeZoneWAbs";
+            h = "safeZoneH";
+            colorBackground[] = {0, 0, 0, 0};
+        };
+    };
+};
diff --git a/arma/client/addons/actor/ui/_site/garage.html b/arma/client/addons/garage/ui/_site/index.html
similarity index 97%
rename from arma/client/addons/actor/ui/_site/garage.html
rename to arma/client/addons/garage/ui/_site/index.html
index 7942d3d..8fd7d94 100644
--- a/arma/client/addons/actor/ui/_site/garage.html
+++ b/arma/client/addons/garage/ui/_site/index.html
@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Vehicle Garage</title>
-    <link rel="stylesheet" href="garage.css" />
+    <link rel="stylesheet" href="style.css" />
     <!--
         Dynamic Resource Loading
         The following script loads CSS and JavaScript files dynamically using the A3API
@@ -14,10 +14,10 @@
     <script>
         Promise.all([
             A3API.RequestFile(
-                "forge\\forge_client\\addons\\actor\\ui\\_site\\garage.css",
+                "forge\\forge_client\\addons\\garage\\ui\\_site\\style.css",
             ),
             A3API.RequestFile(
-                "forge\\forge_client\\addons\\actor\\ui\\_site\\garage.js",
+                "forge\\forge_client\\addons\\garage\\ui\\_site\\script.js",
             ),
         ]).then(([css, js]) => {
             const style = document.createElement("style");
@@ -199,7 +199,7 @@
         </div>
     </div>
 
-    <script src="garage.js"></script>
+    <script src="script.js"></script>
 </body>
 
 </html>
diff --git a/arma/client/addons/actor/ui/_site/garage.js b/arma/client/addons/garage/ui/_site/script.js
similarity index 100%
rename from arma/client/addons/actor/ui/_site/garage.js
rename to arma/client/addons/garage/ui/_site/script.js
diff --git a/arma/client/addons/actor/ui/_site/garage.css b/arma/client/addons/garage/ui/_site/style.css
similarity index 100%
rename from arma/client/addons/actor/ui/_site/garage.css
rename to arma/client/addons/garage/ui/_site/style.css
diff --git a/arma/client/addons/locker/$PBOPREFIX$ b/arma/client/addons/locker/$PBOPREFIX$
new file mode 100644
index 0000000..29dca0c
--- /dev/null
+++ b/arma/client/addons/locker/$PBOPREFIX$
@@ -0,0 +1 @@
+forge\forge_client\addons\locker
diff --git a/arma/client/addons/locker/CfgEventHandlers.hpp b/arma/client/addons/locker/CfgEventHandlers.hpp
new file mode 100644
index 0000000..c6e25db
--- /dev/null
+++ b/arma/client/addons/locker/CfgEventHandlers.hpp
@@ -0,0 +1,19 @@
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
+    };
+};
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
+        clientInit = QUOTE(call COMPILE_SCRIPT(XEH_preInitClient));
+    };
+};
+
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
+        clientInit = QUOTE(call COMPILE_SCRIPT(XEH_postInitClient));
+    };
+};
diff --git a/arma/client/addons/locker/README.md b/arma/client/addons/locker/README.md
new file mode 100644
index 0000000..f23b308
--- /dev/null
+++ b/arma/client/addons/locker/README.md
@@ -0,0 +1,4 @@
+forge_client_locker
+===================
+
+Description for this addon
diff --git a/arma/client/addons/locker/XEH_PREP.hpp b/arma/client/addons/locker/XEH_PREP.hpp
new file mode 100644
index 0000000..f3e1d08
--- /dev/null
+++ b/arma/client/addons/locker/XEH_PREP.hpp
@@ -0,0 +1,2 @@
+PREP(initLockerClass);
+PREP(initVAClass);
diff --git a/arma/client/addons/locker/XEH_postInit.sqf b/arma/client/addons/locker/XEH_postInit.sqf
new file mode 100644
index 0000000..421c54b
--- /dev/null
+++ b/arma/client/addons/locker/XEH_postInit.sqf
@@ -0,0 +1 @@
+#include "script_component.hpp"
diff --git a/arma/client/addons/locker/XEH_postInitClient.sqf b/arma/client/addons/locker/XEH_postInitClient.sqf
new file mode 100644
index 0000000..9e97a3b
--- /dev/null
+++ b/arma/client/addons/locker/XEH_postInitClient.sqf
@@ -0,0 +1,48 @@
+#include "script_component.hpp"
+
+if (isNil QGVAR(LockerClass)) then { [] call FUNC(initLockerClass); };
+if (isNil QGVAR(VArsenalClass)) then { [] call FUNC(initVAClass); };
+
+[QGVAR(initLocker), {
+    GVAR(LockerClass) call ["init", []];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(responseInitLocker), {
+    params [["_data", createHashMap, [createHashMap]]];
+
+    GVAR(LockerClass) call ["sync", [_data, true]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(responseSyncLocker), {
+    params [["_data", createHashMap, [createHashMap, []]], ["_jip", false, [false]]];
+
+    GVAR(LockerClass) call ["sync", [_data, _jip]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(initVA), {
+    GVAR(VArsenalClass) call ["init", []];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(responseInitVA), {
+    params [["_data", createHashMap, [createHashMap]]];
+
+    GVAR(VArsenalClass) call ["sync", [_data, true]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(responseSyncVA), {
+    params [["_data", createHashMap, [createHashMap, []]], ["_jip", false, [false]]];
+
+    GVAR(VArsenalClass) call ["sync", [_data, _jip]];
+}] call CFUNC(addEventHandler);
+
+[{
+    EGVAR(garage,GarageClass) get "isLoaded";
+}, {
+    [QGVAR(initLocker), []] call CFUNC(localEvent);
+}] call CFUNC(waitUntilAndExecute);
+
+[{
+    GVAR(LockerClass) get "isLoaded";
+}, {
+    [QGVAR(initVA), []] call CFUNC(localEvent);
+}] call CFUNC(waitUntilAndExecute);
diff --git a/arma/client/addons/locker/XEH_preInit.sqf b/arma/client/addons/locker/XEH_preInit.sqf
new file mode 100644
index 0000000..dbef1ae
--- /dev/null
+++ b/arma/client/addons/locker/XEH_preInit.sqf
@@ -0,0 +1,10 @@
+#include "script_component.hpp"
+
+PREP_RECOMPILE_START;
+#include "XEH_PREP.hpp"
+PREP_RECOMPILE_END;
+
+// private _category = [QUOTE(MOD_NAME), LLSTRING(displayName)];
+
+// #include "initSettings.inc.sqf"
+// #include "initKeybinds.inc.sqf"
diff --git a/arma/client/addons/locker/XEH_preInitClient.sqf b/arma/client/addons/locker/XEH_preInitClient.sqf
new file mode 100644
index 0000000..421c54b
--- /dev/null
+++ b/arma/client/addons/locker/XEH_preInitClient.sqf
@@ -0,0 +1 @@
+#include "script_component.hpp"
diff --git a/arma/client/addons/locker/XEH_preStart.sqf b/arma/client/addons/locker/XEH_preStart.sqf
new file mode 100644
index 0000000..0228885
--- /dev/null
+++ b/arma/client/addons/locker/XEH_preStart.sqf
@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
diff --git a/arma/client/addons/locker/config.cpp b/arma/client/addons/locker/config.cpp
new file mode 100644
index 0000000..595b77a
--- /dev/null
+++ b/arma/client/addons/locker/config.cpp
@@ -0,0 +1,19 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        author = AUTHOR;
+        authors[] = {"IDSolutions"};
+        url = ECSTRING(main,url);
+        name = COMPONENT_NAME;
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "forge_client_main"
+        };
+        units[] = {};
+        weapons[] = {};
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgEventHandlers.hpp"
diff --git a/arma/client/addons/locker/functions/fnc_handleUIEvents.sqf b/arma/client/addons/locker/functions/fnc_handleUIEvents.sqf
new file mode 100644
index 0000000..2996bad
--- /dev/null
+++ b/arma/client/addons/locker/functions/fnc_handleUIEvents.sqf
@@ -0,0 +1,17 @@
+#include "..\script_component.hpp"
+
+/*
+ * Author: IDSolutions
+ * Handles the UI events.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [] call forge_client_locker_fnc_handleUIEvents;
+ *
+ * Public: No
+ */
diff --git a/arma/client/addons/locker/functions/fnc_initLockerClass.sqf b/arma/client/addons/locker/functions/fnc_initLockerClass.sqf
new file mode 100644
index 0000000..051fe1c
--- /dev/null
+++ b/arma/client/addons/locker/functions/fnc_initLockerClass.sqf
@@ -0,0 +1,73 @@
+#include "..\script_component.hpp"
+
+/*
+ * Author: IDSolutions
+ * Initializes the locker class.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [] call forge_client_locker_fnc_initLockerClass;
+ *
+ * Public: No
+ */
+
+#pragma hemtt ignore_variables ["_self"]
+GVAR(LockerClass) = createHashMapObject [[
+    ["#type", "ILockerClass"],
+    ["#create", {
+        _self set ["uid", (getPlayerUID player)];
+        _self set ["locker", createHashMap];
+        _self set ["isLoaded", false];
+        _self set ["lastSave", time];
+    }],
+    ["init", {
+        private _uid = _self get "uid";
+        private _locker = _self get "locker";
+
+        [SRPC(locker,requestInitLocker), [_uid, _locker]] call CFUNC(serverEvent);
+
+        systemChat format ["Locker loaded for %1", (name player)];
+        diag_log "[FORGE:Client:Locker] Locker Class Initialized!";
+    }],
+    ["save", {
+        params [["_sync", false, [false]]];
+
+        private _uid = _self get "uid";
+        [SRPC(locker,requestSaveLocker), [_uid, _sync]] call CFUNC(serverEvent);
+
+        _self set ["lastSave", time];
+    }],
+    ["sync", {
+        params [["_data", createHashMap, [createHashMap]], ["_jip", false, [false]]];
+
+        private _locker = _self get "locker";
+        private _isLoaded = _self get "isLoaded";
+
+        if (_data isEqualTo createHashMap) exitWith {
+            diag_log "[FORGE:Client:Locker] Empty data received for sync, skipping.";
+        };
+
+        {
+            _locker set [_x, _y];
+        } forEach _data;
+
+        _self set ["locker", _locker];
+
+        if !(_isLoaded) then { _self set ["isLoaded", true]; };
+        diag_log "[FORGE:Client:Locker] Sync completed";
+    }],
+    ["get", {
+        params [["_key", "", [""]], ["_default", nil, [[], "", 0, false, createHashMap]]];
+
+        private _locker = _self get "locker";
+        _locker getOrDefault [_key, _default];
+    }]
+]];
+
+SETVAR(player,FORGE_LockerClass,GVAR(LockerClass));
+GVAR(LockerClass)
diff --git a/arma/client/addons/locker/functions/fnc_initVAClass.sqf b/arma/client/addons/locker/functions/fnc_initVAClass.sqf
new file mode 100644
index 0000000..12576ee
--- /dev/null
+++ b/arma/client/addons/locker/functions/fnc_initVAClass.sqf
@@ -0,0 +1,111 @@
+#include "..\script_component.hpp"
+
+/*
+ * File: fnc_initVAClass.sqf
+ * Author: IDSolutions
+ * Date: 2025-12-16
+ * Last Update: 2025-12-17
+ * Public: No
+ *
+ * Description:
+ *     Initializes the Virtual Arsenal class for managing player arsenal unlocks.
+ *     Provides methods for syncing, saving, and applying virtual items to BIS Arsenal.
+ *
+ * Parameter(s):
+ *     None
+ *
+ * Returns:
+ *     vArsenal class object [HASHMAP OBJECT]
+ *
+ * Example(s):
+ *     [] call forge_client_locker_fnc_initVAClass;
+ */
+
+#pragma hemtt ignore_variables ["_self"]
+GVAR(VArsenalClass) = createHashMapObject [[
+    ["#type", "IVArsenalClass"],
+    ["#create", {
+        _self set ["uid", (getPlayerUID player)];
+        _self set ["vArsenal", createHashMap];
+        _self set ["isLoaded", false];
+        _self set ["lastSave", time];
+
+        private _vArsenal = createHashMap;
+        _vArsenal set ["items", []];
+        _vArsenal set ["weapons", []];
+        _vArsenal set ["magazines", []];
+        _vArsenal set ["backpacks", []];
+
+        _self set ["vArsenal", _vArsenal];
+    }],
+    ["init", {
+        private _uid = _self get "uid";
+        private _vArsenal = _self get "vArsenal";
+
+        [SRPC(locker,requestInitVA), [_uid, _vArsenal]] call CFUNC(serverEvent);
+        FORGE_Locker_Box = "ReammoBox_F" createVehicleLocal [0, 0, -999];
+
+        systemChat format ["VArsenal loaded for %1", (name player)];
+        diag_log "[FORGE:Client:VArsenal] VArsenal Class Initialized!";
+    }],
+    ["save", {
+        params [["_sync", false, [false]]];
+
+        private _uid = _self get "uid";
+        [SRPC(locker,requestSaveVA), [_uid, _sync]] call CFUNC(serverEvent);
+
+        _self set ["lastSave", time];
+    }],
+    ["sync", {
+        params [["_data", createHashMap, [createHashMap]], ["_jip", false, [false]]];
+
+        private _vArsenal = _self get "vArsenal";
+        private _isLoaded = _self get "isLoaded";
+
+        if (_data isEqualTo createHashMap) exitWith { diag_log "[FORGE:Client:VArsenal] Empty data received for sync, skipping."; };
+
+        {
+            _vArsenal set [_x, _y];
+
+            if (_jip) then {
+                switch (_x) do {
+                    case "items": { _self call ["applyItems", []]; };
+                    case "weapons": { _self call ["applyWeapons", []]; };
+                    case "magazines": { _self call ["applyMagazines", []]; };
+                    case "backpacks": { _self call ["applyBackpacks", []]; };
+                    default {};
+                };
+            };
+        } forEach _data;
+
+        _self set ["vArsenal", _vArsenal];
+
+        if !(_isLoaded) then { _self set ["isLoaded", true]; };
+        diag_log "[FORGE:Client:VArsenal] Sync completed";
+    }],
+    ["get", {
+        params [["_key", "", [""]], ["_default", nil, [[], "", 0, false, createHashMap]]];
+
+        private _vArsenal = _self get "vArsenal";
+        _vArsenal getOrDefault [_key, _default];
+    }],
+    ["applyItems", {
+        private _items = _self call ["get", ["items", []]];
+        [FORGE_Armory_Box, _items, false, true, 1, 0] call BFUNC(addVirtualItemCargo);
+    }],
+    ["applyWeapons", {
+        private _weapons = _self call ["get", ["weapons", []]];
+        [FORGE_Armory_Box, _weapons, false, true, 1, 1] call BFUNC(addVirtualItemCargo);
+    }],
+    ["applyMagazines", {
+        private _magazines = _self call ["get", ["magazines", []]];
+        [FORGE_Armory_Box, _magazines, false, true, 1, 2] call BFUNC(addVirtualItemCargo);
+    }],
+    ["applyBackpacks", {
+        private _backpacks = _self call ["get", ["backpacks", []]];
+        [FORGE_Armory_Box, _backpacks, false, true, 1, 3] call BFUNC(addVirtualItemCargo);
+    }]
+]];
+
+SETVAR(player,FORGE_VArsenalClass,GVAR(VArsenalClass));
+GVAR(VArsenalClass)
diff --git a/arma/client/addons/locker/functions/fnc_openUI.sqf b/arma/client/addons/locker/functions/fnc_openUI.sqf
new file mode 100644
index 0000000..c9fcbd1
--- /dev/null
+++ b/arma/client/addons/locker/functions/fnc_openUI.sqf
@@ -0,0 +1,17 @@
+#include "..\script_component.hpp"
+
+/*
+ * Author: IDSolutions
+ * Opens the locker UI.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [] call forge_client_locker_fnc_openUI;
+ *
+ * Public: No
+ */
diff --git a/arma/client/addons/locker/script_component.hpp b/arma/client/addons/locker/script_component.hpp
new file mode 100644
index 0000000..3ed1fbb
--- /dev/null
+++ b/arma/client/addons/locker/script_component.hpp
@@ -0,0 +1,9 @@
+#define COMPONENT locker
+#define COMPONENT_BEAUTIFIED Locker
+#include "\forge\forge_client\addons\main\script_mod.hpp"
+
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define ENABLE_PERFORMANCE_COUNTERS
+
+#include "\forge\forge_client\addons\main\script_macros.hpp"
diff --git a/arma/client/addons/locker/stringtable.xml b/arma/client/addons/locker/stringtable.xml
new file mode 100644
index 0000000..d6824eb
--- /dev/null
+++ b/arma/client/addons/locker/stringtable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="FFE">
+    <Package name="Locker">
+        <Key ID="STR_forge_client_locker_displayName">
+            <English>Locker</English>
+        </Key>
+    </Package>
+</Project>
diff --git a/arma/client/addons/main/script_macros.hpp b/arma/client/addons/main/script_macros.hpp
index 415ad5c..6727a66 100644
--- a/arma/client/addons/main/script_macros.hpp
+++ b/arma/client/addons/main/script_macros.hpp
@@ -14,6 +14,10 @@
 // Remote Procedure Calls
 #define CRPC(var1,var2) QUOTE(DOUBLES(DOUBLES(forge_client,var1),var2))
 #define SRPC(var1,var2) QUOTE(DOUBLES(DOUBLES(forge_server,var1),var2))
+#define SREG(var1,var2) DOUBLES(DOUBLES(forge_server,var1),var2)
+
+#define CLASS(var1) DOUBLES(PREFIX,var1)
+#define QCLASS(var1) QUOTE(DOUBLES(PREFIX,var1))
 
 #define QQUOTE(var1) QUOTE(QUOTE(var1))
 
diff --git a/arma/client/addons/notifications/$PBOPREFIX$ b/arma/client/addons/notifications/$PBOPREFIX$
new file mode 100644
index 0000000..6f3cabe
--- /dev/null
+++ b/arma/client/addons/notifications/$PBOPREFIX$
@@ -0,0 +1 @@
+forge\forge_client\addons\notifications
diff --git a/arma/client/addons/notifications/CfgEventHandlers.hpp b/arma/client/addons/notifications/CfgEventHandlers.hpp
new file mode 100644
index 0000000..c6e25db
--- /dev/null
+++ b/arma/client/addons/notifications/CfgEventHandlers.hpp
@@ -0,0 +1,19 @@
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
+    };
+};
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
+        clientInit = QUOTE(call COMPILE_SCRIPT(XEH_preInitClient));
+    };
+};
+
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
+        clientInit = QUOTE(call COMPILE_SCRIPT(XEH_postInitClient));
+    };
+};
diff --git a/arma/client/addons/notifications/README.md b/arma/client/addons/notifications/README.md
new file mode 100644
index 0000000..9d0e00a
--- /dev/null
+++ b/arma/client/addons/notifications/README.md
@@ -0,0 +1,4 @@
+forge_client_notifications
+===================
+
+Description for this addon
diff --git a/arma/client/addons/notifications/XEH_PREP.hpp b/arma/client/addons/notifications/XEH_PREP.hpp
new file mode 100644
index 0000000..c0e2dad
--- /dev/null
+++ b/arma/client/addons/notifications/XEH_PREP.hpp
@@ -0,0 +1,3 @@
+PREP(handleUIEvents);
+PREP(initNotificationClass);
+PREP(openUI);
diff --git a/arma/client/addons/notifications/XEH_postInit.sqf b/arma/client/addons/notifications/XEH_postInit.sqf
new file mode 100644
index 0000000..421c54b
--- /dev/null
+++ b/arma/client/addons/notifications/XEH_postInit.sqf
@@ -0,0 +1 @@
+#include "script_component.hpp"
diff --git a/arma/client/addons/notifications/XEH_postInitClient.sqf b/arma/client/addons/notifications/XEH_postInitClient.sqf
new file mode 100644
index 0000000..6dc4bcd
--- /dev/null
+++ b/arma/client/addons/notifications/XEH_postInitClient.sqf
@@ -0,0 +1,15 @@
+#include "script_component.hpp"
+
+[{
+    EGVAR(actor,ActorClass) get "isLoaded";
+}, {
+    ("NotificationHudLayer" call BFUNC(rscLayer)) cutRsc ["RscNotifications", "PLAIN"];
+    [] call FUNC(openUI);
+    if (isNil QGVAR(NotificationClass)) then { [] call FUNC(initNotificationClass); };
+}] call CFUNC(waitUntilAndExecute);
+
+[QGVAR(recieveNotification), {
+    params [["_type", "", [""]], ["_title", "", [""]], ["_content", "", [""]], ["_duration", 4000, [4000]]];
+
+    GVAR(NotificationClass) call ["create", [_type, _title, _content, _duration]];
+}] call CFUNC(addEventHandler);
diff --git a/arma/client/addons/notifications/XEH_preInit.sqf b/arma/client/addons/notifications/XEH_preInit.sqf
new file mode 100644
index 0000000..dbef1ae
--- /dev/null
+++ b/arma/client/addons/notifications/XEH_preInit.sqf
@@ -0,0 +1,10 @@
+#include "script_component.hpp"
+
+PREP_RECOMPILE_START;
+#include "XEH_PREP.hpp"
+PREP_RECOMPILE_END;
+
+// private _category = [QUOTE(MOD_NAME), LLSTRING(displayName)];
+
+// #include "initSettings.inc.sqf"
+// #include "initKeybinds.inc.sqf"
diff --git a/arma/client/addons/notifications/XEH_preInitClient.sqf b/arma/client/addons/notifications/XEH_preInitClient.sqf
new file mode 100644
index 0000000..421c54b
--- /dev/null
+++ b/arma/client/addons/notifications/XEH_preInitClient.sqf
@@ -0,0 +1 @@
+#include "script_component.hpp"
diff --git a/arma/client/addons/notifications/XEH_preStart.sqf b/arma/client/addons/notifications/XEH_preStart.sqf
new file mode 100644
index 0000000..0228885
--- /dev/null
+++ b/arma/client/addons/notifications/XEH_preStart.sqf
@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
diff --git a/arma/client/addons/notifications/config.cpp b/arma/client/addons/notifications/config.cpp
new file mode 100644
index 0000000..fdb31cc
--- /dev/null
+++ b/arma/client/addons/notifications/config.cpp
@@ -0,0 +1,21 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        author = AUTHOR;
+        authors[] = {"IDSolutions"};
+        url = ECSTRING(main,url);
+        name = COMPONENT_NAME;
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "forge_client_main"
+        };
+        units[] = {};
+        weapons[] = {};
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgEventHandlers.hpp"
+#include "ui\RscCommon.hpp"
+#include "ui\RscNotifications.hpp"
diff --git a/arma/client/addons/notifications/functions/fnc_handleUIEvents.sqf b/arma/client/addons/notifications/functions/fnc_handleUIEvents.sqf
new file mode 100644
index 0000000..ecfc19e
--- /dev/null
+++ b/arma/client/addons/notifications/functions/fnc_handleUIEvents.sqf
@@ -0,0 +1,34 @@
+#include "..\script_component.hpp"
+
+/*
+ * Author: IDSolutions
+ * Handles UI events.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [] call forge_client_notifications_fnc_handleUIEvents;
+ *
+ * Public: No
+ */
+
+params ["_control", "_isConfirmDialog", "_message"];
+
+private _alert = fromJSON _message;
+private _event = _alert get "event";
+private _data = _alert get "data";
+
+diag_log format ["[FORGE:Client:Notifications] Handling UI event: %1 with data: %2", _event, _data];
+
+switch (_event) do {
+    case "notifications::ready": {
+        GVAR(NotificationClass) call ["init", []];
+    };
+    default { hint format ["[FORGE:Client:Notifications] Unhandled event: %1", _event]; };
+};
+
+true;
diff --git a/arma/client/addons/notifications/functions/fnc_initNotificationClass.sqf b/arma/client/addons/notifications/functions/fnc_initNotificationClass.sqf
new file mode 100644
index 0000000..7558d01
--- /dev/null
+++ b/arma/client/addons/notifications/functions/fnc_initNotificationClass.sqf
@@ -0,0 +1,54 @@
+#include "..\script_component.hpp"
+
+/*
+ * Author: IDSolutions
+ * Initialize notification class
+ *
+ * Arguments:
+ * N/A
+ *
+ * Return Value:
+ * N/A
+ *
+ * Examples:
+ * [] call forge_client_notifications_fnc_initNotificationClass
+ *
+ * Public: Yes
+ */
+
+#pragma hemtt ignore_variables ["_self"]
+GVAR(NotificationClass) = createHashMapObject [[
+    ["#type", "INotificationClass"],
+    ["#create", {
+        private _display = uiNamespace getVariable ["RscNotifications", nil];
+        private _control = _display displayCtrl 1004;
+
+        _self set ["control", _control];
+        _self set ["isLoaded", false];
+    }],
+    ["init", {
+        private _params = ["success", "System Ready", "Notification system handshake complete!", 3000];
+
+        _self call ["create", _params];
+        _self set ["isLoaded", true];
+
+        systemChat format ["Notifications loaded for %1", (name player)];
+        diag_log "[FORGE:Client:Notifications] Notification Class Initialized!";
+    }],
+    ["create", {
+        params [["_type", "", ["info"]], ["_title", "", [""]], ["_content", "", [""]], ["_duration", 4000]];
+
+        private _control = _self get "control";
+        private _message = createHashMap;
+
+        _message set ["type", _type];
+        _message set ["title", _title];
+        _message set ["message", _content];
+        _message set ["duration", _duration];
+
+        _control ctrlWebBrowserAction ["ExecJS", format ["window.dispatchEvent(new CustomEvent('forge:notify', { detail: %1 }))", (toJSON _message)]];
+    }]
+]];
+
+SETVAR(player,FORGE_NotificationClass,GVAR(NotificationClass));
+GVAR(NotificationClass)
diff --git a/arma/client/addons/notifications/functions/fnc_openUI.sqf b/arma/client/addons/notifications/functions/fnc_openUI.sqf
new file mode 100644
index 0000000..49d7eff
--- /dev/null
+++ b/arma/client/addons/notifications/functions/fnc_openUI.sqf
@@ -0,0 +1,31 @@
+#include "..\script_component.hpp"
+
+/*
+ * Author: IDSolutions
+ * Open notification interface.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [] call forge_client_notifications_fnc_openUI;
+ *
+ * Public: No
+ */
+
+private _display = uiNamespace getVariable ["RscNotifications", nil];
+private _ctrl =  (_display displayCtrl 1004);
+
+_ctrl ctrlAddEventHandler ["JSDialog", {
+    params ["_control", "_isConfirmDialog", "_message"];
+
+    [_control, _isConfirmDialog, _message] call FUNC(handleUIEvents);
+}];
+
+_ctrl ctrlWebBrowserAction ["LoadFile", QPATHTOF2(ui\_site\index.html)];
+// _ctrl ctrlWebBrowserAction ["OpenDevConsole"];
+
+true;
diff --git a/arma/client/addons/notifications/initKeybinds.inc.sqf b/arma/client/addons/notifications/initKeybinds.inc.sqf
new file mode 100644
index 0000000..2922c52
--- /dev/null
+++ b/arma/client/addons/notifications/initKeybinds.inc.sqf
@@ -0,0 +1 @@
+#include "\forge\forge_client\addons\main\data\hpp\defineDIKCodes.hpp"
diff --git a/arma/client/addons/notifications/initSettings.inc.sqf b/arma/client/addons/notifications/initSettings.inc.sqf
new file mode 100644
index 0000000..416ff52
--- /dev/null
+++ b/arma/client/addons/notifications/initSettings.inc.sqf
@@ -0,0 +1 @@
+// Can use localize "STR_ACE_Common_Enabled" for name if ACE is required
diff --git a/arma/client/addons/notifications/script_component.hpp b/arma/client/addons/notifications/script_component.hpp
new file mode 100644
index 0000000..b05c9b3
--- /dev/null
+++ b/arma/client/addons/notifications/script_component.hpp
@@ -0,0 +1,9 @@
+#define COMPONENT notifications
+#define COMPONENT_BEAUTIFIED Notifications
+#include "\forge\forge_client\addons\main\script_mod.hpp"
+
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define ENABLE_PERFORMANCE_COUNTERS
+
+#include "\forge\forge_client\addons\main\script_macros.hpp"
diff --git a/arma/client/addons/notifications/stringtable.xml b/arma/client/addons/notifications/stringtable.xml
new file mode 100644
index 0000000..4fef435
--- /dev/null
+++ b/arma/client/addons/notifications/stringtable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="FFE">
+    <Package name="Notifications">
+        <Key ID="STR_forge_client_notifications_displayName">
+            <English>Notifications</English>
+        </Key>
+    </Package>
+</Project>
diff --git a/arma/client/addons/notifications/ui/RscCommon.hpp b/arma/client/addons/notifications/ui/RscCommon.hpp
new file mode 100644
index 0000000..8b57936
--- /dev/null
+++ b/arma/client/addons/notifications/ui/RscCommon.hpp
@@ -0,0 +1,98 @@
+// Control types
+#define CT_STATIC           0
+#define CT_BUTTON           1
+#define CT_EDIT             2
+#define CT_SLIDER           3
+#define CT_COMBO            4
+#define CT_LISTBOX          5
+#define CT_TOOLBOX          6
+#define CT_CHECKBOXES       7
+#define CT_PROGRESS         8
+#define CT_HTML             9
+#define CT_STATIC_SKEW      10
+#define CT_ACTIVETEXT       11
+#define CT_TREE             12
+#define CT_STRUCTURED_TEXT  13
+#define CT_CONTEXT_MENU     14
+#define CT_CONTROLS_GROUP   15
+#define CT_SHORTCUTBUTTON   16
+#define CT_HITZONES         17
+#define CT_XKEYDESC         40
+#define CT_XBUTTON          41
+#define CT_XLISTBOX         42
+#define CT_XSLIDER          43
+#define CT_XCOMBO           44
+#define CT_ANIMATED_TEXTURE 45
+#define CT_OBJECT           80
+#define CT_OBJECT_ZOOM      81
+#define CT_OBJECT_CONTAINER 82
+#define CT_OBJECT_CONT_ANIM 83
+#define CT_LINEBREAK        98
+#define CT_USER             99
+#define CT_MAP              100
+#define CT_MAP_MAIN         101
+#define CT_LISTNBOX         102
+#define CT_ITEMSLOT         103
+#define CT_CHECKBOX         77
+
+// Static styles
+#define ST_POS            0x0F
+#define ST_HPOS           0x03
+#define ST_VPOS           0x0C
+#define ST_LEFT           0x00
+#define ST_RIGHT          0x01
+#define ST_CENTER         0x02
+#define ST_DOWN           0x04
+#define ST_UP             0x08
+#define ST_VCENTER        0x0C
+
+#define ST_TYPE           0xF0
+#define ST_SINGLE         0x00
+#define ST_MULTI          0x10
+#define ST_TITLE_BAR      0x20
+#define ST_PICTURE        0x30
+#define ST_FRAME          0x40
+#define ST_BACKGROUND     0x50
+#define ST_GROUP_BOX      0x60
+#define ST_GROUP_BOX2     0x70
+#define ST_HUD_BACKGROUND 0x80
+#define ST_TILE_PICTURE   0x90
+#define ST_WITH_RECT      0xA0
+#define ST_LINE           0xB0
+#define ST_UPPERCASE      0xC0
+#define ST_LOWERCASE      0xD0
+
+#define ST_SHADOW         0x100
+#define ST_NO_RECT        0x200
+#define ST_KEEP_ASPECT_RATIO  0x800
+
+// Slider styles
+#define SL_DIR            0x400
+#define SL_VERT           0
+#define SL_HORZ           0x400
+
+#define SL_TEXTURES       0x10
+
+// progress bar
+#define ST_VERTICAL       0x01
+#define ST_HORIZONTAL     0
+
+// Listbox styles
+#define LB_TEXTURES       0x10
+#define LB_MULTI          0x20
+
+// Tree styles
+#define TR_SHOWROOT       1
+#define TR_AUTOCOLLAPSE   2
+
+// Default text sizes
+#define GUI_TEXT_SIZE_SMALL		(GUI_GRID_H * 0.8)
+#define GUI_TEXT_SIZE_MEDIUM		(GUI_GRID_H * 1)
+#define GUI_TEXT_SIZE_LARGE		(GUI_GRID_H * 1.2)
+
+// Pixel grid
+#define pixelScale	0.50
+#define GRID_W (pixelW * pixelGrid * pixelScale)
+#define GRID_H (pixelH * pixelGrid * pixelScale)
+
+class RscText;
diff --git a/arma/client/addons/notifications/ui/RscNotifications.hpp b/arma/client/addons/notifications/ui/RscNotifications.hpp
new file mode 100644
index 0000000..5824951
--- /dev/null
+++ b/arma/client/addons/notifications/ui/RscNotifications.hpp
@@ -0,0 +1,22 @@
+class RscTitles {
+    class RscNotifications {
+        idd = 1003;
+        fadein = 0;
+        fadeout = 0;
+        duration = 1e+011;
+        onLoad = "uinamespace setVariable ['RscNotifications', _this select 0]";
+        onUnLoad = "uinamespace setVariable ['RscNotifications', nil]";
+
+        class controlsBackground {};
+        class controls {
+            class IFrame: RscText {
+                type = 106;
+                idc = 1004;
+                x = "safeZoneX";
+                y = "safeZoneY";
+                w = "safeZoneW";
+                h = "safeZoneH";
+            };
+        };
+    };
+};
diff --git a/arma/client/addons/notifications/ui/_site/index.html b/arma/client/addons/notifications/ui/_site/index.html
new file mode 100644
index 0000000..39588c9
--- /dev/null
+++ b/arma/client/addons/notifications/ui/_site/index.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Forge - Notification System</title>
+    <!--
+        Dynamic Resource Loading
+        The following script loads CSS and JavaScript files dynamically using the A3API
+        This approach is used instead of static HTML imports to work with Arma 3's file system
+    -->
+    <script>
+        Promise.all([
+            // Load CSS file
+            A3API.RequestFile("forge\\forge_client\\addons\\notifications\\ui\\_site\\styles.css"),
+            // Load JavaScript file (now using Redux-like pattern)
+            A3API.RequestFile("forge\\forge_client\\addons\\notifications\\ui\\_site\\script.js")
+        ]).then(([css, js]) => {
+            // Apply CSS
+            const style = document.createElement('style');
+            style.textContent = css;
+            document.head.appendChild(style);
+
+            // Load and execute JavaScript
+            const script = document.createElement('script');
+            script.text = js;
+            document.head.appendChild(script);
+        });
+    </script>
+</head>
+
+<body>
+    <!-- Main notification container -->
+    <div id="notification-container" class="notification-container" role="region" aria-label="Notifications"></div>
+</body>
+
+</html>
diff --git a/arma/client/addons/notifications/ui/_site/script.js b/arma/client/addons/notifications/ui/_site/script.js
new file mode 100644
index 0000000..baf5b88
--- /dev/null
+++ b/arma/client/addons/notifications/ui/_site/script.js
@@ -0,0 +1,263 @@
+//=============================================================================
+// #region ACTIONS
+//=============================================================================
+
+const NotificationActionTypes = {
+    ADD_NOTIFICATION: 'ADD_NOTIFICATION',
+    REMOVE_NOTIFICATION: 'REMOVE_NOTIFICATION',
+    CLEAR_NOTIFICATIONS: 'CLEAR_NOTIFICATIONS',
+    UPDATE_NOTIFICATION: 'UPDATE_NOTIFICATION'
+};
+
+const notificationActions = {
+    addNotification: (notification) => ({
+        type: NotificationActionTypes.ADD_NOTIFICATION,
+        payload: {
+            id: Date.now() + Math.random(),
+            timestamp: Date.now(),
+            type: 'info',
+            title: 'Notification',
+            message: 'Default message',
+            duration: 0,
+            status: 'showing',
+            ...notification
+        }
+    }),
+    removeNotification: (id) => ({
+        type: NotificationActionTypes.REMOVE_NOTIFICATION,
+        payload: { id }
+    }),
+    clearNotifications: () => ({
+        type: NotificationActionTypes.CLEAR_NOTIFICATIONS
+    }),
+    updateNotification: (id, updates) => ({
+        type: NotificationActionTypes.UPDATE_NOTIFICATION,
+        payload: { id, updates }
+    })
+};
+
+//=============================================================================
+// #region REDUCER
+//=============================================================================
+
+const notificationInitialState = {
+    notifications: [],
+    maxNotifications: 5
+};
+
+function notificationReducer(state = notificationInitialState, action = {}) {
+    switch (action.type) {
+        case NotificationActionTypes.ADD_NOTIFICATION: {
+            if (!action.payload) return state;
+            let newNotifications = [...state.notifications];
+            if (newNotifications.length >= state.maxNotifications) {
+                newNotifications = newNotifications.slice(1);
+            }
+            return { ...state, notifications: [...newNotifications, action.payload] };
+        }
+        case NotificationActionTypes.REMOVE_NOTIFICATION: {
+            if (!action.payload || !action.payload.id) return state;
+            return {
+                ...state,
+                notifications: state.notifications.filter(n => n.id !== action.payload.id)
+            };
+        }
+        case NotificationActionTypes.CLEAR_NOTIFICATIONS:
+            return { ...state, notifications: [] };
+        case NotificationActionTypes.UPDATE_NOTIFICATION: {
+            if (!action.payload || !action.payload.id || !action.payload.updates) return state;
+            return {
+                ...state,
+                notifications: state.notifications.map(n =>
+                    n.id === action.payload.id ? { ...n, ...action.payload.updates } : n
+                )
+            };
+        }
+        default:
+            return state;
+    }
+}
+
+//=============================================================================
+// #region STORE
+//=============================================================================
+
+class Store {
+    constructor(reducer, initialState) {
+        this.reducer = reducer;
+        this.state = initialState;
+        this.listeners = [];
+    }
+
+    getState() {
+        return this.state;
+    }
+
+    dispatch(action) {
+        this.state = this.reducer(this.state, action);
+        this.listeners.forEach(listener => listener(this.state));
+        return action;
+    }
+
+    subscribe(listener) {
+        this.listeners.push(listener);
+        return () => {
+            this.listeners = this.listeners.filter(l => l !== listener);
+        };
+    }
+}
+
+const notificationStore = new Store(notificationReducer, notificationInitialState);
+
+//=============================================================================
+// #region SELECTORS
+//=============================================================================
+
+const notificationSelectors = {
+    getNotifications: (state) => state.notifications,
+    getMaxNotifications: (state) => state.maxNotifications
+};
+
+//=============================================================================
+// #region UI COMPONENT
+//=============================================================================
+
+class NotificationUI {
+    constructor(store) {
+        this.store = store;
+        this.unsubscribe = null;
+        this.container = document.getElementById('notification-container');
+        this.renderedNotifications = new Map();
+    }
+
+    init() {
+        if (!this.container) {
+            console.error('Notification container not found');
+            return;
+        }
+        this.unsubscribe = this.store.subscribe((state) => this.render(state));
+        this.render(this.store.getState());
+    }
+
+    destroy() {
+        if (this.unsubscribe) this.unsubscribe();
+        this.renderedNotifications.forEach(el => {
+            if (el.parentNode) el.parentNode.removeChild(el);
+        });
+        this.renderedNotifications.clear();
+    }
+
+    render(state) {
+        const notifications = notificationSelectors.getNotifications(state);
+
+        // Remove notifications no longer present
+        const currentIds = new Set(notifications.map(n => n.id));
+        for (const [id, el] of this.renderedNotifications.entries()) {
+            if (!currentIds.has(id)) {
+                if (el.parentNode) el.parentNode.removeChild(el);
+                this.renderedNotifications.delete(id);
+            }
+        }
+
+        // Add or update notifications
+        notifications.forEach(notification => {
+            if (!notification || !notification.id) return;
+            if (!this.renderedNotifications.has(notification.id)) {
+                this.createNotificationElement(notification);
+            } else {
+                this.updateNotificationElement(notification);
+            }
+        });
+    }
+
+    createNotificationElement(notification) {
+        const el = document.createElement('div');
+        el.className = `notification ${notification.type || 'info'}`;
+        el.dataset.id = notification.id;
+        el.innerHTML = `
+            <div class="notification-header">
+                <div class="notification-title">${notification.title || 'Notification'}</div>
+            </div>
+            <div class="notification-message">${notification.message || 'No message'}</div>
+            ${notification.duration > 0 ? '<div class="notification-progress"><div class="notification-progress-bar"></div></div>' : ''}
+        `;
+        this.container.appendChild(el);
+        this.renderedNotifications.set(notification.id, el);
+        setTimeout(() => el.classList.add('show'), 10);
+
+        // Set progress bar animation duration
+        if (notification.duration > 0) {
+            const progressBar = el.querySelector('.notification-progress-bar');
+            if (progressBar) {
+                progressBar.style.transition = `width ${notification.duration}ms linear`;
+                progressBar.style.width = '100%';
+                setTimeout(() => {
+                    progressBar.style.width = '0%';
+                }, 20);
+            }
+
+            setTimeout(() => {
+                notificationStore.dispatch(notificationActions.updateNotification(notification.id, { status: 'hiding' }));
+                setTimeout(() => {
+                    notificationStore.dispatch(notificationActions.removeNotification(notification.id));
+                }, 300);
+            }, notification.duration);
+        }
+    }
+
+    updateNotificationElement(notification) {
+        const el = this.renderedNotifications.get(notification.id);
+        if (!el) return;
+        if (notification.status === 'hiding') el.classList.add('hide');
+    }
+}
+
+//=============================================================================
+// #region GLOBAL API & EVENT HANDLING
+//=============================================================================
+
+let notificationUI = null;
+let notificationUIInitialized = false;
+
+function notifyArmaNotificationReady() {
+    if (window.parent && window.parent !== window && typeof window.parent.postMessage === "function") {
+        window.parent.postMessage({ event: "notifications::ready" }, "*");
+    }
+    if (typeof A3API !== "undefined" && typeof A3API.SendAlert === "function") {
+        A3API.SendAlert(JSON.stringify({ event: "notifications::ready" }));
+    }
+}
+
+function initializeNotifications() {
+    if (notificationUIInitialized) {
+        console.log('Notification system already initialized, skipping...');
+        return;
+    }
+    notificationUI = new NotificationUI(notificationStore);
+    notificationUI.init();
+    notificationUIInitialized = true;
+    console.log('Notification system is ready!');
+    notifyArmaNotificationReady();
+}
+
+// Expose global notification API
+const showNotification = (type, title, message, duration) => {
+    return notificationStore.dispatch(notificationActions.addNotification({ type, title, message, duration }));
+};
+const clearAllNotifications = () => {
+    return notificationStore.dispatch(notificationActions.clearNotifications());
+};
+
+// Listen for global notification events (for Arma/SQF or other scripts)
+window.addEventListener('forge:notify', function (e) {
+    if (!e || !e.detail) return;
+    const { type, title, message, duration } = e.detail;
+    showNotification(type, title, message, duration);
+});
+
+// Auto-initialize if DOM is already loaded when script executes
+if (document.readyState !== 'loading') {
+    initializeNotifications();
+} else {
+    document.addEventListener('DOMContentLoaded', initializeNotifications, { once: true });
+}
\ No newline at end of file
diff --git a/arma/client/addons/notifications/ui/_site/styles.css b/arma/client/addons/notifications/ui/_site/styles.css
new file mode 100644
index 0000000..9fdea12
--- /dev/null
+++ b/arma/client/addons/notifications/ui/_site/styles.css
@@ -0,0 +1,174 @@
+* {
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+}
+
+body {
+    font-family: Arial, sans-serif;
+    background: transparent;
+    min-height: 100vh;
+    color: rgba(200, 220, 240, 0.95);
+    pointer-events: none;
+}
+
+/* Notification Container */
+.notification-container {
+    position: fixed;
+    top: 120px;
+    right: 20px;
+    z-index: 1000;
+    width: 350px;
+    pointer-events: auto;
+}
+
+/* Individual Notification */
+.notification {
+    background: rgba(15, 20, 30, 0.9);
+    border: 1px solid rgba(100, 150, 200, 0.4);
+    border-left: 3px solid rgba(100, 150, 200, 0.5);
+    border-radius: 4px;
+    box-shadow:
+        0 0 20px rgba(100, 150, 200, 0.15),
+        0 4px 16px rgba(0, 0, 0, 0.8);
+    margin-bottom: 10px;
+    padding: 1rem 1.25rem;
+    width: 100%;
+    transform: translateX(100%);
+    transition: all 0.15s ease;
+    position: relative;
+    overflow: hidden;
+
+    &.show {
+        transform: translateX(0);
+    }
+
+    &.hide {
+        transform: translateX(100%);
+        opacity: 0;
+    }
+
+    /* Notification Types */
+    &.success {
+        border-left-color: rgba(100, 200, 150, 0.6);
+
+        .notification-title {
+            color: rgba(150, 255, 200, 0.9);
+        }
+
+        .notification-progress-bar {
+            background: rgba(100, 200, 150, 0.8);
+            animation: progress 5s linear forwards;
+        }
+    }
+
+    &.danger {
+        border-left-color: rgba(220, 100, 100, 0.6);
+
+        .notification-title {
+            color: rgba(255, 150, 150, 0.9);
+        }
+
+        .notification-progress-bar {
+            background: rgba(220, 100, 100, 0.8);
+            animation: progress 5s linear forwards;
+        }
+    }
+
+    &.warning {
+        border-left-color: rgba(200, 150, 100, 0.6);
+
+        .notification-title {
+            color: rgba(255, 200, 150, 0.9);
+        }
+
+        .notification-progress-bar {
+            background: rgba(200, 150, 100, 0.8);
+            animation: progress 5s linear forwards;
+        }
+    }
+
+    &.info {
+        border-left-color: rgba(100, 150, 200, 0.6);
+
+        .notification-title {
+            color: rgba(150, 200, 255, 0.9);
+        }
+
+        .notification-progress-bar {
+            background: rgba(100, 150, 200, 0.8);
+            animation: progress 5s linear forwards;
+        }
+    }
+}
+
+/* Notification Content */
+.notification-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 0.5rem;
+}
+
+.notification-title {
+    font-weight: 600;
+    font-size: 0.875rem;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+    flex: 1;
+    color: rgba(200, 220, 255, 1);
+}
+
+.notification-message {
+    color: rgba(140, 160, 180, 0.9);
+    font-size: 0.8rem;
+    line-height: 1.4;
+    word-wrap: break-word;
+    margin-bottom: 0.5rem;
+}
+
+/* Progress bar for auto-dismiss */
+.notification-progress {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    height: 3px;
+    background: rgba(15, 20, 30, 0.5);
+    width: 100%;
+    border-radius: 0 0 4px 4px;
+}
+
+.notification-progress-bar {
+    height: 100%;
+    width: 0%;
+    transform-origin: left;
+    border-radius: 0 0 4px 4px;
+    transition: width linear;
+}
+
+/* Responsive Design */
+@media (max-width: 768px) {
+    .notification-container {
+        left: 20px;
+        right: 20px;
+        width: auto;
+    }
+
+    .notification {
+        transform: translateY(-100%);
+
+        &.show {
+            transform: translateY(0);
+        }
+
+        &.hide {
+            transform: translateY(-100%);
+        }
+    }
+}
+
+@media (max-width: 500px) {
+    .notification-container {
+        width: calc(100vw - 40px);
+    }
+}
diff --git a/arma/client/addons/org/XEH_postInitClient.sqf b/arma/client/addons/org/XEH_postInitClient.sqf
index 5982469..e6c9147 100644
--- a/arma/client/addons/org/XEH_postInitClient.sqf
+++ b/arma/client/addons/org/XEH_postInitClient.sqf
@@ -10,9 +10,6 @@ if (isNil QGVAR(OrgClass)) then { [] call FUNC(initOrgClass); };
     params [["_data", createHashMap, [createHashMap]]];
 
     GVAR(OrgClass) call ["sync", [_data, true]];
-
-    SETPVAR(player,FORGE_isLoaded,true);
-    cutText ["", "PLAIN", 1];
 }] call CFUNC(addEventHandler);
 
 [QGVAR(responseSyncOrg), {
diff --git a/arma/client/addons/org/functions/fnc_initOrgClass.sqf b/arma/client/addons/org/functions/fnc_initOrgClass.sqf
index ae1a4df..53c2fb7 100644
--- a/arma/client/addons/org/functions/fnc_initOrgClass.sqf
+++ b/arma/client/addons/org/functions/fnc_initOrgClass.sqf
@@ -59,7 +59,6 @@ GVAR(OrgClass) = createHashMapObject [[
         private _isLoaded = _self get "isLoaded";
         private _org = _self get "org";
 
-        if !(_isLoaded) then { _self set ["isLoaded", true]; };
         if (_data isEqualTo createHashMap) exitWith {
             diag_log "[FORGE:Client:Org] Empty data received for sync, skipping.";
         };
@@ -67,6 +66,8 @@ GVAR(OrgClass) = createHashMapObject [[
         { _org set [_x, _y]; } forEach _data;
 
         _self set ["org", _org];
+
+        if !(_isLoaded) then { _self set ["isLoaded", true]; };
         diag_log "[FORGE:Client:Org] Sync completed";
     }],
     ["get", {
diff --git a/arma/example_data.sqf b/arma/example_data.sqf
deleted file mode 100644
index c3ddf3c..0000000
--- a/arma/example_data.sqf
+++ /dev/null
@@ -1,5 +0,0 @@
-[["76561198027566824",[["rank","PRIVATE"],["earnings",0],["holster",true],["state","HEALTHY"],["bank",0],["organization","0160566824_org"],["transactions",[]],["loadout",[[],[],[],["U_BG_Guerrilla_6_1",[]],[],[],"H_Cap_blk_ION","",[],["ItemMap","ItemGPS","ItemRadio","ItemCompass","ItemWatch",""]]],["stance","CROUCH"],["cash",0],["uid","76561198027566824"],["phone_number","0160566824"],["direction",0],["position",[4000,4000,0]],["email","0160566824@spearnet.mil"]]]];
-
-["{""uid"":""76561198027566824"",""loadout"":[[],[],[],[""U_BG_Guerrilla_6_1"",[]],[],[],""H_Cap_blk_ION"","""",[],[""ItemMap"",""ItemGPS"",""ItemRadio"",""ItemCompass"",""ItemWatch"",""""]],""position"":[4000.0,4000.0,0.0],""direction"":0.0,""stance"":""CROUCH"",""email"":""0160566824@spearnet.mil"",""phone_number"":""0160566824"",""bank"":0.0,""cash"":0.0,""earnings"":0.0,""state"":""HEALTHY"",""holster"":true,""rank"":""PRIVATE"",""organization"":""0160566824_org"",""transactions"":[]}",0,0];
-
-["{""id"":""0160566824_org"",""owner"":""76561198027566824"",""name"":""Black Rifle Company"",""funds"":0.0,""reputation"":0}",0,0];
diff --git a/arma/server/.hemtt/lints.toml b/arma/server/.hemtt/lints.toml
index 98a617b..46cef0b 100644
--- a/arma/server/.hemtt/lints.toml
+++ b/arma/server/.hemtt/lints.toml
@@ -2,7 +2,7 @@
 options.banned = [
     "spawn", # Scheduled should be avoided whenever possible
     "execVM", # Script files should never be run directly, they should be functions
-    "remoteExec", # CBA events should be used for networking
+    # "remoteExec", # CBA events should be used for networking
 ]
 
 [sqf.banned_macros]
diff --git a/arma/server/.hemtt/project.toml b/arma/server/.hemtt/project.toml
index 11b6a3c..93f813b 100644
--- a/arma/server/.hemtt/project.toml
+++ b/arma/server/.hemtt/project.toml
@@ -11,10 +11,11 @@ git_hash = 0
 include = [
     "mod.cpp",
     "meta.cpp",
-    "logo_forge_server.png",
-    "logo_forge_server_over.png",
-    "logo_forge_server_ca.paa",
-    "logo_forge_server_over_ca.paa",
+    "icon_64_ca.paa",
+    "icon_128_ca.paa",
+    "icon_128_highlight_ca.paa",
+    "title_ca.paa",
+    "config.example.toml",
     "LICENSE.md",
     "README.md",
 ]
diff --git a/arma/server/addons/actor/XEH_preInit.sqf b/arma/server/addons/actor/XEH_preInit.sqf
index e46d7bd..d776427 100644
--- a/arma/server/addons/actor/XEH_preInit.sqf
+++ b/arma/server/addons/actor/XEH_preInit.sqf
@@ -6,8 +6,6 @@ PREP_RECOMPILE_END;
 
 // private _category = [QUOTE(MOD_NAME), LLSTRING(displayName)];
 
-if (isNil QGVAR(ActorStore)) then { [] call FUNC(initActorStore); };
-
 [QGVAR(requestInitActor), {
     params [["_uid", "", [""]], ["_actor", createHashMap, [createHashMap]]];
 
@@ -69,17 +67,3 @@ if (isNil QGVAR(ActorStore)) then { [] call FUNC(initActorStore); };
 
     GVAR(ActorStore) call ["remove", [_uid]];
 }] call CFUNC(addEventHandler);
-
-[QGVAR(requestResync), {
-    params ["_player"];
-
-    private _uid = getPlayerUID _player;
-    private _actor = GVAR(ActorStore) call ["get", [_uid, true]];
-
-    private _session = GVAR(PlayerSessions) getOrDefault [_uid, nil];
-    if (isNil "_session") exitWith { diag_log "[FORGE:Server:Actor] Empty/Invalid Session!" };
-
-    [CRPC(actor,responseSyncActor), [_actor, true], _player] call CFUNC(targetEvent);
-
-    diag_log format ["[FORGE:Server:Actor] Resync completed for %1", _uid];
-}] call CFUNC(addEventHandler);
diff --git a/arma/server/addons/actor/config.cpp b/arma/server/addons/actor/config.cpp
index 05c825e..cbd0a75 100644
--- a/arma/server/addons/actor/config.cpp
+++ b/arma/server/addons/actor/config.cpp
@@ -8,7 +8,8 @@ class CfgPatches {
         name = COMPONENT_NAME;
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {
-            "forge_server_main"
+            "forge_server_main",
+            "forge_server_common"
         };
         units[] = {};
         weapons[] = {};
diff --git a/arma/server/addons/actor/functions/fnc_initActorStore.sqf b/arma/server/addons/actor/functions/fnc_initActorStore.sqf
index b0447e0..32ac128 100644
--- a/arma/server/addons/actor/functions/fnc_initActorStore.sqf
+++ b/arma/server/addons/actor/functions/fnc_initActorStore.sqf
@@ -18,11 +18,19 @@
 
 #pragma hemtt ignore_variables ["_self"]
 GVAR(ActorStore) = createHashMapObject [[
+    ["#base", EGVAR(common,BaseStore)],
     ["#type", "IActorStore"],
     ["#create", {
         GVAR(ActorRegistry) = createHashMap;
         GVAR(PlayerSessions) = createHashMap;
-        diag_log "[FORGE:Server:Actor] Actor Store Initialized!";
+
+        _self set ["_registry", GVAR(ActorRegistry)];
+        _self set ["_extCallPrefix", "actor"];
+        _self set ["_readMethod", "get"];
+        _self set ["_storeName", "Actor"];
+        _self set ["_syncEventName", CRPC(actor,responseSyncActor)];
+
+        ["INFO", "Actor Store Initialized!", nil, nil] call EFUNC(common,log);
     }],
     ["generateSessionToken", {
         params [["_uid", "", [""]]];
@@ -30,7 +38,9 @@ GVAR(ActorStore) = createHashMapObject [[
         private _token = format ["%1_%2_%3", _uid, floor(random 999999), time];
         private _sessionToken = _token call EFUNC(common,generateHash);
 
-        GVAR(PlayerSessions) set [_uid, _sessionToken];
+        private _regEntry = createHashMapFromArray [["sessionToken", _sessionToken]];
+        GVAR(PlayerSessions) set [_uid, _regEntry];
+
         _sessionToken
     }],
     ["init", {
@@ -39,20 +49,20 @@ GVAR(ActorStore) = createHashMapObject [[
         _self call ["generateSessionToken", [_uid]];
         private _finalActor = createHashMap;
 
-        EXTCALL("actor:exists",[ARR_1(_uid)]);
-        private _exists = (_ext_res select 0) == "true";
+        ["actor:exists", [_uid]] call EFUNC(extension,extCall) params ["_result", "_isSuccess"];
+        private _exists = _result == "true";
 
         if !(_exists) then {
             _finalActor = _defaultActor;
             _finalActor set ["uid", _uid];
 
             private _json = _self call ["toJSON", [_finalActor]];
-            EXTCALL("actor:create",[ARR_2(_uid,_json)]);
+            ["actor:create", [_uid, _json]] call EFUNC(extension,extCall);
 
             private _phone_number = _finalActor getOrDefault ["phone_number", ""];
             private _email = _finalActor getOrDefault ["email", ""];
 
-            diag_log format ["[FORGE:Server:Actor] New player %1 registered with phone number: %2, email: %3", _uid, _phone_number, _email];
+            ["INFO", format ["New player %1 registered with phone number: %2, email: %3", _uid, _phone_number, _email], nil, nil] call EFUNC(common,log);
         } else {
             private _existingActor = _self call ["fetch", [_uid]];
             _finalActor = _existingActor;
@@ -68,112 +78,6 @@ GVAR(ActorStore) = createHashMapObject [[
         [CRPC(actor,responseInitActor), [_finalActor], _player] call CFUNC(targetEvent);
 
         _finalActor
-    }],
-    ["fetch", {
-        params [["_uid", "", [""]]];
-
-        private _actor = createHashMap;
-
-        EXTCALL("actor:get",[ARR_1(_uid)]);
-        diag_log format ["[FORGE:Server:Actor] Data: %1", _ext_res];
-
-        private _ext_res_actor = _ext_res select 0;
-        if (count _ext_res_actor > 0) then { _actor = _self call ["toHashMap", [_ext_res_actor]]; };
-
-        _actor
-    }],
-    ["get", {
-        params [["_uid", "", [""]], ["_sync", false, [false]]];
-
-        private _finalActor = createHashMap;
-
-        if (_sync) then {
-            private _existingActor = _self call ["fetch", [_uid]];
-            _finalActor = _existingActor;
-
-            GVAR(ActorRegistry) set [_uid, _finalActor];
-        } else {
-            _finalActor = GVAR(ActorRegistry) get _uid;
-        };
-
-        _finalActor
-    }],
-    ["set", {
-        params [["_uid", "", [""]], ["_field", "", [""]], ["_value", nil], ["_sync", false, [false]]];
-
-        private _existingActor = GVAR(ActorRegistry) get _uid;
-        private _finalActor = +_existingActor;
-        private _hashMap = createHashMap;
-
-        _finalActor set [_field, _value];
-        _hashMap set [_field, _value];
-
-        GVAR(ActorRegistry) set [_uid, _finalActor];
-
-        if (_sync) then {
-            private _json = _self call ["toJSON", [_hashMap]];
-            EXTCALL("actor:update",[ARR_2(_uid,_json)]);
-        };
-
-        private _player = [_uid] call EFUNC(common,getPlayer);
-        [CRPC(actor,responseSyncActor), [_hashMap], _player] call CFUNC(targetEvent);
-
-        _hashMap
-    }],
-    ["mset", {
-        params [["_uid", "", [""]], ["_fieldValuePairs", createHashMap, [createHashMap]], ["_sync", false, [false]]];
-
-        private _existingActor = GVAR(ActorRegistry) get _uid;
-        private _finalActor = +_existingActor;
-        private _hashMap = createHashMap;
-
-        { _finalActor set [_x, _y]; } forEach _fieldValuePairs;
-        { _hashMap set [_x, _y]; } forEach _fieldValuePairs;
-
-        GVAR(ActorRegistry) set [_uid, _finalActor];
-
-        if (_sync) then {
-            private _json = _self call ["toJSON", [_hashMap]];
-            EXTCALL("actor:update",[ARR_2(_uid,_json)]);
-        };
-
-        private _player = [_uid] call EFUNC(common,getPlayer);
-        [CRPC(actor,responseSyncActor), [_hashMap], _player] call CFUNC(targetEvent);
-
-        _hashMap
-    }],
-    ["save", {
-        params [["_uid", "", [""]], ["_sync", false, [false]]];
-
-        private _existingActor = GVAR(ActorRegistry) get _uid;
-        private _finalActor = +_existingActor;
-        private _json = _self call ["toJSON", [_finalActor]];
-
-        EXTCALL("actor:update",[ARR_2(_uid,_json)]);
-
-        if (_sync) then {
-            private _player = [_uid] call EFUNC(common,getPlayer);
-            [CRPC(actor,responseSyncActor), [_finalActor], _player] call CFUNC(targetEvent);
-        };
-
-        _finalActor
-    }],
-    ["remove", {
-        params [["_uid", "", [""]]];
-
-        GVAR(ActorRegistry) deleteAt _uid;
-    }],
-    ["toHashMap", {
-        params [["_data", "", [""]]];
-
-        private _hashMap = fromJSON _data;
-        _hashMap
-    }],
-    ["toJSON", {
-        params [["_data", createHashMap, [createHashMap]]];
-
-        private _json = toJSON _data;
-        _json
     }]
 ]];
 
diff --git a/arma/server/addons/bank/XEH_preInit.sqf b/arma/server/addons/bank/XEH_preInit.sqf
index 276041b..f94f7ed 100644
--- a/arma/server/addons/bank/XEH_preInit.sqf
+++ b/arma/server/addons/bank/XEH_preInit.sqf
@@ -6,8 +6,6 @@ PREP_RECOMPILE_END;
 
 // private _category = [QUOTE(MOD_NAME), LLSTRING(displayName)];
 
-if (isNil QGVAR(BankStore)) then { [] call FUNC(initBankStore); };
-
 [QGVAR(requestInitBank), {
     params [["_uid", "", [""]], ["_bank", createHashMap, [createHashMap]]];
 
@@ -70,16 +68,44 @@ if (isNil QGVAR(BankStore)) then { [] call FUNC(initBankStore); };
     GVAR(BankStore) call ["remove", [_uid]];
 }] call CFUNC(addEventHandler);
 
-[QGVAR(requestResync), {
-    params ["_player"];
+[QGVAR(requestDeposit), {
+    params [["_uid", "", [""]], ["_amount", 0, [0]]];
 
-    private _uid = getPlayerUID _player;
-    private _bank = GVAR(BankStore) call ["get", [_uid, true]];
+    if (_uid isEqualTo "" || _amount isEqualTo 0) exitWith { diag_log "[FORGE:Server:Bank] Empty/Invalid UID or Amount!" };
 
     private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
     if (isNil "_session") exitWith { diag_log "[FORGE:Server:Bank] Empty/Invalid Session!" };
 
-    [CRPC(bank,responseSyncBank), [_bank, true], _player] call CFUNC(targetEvent);
-
-    diag_log format ["[FORGE:Server:Bank] Resync completed for %1", _uid];
+    GVAR(BankStore) call ["deposit", [_uid, _amount]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestTransfer), {
+    params [["_uid", "", [""]], ["_target", "", [""]], ["_from", "", [""]], ["_amount", 0, [0]]];
+
+    if (_uid isEqualTo "" || _target isEqualTo "" || _from isEqualTo "" || _amount isEqualTo 0) exitWith {
+        diag_log "[FORGE:Server:Bank] Empty/Invalid UID, Target, From Account, or Amount!"
+    };
+
+    // Prevent self-transfers (security check)
+    if (_uid isEqualTo _target) exitWith {
+        diag_log format ["[FORGE:Server:Bank] SECURITY: Player %1 attempted self-transfer!", _uid];
+        private _player = [_uid] call EFUNC(common,getPlayer);
+        [CRPC(notifications,recieveNotification), ["error", "Bank", "Cannot transfer to yourself!"], _player] call CFUNC(targetEvent);
+    };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:Bank] Empty/Invalid Session!" };
+
+    GVAR(BankStore) call ["transfer", [_uid, _target, _from, _amount]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestWithdraw), {
+    params [["_uid", "", [""]], ["_amount", 0, [0]]];
+
+    if (_uid isEqualTo "" || _amount isEqualTo 0) exitWith { diag_log "[FORGE:Server:Bank] Empty/Invalid UID or Amount!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:Bank] Empty/Invalid Session!" };
+
+    GVAR(BankStore) call ["withdraw", [_uid, _amount]];
 }] call CFUNC(addEventHandler);
diff --git a/arma/server/addons/bank/config.cpp b/arma/server/addons/bank/config.cpp
index 05c825e..cbd0a75 100644
--- a/arma/server/addons/bank/config.cpp
+++ b/arma/server/addons/bank/config.cpp
@@ -8,7 +8,8 @@ class CfgPatches {
         name = COMPONENT_NAME;
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {
-            "forge_server_main"
+            "forge_server_main",
+            "forge_server_common"
         };
         units[] = {};
         weapons[] = {};
diff --git a/arma/server/addons/bank/functions/fnc_initBankStore.sqf b/arma/server/addons/bank/functions/fnc_initBankStore.sqf
index 0abbc71..af9d3ea 100644
--- a/arma/server/addons/bank/functions/fnc_initBankStore.sqf
+++ b/arma/server/addons/bank/functions/fnc_initBankStore.sqf
@@ -18,28 +18,36 @@
 
 #pragma hemtt ignore_variables ["_self"]
 GVAR(BankStore) = createHashMapObject [[
+    ["#base", EGVAR(common,BaseStore)],
     ["#type", "IBankStore"],
     ["#create", {
         GVAR(BankRegistry) = createHashMap;
-        diag_log "[FORGE:Server:Bank] Bank Store Initialized!";
+        GVAR(NameRegistry) = createHashMap;
+
+        _self set ["_registry", GVAR(BankRegistry)];
+        _self set ["_extCallPrefix", "bank"];
+        _self set ["_readMethod", "get"];
+        _self set ["_storeName", "Bank"];
+        _self set ["_syncEventName", CRPC(bank,responseSyncBank)];
+
+        ["INFO", "Bank Store Initialized!", nil, nil] call EFUNC(common,log);
     }],
     ["init", {
         params [["_uid", "", [""]], ["_defaultAccount", createHashMap, [createHashMap]]];
 
         private _finalAccount = createHashMap;
 
-        EXTCALL("bank:exists",[ARR_1(_uid)]);
-
-        private _exists = (_ext_res select 0) == "true";
+        ["bank:exists", [_uid]] call EFUNC(extension,extCall) params ["_result", "_isSuccess"];
+        private _exists = _result == "true";
 
         if !(_exists) then {
             _finalAccount = _defaultAccount;
             _finalAccount set ["uid", _uid];
 
             private _json = _self call ["toJSON", [_finalAccount]];
-            EXTCALL("bank:create",[ARR_2(_uid,_json)]);
+            ["bank:create", [_uid, _json]] call EFUNC(extension,extCall);
 
-            diag_log format ["[FORGE:Server:Bank] Created new bank account for %1", _uid];
+            ["INFO", format ["Created new bank account for %1", _uid], nil, nil] call EFUNC(common,log);
         } else {
             private _existingAccount = _self call ["fetch", [_uid]];
             _finalAccount = _existingAccount;
@@ -48,121 +56,88 @@ GVAR(BankStore) = createHashMapObject [[
                 if !(_x in _finalAccount) then { _finalAccount set [_x, _y]; };
             } forEach _defaultAccount;
 
-            diag_log format ["[FORGE:Server:Bank] Found bank account for %1", _uid];
+            ["INFO", format ["Found bank account for %1", _uid], nil, nil] call EFUNC(common,log);
         };
 
         GVAR(BankRegistry) set [_uid, _finalAccount, true];
 
         private _player = [_uid] call EFUNC(common,getPlayer);
+        private _regEntry = createHashMapFromArray [["uid", _uid], ["name", (name _player)]];
+        GVAR(NameRegistry) set [_uid, _regEntry];
         [CRPC(bank,responseInitBank), [_finalAccount], _player] call CFUNC(targetEvent);
 
         _finalAccount
     }],
-    ["fetch", {
-        params [["_uid", "", [""]]];
+    ["deposit", {
+        params [["_uid", "", [""]], ["_amount", 0, [0]]];
 
-        private _account = createHashMap;
+        ["INFO", format ["Deposit %1, for %2", _amount, _uid], nil, nil] call EFUNC(common,log);
 
-        EXTCALL("bank:get",[ARR_1(_uid)]);
-        diag_log format ["[FORGE:Server:Bank] Data: %1", _ext_res];
+        private _account = GVAR(BankRegistry) getOrDefault [_uid, nil];
+        if (isNil "_account") exitWith { ["ERROR", "Empty/Invalid Account!", nil, nil] call EFUNC(common,log); };
 
-        private _ext_res_account = _ext_res select 0;
-        if (count _ext_res_account > 0) then { _account = _self call ["toHashMap", [_ext_res_account]]; };
+        private _bank = _account getOrDefault ["bank", 0];
+        private _cash = _account getOrDefault ["cash", 0];
+        if (_cash < _amount) exitWith { ["WARNING", "Insufficient Funds!", nil, nil] call EFUNC(common,log); };
 
-        _account
-    }],
-    ["get", {
-        params [["_uid", "", [""]], ["_sync", false, [false]]];
-
-        private _finalAccount = createHashMap;
-
-        if (_sync) then {
-            private _existingAccount = _self call ["fetch", [_uid]];
-            _finalAccount = _existingAccount;
-
-            GVAR(BankRegistry) set [_uid, _finalAccount];
-        } else {
-            _finalAccount = GVAR(BankRegistry) get _uid;
-        };
-
-        _finalAccount
-    }],
-    ["set", {
-        params [["_uid", "", [""]], ["_field", "", [""]], ["_value", nil], ["_sync", false, [false]]];
-
-        private _existingAccount = GVAR(BankRegistry) get _uid;
-        private _finalAccount = +_existingAccount;
-        private _hashMap = createHashMap;
-
-        _finalAccount set [_field, _value];
-        _hashMap set [_field, _value];
-
-        GVAR(BankRegistry) set [_uid, _finalAccount];
-
-        if (_sync) then {
-            private _json = _self call ["toJSON", [_hashMap]];
-            EXTCALL("bank:update",[ARR_2(_uid,_json)]);
-        };
+        private _finalAccount = createHashMapFromArray [
+            ["bank", (_bank + _amount)],
+            ["cash", (_cash - _amount)]
+        ];
+        _self call ["mset", [_uid, _finalAccount]];
 
         private _player = [_uid] call EFUNC(common,getPlayer);
-        [CRPC(bank,responseSyncBank), [_hashMap], _player] call CFUNC(targetEvent);
-
-        _hashMap
+        [CRPC(notifications,recieveNotification), ["info", "Bank", format ["Deposited $%1", _amount]], _player] call CFUNC(targetEvent);
     }],
-    ["mset", {
-        params [["_uid", "", [""]], ["_fieldValuePairs", createHashMap, [createHashMap]], ["_sync", false, [false]]];
+    ["transfer", {
+        params [["_uid", "", [""]], ["_target", "", [""]], ["_from", "", [""]], ["_amount", 0, [0]]];
 
-        private _existingAccount = GVAR(BankRegistry) get _uid;
-        private _finalAccount = +_existingAccount;
-        private _hashMap = createHashMap;
-
-        { _finalAccount set [_x, _y]; } forEach _fieldValuePairs;
-        { _hashMap set [_x, _y]; } forEach _fieldValuePairs;
-
-        GVAR(BankRegistry) set [_uid, _finalAccount];
-
-        if (_sync) then {
-            private _json = _self call ["toJSON", [_hashMap]];
-            EXTCALL("bank:update",[ARR_2(_uid,_json)]);
+        if (_uid isEqualTo _target) exitWith {
+            ["WARNING", format ["Self-transfer attempt blocked for %1", _uid], nil, nil] call EFUNC(common,log);
         };
 
+        private _account = GVAR(BankRegistry) getOrDefault [_uid, nil];
+        if (isNil "_account") exitWith { ["ERROR", "Empty/Invalid Account!", nil, nil] call EFUNC(common,log); };
+
+        private _targetAccount = GVAR(BankRegistry) getOrDefault [_target, nil];
+        if (isNil "_targetAccount") exitWith { ["ERROR", "Empty/Invalid Target Account!", nil, nil] call EFUNC(common,log); };
+
+        private _bank = _account getOrDefault [_from, 0];
+        if (_bank < _amount) exitWith { ["WARNING", "Insufficient Funds!", nil, nil] call EFUNC(common,log); };
+
+        private _targetBank = _targetAccount getOrDefault ["bank", 0];
+        private _finalAccount = createHashMapFromArray [[_from, (_bank - _amount)]];
+        private _finalTargetBank = createHashMapFromArray [["bank", (_targetBank + _amount)]];
+
+        _self call ["mset", [_uid, _finalAccount]];
+        _self call ["mset", [_target, _finalTargetBank]];
+
         private _player = [_uid] call EFUNC(common,getPlayer);
-        [CRPC(bank,responseSyncBank), [_hashMap], _player] call CFUNC(targetEvent);
+        private _targetPlayer = [_target] call EFUNC(common,getPlayer);
 
-        _hashMap
+        [CRPC(notifications,recieveNotification), ["info", "Bank", format ["Transferred $%1 to %2", _amount, (name _targetPlayer)]], _player] call CFUNC(targetEvent);
+        [CRPC(notifications,recieveNotification), ["info", "Bank", format ["Received $%1 from %2", _amount, (name _player)]], _targetPlayer] call CFUNC(targetEvent);
     }],
-    ["save", {
-        params [["_uid", "", [""]], ["_sync", false, [false]]];
+    ["withdraw", {
+        params [["_uid", "", [""]], ["_amount", 0, [0]]];
 
-        private _existingAccount = GVAR(BankRegistry) get _uid;
-        private _finalAccount = +_existingAccount;
-        private _json = _self call ["toJSON", [_finalAccount]];
+        ["INFO", format ["Withdraw %1, for %2", _amount, _uid], nil, nil] call EFUNC(common,log);
 
-        EXTCALL("bank:update",[ARR_2(_uid,_json)]);
+        private _account = GVAR(BankRegistry) getOrDefault [_uid, nil];
+        if (isNil "_account") exitWith { ["ERROR", "Empty/Invalid Account!", nil, nil] call EFUNC(common,log); };
 
-        if (_sync) then {
-            private _player = [_uid] call EFUNC(common,getPlayer);
-            [CRPC(bank,responseSyncBank), [_finalAccount], _player] call CFUNC(targetEvent);
-        };
+        private _bank = _account getOrDefault ["bank", 0];
+        private _cash = _account getOrDefault ["cash", 0];
+        if (_bank < _amount) exitWith { ["WARNING", "Insufficient Funds!", nil, nil] call EFUNC(common,log); };
 
-        _finalAccount
-    }],
-    ["remove", {
-        params [["_uid", "", [""]]];
+        private _finalAccount = createHashMapFromArray [
+            ["bank", (_bank - _amount)],
+            ["cash", (_cash + _amount)]
+        ];
+        _self call ["mset", [_uid, _finalAccount]];
 
-        GVAR(BankRegistry) deleteAt _uid;
-    }],
-    ["toHashMap", {
-        params [["_data", "", [""]]];
-
-        private _hashMap = fromJSON _data;
-        _hashMap
-    }],
-    ["toJSON", {
-        params [["_data", createHashMap, [createHashMap]]];
-
-        private _json = toJSON _data;
-        _json
+        private _player = [_uid] call EFUNC(common,getPlayer);
+        [CRPC(notifications,recieveNotification), ["info", "Bank", format ["Withdrew $%1", _amount]], _player] call CFUNC(targetEvent);
     }]
 ]];
 
diff --git a/arma/server/addons/common/CfgVehicles.hpp b/arma/server/addons/common/CfgVehicles.hpp
new file mode 100644
index 0000000..61587be
--- /dev/null
+++ b/arma/server/addons/common/CfgVehicles.hpp
@@ -0,0 +1,12 @@
+class CfgVehicles {
+    class Land_Bodybag_01_black_F;
+    class forge_bodyBag: Land_Bodybag_01_black_F {
+        maximumLoad = 2000;
+        transportMaxWeapons = 500;
+        transportMaxMagazines = 2000;
+        transportMaxItems = 1000;
+        ace_dragging_canCarry = 1;
+        ace_dragging_carryPosition[] = {0, 0.5, 1.2};
+        ace_dragging_carryDirection = 90;
+    };
+};
diff --git a/arma/server/addons/common/XEH_PREP.hpp b/arma/server/addons/common/XEH_PREP.hpp
index b7ecf76..b74d96d 100644
--- a/arma/server/addons/common/XEH_PREP.hpp
+++ b/arma/server/addons/common/XEH_PREP.hpp
@@ -1,4 +1,7 @@
+PREP(formatNumber);
 PREP(getPlayer);
 PREP(generateHash);
 PREP(generateSecureData);
+PREP(initBaseStore);
+PREP(log);
 PREP(timeToSeconds);
diff --git a/arma/server/addons/common/config.cpp b/arma/server/addons/common/config.cpp
index 4023b3c..95a8f61 100644
--- a/arma/server/addons/common/config.cpp
+++ b/arma/server/addons/common/config.cpp
@@ -17,3 +17,4 @@ class CfgPatches {
 };
 
 #include "CfgEventHandlers.hpp"
+#include "CfgVehicles.hpp"
diff --git a/arma/server/addons/common/functions/fnc_formatNumber.sqf b/arma/server/addons/common/functions/fnc_formatNumber.sqf
new file mode 100644
index 0000000..30fc559
--- /dev/null
+++ b/arma/server/addons/common/functions/fnc_formatNumber.sqf
@@ -0,0 +1,42 @@
+#include "..\script_component.hpp"
+
+/*
+ * Author: IDSolutions
+ * Formats a number with thousands separators and decimal places
+ *
+ * Arguments:
+ * 0: Number <NUMBER>
+ *
+ * Return Value:
+ * Formatted Number <STRING>
+ *
+ * Examples:
+ * [1234567.89] call forge_server_common_fnc_formatNumber
+ *
+ * Public: Yes
+ */
+
+#define PX_DC_SEP "."
+#define PX_TH_SEP ","
+#define PX_DC_PL 2
+
+private _count = 0;
+private _arr = (_this toFixed PX_DC_PL) splitString ".";
+private _str = PX_DC_SEP+(_arr select 1);
+
+_arr = toArray(_arr select 0);
+reverse _arr;
+
+{
+	if (_count == 3) then {
+		_count = 0;
+		_str = PX_TH_SEP + _str;
+	};
+
+	_str = toString[_x] + _str;
+	_count = _count + 1;
+
+	true
+} count (_arr);
+
+_str
diff --git a/arma/server/addons/common/functions/fnc_generateSecureData.sqf b/arma/server/addons/common/functions/fnc_generateSecureData.sqf
index 486b992..acd981a 100644
--- a/arma/server/addons/common/functions/fnc_generateSecureData.sqf
+++ b/arma/server/addons/common/functions/fnc_generateSecureData.sqf
@@ -31,6 +31,6 @@ _secureData set ["timestamp", _timestamp];
 _secureData set ["signature", _signature];
 _secureData set ["token", _sessionToken];
 
-diag_log format ["[SECURITY] Generated secure data for %1: sig=%2", _uid, _signature];
+["INFO", format ["Generated secure data for %1: sig=%2", _uid, _signature], nil, nil] call EFUNC(common,log);
 
 _secureData
diff --git a/arma/server/addons/common/functions/fnc_initBaseStore.sqf b/arma/server/addons/common/functions/fnc_initBaseStore.sqf
new file mode 100644
index 0000000..a8abf0e
--- /dev/null
+++ b/arma/server/addons/common/functions/fnc_initBaseStore.sqf
@@ -0,0 +1,154 @@
+#include "..\script_component.hpp"
+
+/*
+ * Author: IDSolutions
+ * Initializes the base store.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Examples:
+ * [] call forge_server_common_fnc_initBaseStore
+ *
+ * Public: Yes
+ */
+
+#pragma hemtt ignore_variables ["_self"]
+GVAR(BaseStore) = createHashMapObject [[
+    ["#type", "IBaseStore"],
+    ["fetch", {
+        params [["_uid", "", [""]]];
+
+        private _extCallPrefix = _self get "_extCallPrefix";
+        private _readMethod = _self getOrDefault ["_readMethod", "get"];
+        private _funcName = format ["%1:%2", _extCallPrefix, _readMethod];
+        private _store = createHashMap;
+
+        [_funcName, [_uid]] call EFUNC(extension,extCall) params ["_result", "_isSuccess"];
+        ["INFO", format ["Data: %1", _result], nil, nil] call EFUNC(common,log);
+
+        if (count _result > 0) then { _store = _self call ["toHashMap", [_result]]; };
+
+        _store
+    }],
+    ["get", {
+        params [["_uid", "", [""]], ["_sync", false, [false]]];
+
+        private _finalData = createHashMap;
+        private _registry = _self get "_registry";
+
+        if (_sync) then {
+            private _existingData = _self call ["fetch", [_uid]];
+
+            _finalData = _existingData;
+            _registry set [_uid, _finalData];
+        } else {
+            _finalData = _registry get _uid;
+        };
+
+        _finalData
+    }],
+    ["set", {
+        params [["_uid", "", [""]], ["_field", "", [""]], ["_value", nil], ["_sync", false, [false]]];
+
+        private _registry = _self get "_registry";
+        private _existingData = _registry get _uid;
+        private _finalData = +_existingData;
+        private _hashMap = createHashMap;
+
+        _finalData set [_field, _value];
+        _hashMap set [_field, _value];
+        _registry set [_uid, _finalData];
+
+        if (_sync) then {
+            private _extCallPrefix = _self get "_extCallPrefix";
+            private _funcName = format ["%1:update", _extCallPrefix];
+            private _json = _self call ["toJSON", [_hashMap]];
+
+            [_funcName, [_uid, _json]] call EFUNC(extension,extCall);
+        };
+
+        private _syncEventName = _self getOrDefault ["_syncEventName", ""];
+        if (_syncEventName isNotEqualTo "") then {
+            private _player = [_uid] call EFUNC(common,getPlayer);
+            [_syncEventName, [_hashMap], _player] call CFUNC(targetEvent);
+        };
+
+        _hashMap
+    }],
+    ["mset", {
+        params [["_uid", "", [""]], ["_fieldValuePairs", createHashMap, [createHashMap]], ["_sync", false, [false]]];
+
+        private _registry = _self get "_registry";
+        private _existingData = _registry get _uid;
+        private _finalData = +_existingData;
+        private _hashMap = createHashMap;
+
+        { _finalData set [_x, _y]; } forEach _fieldValuePairs;
+        { _hashMap set [_x, _y]; } forEach _fieldValuePairs;
+
+        _registry set [_uid, _finalData];
+
+        if (_sync) then {
+            private _extCallPrefix = _self get "_extCallPrefix";
+            private _funcName = format ["%1:update", _extCallPrefix];
+            private _json = _self call ["toJSON", [_hashMap]];
+
+            [_funcName, [_uid, _json]] call EFUNC(extension,extCall);
+        };
+
+        private _syncEventName = _self getOrDefault ["_syncEventName", ""];
+        if (_syncEventName isNotEqualTo "") then {
+            private _player = [_uid] call EFUNC(common,getPlayer);
+            [_syncEventName, [_hashMap], _player] call CFUNC(targetEvent);
+        };
+
+        _hashMap
+    }],
+    ["save", {
+        params [["_uid", "", [""]], ["_sync", false, [false]]];
+
+        private _registry = _self get "_registry";
+        private _existingData = _registry get _uid;
+        private _finalData = +_existingData;
+        private _extCallPrefix = _self get "_extCallPrefix";
+        private _funcName = format ["%1:update", _extCallPrefix];
+        private _json = _self call ["toJSON", [_finalData]];
+
+        [_funcName, [_uid, _json]] call EFUNC(extension,extCall);
+
+        if (_sync) then {
+            private _syncEventName = _self getOrDefault ["_syncEventName", ""];
+            if (_syncEventName isNotEqualTo "") then {
+                private _player = [_uid] call EFUNC(common,getPlayer);
+                [_syncEventName, [_finalData], _player] call CFUNC(targetEvent);
+            };
+        };
+
+        _finalData
+    }],
+    ["remove", {
+        params [["_uid", "", [""]]];
+
+        private _registry = _self get "_registry";
+        _registry deleteAt _uid;
+    }],
+    ["toHashMap", {
+        params [["_data", "", [""]]];
+
+        private _hashMap = fromJSON _data;
+        _hashMap
+    }],
+    ["toJSON", {
+        params [["_data", createHashMap, [createHashMap]]];
+
+        private _json = toJSON _data;
+        _json
+    }]
+]];
+
+SETMVAR(FORGE_BaseStore,GVAR(BaseStore));
+GVAR(BaseStore)
diff --git a/arma/server/addons/common/functions/fnc_log.sqf b/arma/server/addons/common/functions/fnc_log.sqf
new file mode 100644
index 0000000..e14272e
--- /dev/null
+++ b/arma/server/addons/common/functions/fnc_log.sqf
@@ -0,0 +1,53 @@
+#include "..\script_component.hpp"
+
+/*
+ * File: fnc_log.sqf
+ * Author: IDSolutions
+ * Date: 2026-01-03
+ * Last Update: 2026-01-03
+ * Public: No
+ *
+ * Description:
+ *     Writes a log entry.
+ *
+ * Parameter(s):
+ *     0: Log level <STRING> (DEBUG, INFO, ERROR, WARNING, VERBOSE)
+ *     1: Message to log <STRING>
+ *     2: File that's being logged <STRING>
+ *     3: File that called the file being logged <STRING> (Optional)
+ *     4: Stack trace <BOOL> (Default: false)
+ *     5: Identifier <STRING> (Default: "FORGE")
+ *
+ * Returns:
+ *     N/A
+ *
+ * Example(s):
+ *     ["ERROR", "Ooh, something went wrong"] call para_g_fnc_log;
+ */
+
+params ["_logLevel", "_message", "_file", "_callingFile", ["_stackTrace", false, [false]], ["_identifier", "FORGE", [""]]];
+
+if (is3DENPreview) exitWith { diag_log text format ["[%1] %2: %3", _identifier, _logLevel, _message]; };
+if !(_logLevel in ["DEBUG", "INFO", "ERROR", "WARNING", "VERBOSE"]) exitWith { diag_log text format ["[%1] ERROR: Invalid log level '%2'", _identifier, _logLevel]; };
+if (_stackTrace) then {
+    private _trace = diag_stacktrace;
+    private _traceText = _trace apply { format ["%1 (Line %2)", _x # 0, _x # 1] } joinString endl;
+    _message = _traceText;
+};
+
+private _timestamp = format (["%1-%2-%3 %4:%5:%6:%7"] + systemTimeUTC);
+
+if (isNil "_file") then { _file = ["", _fnc_scriptName] select (!isNil "_fnc_scriptName"); };
+if (isNil "_callingFile" && !isNil "_fnc_scriptNameParent") then { _callingFile = _fnc_scriptNameParent; };
+
+private _callingFileText = if !(isNil "_callingFile") then { format ["Called By: %1 |", _callingFile] } else { "" };
+
+diag_log text format [
+	"%1 | %2 | %3 | File: %4 | %5 | %6",
+	_timestamp,
+	_identifier,
+	_logLevel,
+	_file,
+	_callingFileText,
+	_message
+];
diff --git a/arma/server/addons/common/functions/fnc_timeToSeconds.sqf b/arma/server/addons/common/functions/fnc_timeToSeconds.sqf
index 9674445..fe85258 100644
--- a/arma/server/addons/common/functions/fnc_timeToSeconds.sqf
+++ b/arma/server/addons/common/functions/fnc_timeToSeconds.sqf
@@ -20,12 +20,12 @@
 params [["_systemTime", [], [[]]]];
 
 if (typeName _systemTime != "ARRAY") exitWith {
-    diag_log format ["[ERROR] timeToSeconds received %1 instead of ARRAY: %2", typeName _systemTime, _systemTime];
+    ["WARNING", format ["timeToSeconds received %1 instead of ARRAY: %2", typeName _systemTime, _systemTime], nil, nil] call EFUNC(common,log);
     0
 };
 
 if (count _systemTime < 6) exitWith {
-    diag_log format ["[ERROR] timeToSeconds received array with %1 elements, need at least 6: %2", count _systemTime, _systemTime];
+    ["WARNING", format ["timeToSeconds received array with %1 elements, need at least 6: %2", count _systemTime, _systemTime], nil, nil] call EFUNC(common,log);
     0
 };
 
diff --git a/arma/server/addons/economy/$PBOPREFIX$ b/arma/server/addons/economy/$PBOPREFIX$
new file mode 100644
index 0000000..448e3b0
--- /dev/null
+++ b/arma/server/addons/economy/$PBOPREFIX$
@@ -0,0 +1 @@
+forge\forge_server\addons\economy
diff --git a/arma/server/addons/economy/CfgEventHandlers.hpp b/arma/server/addons/economy/CfgEventHandlers.hpp
new file mode 100644
index 0000000..f6503c2
--- /dev/null
+++ b/arma/server/addons/economy/CfgEventHandlers.hpp
@@ -0,0 +1,17 @@
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
+    };
+};
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
+    };
+};
+
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
+    };
+};
diff --git a/arma/server/addons/economy/README.md b/arma/server/addons/economy/README.md
new file mode 100644
index 0000000..f97b17f
--- /dev/null
+++ b/arma/server/addons/economy/README.md
@@ -0,0 +1,4 @@
+forge_server_economy
+===================
+
+Description for this addon
diff --git a/arma/server/addons/economy/XEH_PREP.hpp b/arma/server/addons/economy/XEH_PREP.hpp
new file mode 100644
index 0000000..6bbcd10
--- /dev/null
+++ b/arma/server/addons/economy/XEH_PREP.hpp
@@ -0,0 +1,2 @@
+PREP(initFEconomyStore);
+PREP(initMEconomyStore);
diff --git a/arma/server/addons/economy/XEH_postInit.sqf b/arma/server/addons/economy/XEH_postInit.sqf
new file mode 100644
index 0000000..f10b958
--- /dev/null
+++ b/arma/server/addons/economy/XEH_postInit.sqf
@@ -0,0 +1,18 @@
+#include "script_component.hpp"
+
+GVAR(MEconomyStore) call ["init", []];
+
+[QGVAR(onKilled), {
+    params ["_unit"];
+    GVAR(MEconomyStore) call ["onKilled", [_unit]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(onRespawn), {
+    params ["_unit", "_corpse", "_uid"];
+    GVAR(MEconomyStore) call ["onRespawn", [_unit, _corpse, _uid]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(onHealed), {
+    params ["_unit"];
+    GVAR(MEconomyStore) call ["onHealed", [_unit]];
+}] call CFUNC(addEventHandler);
diff --git a/arma/server/addons/economy/XEH_preInit.sqf b/arma/server/addons/economy/XEH_preInit.sqf
new file mode 100644
index 0000000..e66ae75
--- /dev/null
+++ b/arma/server/addons/economy/XEH_preInit.sqf
@@ -0,0 +1,29 @@
+#include "script_component.hpp"
+
+PREP_RECOMPILE_START;
+#include "XEH_PREP.hpp"
+PREP_RECOMPILE_END;
+
+// private _category = [QUOTE(MOD_NAME), LLSTRING(displayName)];
+
+if (isNil QGVAR(MEconomyStore)) then { [] call FUNC(initMEconomyStore); };
+if (isNil QGVAR(FEconomyStore)) then { [] call FUNC(initFEconomyStore); };
+// if (isNil QGVAR(SEconomyStore)) then { [] call FUNC(initSEconomyStore); };
+
+[QGVAR(FuelStart), {
+    params ["_source", "_target", "_unit"];
+    GVAR(FEconomyStore) call ["start", [_source, _target, _unit]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(FuelTick), {
+    params ["_source", "_target", "_amount"];
+
+    private _liters = GETVAR(_target,liters,0);
+    private _newLiters = _liters + _amount;
+    SETVAR(_target,liters,_newLiters);
+}] call CFUNC(addEventHandler);
+
+[QGVAR(FuelStop), {
+    params ["_source", "_target"];
+    GVAR(FEconomyStore) call ["stop", [_source, _target]];
+}] call CFUNC(addEventHandler);
diff --git a/arma/server/addons/economy/XEH_preStart.sqf b/arma/server/addons/economy/XEH_preStart.sqf
new file mode 100644
index 0000000..0228885
--- /dev/null
+++ b/arma/server/addons/economy/XEH_preStart.sqf
@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
diff --git a/arma/server/addons/economy/config.cpp b/arma/server/addons/economy/config.cpp
new file mode 100644
index 0000000..05c825e
--- /dev/null
+++ b/arma/server/addons/economy/config.cpp
@@ -0,0 +1,19 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        author = AUTHOR;
+        authors[] = {"J.Schmidt"};
+        url = ECSTRING(main,url);
+        name = COMPONENT_NAME;
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "forge_server_main"
+        };
+        units[] = {};
+        weapons[] = {};
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgEventHandlers.hpp"
diff --git a/arma/server/addons/economy/functions/fnc_initFEconomyStore.sqf b/arma/server/addons/economy/functions/fnc_initFEconomyStore.sqf
new file mode 100644
index 0000000..1bb6135
--- /dev/null
+++ b/arma/server/addons/economy/functions/fnc_initFEconomyStore.sqf
@@ -0,0 +1,59 @@
+#include "..\script_component.hpp"
+
+/*
+ * File: fnc_initFEconomyStore.sqf
+ * Author: IDSolutions
+ * Date: 2025-12-20
+ * Last Update: 2026-01-03
+ * Public: No
+ *
+ * Description:
+ *     No description added yet.
+ *
+ * Parameter(s):
+ *     N/A
+ *
+ * Returns:
+ *     Something [BOOL]
+ *
+ * Example(s):
+ *     [parameter] call forge_x_component_fnc_myFunction
+ */
+
+#pragma hemtt ignore_variables ["_self"]
+GVAR(FEconomyStore) = createHashMapObject [[
+    ["#type", "IFuelEconomy"],
+    ["#create", {
+        GVAR(FuelCost) = 5;
+        GVAR(FuelRegistry) = createHashMap;
+
+        ["INFO", "Fuel Store Initialized!", nil, nil] call EFUNC(common,log);
+    }],
+    ["start", {
+        params ["_source", "_target", "_unit"];
+
+        private _index = netId _target;
+        private _uid = getPlayerUID _unit;
+
+        GVAR(FuelRegistry) set [_index, _uid];
+        SETVAR(_target,liters,0);
+    }],
+    ["stop", {
+        params ["_source", "_target"];
+
+        private _index = netId _target;
+        private _uid = GVAR(FuelRegistry) get _index;
+        private _player = [_uid] call EFUNC(common,getPlayer);
+
+        private _totalLiters = GETVAR(_target,liters,0);
+        private _totalCost = _totalLiters * 5;
+        private _formattedTotalCost = _totalCost toFixed 2;
+        private _formattedTotalLiters = _totalLiters toFixed 2;
+
+        [CRPC(notifications,recieveNotification), ["info", "Refueling", format ["Refueling complete: %1L<br />Total Cost: $%2", _formattedTotalLiters, _formattedTotalCost]], _player] call CFUNC(targetEvent);
+        GVAR(FuelRegistry) deleteAt _index;
+    }]
+]];
+
+SETMVAR(FORGE_FEconomyStore,GVAR(FEconomyStore));
+GVAR(FEconomyStore)
diff --git a/arma/server/addons/economy/functions/fnc_initMEconomyStore.sqf b/arma/server/addons/economy/functions/fnc_initMEconomyStore.sqf
new file mode 100644
index 0000000..7a56360
--- /dev/null
+++ b/arma/server/addons/economy/functions/fnc_initMEconomyStore.sqf
@@ -0,0 +1,197 @@
+#include "..\script_component.hpp"
+
+/*
+ * File: fnc_initMEconomyStore.sqf
+ * Author: IDSolutions
+ * Date: 2025-12-20
+ * Last Update: 2026-01-03
+ * Public: No
+ *
+ * Description:
+ *     No description added yet.
+ *
+ * Parameter(s):
+ *     N/A
+ *
+ * Returns:
+ *     Something [BOOL]
+ *
+ * Example(s):
+ *     [parameter] call forge_x_component_fnc_myFunction
+ */
+
+#pragma hemtt ignore_variables ["_self"]
+GVAR(MEconomyStore) = createHashMapObject [[
+    ["#type", "IMedEconomy"],
+    ["#create", {
+        _self set ["mSpawns", createHashMap];
+
+        GVAR(occupancyTriggers) = [];
+        ["INFO", "Medical Store Initialized!", nil, nil] call EFUNC(common,log);
+    }],
+    ["init", {
+        private _mSpawns = (_self get "mSpawns");
+        private _prefix = "med_spawn";
+
+        for "_i" from 0 to 10 do {
+            private _var = if (_i == 0) then { _prefix } else { format ["%1_%2", _prefix, _i] };
+            private _obj = missionNamespace getVariable [_var, objNull];
+
+            if (!isNull _obj) then {
+                _mSpawns set [_var, [_obj, (getPos _obj)]];
+            };
+        };
+
+        if (_mSpawns isEqualTo createHashMap) then {
+            ["WARNING", "No medical spawns found in the world.", nil, nil] call EFUNC(common,log);
+        } else {
+            {
+                _y params ["_obj", "_pos"];
+                private _trigger = createTrigger ["EmptyDetector", _pos];
+
+                _trigger setVariable ["isOccupied", false, true];
+                _trigger setVariable ["linkedObject", _obj, true];
+                _trigger setTriggerArea [5, 5, 0, true, 5];
+                _trigger setTriggerActivation ["ANYPLAYER", "PRESENT", true];
+                _trigger setTriggerStatements [
+                    "{ (_x isKindOf 'CAManBase') && _x distance thisTrigger < 0.5 } count thisList > 0",
+                    "thisTrigger setVariable ['isOccupied', true, true];",
+                    "thisTrigger setVariable ['isOccupied', false, true];"
+                ];
+
+                GVAR(occupancyTriggers) pushBack _trigger;
+            } forEach _mSpawns;
+        };
+    }],
+    ["onHealed", {
+        params [["_unit", objNull, [objNull]]];
+
+        if (isNull _unit) exitWith { ["WARNING", format ["Invalid unit provided: %1", (name _unit)], nil, nil] call EFUNC(common,log); };
+
+        private _uid = getPlayerUID _unit;
+        private _account = EGVAR(bank,BankRegistry) get _uid;
+
+        if (isNil "_account") exitWith { ["ERROR", format ["No account found for %1. UID: %2", (name _unit), _uid], nil, nil] call EFUNC(common,log); };
+
+        private _bank = _account get "bank";
+        private _cash = _account get "cash";
+
+        private _healCost = 100;
+        private _newBalance = 0;
+
+        if (_bank < _healCost && _cash < _healCost) exitWith {
+            [CRPC(notifications,recieveNotification), ["danger", "Insufficient Funds", format ["Insufficient funds for %1. Bank: %2, Cash: %3, Required: %4", (name _unit), _bank, _cash, _healCost]], _unit] call CFUNC(targetEvent);
+        };
+
+        if (_bank >= _healCost) then {
+            _newBalance = _bank - _healCost;
+            _account set ["bank", _newBalance];
+        } else {
+            _newBalance = _cash - _healCost;
+            _account set ["cash", _newBalance];
+        };
+
+        [CRPC(actor,onActorHealed), [], _unit] call CFUNC(targetEvent);
+    }],
+    ["onRespawn", {
+        params [["_unit", objNull, [objNull]], ["_corpse", objNull, [objNull]], ["_uid", "", [""]]];
+
+        private _loadout = [[], [], [], ["U_BG_Guerrilla_6_1", []], [], [], "", "", [], ["", "", "", "", "", ""]];
+        private _medSpawn = (GVAR(occupancyTriggers) select { !(GETVAR(_x,isOccupied,false)) }) param [0, objNull];
+        private _medSpawnObj = _medSpawn getVariable ["linkedObject", objNull];
+        private _medSpawnPos = (getPosATL _medSpawnObj) vectorAdd [0.05, -0.125, 0.45];
+        private _medSpawnDir = getDir _medSpawnObj;
+
+        deleteVehicle _corpse;
+
+        private _player = [_uid] call EFUNC(common,getPlayer);
+        [CRPC(actor,onActorRespawn), [_loadout, _medSpawnPos, _medSpawnDir], _player] call CFUNC(targetEvent);
+    }],
+    ["onKilled", {
+        params [["_unit", objNull, [objNull]]];
+
+        private _unitPos = getPosATL _unit;
+        private _bodyBag = createVehicle ["forge_bodyBag", _unitPos, [], 0, "NONE"];
+
+        _self call ["saveWeapons", [_unit]];
+        _self call ["moveInventory", [_unit, _bodyBag]];
+    }],
+    ["saveWeapons", {
+        params [["_unit", objNull, [objNull]]];
+
+        private _droppedWeapons = [];
+        private _droppedItems = [];
+
+        _droppedWeapons pushBack (primaryWeapon _unit);
+        _droppedItems append (primaryWeaponItems _unit);
+        _droppedItems append (primaryWeaponMagazine _unit);
+        _droppedWeapons pushBack (secondaryWeapon _unit);
+        _droppedItems append (secondaryWeaponItems _unit);
+        _droppedItems append (secondaryWeaponMagazine _unit);
+
+        if (isPlayer _unit) then { _droppedItems pushBack (goggles _unit); };
+        if (currentWeapon _unit isEqualTo handgunWeapon _unit) then {
+            _droppedWeapons pushBack (handgunWeapon _unit);
+            _droppedItems append (handgunItems _unit);
+            _droppedItems append (handgunMagazine _unit);
+        };
+
+        _unit setVariable [QGVAR(droppedWeapons), _droppedWeapons, true];
+        _unit setVariable [QGVAR(droppedItems), _droppedItems, true];
+    }],
+    ["moveInventory", {
+        params [["_unit", objNull, [objNull]], ["_bodyBag", objNull, [objNull]]];
+
+        private _items = [];
+        private _weapons = [];
+        private _backpack = backpack _unit;
+        private _nearHolders = _bodyBag nearObjects ["WeaponHolderSimulated", 3];
+
+        _items pushBack (headgear _unit);
+        _items pushBack (uniform _unit);
+        _items append (uniformItems _unit);
+        _items pushBack (vest _unit);
+        _items append (vestItems _unit);
+        _items append (backpackItems _unit);
+        _weapons pushBack (primaryWeapon _unit);
+        _items append (primaryWeaponItems _unit);
+        _items append (primaryWeaponMagazine _unit);
+        _weapons pushBack (secondaryWeapon _unit);
+        _items append (secondaryWeaponItems _unit);
+        _items append (secondaryWeaponMagazine _unit);
+        _weapons pushBack (handgunWeapon _unit);
+        _items append (handgunItems _unit);
+        _items append (handgunMagazine _unit);
+        _weapons append (_unit getVariable [QGVAR(droppedWeapons), []]);
+        _items append (_unit getVariable [QGVAR(droppedItems), []]);
+        _items append (assignedItems _unit);
+        _items pushBack (_unit call CFUNC(binocularMagazine));
+
+        if !((goggles _unit ) in (_unit getVariable [QGVAR(droppedItems), []])) then { _items pushBack (goggles _unit); };
+
+        _items = _items select { _x isNotEqualTo "" };
+        _weapons = _weapons select { _x isNotEqualTo "" };
+
+        { _bodyBag addItemCargoGlobal [_x, 1] } forEach _items;
+
+        {
+            private _weaponNonPresent = [_x] call CFUNC(getNonPresetClass);
+            if (_weaponNonPresent == "") then { _weaponNonPresent = _x; };
+            _bodyBag addWeaponCargoGlobal [_weaponNonPresent, 1];
+        } forEach _weapons;
+
+        if (_backpack isNotEqualTo "") then {
+            private _backpackNonPresent = [_backpack, "CfgVehicles"] call CFUNC(getNonPresetClass);
+            if (_backpackNonPresent == "") then { _backpackNonPresent = _backpack; };
+            _bodyBag addItemCargoGlobal [_backpackNonPresent, 1];
+        };
+
+        {
+            private _holderWeapons = ((getWeaponCargo _x) select 0) select { _x in _weapons };
+            if (_holderWeapons isNotEqualTo []) then { deleteVehicle _x; };
+        } forEach _nearHolders;
+    }]
+]];
+
+SETMVAR(FORGE_MEconomyStore,GVAR(MEconomyStore));
+GVAR(MEconomyStore)
diff --git a/arma/server/addons/economy/functions/fnc_initSEconomyStore.sqf b/arma/server/addons/economy/functions/fnc_initSEconomyStore.sqf
new file mode 100644
index 0000000..07a94dc
--- /dev/null
+++ b/arma/server/addons/economy/functions/fnc_initSEconomyStore.sqf
@@ -0,0 +1,33 @@
+#include "..\script_component.hpp"
+
+/*
+ * File: initSEconomyStore.sqf
+ * Author: IDSolutions
+ * Date: 2025-12-20
+ * Last Update: 2026-01-03
+ * Public: No
+ *
+ * Description:
+ *     No description added yet.
+ *
+ * Parameter(s):
+ *     N/A
+ *
+ * Returns:
+ *     Something [BOOL]
+ *
+ * Example(s):
+ *     [parameter] call forge_x_component_fnc_myFunction
+ */
+
+#pragma hemtt ignore_variables ["_self"]
+GVAR(SEconomyStore) = createHashMapObject [[
+    ["#type", "IServiceEconomy"],
+    ["#create", {
+        ["INFO", "Service Store Initialized!", nil, nil] call EFUNC(common,log);
+    }],
+    ["init", {}]
+]];
+
+SETMVAR(FORGE_SEconomyStore,GVAR(SEconomyStore));
+GVAR(SEconomyStore)
diff --git a/arma/server/addons/economy/script_component.hpp b/arma/server/addons/economy/script_component.hpp
new file mode 100644
index 0000000..89677f7
--- /dev/null
+++ b/arma/server/addons/economy/script_component.hpp
@@ -0,0 +1,9 @@
+#define COMPONENT economy
+#define COMPONENT_BEAUTIFIED Economy
+#include "\forge\forge_server\addons\main\script_mod.hpp"
+
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define ENABLE_PERFORMANCE_COUNTERS
+
+#include "\forge\forge_server\addons\main\script_macros.hpp"
diff --git a/arma/server/addons/economy/stringtable.xml b/arma/server/addons/economy/stringtable.xml
new file mode 100644
index 0000000..320b079
--- /dev/null
+++ b/arma/server/addons/economy/stringtable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="FFE">
+    <Package name="Economy">
+        <Key ID="STR_forge_server_economy_displayName">
+            <English>Economy</English>
+        </Key>
+    </Package>
+</Project>
diff --git a/arma/server/addons/extension/$PBOPREFIX$ b/arma/server/addons/extension/$PBOPREFIX$
new file mode 100644
index 0000000..3b867e2
--- /dev/null
+++ b/arma/server/addons/extension/$PBOPREFIX$
@@ -0,0 +1 @@
+forge\forge_server\addons\extension
diff --git a/arma/server/addons/extension/CfgEventHandlers.hpp b/arma/server/addons/extension/CfgEventHandlers.hpp
new file mode 100644
index 0000000..865276c
--- /dev/null
+++ b/arma/server/addons/extension/CfgEventHandlers.hpp
@@ -0,0 +1,11 @@
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
+    };
+};
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
+    };
+};
diff --git a/arma/server/addons/extension/README.md b/arma/server/addons/extension/README.md
new file mode 100644
index 0000000..067835e
--- /dev/null
+++ b/arma/server/addons/extension/README.md
@@ -0,0 +1,4 @@
+forge_server_extension
+===================
+
+Extension functionality shared between addons.
diff --git a/arma/server/addons/extension/XEH_PREP.hpp b/arma/server/addons/extension/XEH_PREP.hpp
new file mode 100644
index 0000000..c9a683a
--- /dev/null
+++ b/arma/server/addons/extension/XEH_PREP.hpp
@@ -0,0 +1,2 @@
+PREP(extCall);
+PREP(setHandler);
diff --git a/arma/server/addons/extension/XEH_preInit.sqf b/arma/server/addons/extension/XEH_preInit.sqf
new file mode 100644
index 0000000..aa5dec2
--- /dev/null
+++ b/arma/server/addons/extension/XEH_preInit.sqf
@@ -0,0 +1,13 @@
+#include "script_component.hpp"
+
+PREP_RECOMPILE_START;
+#include "XEH_PREP.hpp"
+PREP_RECOMPILE_END;
+
+// private _category = [QUOTE(MOD_NAME), LLSTRING(displayName)];
+
+addMissionEventHandler ["ExtensionCallback", {
+    params ["_function", "_result", "_data"];
+    (GVAR(handlers) get _function) params ["_handler", "_arguments"];
+    [_result, (fromJSON _data), _arguments] call _handler;
+}];
diff --git a/arma/server/addons/extension/XEH_preStart.sqf b/arma/server/addons/extension/XEH_preStart.sqf
new file mode 100644
index 0000000..0228885
--- /dev/null
+++ b/arma/server/addons/extension/XEH_preStart.sqf
@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
diff --git a/arma/server/addons/extension/config.cpp b/arma/server/addons/extension/config.cpp
new file mode 100644
index 0000000..4023b3c
--- /dev/null
+++ b/arma/server/addons/extension/config.cpp
@@ -0,0 +1,19 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        author = AUTHOR;
+        authors[] = {"IDSolutions"};
+        url = ECSTRING(main,url);
+        name = COMPONENT_NAME;
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "forge_server_main"
+        };
+        units[] = {};
+        weapons[] = {};
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgEventHandlers.hpp"
diff --git a/arma/server/addons/extension/functions/fnc_extCall.sqf b/arma/server/addons/extension/functions/fnc_extCall.sqf
new file mode 100644
index 0000000..e56b7e4
--- /dev/null
+++ b/arma/server/addons/extension/functions/fnc_extCall.sqf
@@ -0,0 +1,54 @@
+#include "..\script_component.hpp"
+
+/*
+ * File: fnc_extCall.sqf
+ * Author: IDSolutions
+ * Date: 2026-01-03
+ * Last Update: 2026-01-03
+ * Public: No
+ *
+ * Description:
+ *     Call Forge Server extension.
+ *
+ * Parameter(s):
+ *     0: Function name to call <STRING>
+ *     1: Arguments to pass to function <ARRAY>
+ *
+ * Returns:
+ *     Extension result <ARRAY>
+ *     Success <BOOL>
+ *
+ * Example(s):
+ *     ["icom:connect", ["127.0.0.1:9090", "server_1"]] call forge_x_component_fnc_extCall params ["_result", "_isSuccess"];
+ */
+
+params [["_function", "", [""]], ["_arguments", [], [[]]]];
+
+["INFO", format ["Calling function: %1", _function], nil, nil] call EFUNC(common,log);
+("forge_server" callExtension [_function, _arguments]) params ["_result", "_extCode", "_armaCode"];
+
+private _success = true;
+
+if (_armaCode != 0 && _armaCode != 301) then {
+    _success = false;
+    private _armaCodeMessage = createHashMapFromArray [
+        [101, "SYNTAX_ERROR_WRONG_PARAMS_SIZE"],
+        [102, "SYNTAX_ERROR_WRONG_PARAMS_TYPE"],
+        [201, "PARAMS_ERROR_TOO_MANY_ARGS"],
+        // [301, "EXECUTION_WARNING_TAKES_TOO_LONG"],
+        [400, "EXTENSION_LOAD_FAILED"],
+        [403, "EXTENSION_BLOCKED_BY_BATTLEYE"],
+        [404, "EXTENSION_NOT_FOUND"]
+    ] getOrDefault [_armaCode, format ["UNKNOWN_%1", _armaCode]];
+    ["WARNING", format ["Arma error: %1", _armaCodeMessage], nil, nil] call EFUNC(common,log);
+};
+
+if (_extCode != 0) then {
+    _success = false;
+    if (_extCode == -1) exitWith { ["WARNING", "Extension not available", nil, nil] call EFUNC(common,log); };
+    if (_extCode == 9) exitWith { ["WARNING", format ["Extension error: %1", _result], nil, nil] call EFUNC(common,log); };
+
+    ["WARNING", format ["Extension error: %1", _extCode], nil, nil] call EFUNC(common,log);
+};
+
+[_result, _success]
diff --git a/arma/server/addons/extension/functions/fnc_setHandler.sqf b/arma/server/addons/extension/functions/fnc_setHandler.sqf
new file mode 100644
index 0000000..19762f1
--- /dev/null
+++ b/arma/server/addons/extension/functions/fnc_setHandler.sqf
@@ -0,0 +1,45 @@
+#include "..\script_component.hpp"
+
+/*
+ * File: fnc_setHandler.sqf
+ * Author: IDSolutions
+ * Date: 2026-01-03
+ * Last Update: 2026-01-03
+ * Public: No
+ *
+ * Description:
+ *     Set handler for extension function callbacks.
+ *
+ * Parameter(s):
+ *     0: Function name to handle callbacks <STRING>
+ *     1: Callback function to use as handler <CODE>
+ *     2: Arguments to pass to callback function <ARRAY>
+ *
+ * Returns:
+ *     Handler was set <BOOL>
+ *
+ * Example(s):
+ *     ["actor:greet", {
+ *          params ["_message"];
+ *          private _player = _arguments select 0;
+ *          systemChat format ["Hello, %1! %2", name _player, _message];
+ *      }, [player]] call forge_x_component_fnc_setHandler;
+ */
+
+params [["_function", "", [""]], ["_callback", {}, [{}]], ["_arguments", [], [[]]]];
+
+if (_function isEqualTo "") exitWith {
+    ["WARNING", "Function not specified, handler not set!", nil, nil] call EFUNC(common,log);
+    false
+};
+if (_callback isEqualTo {}) exitWith {
+    ["WARNING", "Callback not specified, handler not set!", nil, nil] call EFUNC(common,log);
+    false
+};
+if (isNil QGVAR(handlers)) then { GVAR(handlers) = createHashMap; };
+
+private _entry = format ["forge_server:%1", _function];
+GVAR(handlers) set [_entry, [_callback, _arguments]];
+["INFO", format ["Handler set: %1", _entry], nil, nil] call EFUNC(common,log);
+
+true
diff --git a/arma/server/addons/extension/script_component.hpp b/arma/server/addons/extension/script_component.hpp
new file mode 100644
index 0000000..ba0d457
--- /dev/null
+++ b/arma/server/addons/extension/script_component.hpp
@@ -0,0 +1,9 @@
+#define COMPONENT extension
+#define COMPONENT_BEAUTIFIED Extension
+#include "\forge\forge_server\addons\main\script_mod.hpp"
+
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define ENABLE_PERFORMANCE_COUNTERS
+
+#include "\forge\forge_server\addons\main\script_macros.hpp"
diff --git a/arma/server/addons/extension/stringtable.xml b/arma/server/addons/extension/stringtable.xml
new file mode 100644
index 0000000..d56e591
--- /dev/null
+++ b/arma/server/addons/extension/stringtable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="FFE">
+    <Package name="Extension">
+        <Key ID="STR_forge_server_extension_displayName">
+            <English>Extension</English>
+        </Key>
+    </Package>
+</Project>
diff --git a/arma/server/addons/garage/$PBOPREFIX$ b/arma/server/addons/garage/$PBOPREFIX$
new file mode 100644
index 0000000..66f9369
--- /dev/null
+++ b/arma/server/addons/garage/$PBOPREFIX$
@@ -0,0 +1 @@
+forge\forge_server\addons\garage
diff --git a/arma/server/addons/garage/CfgEventHandlers.hpp b/arma/server/addons/garage/CfgEventHandlers.hpp
new file mode 100644
index 0000000..f6503c2
--- /dev/null
+++ b/arma/server/addons/garage/CfgEventHandlers.hpp
@@ -0,0 +1,17 @@
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
+    };
+};
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
+    };
+};
+
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
+    };
+};
diff --git a/arma/server/addons/garage/README.md b/arma/server/addons/garage/README.md
new file mode 100644
index 0000000..5cfa273
--- /dev/null
+++ b/arma/server/addons/garage/README.md
@@ -0,0 +1,4 @@
+forge_server_garage
+===================
+
+Description for this addon
diff --git a/arma/server/addons/garage/XEH_PREP.hpp b/arma/server/addons/garage/XEH_PREP.hpp
new file mode 100644
index 0000000..f30dc3b
--- /dev/null
+++ b/arma/server/addons/garage/XEH_PREP.hpp
@@ -0,0 +1,3 @@
+PREP(initGarage);
+PREP(initGarageStore);
+PREP(initVGStore);
diff --git a/arma/server/addons/garage/XEH_postInit.sqf b/arma/server/addons/garage/XEH_postInit.sqf
new file mode 100644
index 0000000..13676d7
--- /dev/null
+++ b/arma/server/addons/garage/XEH_postInit.sqf
@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+[] call FUNC(initGarage);
diff --git a/arma/server/addons/garage/XEH_preInit.sqf b/arma/server/addons/garage/XEH_preInit.sqf
new file mode 100644
index 0000000..0ab16a4
--- /dev/null
+++ b/arma/server/addons/garage/XEH_preInit.sqf
@@ -0,0 +1,129 @@
+#include "script_component.hpp"
+
+PREP_RECOMPILE_START;
+#include "XEH_PREP.hpp"
+PREP_RECOMPILE_END;
+
+// private _category = [QUOTE(MOD_NAME), LLSTRING(displayName)];
+
+[QGVAR(requestInitGarage), {
+    params [["_uid", "", [""]], ["_garage", createHashMap, [createHashMap]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:Garage] Empty/Invalid UID!" };
+    GVAR(GarageStore) call ["init", [_uid, _garage]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestGetGarage), {
+    params [["_uid", "", [""]], ["_sync", false, [false]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:Garage] Empty/Invalid UID!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:Garage] Empty/Invalid Session!" };
+
+    GVAR(GarageStore) call ["get", [_uid, _sync]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestSetGarage), {
+    params [["_uid", "", [""]], ["_key", "", [""]], ["_value", nil, [[], "", 0, false, createHashMap]], ["_sync", false, [false]]];
+
+    if (_uid isEqualTo "" || _key isEqualTo "") exitWith { diag_log "[FORGE:Server:Garage] Empty/Invalid UID or Key!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:Garage] Empty/Invalid Session!" };
+
+    GVAR(GarageStore) call ["set", [_uid, _key, _value, _sync]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestMSetGarage), {
+    params [["_uid", "", [""]], ["_fieldValuePairs", createHashMap, [createHashMap]], ["_sync", false, [false]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:Garage] Empty/Invalid UID!" };
+    if ((_fieldValuePairs isEqualTo createHashMap) || !(_fieldValuePairs isEqualType createHashMap)) exitWith { diag_log "[FORGE:Server:Garage] Empty/Invalid field pairs!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:Garage] Empty/Invalid Session!" };
+
+    GVAR(GarageStore) call ["mset", [_uid, _fieldValuePairs, _sync]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestSaveGarage), {
+    params [["_uid", "", [""]], ["_sync", false, [false]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:Garage] Empty/Invalid UID!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:Garage] Empty/Invalid Session!" };
+
+    GVAR(GarageStore) call ["save", [_uid, _sync]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestRemoveGarage), {
+    params [["_uid", "", [""]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:Garage] Empty/Invalid UID!" };
+
+    GVAR(GarageStore) call ["remove", [_uid]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestInitVG), {
+    params [["_uid", "", [""]], ["_vGarage", createHashMap, [createHashMap]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:VGarage] Empty/Invalid UID!" };
+    if (_vGarage isEqualTo createHashMap) exitWith { diag_log "[FORGE:Server:VGarage] Empty/Invalid VGarage data!" };
+
+    GVAR(VGarageStore) call ["init", [_uid, _vGarage]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestGetVG), {
+    params [["_uid", "", [""]], ["_sync", false, [false]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:VGarage] Empty/Invalid UID!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:VGarage] Empty/Invalid Session!" };
+
+    GVAR(VGarageStore) call ["get", [_uid, _sync]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestSetVG), {
+    params [["_uid", "", [""]], ["_key", "", [""]], ["_value", nil, [[], "", 0, false, createHashMap]], ["_sync", false, [false]]];
+
+    if (_uid isEqualTo "" || _key isEqualTo "") exitWith { diag_log "[FORGE:Server:VGarage] Empty/Invalid UID or Key!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:VGarage] Empty/Invalid Session!" };
+
+    GVAR(VGarageStore) call ["set", [_uid, _key, _value, _sync]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestMSetVG), {
+    params [["_uid", "", [""]], ["_fieldValuePairs", createHashMap, [createHashMap]], ["_sync", false, [false]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:VGarage] Empty/Invalid UID!" };
+    if ((_fieldValuePairs isEqualTo createHashMap) || !(_fieldValuePairs isEqualType createHashMap)) exitWith { diag_log "[FORGE:Server:VGarage] Empty/Invalid field pairs!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:VGarage] Empty/Invalid Session!" };
+
+    GVAR(VGarageStore) call ["mset", [_uid, _fieldValuePairs, _sync]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestSaveVG), {
+    params [["_uid", "", [""]], ["_sync", false, [false]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:VGarage] Empty/Invalid UID!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:VGarage] Empty/Invalid Session!" };
+
+    GVAR(VGarageStore) call ["save", [_uid, _sync]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestRemoveVG), {
+    params [["_uid", "", [""]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:VGarage] Empty/Invalid UID!" };
+
+    GVAR(VGarageStore) call ["remove", [_uid]];
+}] call CFUNC(addEventHandler);
diff --git a/arma/server/addons/garage/XEH_preStart.sqf b/arma/server/addons/garage/XEH_preStart.sqf
new file mode 100644
index 0000000..0228885
--- /dev/null
+++ b/arma/server/addons/garage/XEH_preStart.sqf
@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
diff --git a/arma/server/addons/garage/config.cpp b/arma/server/addons/garage/config.cpp
new file mode 100644
index 0000000..cbd0a75
--- /dev/null
+++ b/arma/server/addons/garage/config.cpp
@@ -0,0 +1,20 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        author = AUTHOR;
+        authors[] = {"J.Schmidt"};
+        url = ECSTRING(main,url);
+        name = COMPONENT_NAME;
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "forge_server_main",
+            "forge_server_common"
+        };
+        units[] = {};
+        weapons[] = {};
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgEventHandlers.hpp"
diff --git a/arma/server/addons/garage/functions/fnc_initGarage.sqf b/arma/server/addons/garage/functions/fnc_initGarage.sqf
new file mode 100644
index 0000000..306bddb
--- /dev/null
+++ b/arma/server/addons/garage/functions/fnc_initGarage.sqf
@@ -0,0 +1,39 @@
+#include "..\script_component.hpp"
+
+/*
+ * File: fnc_initGarage.sqf
+ * Author: IDSolutions
+ * Date: 2025-12-17
+ * Last Update: 2025-12-19
+ * Public: No
+ *
+ * Description:
+ *     No description added yet.
+ *
+ * Parameter(s):
+ *     N/A
+ *
+ * Returns:
+ *     Something [BOOL]
+ *
+ * Example(s):
+ *     [parameter] call forge_x_component_fnc_myFunction
+ */
+
+private _mC = "FORGE_CfgGarages";
+private _garages = "true" configClasses (missionConfigFile >> "FORGE_CfgGarages" >> "garages");
+
+{
+	private _configName = configName(_x);
+	private _className = (missionConfigFile >> _mC >> "garages" >> _configName >> "className") call BFUNC(getCfgData);
+	private _pos = (missionConfigFile >> _mC >> "garages" >> _configName >> "pos") call BFUNC(getCfgData);
+	private _dir = (missionConfigFile >> _mC >> "garages" >> _configName >> "dir") call BFUNC(getCfgData);
+	private _garage = createSimpleObject [_className, [0, 0, 0]];
+
+	_garage setPosATL _pos;
+	_garage setDir _dir;
+	_garage allowDamage false;
+	_garage setVariable ["isGarage", true, true];
+
+	diag_log format ["[FORGE:Server:Garage] ClassName: %1 Pos: %2 Dir: %3", _className, _pos, _dir];
+} forEach _garages;
diff --git a/arma/server/addons/garage/functions/fnc_initGarageStore.sqf b/arma/server/addons/garage/functions/fnc_initGarageStore.sqf
new file mode 100644
index 0000000..222463f
--- /dev/null
+++ b/arma/server/addons/garage/functions/fnc_initGarageStore.sqf
@@ -0,0 +1,109 @@
+#include "..\script_component.hpp"
+
+/*
+ * File: fnc_initGarageStore.sqf
+ * Author: IDSolutions
+ * Date: 2025-12-17
+ * Last Update: 2026-01-03
+ * Public: No
+ *
+ * Description:
+ *     Initializes the Garage store for managing player vehicles.
+ *     Provides methods for syncing, saving, and applying vehicles to the player's garage.
+ *
+ * Parameter(s):
+ *     N/A
+ *
+ * Returns:
+ *     Something [BOOL]
+ *
+ * Example(s):
+ *     [parameter] call forge_x_component_fnc_myFunction
+ */
+
+#pragma hemtt ignore_variables ["_self"]
+GVAR(GarageStore) = createHashMapObject [[
+    ["#base", EGVAR(common,BaseStore)],
+    ["#type", "IGarageStore"],
+    ["#create", {
+        GVAR(GarageRegistry) = createHashMap;
+
+        _self set ["_registry", GVAR(GarageRegistry)];
+        _self set ["_extCallPrefix", "garage"];
+        _self set ["_readMethod", "get"];
+        _self set ["_storeName", "Garage"];
+        _self set ["_syncEventName", CRPC(garage,responseSyncGarage)];
+
+        ["INFO", "Garage Store Initialized!", nil, nil] call EFUNC(common,log);
+    }],
+    ["init", {
+        params [["_uid", "", [""]], ["_defaultGarage", createHashMap, [createHashMap]]];
+
+        private _finalGarage = createHashMap;
+
+        ["garage:exists", [_uid]] call EFUNC(extension,extCall) params ["_result", "_isSuccess"];
+        private _exists = _result == "true";
+
+        if !(_exists) then {
+            _finalGarage = _defaultGarage;
+
+            ["garage:create", [_uid]] call EFUNC(extension,extCall);
+            ["INFO", format ["Created new garage for %1", _uid], nil, nil] call EFUNC(common,log);
+        } else {
+            _finalGarage = _self call ["fetch", [_uid]];
+            ["INFO", format ["Found garage for %1", _uid], nil, nil] call EFUNC(common,log);
+        };
+
+        GVAR(GarageRegistry) set [_uid, _finalGarage];
+
+        private _player = [_uid] call EFUNC(common,getPlayer);
+        [CRPC(garage,responseInitGarage), [_finalGarage], _player] call CFUNC(targetEvent);
+
+        _finalGarage
+    }],
+    ["set", {
+        params [["_uid", "", [""]], ["_field", "", [""]], ["_value", nil], ["_sync", false, [false]]];
+
+        private _existingData = GVAR(GarageRegistry) get _uid;
+        private _finalData = +_existingData;
+        private _hashMap = createHashMap;
+
+        _finalData set [_field, _value];
+        _hashMap set [_field, _value];
+        GVAR(GarageRegistry) set [_uid, _finalData];
+
+        if (_sync) then {
+            private _json = _self call ["toJSON", [_finalData]];
+            ["garage:update", [_uid, _json]] call EFUNC(extension,extCall);
+        };
+
+        private _player = [_uid] call EFUNC(common,getPlayer);
+        [CRPC(garage,responseSyncGarage), [_hashMap], _player] call CFUNC(targetEvent);
+
+        _hashMap
+    }],
+    ["mset", {
+        params [["_uid", "", [""]], ["_fieldValuePairs", createHashMap, [createHashMap]], ["_sync", false, [false]]];
+
+        private _existingData = GVAR(GarageRegistry) get _uid;
+        private _finalData = +_existingData;
+        private _hashMap = createHashMap;
+
+        { _finalData set [_x, _y]; } forEach _fieldValuePairs;
+        { _hashMap set [_x, _y]; } forEach _fieldValuePairs;
+        GVAR(GarageRegistry) set [_uid, _finalData];
+
+        if (_sync) then {
+            private _json = _self call ["toJSON", [_finalData]];
+            ["garage:update", [_uid, _json]] call EFUNC(extension,extCall);
+        };
+
+        private _player = [_uid] call EFUNC(common,getPlayer);
+        [CRPC(garage,responseSyncGarage), [_hashMap], _player] call CFUNC(targetEvent);
+
+        _hashMap
+    }]
+]];
+
+SETMVAR(FORGE_GarageStore,GVAR(GarageStore));
+GVAR(GarageStore)
diff --git a/arma/server/addons/garage/functions/fnc_initVGStore.sqf b/arma/server/addons/garage/functions/fnc_initVGStore.sqf
new file mode 100644
index 0000000..5fb13d4
--- /dev/null
+++ b/arma/server/addons/garage/functions/fnc_initVGStore.sqf
@@ -0,0 +1,71 @@
+#include "..\script_component.hpp"
+
+/*
+ * File: fnc_initVGStore.sqf
+ * Author: IDSolutions
+ * Date: 2025-12-17
+ * Last Update: 2026-01-03
+ * Public: No
+ *
+ * Description:
+ *     Initializes the Virtual Garage store for managing player vehicle unlocks.
+ *     Provides methods for syncing, saving, and applying virtual vehicles to BIS Garage.
+ *
+ * Parameter(s):
+ *     N/A
+ *
+ * Returns:
+ *     Something [BOOL]
+ *
+ * Example(s):
+ *     [parameter] call forge_x_component_fnc_myFunction
+ */
+
+#pragma hemtt ignore_variables ["_self"]
+GVAR(VGarageStore) = createHashMapObject [[
+    ["#base", EGVAR(common,BaseStore)],
+    ["#type", "IVGarageStore"],
+    ["#create", {
+        GVAR(VGarageRegistry) = createHashMap;
+
+        _self set ["_registry", GVAR(VGarageRegistry)];
+        _self set ["_extCallPrefix", "owned:garage"];
+        _self set ["_readMethod", "fetch"];
+        _self set ["_storeName", "VGarage"];
+        _self set ["_syncEventName", CRPC(garage,responseSyncVG)];
+
+        ["INFO", "VGarage Store Initialized!", nil, nil] call EFUNC(common,log);
+    }],
+    ["init", {
+        params [["_uid", "", [""]], ["_defaultVGarage", createHashMap, [createHashMap]]];
+
+        private _finalVGarage = createHashMap;
+
+        ["owned:garage:exists", [_uid]] call EFUNC(extension,extCall) params ["_result", "_isSuccess"];
+        private _exists = _result == "true";
+
+        if !(_exists) then {
+            _finalVGarage = _defaultVGarage;
+
+            ["owned:garage:create", [_uid]] call EFUNC(extension,extCall);
+            ["INFO", format ["Created new VGarage for %1", _uid], nil, nil] call EFUNC(common,log);
+        } else {
+            private _existingVGarage = _self call ["fetch", [_uid]];
+            _finalVGarage = _existingVGarage;
+
+            {
+                if !(_x in _finalVGarage) then { _finalVGarage set [_x, _y]; };
+            } forEach _defaultVGarage;
+        };
+
+        GVAR(VGarageRegistry) set [_uid, _finalVGarage];
+
+        private _player = [_uid] call EFUNC(common,getPlayer);
+        [CRPC(garage,responseInitVG), [_finalVGarage], _player] call CFUNC(targetEvent);
+
+        _finalVGarage
+    }]
+]];
+
+SETMVAR(FORGE_VGarageStore,GVAR(VGarageStore));
+GVAR(VGarageStore)
diff --git a/arma/server/addons/garage/script_component.hpp b/arma/server/addons/garage/script_component.hpp
new file mode 100644
index 0000000..25c5611
--- /dev/null
+++ b/arma/server/addons/garage/script_component.hpp
@@ -0,0 +1,9 @@
+#define COMPONENT garage
+#define COMPONENT_BEAUTIFIED Garage
+#include "\forge\forge_server\addons\main\script_mod.hpp"
+
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define ENABLE_PERFORMANCE_COUNTERS
+
+#include "\forge\forge_server\addons\main\script_macros.hpp"
diff --git a/arma/server/addons/garage/stringtable.xml b/arma/server/addons/garage/stringtable.xml
new file mode 100644
index 0000000..71ca3e2
--- /dev/null
+++ b/arma/server/addons/garage/stringtable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="FFE">
+    <Package name="Garage">
+        <Key ID="STR_forge_server_garage_displayName">
+            <English>Garage</English>
+        </Key>
+    </Package>
+</Project>
diff --git a/arma/server/addons/locker/$PBOPREFIX$ b/arma/server/addons/locker/$PBOPREFIX$
new file mode 100644
index 0000000..c89686b
--- /dev/null
+++ b/arma/server/addons/locker/$PBOPREFIX$
@@ -0,0 +1 @@
+forge\forge_server\addons\locker
diff --git a/arma/server/addons/locker/CfgEventHandlers.hpp b/arma/server/addons/locker/CfgEventHandlers.hpp
new file mode 100644
index 0000000..f6503c2
--- /dev/null
+++ b/arma/server/addons/locker/CfgEventHandlers.hpp
@@ -0,0 +1,17 @@
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
+    };
+};
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
+    };
+};
+
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
+    };
+};
diff --git a/arma/server/addons/locker/README.md b/arma/server/addons/locker/README.md
new file mode 100644
index 0000000..e23c4cb
--- /dev/null
+++ b/arma/server/addons/locker/README.md
@@ -0,0 +1,4 @@
+forge_server_locker
+===================
+
+Description for this addon
diff --git a/arma/server/addons/locker/XEH_PREP.hpp b/arma/server/addons/locker/XEH_PREP.hpp
new file mode 100644
index 0000000..a81a67c
--- /dev/null
+++ b/arma/server/addons/locker/XEH_PREP.hpp
@@ -0,0 +1,3 @@
+PREP(initLocker);
+PREP(initLockerStore);
+PREP(initVAStore);
diff --git a/arma/server/addons/locker/XEH_postInit.sqf b/arma/server/addons/locker/XEH_postInit.sqf
new file mode 100644
index 0000000..9571a80
--- /dev/null
+++ b/arma/server/addons/locker/XEH_postInit.sqf
@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+[] call FUNC(initLocker);
diff --git a/arma/server/addons/locker/XEH_preInit.sqf b/arma/server/addons/locker/XEH_preInit.sqf
new file mode 100644
index 0000000..b4dc94a
--- /dev/null
+++ b/arma/server/addons/locker/XEH_preInit.sqf
@@ -0,0 +1,129 @@
+#include "script_component.hpp"
+
+PREP_RECOMPILE_START;
+#include "XEH_PREP.hpp"
+PREP_RECOMPILE_END;
+
+// private _category = [QUOTE(MOD_NAME), LLSTRING(displayName)];
+
+[QGVAR(requestInitLocker), {
+    params [["_uid", "", [""]], ["_locker", createHashMap, [createHashMap]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:Locker] Empty/Invalid UID!" };
+    GVAR(LockerStore) call ["init", [_uid, _locker]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestGetLocker), {
+    params [["_uid", "", [""]], ["_sync", false, [false]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:Locker] Empty/Invalid UID!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:Locker] Empty/Invalid Session!" };
+
+    GVAR(LockerStore) call ["get", [_uid, _sync]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestSetLocker), {
+    params [["_uid", "", [""]], ["_key", "", [""]], ["_value", nil, [[], "", 0, false, createHashMap]], ["_sync", false, [false]]];
+
+    if (_uid isEqualTo "" || _key isEqualTo "") exitWith { diag_log "[FORGE:Server:Locker] Empty/Invalid UID or Key!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:Locker] Empty/Invalid Session!" };
+
+    GVAR(LockerStore) call ["set", [_uid, _key, _value, _sync]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestMSetLocker), {
+    params [["_uid", "", [""]], ["_fieldValuePairs", createHashMap, [createHashMap]], ["_sync", false, [false]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:Locker] Empty/Invalid UID!" };
+    if ((_fieldValuePairs isEqualTo createHashMap) || !(_fieldValuePairs isEqualType createHashMap)) exitWith { diag_log "[FORGE:Server:Locker] Empty/Invalid field pairs!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:Locker] Empty/Invalid Session!" };
+
+    GVAR(LockerStore) call ["mset", [_uid, _fieldValuePairs, _sync]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestSaveLocker), {
+    params [["_uid", "", [""]], ["_sync", false, [false]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:Locker] Empty/Invalid UID!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:Locker] Empty/Invalid Session!" };
+
+    GVAR(LockerStore) call ["save", [_uid, _sync]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestRemoveLocker), {
+    params [["_uid", "", [""]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:Locker] Empty/Invalid UID!" };
+
+    GVAR(LockerStore) call ["remove", [_uid]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestInitVA), {
+    params [["_uid", "", [""]], ["_vArsenal", createHashMap, [createHashMap]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:VArsenal] Empty/Invalid UID!" };
+    if (_vArsenal isEqualTo createHashMap) exitWith { diag_log "[FORGE:Server:VArsenal] Empty/Invalid VArsenal data!" };
+
+    GVAR(VArsenalStore) call ["init", [_uid, _vArsenal]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestGetVA), {
+    params [["_uid", "", [""]], ["_sync", false, [false]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:VArsenal] Empty/Invalid UID!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:VArsenal] Empty/Invalid Session!" };
+
+    GVAR(VArsenalStore) call ["get", [_uid, _sync]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestSetVA), {
+    params [["_uid", "", [""]], ["_key", "", [""]], ["_value", nil, [[], "", 0, false, createHashMap]], ["_sync", false, [false]]];
+
+    if (_uid isEqualTo "" || _key isEqualTo "") exitWith { diag_log "[FORGE:Server:VArsenal] Empty/Invalid UID or Key!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:VArsenal] Empty/Invalid Session!" };
+
+    GVAR(VArsenalStore) call ["set", [_uid, _key, _value, _sync]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestMSetVA), {
+    params [["_uid", "", [""]], ["_fieldValuePairs", createHashMap, [createHashMap]], ["_sync", false, [false]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:VArsenal] Empty/Invalid UID!" };
+    if ((_fieldValuePairs isEqualTo createHashMap) || !(_fieldValuePairs isEqualType createHashMap)) exitWith { diag_log "[FORGE:Server:VArsenal] Empty/Invalid field pairs!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:VArsenal] Empty/Invalid Session!" };
+
+    GVAR(VArsenalStore) call ["mset", [_uid, _fieldValuePairs, _sync]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestSaveVA), {
+    params [["_uid", "", [""]], ["_sync", false, [false]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:VArsenal] Empty/Invalid UID!" };
+
+    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
+    if (isNil "_session") exitWith { diag_log "[FORGE:Server:VArsenal] Empty/Invalid Session!" };
+
+    GVAR(VArsenalStore) call ["save", [_uid, _sync]];
+}] call CFUNC(addEventHandler);
+
+[QGVAR(requestRemoveVA), {
+    params [["_uid", "", [""]]];
+
+    if (_uid isEqualTo "") exitWith { diag_log "[FORGE:Server:VArsenal] Empty/Invalid UID!" };
+
+    GVAR(VArsenalStore) call ["remove", [_uid]];
+}] call CFUNC(addEventHandler);
diff --git a/arma/server/addons/locker/XEH_preStart.sqf b/arma/server/addons/locker/XEH_preStart.sqf
new file mode 100644
index 0000000..0228885
--- /dev/null
+++ b/arma/server/addons/locker/XEH_preStart.sqf
@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
diff --git a/arma/server/addons/locker/config.cpp b/arma/server/addons/locker/config.cpp
new file mode 100644
index 0000000..cbd0a75
--- /dev/null
+++ b/arma/server/addons/locker/config.cpp
@@ -0,0 +1,20 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        author = AUTHOR;
+        authors[] = {"J.Schmidt"};
+        url = ECSTRING(main,url);
+        name = COMPONENT_NAME;
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "forge_server_main",
+            "forge_server_common"
+        };
+        units[] = {};
+        weapons[] = {};
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgEventHandlers.hpp"
diff --git a/arma/server/addons/locker/functions/fnc_initLocker.sqf b/arma/server/addons/locker/functions/fnc_initLocker.sqf
new file mode 100644
index 0000000..7038d44
--- /dev/null
+++ b/arma/server/addons/locker/functions/fnc_initLocker.sqf
@@ -0,0 +1,39 @@
+#include "..\script_component.hpp"
+
+/*
+ * File: fnc_initLocker.sqf
+ * Author: IDSolutions
+ * Date: 2025-12-17
+ * Last Update: 2025-12-19
+ * Public: No
+ *
+ * Description:
+ *     No description added yet.
+ *
+ * Parameter(s):
+ *     N/A
+ *
+ * Returns:
+ *     Something [BOOL]
+ *
+ * Example(s):
+ *     [parameter] call forge_x_component_fnc_myFunction
+ */
+
+private _mC = "FORGE_CfgLockers";
+private _lockers = "true" configClasses (missionConfigFile >> "FORGE_CfgLockers" >> "lockers");
+
+{
+	private _configName = configName(_x);
+	private _className = (missionConfigFile >> _mC >> "lockers" >> _configName >> "className") call BFUNC(getCfgData);
+	private _pos = (missionConfigFile >> _mC >> "lockers" >> _configName >> "pos") call BFUNC(getCfgData);
+	private _dir = (missionConfigFile >> _mC >> "lockers" >> _configName >> "dir") call BFUNC(getCfgData);
+	private _locker = createSimpleObject [_className, [0, 0, 0]];
+
+	_locker setPosATL _pos;
+	_locker setDir _dir;
+	_locker allowDamage false;
+	_locker setVariable ["isLocker", true, true];
+
+	diag_log format ["[FORGE:Server:Locker] ClassName: %1 Pos: %2 Dir: %3", _className, _pos, _dir];
+} forEach _lockers;
diff --git a/arma/server/addons/locker/functions/fnc_initLockerStore.sqf b/arma/server/addons/locker/functions/fnc_initLockerStore.sqf
new file mode 100644
index 0000000..66f29d3
--- /dev/null
+++ b/arma/server/addons/locker/functions/fnc_initLockerStore.sqf
@@ -0,0 +1,111 @@
+#include "..\script_component.hpp"
+
+/*
+ * File: fnc_initLockerStore.sqf
+ * Author: IDSolutions
+ * Date: 2025-12-17
+ * Last Update: 2026-01-03
+ * Public: No
+ *
+ * Description:
+ *     Initializes the Locker store for managing player locker items.
+ *     Provides methods for syncing, saving, and applying locker items to the player's locker.
+ *
+ * Parameter(s):
+ *     N/A
+ *
+ * Returns:
+ *     vArsenal class object [HASHMAP OBJECT]
+ *
+ * Example(s):
+ *     [parameter] call forge_client_locker_fnc_initVAStore;
+ */
+
+#pragma hemtt ignore_variables ["_self"]
+GVAR(LockerStore) = createHashMapObject [[
+    ["#base", EGVAR(common,BaseStore)],
+    ["#type", "ILockerStore"],
+    ["#create", {
+        GVAR(LockerRegistry) = createHashMap;
+
+        _self set ["_registry", GVAR(LockerRegistry)];
+        _self set ["_extCallPrefix", "locker"];
+        _self set ["_readMethod", "get"];
+        _self set ["_storeName", "Locker"];
+        _self set ["_syncEventName", CRPC(locker,responseSyncLocker)];
+
+        ["INFO", "Locker Store Initialized!", nil, nil] call EFUNC(common,log);
+    }],
+    ["init", {
+        params [["_uid", "", [""]], ["_defaultLocker", createHashMap, [createHashMap]]];
+
+        private _finalLocker = createHashMap;
+
+        ["locker:exists", [_uid]] call EFUNC(extension,extCall) params ["_result", "_isSuccess"];
+        private _exists = _result == "true";
+
+        if !(_exists) then {
+            _finalLocker = _defaultLocker;
+
+            ["locker:create", [_uid]] call EFUNC(extension,extCall);
+            ["INFO", format ["Created new locker for %1", _uid], nil, nil] call EFUNC(common,log);
+        } else {
+            _finalLocker = _self call ["fetch", [_uid]];
+            ["INFO", format ["Found locker for %1", _uid], nil, nil] call EFUNC(common,log);
+        };
+
+        GVAR(LockerRegistry) set [_uid, _finalLocker];
+
+        private _player = [_uid] call EFUNC(common,getPlayer);
+
+        [CRPC(locker,responseInitLocker), [_finalLocker], _player] call CFUNC(targetEvent);
+
+        _finalLocker
+    }],
+    ["set", {
+        params [["_uid", "", [""]], ["_field", "", [""]], ["_value", nil], ["_sync", false, [false]]];
+
+        private _existingData = GVAR(LockerRegistry) get _uid;
+        private _finalData = +_existingData;
+        private _hashMap = createHashMap;
+
+        _finalData set [_field, _value];
+        _hashMap set [_field, _value];
+        GVAR(LockerRegistry) set [_uid, _finalData];
+
+        if (_sync) then {
+            private _json = _self call ["toJSON", [_finalData]];
+            ["locker:update", [_uid, _json]] call EFUNC(extension,extCall);
+        };
+
+        private _player = [_uid] call EFUNC(common,getPlayer);
+        [CRPC(locker,responseSyncLocker), [_hashMap], _player] call CFUNC(targetEvent);
+
+        _hashMap
+    }],
+    ["mset", {
+        params [["_uid", "", [""]], ["_fieldValuePairs", createHashMap, [createHashMap]], ["_sync", false, [false]]];
+
+        private _existingData = GVAR(LockerRegistry) get _uid;
+        private _finalData = +_existingData;
+        private _hashMap = createHashMap;
+
+        { _finalData set [_x, _y]; } forEach _fieldValuePairs;
+        { _hashMap set [_x, _y]; } forEach _fieldValuePairs;
+
+        GVAR(LockerRegistry) set [_uid, _finalData];
+
+        if (_sync) then {
+            private _json = _self call ["toJSON", [_finalData]];
+            ["locker:update", [_uid, _json]] call EFUNC(extension,extCall);
+        };
+
+        private _player = [_uid] call EFUNC(common,getPlayer);
+        [CRPC(locker,responseSyncLocker), [_hashMap], _player] call CFUNC(targetEvent);
+
+        _hashMap
+    }]
+]];
+
+SETMVAR(FORGE_LockerStore,GVAR(LockerStore));
+GVAR(LockerStore)
diff --git a/arma/server/addons/locker/functions/fnc_initVAStore.sqf b/arma/server/addons/locker/functions/fnc_initVAStore.sqf
new file mode 100644
index 0000000..fd85e6b
--- /dev/null
+++ b/arma/server/addons/locker/functions/fnc_initVAStore.sqf
@@ -0,0 +1,71 @@
+#include "..\script_component.hpp"
+
+/*
+ * File: fnc_initVAStore.sqf
+ * Author: IDSolutions
+ * Date: 2025-12-17
+ * Last Update: 2026-01-03
+ * Public: No
+ *
+ * Description:
+ *     Initializes the Virtual Arsenal store for managing player arsenal unlocks.
+ *     Provides methods for syncing, saving, and applying virtual items to BIS Arsenal.
+ *
+ * Parameter(s):
+ *     N/A
+ *
+ * Returns:
+ *     vArsenal class object [HASHMAP OBJECT]
+ *
+ * Example(s):
+ *     [parameter] call forge_client_locker_fnc_initVAStore;
+ */
+
+#pragma hemtt ignore_variables ["_self"]
+GVAR(VArsenalStore) = createHashMapObject [[
+    ["#base", EGVAR(common,BaseStore)],
+    ["#type", "IVArsenalStore"],
+    ["#create", {
+        GVAR(VArsenalRegistry) = createHashMap;
+
+        _self set ["_registry", GVAR(VArsenalRegistry)];
+        _self set ["_extCallPrefix", "owned:locker"];
+        _self set ["_readMethod", "fetch"];
+        _self set ["_storeName", "VArsenal"];
+        _self set ["_syncEventName", CRPC(locker,responseSyncVA)];
+
+        ["INFO", "VArsenal Store Initialized!", nil, nil] call EFUNC(common,log);
+    }],
+    ["init", {
+        params [["_uid", "", [""]], ["_defaultVArsenal", createHashMap, [createHashMap]]];
+
+        private _finalVArsenal = createHashMap;
+
+        ["owned:locker:exists", [_uid]] call EFUNC(extension,extCall) params ["_result", "_isSuccess"];
+        private _exists = _result == "true";
+
+        if !(_exists) then {
+            _finalVArsenal = _defaultVArsenal;
+
+            ["owned:locker:create", [_uid]] call EFUNC(extension,extCall);
+            ["INFO", format ["Created new VArsenal for %1", _uid], nil, nil] call EFUNC(common,log);
+        } else {
+            private _existingVArsenal = _self call ["fetch", [_uid]];
+            _finalVArsenal = _existingVArsenal;
+
+            {
+                if !(_x in _finalVArsenal) then { _finalVArsenal set [_x, _y]; };
+            } forEach _defaultVArsenal;
+        };
+
+        GVAR(VArsenalRegistry) set [_uid, _finalVArsenal];
+
+        private _player = [_uid] call EFUNC(common,getPlayer);
+        [CRPC(locker,responseInitVA), [_finalVArsenal], _player] call CFUNC(targetEvent);
+
+        _finalVArsenal
+    }]
+]];
+
+SETMVAR(FORGE_VArsenalStore,GVAR(VArsenalStore));
+GVAR(VArsenalStore)
diff --git a/arma/server/addons/locker/script_component.hpp b/arma/server/addons/locker/script_component.hpp
new file mode 100644
index 0000000..89fd768
--- /dev/null
+++ b/arma/server/addons/locker/script_component.hpp
@@ -0,0 +1,9 @@
+#define COMPONENT locker
+#define COMPONENT_BEAUTIFIED Locker
+#include "\forge\forge_server\addons\main\script_mod.hpp"
+
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define ENABLE_PERFORMANCE_COUNTERS
+
+#include "\forge\forge_server\addons\main\script_macros.hpp"
diff --git a/arma/server/addons/locker/stringtable.xml b/arma/server/addons/locker/stringtable.xml
new file mode 100644
index 0000000..fe4de1c
--- /dev/null
+++ b/arma/server/addons/locker/stringtable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="FFE">
+    <Package name="Locker">
+        <Key ID="STR_forge_server_locker_displayName">
+            <English>Locker</English>
+        </Key>
+    </Package>
+</Project>
diff --git a/arma/server/addons/main/CfgEventHandlers.hpp b/arma/server/addons/main/CfgEventHandlers.hpp
new file mode 100644
index 0000000..f6503c2
--- /dev/null
+++ b/arma/server/addons/main/CfgEventHandlers.hpp
@@ -0,0 +1,17 @@
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
+    };
+};
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
+    };
+};
+
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
+    };
+};
diff --git a/arma/server/addons/main/CfgSettings.hpp b/arma/server/addons/main/CfgSettings.hpp
index 05d0b0b..f517d07 100644
--- a/arma/server/addons/main/CfgSettings.hpp
+++ b/arma/server/addons/main/CfgSettings.hpp
@@ -1,13 +1,3 @@
 class CfgSettings {
-    class CBA {
-        class Versioning {
-            class PREFIX {
-                main_addon = QUOTE(ADDON);
-
-                class dependencies {
-                    CBA[] = {"cba_main", REQUIRED_CBA_VERSION, "true"};
-                };
-            };
-        };
-    };
+    class CBA {};
 };
diff --git a/arma/server/addons/main/XEH_PREP.hpp b/arma/server/addons/main/XEH_PREP.hpp
new file mode 100644
index 0000000..2e61ebc
--- /dev/null
+++ b/arma/server/addons/main/XEH_PREP.hpp
@@ -0,0 +1 @@
+PREP(initStores);
diff --git a/arma/server/addons/main/XEH_postInit.sqf b/arma/server/addons/main/XEH_postInit.sqf
new file mode 100644
index 0000000..23ac945
--- /dev/null
+++ b/arma/server/addons/main/XEH_postInit.sqf
@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+[] call FUNC(initStores);
diff --git a/arma/server/addons/main/XEH_preInit.sqf b/arma/server/addons/main/XEH_preInit.sqf
new file mode 100644
index 0000000..dcc00c2
--- /dev/null
+++ b/arma/server/addons/main/XEH_preInit.sqf
@@ -0,0 +1,56 @@
+#include "script_component.hpp"
+
+PREP_RECOMPILE_START;
+#include "XEH_PREP.hpp"
+PREP_RECOMPILE_END;
+
+["forge_icom_event", {
+    params [["_event", "", [""]], ["_data", createHashMap, [createHashMap]]];
+
+    systemChat format ["ICOM Event: %1", _event];
+    diag_log format ["[ICOM] Event received: %1 | Data: %2", _event, _data];
+
+    switch (_event) do {
+        case "supply_drop": {
+            systemChat "Supply drop event received";
+
+            private _coords = _data getOrDefault ["coords", []];
+            private _supplies = _data getOrDefault ["supplies", []];
+
+            diag_log format ["[ICOM] Supply drop at %1 with supplies: %2", _coords, _supplies];
+        };
+        case "spawn_mission": {
+            systemChat "Mission spawn event received";
+
+            private _missionType = _data getOrDefault ["mission_type", ""];
+            private _location = _data getOrDefault ["location", []];
+
+            diag_log format ["[ICOM] Spawning mission type '%1' at %2", _missionType, _location];
+        };
+        case "global_alert": {
+            systemChat "Global event received";
+
+            private _message = _data getOrDefault ["message", ""];
+            private _severity = _data getOrDefault ["severity", ""];
+
+            diag_log format ["[ICOM] Global event '%1' severity: %2", _message, _severity];
+        };
+        default {
+            diag_log format ["[ICOM] Unhandled event: %1", _event];
+        };
+    };
+}] call CFUNC(addEventHandler);
+
+diag_log "[ICOM] Event handler initialized";
+
+addMissionEventHandler ["ExtensionCallback", {
+    params ["_name", "_function", "_data"];
+
+    if (_name isEqualTo "icom") then {
+        ["forge_icom_event", (fromJSON _data)] call CFUNC(serverEvent);
+    } else {
+        (fromJSON _data) call (missionNamespace getVariable [_function, {
+            diag_log "[FORGE:Server] Function does not exist!";
+        }]);
+    };
+}];
diff --git a/arma/server/addons/main/XEH_preStart.sqf b/arma/server/addons/main/XEH_preStart.sqf
new file mode 100644
index 0000000..0228885
--- /dev/null
+++ b/arma/server/addons/main/XEH_preStart.sqf
@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
diff --git a/arma/server/addons/main/config.cpp b/arma/server/addons/main/config.cpp
index 2b42b1e..21acf8f 100644
--- a/arma/server/addons/main/config.cpp
+++ b/arma/server/addons/main/config.cpp
@@ -8,7 +8,8 @@ class CfgPatches {
         name = COMPONENT_NAME;
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {
-            "cba_main"
+            "cba_main",
+            "ace_main"
         };
         units[] = {};
         weapons[] = {};
@@ -17,3 +18,4 @@ class CfgPatches {
 };
 
 #include "CfgSettings.hpp"
+#include "CfgEventHandlers.hpp"
diff --git a/arma/server/addons/main/functions/fnc_initStores.sqf b/arma/server/addons/main/functions/fnc_initStores.sqf
new file mode 100644
index 0000000..52cdb8d
--- /dev/null
+++ b/arma/server/addons/main/functions/fnc_initStores.sqf
@@ -0,0 +1,41 @@
+#include "..\script_component.hpp"
+
+/*
+ * Author: J.Schmidt
+ * Initializes all stores in the correct order.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [] call forge_server_main_fnc_initStores;
+ *
+ * Public: No
+ */
+
+// Base
+if (isNil QEGVAR(common,BaseStore)) then { [] call EFUNC(common,initBaseStore); };
+
+// Actor
+if (isNil QEGVAR(actor,ActorStore)) then { [] call EFUNC(actor,initActorStore); };
+
+// Bank
+if (isNil QEGVAR(bank,BankStore)) then { [] call EFUNC(bank,initBankStore); };
+
+// Garage
+if (isNil QEGVAR(garage,GarageStore)) then { [] call EFUNC(garage,initGarageStore); };
+
+// VGarage
+if (isNil QEGVAR(garage,VGarageStore)) then { [] call EFUNC(garage,initVGStore); };
+
+// Locker
+if (isNil QEGVAR(locker,LockerStore)) then { [] call EFUNC(locker,initLockerStore); };
+
+// VArsenal
+if (isNil QEGVAR(locker,VArsenalStore)) then { [] call EFUNC(locker,initVAStore); };
+
+// Org
+if (isNil QEGVAR(org,OrgStore)) then { [] call EFUNC(org,initOrgStore); };
diff --git a/arma/server/addons/main/script_macros.hpp b/arma/server/addons/main/script_macros.hpp
index e64fe52..a3ab43b 100644
--- a/arma/server/addons/main/script_macros.hpp
+++ b/arma/server/addons/main/script_macros.hpp
@@ -15,6 +15,9 @@
 #define CRPC(var1,var2) QUOTE(DOUBLES(DOUBLES(forge_client,var1),var2))
 #define SRPC(var1,var2) QUOTE(DOUBLES(DOUBLES(forge_server,var1),var2))
 
+#define CLASS(var1) DOUBLES(PREFIX,var1)
+#define QCLASS(var1) QUOTE(DOUBLES(PREFIX,var1))
+
 #define QQUOTE(var1) QUOTE(QUOTE(var1))
 
 // QPATHTOF but without a leading slash
diff --git a/arma/server/addons/org/XEH_preInit.sqf b/arma/server/addons/org/XEH_preInit.sqf
index f1e7190..31a34cf 100644
--- a/arma/server/addons/org/XEH_preInit.sqf
+++ b/arma/server/addons/org/XEH_preInit.sqf
@@ -6,8 +6,6 @@ PREP_RECOMPILE_END;
 
 // private _category = [QUOTE(MOD_NAME), LLSTRING(displayName)];
 
-if (isNil QGVAR(OrgStore)) then { [] call FUNC(initOrgStore); };
-
 [QGVAR(requestInitOrg), {
     params [["_uid", "", [""]], ["_org", createHashMap, [createHashMap]]];
 
@@ -69,17 +67,3 @@ if (isNil QGVAR(OrgStore)) then { [] call FUNC(initOrgStore); };
 
     GVAR(OrgStore) call ["remove", [_uid]];
 }] call CFUNC(addEventHandler);
-
-[QGVAR(requestResync), {
-    params ["_player"];
-
-    private _uid = getPlayerUID _player;
-    private _org = GVAR(OrgStore) call ["get", [_uid, true]];
-
-    private _session = EGVAR(actor,PlayerSessions) getOrDefault [_uid, nil];
-    if (isNil "_session") exitWith { diag_log "[FORGE:Server:Org] Empty/Invalid Session!" };
-
-    [CRPC(org,responseSyncOrg), [_org, true], _player] call CFUNC(targetEvent);
-
-    diag_log format ["[FORGE:Server:Org] Resync completed for %1", _uid];
-}] call CFUNC(addEventHandler);
diff --git a/arma/server/addons/org/config.cpp b/arma/server/addons/org/config.cpp
index 05c825e..cbd0a75 100644
--- a/arma/server/addons/org/config.cpp
+++ b/arma/server/addons/org/config.cpp
@@ -8,7 +8,8 @@ class CfgPatches {
         name = COMPONENT_NAME;
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {
-            "forge_server_main"
+            "forge_server_main",
+            "forge_server_common"
         };
         units[] = {};
         weapons[] = {};
diff --git a/arma/server/addons/org/functions/fnc_initOrgStore.sqf b/arma/server/addons/org/functions/fnc_initOrgStore.sqf
index c65e8f3..6c178b4 100644
--- a/arma/server/addons/org/functions/fnc_initOrgStore.sqf
+++ b/arma/server/addons/org/functions/fnc_initOrgStore.sqf
@@ -22,7 +22,18 @@ GVAR(OrgStore) = createHashMapObject [[
     ["#create", {
         GVAR(IndexRegistry) = createHashMap;
         GVAR(OrgRegistry) = createHashMap;
-        diag_log "[FORGE:Server:Org] Org Store Initialized!";
+
+        private _hashMap = createHashMap;
+        _hashMap set ["id", "default"];
+        _hashMap set ["owner", "server"];
+        _hashMap set ["name", "Forge Dynamics"];
+        _hashMap set ["funds", 200000];
+        _hashMap set ["reputation", 0];
+
+        private _json = _self call ["toJSON", [_hashMap]];
+        ["org:create", ["default", _json]] call EFUNC(extension,extCall);
+
+        ["INFO", "Org Store Initialized!", nil, nil] call EFUNC(common,log);
     }],
     ["init", {
         params [["_uid", "", [""]], ["_defaultOrg", createHashMap, [createHashMap]]];
@@ -30,25 +41,30 @@ GVAR(OrgStore) = createHashMapObject [[
         private _actor = EGVAR(actor,ActorRegistry) get _uid;
         private _orgID = _actor get "organization";
 
-        EXTCALL("org:exists",[ARR_1(_orgID)]);
+        private _assets = createHashMap;
+        private _organization = createHashMap;
+        private _members = createHashMap;
 
-        private _exists = (_ext_res select 0) == "true";
+        ["org:exists", [_orgID]] call EFUNC(extension,extCall) params ["_result", "_isSuccess"];
+
+        private _exists = _result == "true";
         private _player = [_uid] call EFUNC(common,getPlayer);
 
         if !(_exists) exitWith {
-            [CRPC(org,responseInitOrg), [createHashMap], _player] call CFUNC(targetEvent);
-            diag_log format ["[FORGE:Server:Org] No existing org found for %1, using default org.", _uid];
+            _self call ["default", [_uid, (name _player)]];
+            ["WARNING", format ["No existing org found for %1, using default org.", _uid], nil, nil] call EFUNC(common,log);
         };
 
-        GVAR(IndexRegistry) set [_uid, _orgID];
+        private _regEntry = createHashMapFromArray [["orgID", _orgID]];
+        GVAR(IndexRegistry) set [_uid, _regEntry];
 
-        private _organization = _self call ["fetch", [_uid]];
-        private _members = _self call ["fetchMembers", [_uid]];
-        // private _assets = _self call ["fetchAssets", [_uid]];
+        _organization = _self call ["fetch", [_uid]];
+        _members = _self call ["fetchMembers", [_uid]];
+        // _assets = _self call ["fetchAssets", [_uid]];
 
         private _finalOrg = GVAR(OrgRegistry) getOrDefault [_orgID, _organization];
         _finalOrg set ["members", _members];
-        // _finalOrg set ["assets", _assets];
+        _finalOrg set ["assets", _assets];
 
         GVAR(OrgRegistry) set [_orgID, _finalOrg, true];
 
@@ -56,17 +72,47 @@ GVAR(OrgStore) = createHashMapObject [[
 
         _finalOrg
     }],
+    ["default", {
+        params [["_uid", "", [""]], ["_name", "", [""]]];
+
+        private _assets = createHashMap;
+        private _members = createHashMap;
+        private _organization = createHashMap;
+        private _member = createHashMapFromArray [["uid", _uid], ["name", _name]];
+
+        private _regEntry = createHashMapFromArray [["orgID", "default"]];
+        GVAR(IndexRegistry) set [_uid, _regEntry];
+
+        _organization = _self call ["fetch", ["default"]];
+        _members set [_uid, _member];
+
+        private _finalOrg = GVAR(OrgRegistry) getOrDefault ["default", _organization];
+        _finalOrg set ["members", _members];
+        _finalOrg set ["assets", _assets];
+
+        GVAR(OrgRegistry) set ["default", _finalOrg];
+
+        private _player = [_uid] call EFUNC(common,getPlayer);
+        [CRPC(org,responseInitOrg), [_finalOrg], _player] call CFUNC(targetEvent);
+
+        _finalOrg
+    }],
     ["fetch", {
         params [["_uid", "", [""]]];
 
+        private _index = "";
         private _organization = createHashMap;
-        private _orgID = GVAR(IndexRegistry) get _uid;
+        private _orgID = "default";
 
-        EXTCALL("org:get",[ARR_1(_orgID)]);
-        diag_log format ["[FORGE:Server:Org] Data: %1", _ext_res];
+        if (_uid isNotEqualTo "default") then {
+            _index = GVAR(IndexRegistry) get _uid;
+            _orgID = _index get "orgID";
+        };
 
-        private _ext_res_org = _ext_res select 0;
-        if (count _ext_res_org > 0) then { _organization = _self call ["toHashMap", [_ext_res_org]]; };
+        ["org:get", [_orgID]] call EFUNC(extension,extCall) params ["_result", "_isSuccess"];
+        ["INFO", format ["Data: %1", _result], nil, nil] call EFUNC(common,log);
+
+        if (count _result > 0) then { _organization = _self call ["toHashMap", [_result]]; };
 
         _organization
     }],
@@ -74,13 +120,13 @@ GVAR(OrgStore) = createHashMapObject [[
         params [["_uid", "", [""]]];
 
         private _assets = createHashMap;
-        private _orgID = GVAR(IndexRegistry) get _uid;
+        private _index = GVAR(IndexRegistry) get _uid;
+        private _orgID = _index get "orgID";
 
-        EXTCALL("org:get_assets",[ARR_1(_orgID)]);
-        diag_log format ["[FORGE:Server:Org] Assets: %1", _ext_res];
+        ["org:assets:get", [_orgID]] call EFUNC(extension,extCall) params ["_result", "_isSuccess"];
+        ["INFO", format ["Assets: %1", _result], nil, nil] call EFUNC(common,log);
 
-        private _ext_res_assets = _ext_res select 0;
-        if (count _ext_res_assets > 0) then { _assets = _self call ["toHashMap", [_ext_res_assets]]; };
+        if (count _result > 0) then { _assets = _self call ["toHashMap", [_result]]; };
 
         _assets
     }],
@@ -88,13 +134,13 @@ GVAR(OrgStore) = createHashMapObject [[
         params [["_uid", "", [""]]];
 
         private _members = createHashMap;
-        private _orgID = GVAR(IndexRegistry) get _uid;
+        private _index = GVAR(IndexRegistry) get _uid;
+        private _orgID = _index get "orgID";
 
-        EXTCALL("org:get_members",[ARR_1(_orgID)]);
-        diag_log format ["[FORGE:Server:Org] Members: %1", _ext_res];
+        ["org:members:get", [_orgID]] call EFUNC(extension,extCall) params ["_result", "_isSuccess"];
+        ["INFO", format ["Members: %1", _result], nil, nil] call EFUNC(common,log);
 
-        private _ext_res_members = _ext_res select 0;
-        private _raw_members = _self call ["toHashMap", [_ext_res_members]];
+        private _raw_members = _self call ["toHashMap", [_result]];
 
         {
             private _uid = _x get "uid";
@@ -107,7 +153,8 @@ GVAR(OrgStore) = createHashMapObject [[
         params [["_uid", "", [""]], ["_sync", false, [false]]];
 
         private _finalOrg = createHashMap;
-        private _orgID = GVAR(IndexRegistry) get _uid;
+        private _index = GVAR(IndexRegistry) get _uid;
+        private _orgID = _index get "orgID";
 
         if (_sync) then {
             _finalOrg = _self call ["fetch", [_uid]];
@@ -121,7 +168,8 @@ GVAR(OrgStore) = createHashMapObject [[
     ["set", {
         params [["_uid", "", [""]], ["_field", "", [""]], ["_value", nil], ["_sync", false, [false]]];
 
-        private _orgID = GVAR(IndexRegistry) get _uid;
+        private _index = GVAR(IndexRegistry) get _uid;
+        private _orgID = _index get "orgID";
         private _organization = GVAR(OrgRegistry) get _orgID;
         private _finalOrg = +_organization;
         private _hashMap = createHashMap;
@@ -133,7 +181,7 @@ GVAR(OrgStore) = createHashMapObject [[
 
         if (_sync) then {
             private _json = _self call ["toJSON", [_hashMap]];
-            EXTCALL("org:update",[ARR_2(_orgID,_json)]);
+            ["org:update", [_orgID, _json]] call EFUNC(extension,extCall);
         };
 
         private _player = [_uid] call EFUNC(common,getPlayer);
@@ -144,7 +192,8 @@ GVAR(OrgStore) = createHashMapObject [[
     ["mset", {
         params [["_uid", "", [""]], ["_fieldValuePairs", createHashMap, [createHashMap]], ["_sync", false, [false]]];
 
-        private _orgID = GVAR(IndexRegistry) get _uid;
+        private _index = GVAR(IndexRegistry) get _uid;
+        private _orgID = _index get "orgID";
         private _organization = GVAR(OrgRegistry) get _orgID;
         private _finalOrg = +_organization;
         private _hashMap = createHashMap;
@@ -156,7 +205,7 @@ GVAR(OrgStore) = createHashMapObject [[
 
         if (_sync) then {
             private _json = _self call ["toJSON", [_hashMap]];
-            EXTCALL("org:update",[ARR_2(_orgID,_json)]);
+            ["org:update", [_orgID, _json]] call EFUNC(extension,extCall);
         };
 
         private _player = [_uid] call EFUNC(common,getPlayer);
@@ -167,12 +216,13 @@ GVAR(OrgStore) = createHashMapObject [[
     ["save", {
         params [["_uid", "", [""]], ["_sync", false, [false]]];
 
-        private _orgID = GVAR(IndexRegistry) get _uid;
+        private _index = GVAR(IndexRegistry) get _uid;
+        private _orgID = _index get "orgID";
         private _organization = GVAR(OrgRegistry) get _orgID;
         private _finalOrg = +_organization;
         private _json = _self call ["toJSON", [_finalOrg]];
 
-        EXTCALL("org:update",[ARR_2(_orgID,_json)]);
+        ["org:update", [_orgID, _json]] call EFUNC(extension,extCall);
 
         if (_sync) then {
             private _player = [_uid] call EFUNC(common,getPlayer);
@@ -184,7 +234,8 @@ GVAR(OrgStore) = createHashMapObject [[
     ["remove", {
         params [["_uid", "", [""]]];
 
-        private _orgID = GVAR(IndexRegistry) get _uid;
+        private _index = GVAR(IndexRegistry) get _uid;
+        private _orgID = _index get "orgID";
         GVAR(OrgRegistry) deleteAt _orgID;
     }],
     ["toHashMap", {
diff --git a/arma/server/extension/Cargo.toml b/arma/server/extension/Cargo.toml
index 613facc..2c7e903 100644
--- a/arma/server/extension/Cargo.toml
+++ b/arma/server/extension/Cargo.toml
@@ -12,6 +12,7 @@ arma-rs = { workspace = true }
 base64 = "0.22.1"
 bb8-redis = "0.25.0-rc.1"
 chrono = { workspace = true }
+forge-icom = { path = "../../../bin/icom" }
 forge-models = { path = "../../../lib/models", features = ["actor"] }
 forge-repositories = { path = "../../../lib/repositories" }
 forge-services = { path = "../../../lib/services" }
diff --git a/arma/server/extension/src/actor.rs b/arma/server/extension/src/actor.rs
index 892b268..6bbcd5f 100644
--- a/arma/server/extension/src/actor.rs
+++ b/arma/server/extension/src/actor.rs
@@ -28,9 +28,9 @@ static ACTOR_SERVICE: LazyLock<ActorService<RedisActorRepository<ExtensionRedisC
 pub fn group() -> Group {
     Group::new()
         .command("get", get_actor)
-        .command("exists", actor_exists)
         .command("create", create_actor)
         .command("update", update_actor)
+        .command("exists", actor_exists)
         .command("delete", delete_actor)
 }
 
diff --git a/arma/server/extension/src/adapters/redis_client.rs b/arma/server/extension/src/adapters/redis_client.rs
index 298d963..c9412ad 100644
--- a/arma/server/extension/src/adapters/redis_client.rs
+++ b/arma/server/extension/src/adapters/redis_client.rs
@@ -16,6 +16,8 @@ impl RedisClient for ExtensionRedisClient {
     /// Sets multiple fields in a Redis hash.
     fn hash_mset(&self, key: String, fields: Vec<(String, String)>) -> Result<(), String> {
         let result = redis::hash::hash_mset(key, fields);
+        log("debug", "DEBUG", &result);
+
         if result == "OK" { Ok(()) } else { Err(result) }
     }
 
@@ -58,6 +60,8 @@ impl RedisClient for ExtensionRedisClient {
     /// Appends a value to the end of a Redis list.
     fn list_rpush(&self, key: String, value: String) -> Result<(), String> {
         let result = redis::list::list_rpush(key, value);
+        log("debug", "DEBUG", &result);
+
         if result.starts_with("Error:") {
             Err(result)
         } else {
@@ -84,6 +88,8 @@ impl RedisClient for ExtensionRedisClient {
     /// Removes elements from a Redis list by value.
     fn list_del(&self, key: String, count: isize, value: String) -> Result<(), String> {
         let result = redis::list::list_del(key, count, value);
+        log("debug", "DEBUG", &result);
+
         if result.starts_with("Error:") {
             Err(result)
         } else {
@@ -96,6 +102,8 @@ impl RedisClient for ExtensionRedisClient {
     /// Adds a member to a Redis set.
     fn set_add(&self, key: String, member: String) -> Result<(), String> {
         let result = redis::set::set_add(key, member);
+        log("debug", "DEBUG", &result);
+
         if result.starts_with("Error:") {
             Err(result)
         } else {
@@ -106,6 +114,8 @@ impl RedisClient for ExtensionRedisClient {
     /// Retrieves all members from a Redis set.
     fn set_members(&self, key: String) -> Result<Vec<String>, String> {
         let result = redis::set::set_members(key);
+        log("debug", "DEBUG", &result);
+
         if result.starts_with("Error:") {
             Err(result)
         } else {
@@ -119,6 +129,8 @@ impl RedisClient for ExtensionRedisClient {
     /// Removes a member from a Redis set.
     fn set_del(&self, key: String, member: String) -> Result<(), String> {
         let result = redis::set::set_del(key, member);
+        log("debug", "DEBUG", &result);
+
         if result.starts_with("Error:") {
             Err(result)
         } else {
@@ -129,6 +141,8 @@ impl RedisClient for ExtensionRedisClient {
     /// Checks if a Redis key exists.
     fn key_exists(&self, key: String) -> Result<bool, String> {
         let result = redis::common::key_exists(key);
+        log("debug", "DEBUG", &result);
+
         match result.as_str() {
             "1" => Ok(true),
             "0" => Ok(false),
@@ -136,9 +150,35 @@ impl RedisClient for ExtensionRedisClient {
         }
     }
 
+    /// Retrieves the value of a Redis key.
+    fn get_key(&self, key: String) -> Result<String, String> {
+        let result = redis::common::get_key(key);
+        log("debug", "DEBUG", &result);
+
+        if result.starts_with("Error:") {
+            Err(result)
+        } else {
+            Ok(result)
+        }
+    }
+
+    /// Sets a value in a Redis key.
+    fn set_key(&self, key: String, value: String) -> Result<(), String> {
+        let result = redis::common::set_key(key, value);
+        log("debug", "DEBUG", &result);
+
+        if result.starts_with("Error:") {
+            Err(result)
+        } else {
+            Ok(())
+        }
+    }
+
     /// Deletes a Redis key and all its associated data.
     fn delete_key(&self, key: String) -> Result<(), String> {
         let result = redis::common::delete_key(key);
+        log("debug", "DEBUG", &result);
+
         if result.starts_with("Error:") {
             Err(result)
         } else {
diff --git a/arma/server/extension/src/bank.rs b/arma/server/extension/src/bank.rs
index 46a67a2..bac62a8 100644
--- a/arma/server/extension/src/bank.rs
+++ b/arma/server/extension/src/bank.rs
@@ -28,9 +28,9 @@ static BANK_SERVICE: LazyLock<BankService<RedisBankRepository<ExtensionRedisClie
 pub fn group() -> Group {
     Group::new()
         .command("get", get_bank)
-        .command("exists", bank_exists)
         .command("create", create_bank)
         .command("update", update_bank)
+        .command("exists", bank_exists)
         .command("delete", delete_bank)
 }
 
diff --git a/arma/server/extension/src/garage.rs b/arma/server/extension/src/garage.rs
new file mode 100644
index 0000000..38690d0
--- /dev/null
+++ b/arma/server/extension/src/garage.rs
@@ -0,0 +1,546 @@
+//! Garage management operations for the Arma 3 server extension.
+//!
+//! Provides Arma 3 extension commands for vehicle storage, retrieval, and updates.
+
+use arma_rs::{CallContext, Group};
+use forge_models::Vehicle;
+use forge_repositories::RedisGarageRepository;
+use forge_services::GarageService;
+use std::collections::HashMap;
+use std::sync::LazyLock;
+
+use crate::adapters::ExtensionRedisClient;
+use crate::helpers::resolve_uid;
+use crate::log::log;
+
+/// Global garage service instance.
+static GARAGE_SERVICE: LazyLock<GarageService<RedisGarageRepository<ExtensionRedisClient>>> =
+    LazyLock::new(|| {
+        let redis_client = ExtensionRedisClient::new();
+        let repository = RedisGarageRepository::new(redis_client);
+        GarageService::new(repository)
+    });
+
+/// Creates the Arma 3 command group for garage operations.
+///
+/// Registers commands: `create`, `get`, `add`, `update`, `remove`, `delete`, `exists`.
+pub fn group() -> Group {
+    Group::new()
+        .command("create", create_garage)
+        .command("get", get_garage)
+        .command("add", add_vehicle)
+        .command("update", update_garage)
+        .command("patch", patch_vehicle)
+        .command("remove", remove_vehicle)
+        .command("delete", delete_garage)
+        .command("exists", garage_exists)
+}
+
+/// Creates a new empty garage for a player.
+///
+/// Parameters: key
+pub fn create_garage(call_context: CallContext, key: String) -> String {
+    log(
+        "garage",
+        "DEBUG",
+        &format!("Creating garage for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("garage", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match GARAGE_SERVICE.create_garage(resolved_uid.clone()) {
+        Ok(empty_garage) => {
+            log(
+                "garage",
+                "INFO",
+                &format!("Successfully created garage for: {}", resolved_uid),
+            );
+            match serde_json::to_string(&empty_garage.vehicles) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize garage: {}", e);
+                    log("garage", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "garage",
+                "ERROR",
+                &format!("Failed to create garage '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Retrieves a player's garage by key/UID.
+///
+/// Returns JSON object with garage data including all vehicles.
+pub fn get_garage(call_context: CallContext, key: String) -> String {
+    log(
+        "garage",
+        "DEBUG",
+        &format!("Getting garage for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("garage", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match GARAGE_SERVICE.get_garage(resolved_uid.clone()) {
+        Ok(garage) => {
+            log(
+                "garage",
+                "INFO",
+                &format!(
+                    "Successfully retrieved garage with {} vehicles",
+                    garage.vehicles.len()
+                ),
+            );
+            match serde_json::to_string(&garage.vehicles) {
+                Ok(json) => {
+                    log(
+                        "garage",
+                        "DEBUG",
+                        &format!("Serialized garage to JSON: {}", json),
+                    );
+                    json
+                }
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize garage: {}", e);
+                    log("garage", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "garage",
+                "ERROR",
+                &format!("Failed to get garage '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Adds a new vehicle to a player's garage.
+///
+/// Parameters: key, json_data
+pub fn add_vehicle(call_context: CallContext, key: String, json_data: String) -> String {
+    log(
+        "garage",
+        "DEBUG",
+        &format!("Adding vehicle for key: {} with data: {}", key, json_data),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("garage", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    // Parse JSON data
+    let data: serde_json::Value = match serde_json::from_str(&json_data) {
+        Ok(d) => d,
+        Err(e) => {
+            let error_msg = format!("Error: Invalid JSON data: {}", e);
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    // Extract fields
+    let classname = match data.get("classname").and_then(|v| v.as_str()) {
+        Some(c) => c.to_string(),
+        None => {
+            let error_msg = "Error: Missing or invalid classname".to_string();
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    let fuel = match data.get("fuel").and_then(|v| v.as_f64()) {
+        Some(f) => f,
+        None => {
+            let error_msg = "Error: Missing or invalid fuel".to_string();
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    let damage = match data.get("damage").and_then(|v| v.as_f64()) {
+        Some(d) => d,
+        None => {
+            let error_msg = "Error: Missing or invalid damage".to_string();
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    let hit_points_json = match data.get("hit_points") {
+        Some(hp) => match serde_json::to_string(hp) {
+            Ok(s) => s,
+            Err(e) => {
+                let error_msg = format!("Error: Failed to serialize hit_points: {}", e);
+                log("garage", "ERROR", &error_msg);
+                return error_msg;
+            }
+        },
+        None => {
+            let error_msg = "Error: Missing hit_points".to_string();
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match GARAGE_SERVICE.add_vehicle(
+        resolved_uid.clone(),
+        classname,
+        fuel,
+        damage,
+        hit_points_json,
+    ) {
+        Ok(garage) => {
+            log(
+                "garage",
+                "INFO",
+                &format!("Successfully added vehicle to garage: {}", resolved_uid),
+            );
+            match serde_json::to_string(&garage.vehicles) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize garage: {}", e);
+                    log("garage", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "garage",
+                "ERROR",
+                &format!("Failed to add vehicle '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Updates the entire garage state.
+///
+/// Parameters: key, json_data (Map of vehicles)
+pub fn update_garage(call_context: CallContext, key: String, json_data: String) -> String {
+    log(
+        "garage",
+        "DEBUG",
+        &format!("Updating garage for key: {} with data: {}", key, json_data),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("garage", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    // Parse JSON data
+    let vehicles: HashMap<String, Vehicle> = match serde_json::from_str(&json_data) {
+        Ok(d) => d,
+        Err(e) => {
+            let error_msg = format!("Error: Invalid JSON data: {}", e);
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match GARAGE_SERVICE.update_garage(resolved_uid.clone(), vehicles) {
+        Ok(garage) => {
+            log(
+                "garage",
+                "INFO",
+                &format!("Successfully updated garage for: {}", resolved_uid),
+            );
+            match serde_json::to_string(&garage.vehicles) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize garage: {}", e);
+                    log("garage", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "garage",
+                "ERROR",
+                &format!("Failed to update garage '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Patches a specific vehicle in the garage.
+///
+/// Parameters: key, json_data (Map with plate and optional fields)
+pub fn patch_vehicle(call_context: CallContext, key: String, json_data: String) -> String {
+    log(
+        "garage",
+        "DEBUG",
+        &format!("Patching vehicle for key: {} with data: {}", key, json_data),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("garage", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    let data: serde_json::Value = match serde_json::from_str(&json_data) {
+        Ok(d) => d,
+        Err(e) => {
+            let error_msg = format!("Error: Invalid JSON data: {}", e);
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    let plate = match data.get("plate").and_then(|v| v.as_str()) {
+        Some(s) => s.to_string(),
+        None => {
+            let error_msg = "Error: Missing plate".to_string();
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    let fuel = data.get("fuel").and_then(|v| v.as_f64());
+    let damage = data.get("damage").and_then(|v| v.as_f64());
+    let hit_points_json = data
+        .get("hit_points")
+        .and_then(|v| serde_json::to_string(v).ok());
+
+    match GARAGE_SERVICE.patch_vehicle(resolved_uid.clone(), plate, damage, fuel, hit_points_json) {
+        Ok(garage) => {
+            log(
+                "garage",
+                "INFO",
+                &format!("Successfully patched vehicle for: {}", resolved_uid),
+            );
+            match serde_json::to_string(&garage.vehicles) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize garage: {}", e);
+                    log("garage", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "garage",
+                "ERROR",
+                &format!("Failed to patch vehicle '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Removes a vehicle from the garage.
+///
+/// Parameters: key, json_data
+pub fn remove_vehicle(call_context: CallContext, key: String, json_data: String) -> String {
+    log(
+        "garage",
+        "DEBUG",
+        &format!(
+            "Removing vehicle from garage for key: {} with data: {}",
+            key, json_data
+        ),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("garage", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    // Parse JSON data
+    let data: serde_json::Value = match serde_json::from_str(&json_data) {
+        Ok(d) => d,
+        Err(e) => {
+            let error_msg = format!("Error: Invalid JSON data: {}", e);
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    // Extract plate
+    let plate = match data.get("plate").and_then(|v| v.as_str()) {
+        Some(p) => p.to_string(),
+        None => {
+            let error_msg = "Error: Missing or invalid plate".to_string();
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match GARAGE_SERVICE.remove_vehicle(resolved_uid.clone(), plate) {
+        Ok(garage) => {
+            log(
+                "garage",
+                "INFO",
+                &format!("Successfully removed vehicle from garage: {}", resolved_uid),
+            );
+            match serde_json::to_string(&garage.vehicles) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize garage: {}", e);
+                    log("garage", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "garage",
+                "ERROR",
+                &format!("Failed to remove vehicle '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Permanently deletes a player's garage.
+pub fn delete_garage(call_context: CallContext, key: String) -> String {
+    log(
+        "garage",
+        "DEBUG",
+        &format!("Deleting garage for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("garage", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match GARAGE_SERVICE.delete_garage(resolved_uid.clone()) {
+        Ok(_) => {
+            log(
+                "garage",
+                "INFO",
+                &format!("Successfully deleted garage: {}", resolved_uid),
+            );
+            "OK".to_string()
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "garage",
+                "ERROR",
+                &format!("Failed to delete garage '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Checks if a player has a garage.
+pub fn garage_exists(call_context: CallContext, key: String) -> String {
+    log(
+        "garage",
+        "DEBUG",
+        &format!("Checking garage existence for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("garage", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match GARAGE_SERVICE.garage_exists(resolved_uid.clone()) {
+        Ok(exists) => {
+            log(
+                "garage",
+                "DEBUG",
+                &format!("Garage exists for '{}': {}", resolved_uid, exists),
+            );
+            exists.to_string()
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "garage",
+                "ERROR",
+                &format!("Failed to check garage existence '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
diff --git a/arma/server/extension/src/icom.rs b/arma/server/extension/src/icom.rs
new file mode 100644
index 0000000..92f3807
--- /dev/null
+++ b/arma/server/extension/src/icom.rs
@@ -0,0 +1,353 @@
+//! ICOM (Internal Communication) module for inter-server communication
+//!
+//! This module provides functionality for Arma 3 servers to communicate with each other
+//! through a central ICOM hub server. It enables real-time event passing between multiple
+//! game servers, allowing for synchronized gameplay experiences.
+//!
+//! # Architecture
+//!
+//! - **Extension Module**: This code runs inside the Arma 3 server extension
+//! - **ICOM Client**: Connects to the central ICOM server on initialization
+//! - **Event Listener**: Spawned task that continuously listens for incoming events
+//! - **Event Forwarder**: Receives events and forwards them to Arma via callbacks
+//!
+//! # Event Flow
+//!
+//! 1. **Outgoing**: SQF → Extension command → ICOM client → ICOM server → Target server
+//! 2. **Incoming**: ICOM server → Event listener → Forward helper → Arma callback → SQF
+//!
+//! # Usage from SQF
+//!
+//! ```sqf
+//! // Send event to specific server
+//! "forge_server" callExtension ["icom:send_event", ["server_2", "supply_drop", '{"coords":[1234,5678,0]}']]
+//!
+//! // Broadcast to all servers
+//! "forge_server" callExtension ["icom:broadcast", ["global_alert", '{"message":"Event starting"}']]
+//!
+//! // Handle incoming events
+//! ["forge_icom_event", {
+//!     params ["_eventName", "_data"];
+//!     // Process event based on _eventName
+//! }] call CBA_fnc_addEventHandler;
+//! ```
+
+use arma_rs::{Context, Group};
+use forge_icom::Message;
+use forge_icom::client::IComClient;
+use std::sync::OnceLock;
+
+use crate::{CONTEXT, RUNTIME, log};
+
+/// Global ICOM client, created once and shared by all commands.
+/// Initialized asynchronously after extension loads.
+pub static ICOM_CLIENT: OnceLock<IComClient> = OnceLock::new();
+
+/// Initialize ICOM client connection
+///
+/// Establishes connection to the ICOM server and spawns a background listener task.
+/// This function is called during extension startup (from `lib.rs`) or manually via
+/// the `icom:connect` command.
+///
+/// # Process
+///
+/// 1. Stores Arma context globally for use in event forwarding callbacks
+/// 2. Connects to ICOM server and registers with the provided server ID
+/// 3. Spawns persistent listener task on the runtime's thread pool
+/// 4. Listener automatically forwards incoming events to Arma via CBA
+///
+/// # Arguments
+///
+/// * `ctx` - Arma extension context for triggering CBA callbacks
+/// * `address` - ICOM server address (e.g., "127.0.0.1:9090")
+/// * `server_id` - Unique identifier for this server (e.g., "server_1")
+///
+/// # Behavior
+///
+/// - If connection fails, a warning is logged but the extension continues
+/// - If already connected, logs an error and returns
+/// - Listener runs indefinitely until connection is lost or extension unloads
+pub async fn initialize(ctx: Context, address: String, server_id: String) {
+    // Store context in global CONTEXT
+    *CONTEXT.write().await = Some(ctx);
+    match IComClient::connect(&address, server_id).await {
+        Ok(client) => {
+            if ICOM_CLIENT.set(client).is_ok() {
+                log::log("icom", "INFO", "Connected to ICOM server");
+
+                // Spawn listener task
+                RUNTIME.spawn(async move {
+                    if let Some(client) = ICOM_CLIENT.get() {
+                        let result = client
+                            .listen_for_events(|msg| {
+                                match msg {
+                                    Message::Event {
+                                        event_name, data, ..
+                                    } => {
+                                        log::log(
+                                            "icom",
+                                            "INFO",
+                                            &format!("Received event '{}': {}", event_name, data),
+                                        );
+
+                                        // Forward event to Arma
+                                        forward(&event_name, &data);
+                                    }
+                                    _ => {}
+                                }
+                                Ok(())
+                            })
+                            .await;
+
+                        if let Err(e) = result {
+                            log::log("icom", "ERROR", &format!("Event listener error: {}", e));
+                        }
+                    }
+                });
+            } else {
+                log::log("icom", "ERROR", "Failed to set ICOM client (already set)");
+            }
+        }
+        Err(e) => {
+            log::log(
+                "icom",
+                "WARN",
+                &format!("Failed to connect to ICOM server: {}", e),
+            );
+        }
+    }
+}
+
+/// Create ICOM command group
+///
+/// Builds the command group exposed to SQF under the `icom:` namespace.
+///
+/// # Available Commands
+///
+/// - `connect` - Connect to the ICOM server manually
+/// - `send_event` - Send event to a specific server
+/// - `broadcast` - Broadcast event to all connected servers
+pub fn group() -> Group {
+    Group::new()
+        .command("connect", connect)
+        .command("broadcast", broadcast)
+        .command("send_event", send_event)
+}
+
+/// Connect to ICOM server from SQF
+///
+/// Initiates connection to the ICOM server with custom parameters. Useful for:
+/// - Retrying after initial connection failure
+/// - Connecting to non-default ICOM server address
+/// - Setting server ID at runtime instead of compile-time
+///
+/// The connection process runs asynchronously in the background. Check logs
+/// for success/failure status.
+///
+/// # Arguments
+///
+/// * `ctx` - Arma extension context (automatically provided by arma-rs)
+/// * `address` - ICOM server address (e.g., "127.0.0.1:9090")
+/// * `server_id` - Unique server identifier (e.g., "server_1", "server_2")
+///
+/// # Returns
+///
+/// - `"Connection initiated"` - Background connection task started successfully
+/// - `"ERROR: Already connected"` - Client is already connected (disconnect first)
+///
+/// # SQF Usage
+///
+/// ```sqf
+/// private _result = "forge_server" callExtension ["icom:connect", ["127.0.0.1:9090", "server_1"]];
+/// systemChat _result; // "Connection initiated"
+/// // Check @forge_server/logs/icom.log for connection status
+/// ```
+fn connect(ctx: Context, address: String, server_id: String) -> String {
+    if ICOM_CLIENT.get().is_some() {
+        return "ERROR: Already connected".to_string();
+    }
+
+    RUNTIME.spawn(async move {
+        log::log(
+            "icom",
+            "INFO",
+            &format!("Connecting to {} as {}", address, server_id),
+        );
+
+        initialize(ctx, address, server_id).await;
+    });
+
+    "Connection initiated".to_string()
+}
+
+/// Broadcast an event to all connected servers
+///
+/// Sends an event to all servers currently connected to the ICOM hub,
+/// except the sender itself.
+///
+/// # Arguments
+///
+/// * `event_name` - Name of the event (e.g., "global_alert", "server_restart")
+/// * `data` - JSON string containing event data
+///
+/// # Returns
+///
+/// - `"OK"` if the broadcast was sent successfully
+/// - `"ERROR: <reason>"` if broadcast failed
+///
+/// # SQF Usage
+///
+/// ```sqf
+/// private _result = "forge_server" callExtension [
+///     "icom:broadcast",
+///     ["global_alert", '{"message":"Server restart in 5 minutes","severity":"warning"}']
+/// ];
+/// ```
+fn broadcast(event_name: String, data: String) -> String {
+    let client = match ICOM_CLIENT.get() {
+        Some(c) => c,
+        None => {
+            log::log("icom", "ERROR", "ICOM client not connected");
+            return "ERROR: Not connected to ICOM server".to_string();
+        }
+    };
+
+    // Parse JSON data
+    let json_data: serde_json::Value = match serde_json::from_str(&data) {
+        Ok(d) => d,
+        Err(e) => {
+            log::log("icom", "ERROR", &format!("Invalid JSON data: {}", e));
+            return format!("ERROR: Invalid JSON - {}", e);
+        }
+    };
+
+    log::log(
+        "icom",
+        "INFO",
+        &format!("Broadcasting event '{}'", event_name),
+    );
+
+    // Broadcast the event asynchronously
+    RUNTIME.spawn(async move {
+        if let Err(e) = client.broadcast(&event_name, json_data).await {
+            log::log("icom", "ERROR", &format!("Failed to send event: {}", e));
+        }
+    });
+
+    "OK".to_string()
+}
+
+/// Send an event to a specific server
+///
+/// Sends a custom event with arbitrary JSON data to another server connected to ICOM.
+///
+/// # Arguments
+///
+/// * `target_server` - The server ID to send the event to (e.g., "server_2")
+/// * `event_name` - Name of the event (e.g., "supply_drop", "spawn_mission")
+/// * `data` - JSON string containing event data
+///
+/// # Returns
+///
+/// - `"OK"` if the event was sent successfully
+/// - `"ERROR: <reason>"` if sending failed
+///
+/// # SQF Usage
+///
+/// ```sqf
+/// private _result = "forge_server" callExtension [
+///     "icom:send_event",
+///     ["server_2", "supply_drop", '{"coords":[1234,5678,0],"supplies":["ammo","medical"]}']
+/// ];
+/// ```
+fn send_event(target_server: String, event_name: String, data: String) -> String {
+    let client = match ICOM_CLIENT.get() {
+        Some(c) => c,
+        None => {
+            log::log("icom", "ERROR", "ICOM client not connected");
+            return "ERROR: Not connected to ICOM server".to_string();
+        }
+    };
+
+    // Parse JSON data
+    let json_data: serde_json::Value = match serde_json::from_str(&data) {
+        Ok(d) => d,
+        Err(e) => {
+            log::log("icom", "ERROR", &format!("Invalid JSON data: {}", e));
+            return format!("ERROR: Invalid JSON - {}", e);
+        }
+    };
+
+    log::log(
+        "icom",
+        "INFO",
+        &format!("Sending event '{}' to '{}'", event_name, target_server),
+    );
+
+    // Send the event asynchronously
+    RUNTIME.spawn(async move {
+        if let Err(e) = client
+            .send_event(&target_server, &event_name, json_data)
+            .await
+        {
+            log::log("icom", "ERROR", &format!("Failed to send event: {}", e));
+        }
+    });
+
+    "OK".to_string()
+}
+
+/// Forward an ICOM event to Arma via callback
+///
+/// Internal helper function that takes an event received from ICOM and forwards it
+/// to Arma 3 via the callback mechanism. The event is sent to SQF as a JSON array:
+/// `["event_name", {data}]`
+///
+/// # Arguments
+///
+/// * `event_name` - The name of the event
+/// * `data` - The event data as a JSON value
+///
+/// # Implementation Notes
+///
+/// Uses `try_read()` instead of blocking to avoid deadlocks when called from within
+/// an async task running on the same runtime that manages the context lock.
+///
+/// The callback triggers the "forge_icom_event" CBA event in Arma, which should be
+/// handled by mission code to process incoming inter-server events.
+fn forward(event_name: &str, data: &serde_json::Value) {
+    // Use try_read to avoid blocking inside async context
+    let context_guard = match CONTEXT.try_read() {
+        Ok(guard) => guard,
+        Err(_) => {
+            log::log("icom", "WARN", "Could not acquire CONTEXT read lock");
+            return;
+        }
+    };
+
+    if let Some(ctx) = context_guard.as_ref() {
+        // Format as JSON array: ["event_name", data]
+        let event_data = serde_json::json!([event_name, data]);
+        let event_json =
+            serde_json::to_string(&event_data).unwrap_or_else(|_| "[\"error\",null]".to_string());
+
+        match ctx.callback_data("icom", "forge_icom_event", Some(event_json)) {
+            Ok(_) => {
+                log::log(
+                    "icom",
+                    "INFO",
+                    &format!("Forwarded event '{}' to Arma", event_name),
+                );
+            }
+            Err(e) => {
+                log::log(
+                    "icom",
+                    "ERROR",
+                    &format!("Failed to forward event to Arma: {}", e),
+                );
+            }
+        }
+    } else {
+        log::log("icom", "WARN", "Context not available for callback");
+    }
+}
diff --git a/arma/server/extension/src/lib.rs b/arma/server/extension/src/lib.rs
index e780192..1d71c7e 100644
--- a/arma/server/extension/src/lib.rs
+++ b/arma/server/extension/src/lib.rs
@@ -4,7 +4,9 @@
 //! all command groups. Provides status/version commands and maintains a shared
 //! Arma `Context` for engine interop.
 //!
-use arma_rs::{Context, Extension, arma};
+#![allow(future_incompatible)] // Future-incompatible lint is triggered by arma_rs
+
+use arma_rs::{Context, Extension, Group, arma};
 use std::sync::{LazyLock, OnceLock, RwLock as StdRwLock};
 use tokio::runtime::{Builder, Runtime};
 use tokio::sync::RwLock as TokioRwLock;
@@ -12,10 +14,15 @@ use tokio::sync::RwLock as TokioRwLock;
 pub mod actor;
 pub mod adapters;
 pub mod bank;
+pub mod garage;
 pub mod helpers;
+pub mod icom;
+pub mod locker;
 mod log;
 pub mod org;
 pub mod redis;
+pub mod v_garage;
+pub mod v_locker;
 
 /// Global Arma `Context` captured at initialization and made available to
 /// commands that need engine interop. Stored inside an async `RwLock` to
@@ -55,34 +62,23 @@ fn init() -> Extension {
         .group("redis", redis::group())
         .group("actor", actor::group())
         .group("bank", bank::group())
+        .group("garage", garage::group())
+        .group("icom", icom::group())
+        .group("locker", locker::group())
         .group("org", org::group())
+        .group(
+            "owned",
+            Group::new()
+                .group("garage", v_garage::group())
+                .group("locker", v_locker::group()),
+        )
         .finish();
 
-    let ctx = ext.context();
-
-    // Spawn the connection task on the runtime.
-    // This returns immediately, allowing Arma to continue.
+    // Spawn initialization tasks for Redis and ICOM
+    // These run asynchronously and don't block extension startup
+    // Redis initialization will set the global CONTEXT
     RUNTIME.spawn(async move {
-        // Store context immediately if needed, or pass it to the connection logic
-        *CONTEXT.write().await = Some(ctx);
-
-        let pool_result = redis::client::create_redis_pool(&config.redis).await;
-        let pool = match pool_result {
-            Ok(pool) => pool,
-            Err(_e) => {
-                // Log error, maybe try default config, or set state to Failed
-                let default_config = redis::RedisConfig::default();
-                redis::client::create_redis_pool(&default_config)
-                    .await
-                    .expect("Failed to create default Redis pool")
-            }
-        };
-
-        if REDIS_POOL.set(pool).is_ok() {
-            *CONNECTION_STATE.write().unwrap() = ConnectionState::Connected;
-        } else {
-            *CONNECTION_STATE.write().unwrap() = ConnectionState::Failed;
-        }
+        redis::initialize(config.redis).await;
     });
 
     ext
diff --git a/arma/server/extension/src/lib.rs.bak b/arma/server/extension/src/lib.rs.bak
deleted file mode 100644
index 68937f5..0000000
--- a/arma/server/extension/src/lib.rs.bak
+++ /dev/null
@@ -1,54 +0,0 @@
-use arma_rs::{Context, Extension, arma};
-use std::sync::{LazyLock, OnceLock};
-use tokio::runtime::{Builder, Runtime};
-use tokio::sync::RwLock;
-
-pub mod actor;
-pub mod adapters;
-pub mod helpers;
-mod log;
-pub mod org;
-pub mod redis;
-
-static CONTEXT: LazyLock<RwLock<Option<Context>>> = LazyLock::new(|| RwLock::new(None));
-static REDIS_POOL: OnceLock<redis::client::RedisClient> = OnceLock::new();
-static RUNTIME: LazyLock<Runtime> = LazyLock::new(|| {
-    Builder::new_multi_thread()
-        .enable_all()
-        .build()
-        .expect("Failed to create tokio runtime")
-});
-
-#[arma]
-fn init() -> Extension {
-    let config = redis::config::load();
-    let ext = Extension::build()
-        .command("version", get_version)
-        .group("redis", redis::group())
-        .group("actor", actor::group())
-        .group("org", org::group())
-        .finish();
-
-    let ctx = ext.context();
-
-    RUNTIME.block_on(async {
-        let pool = match redis::client::create_redis_pool(&config.redis).await {
-            Ok(pool) => pool,
-            Err(_) => {
-                let default_config = redis::RedisConfig::default();
-                redis::client::create_redis_pool(&default_config)
-                    .await
-                    .expect("Failed to create Redis pool")
-            }
-        };
-
-        REDIS_POOL.set(pool).ok();
-        *CONTEXT.write().await = Some(ctx);
-    });
-
-    ext
-}
-
-pub fn get_version() -> String {
-    format!("forge-server v{}", env!("CARGO_PKG_VERSION"))
-}
diff --git a/arma/server/extension/src/locker.rs b/arma/server/extension/src/locker.rs
new file mode 100644
index 0000000..0f42ac5
--- /dev/null
+++ b/arma/server/extension/src/locker.rs
@@ -0,0 +1,504 @@
+use arma_rs::{CallContext, Group};
+use forge_models::locker::Item;
+use forge_repositories::RedisLockerRepository;
+use forge_services::LockerService;
+use std::collections::HashMap;
+use std::sync::LazyLock;
+
+use crate::adapters::ExtensionRedisClient;
+use crate::helpers::resolve_uid;
+use crate::log::log;
+
+static LOCKER_SERVICE: LazyLock<LockerService<RedisLockerRepository<ExtensionRedisClient>>> =
+    LazyLock::new(|| {
+        let redis_client = ExtensionRedisClient::new();
+        let repository = RedisLockerRepository::new(redis_client);
+        LockerService::new(repository)
+    });
+
+/// Creates the Arma 3 command group for locker operations.
+///
+/// Registers commands: `create`, `get`, `add`, `update`, `remove`, `delete`, `exists`.
+pub fn group() -> Group {
+    Group::new()
+        .command("create", create_locker)
+        .command("get", get_locker)
+        .command("add", add_item)
+        .command("update", update_locker)
+        .command("patch", patch_item)
+        .command("remove", remove_item)
+        .command("delete", delete_locker)
+        .command("exists", locker_exists)
+}
+
+/// Creates a new empty locker for a player.
+///
+/// Parameters: key
+pub fn create_locker(call_context: CallContext, key: String) -> String {
+    log(
+        "locker",
+        "DEBUG",
+        &format!("Creating locker for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("locker", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match LOCKER_SERVICE.create_locker(resolved_uid.clone()) {
+        Ok(locker) => {
+            log(
+                "locker",
+                "INFO",
+                &format!("Successfully created locker for: {}", resolved_uid),
+            );
+            match serde_json::to_string(&locker.items) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize locker: {}", e);
+                    log("locker", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "locker",
+                "ERROR",
+                &format!("Failed to create locker '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Retrieves a player's locker by key/UID.
+///
+/// Returns JSON object with locker data including all items.
+pub fn get_locker(call_context: CallContext, key: String) -> String {
+    log(
+        "locker",
+        "DEBUG",
+        &format!("Getting locker for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("locker", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match LOCKER_SERVICE.get_locker(resolved_uid.clone()) {
+        Ok(locker) => {
+            log(
+                "locker",
+                "INFO",
+                &format!("Successfully got locker for: {}", resolved_uid),
+            );
+            match serde_json::to_string(&locker.items) {
+                Ok(json) => {
+                    log(
+                        "locker",
+                        "DEBUG",
+                        &format!("Serialized locker to JSON: {}", json),
+                    );
+                    json
+                }
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize locker: {}", e);
+                    log("locker", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "locker",
+                "ERROR",
+                &format!("Failed to get locker '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Adds a new item to a player's locker.
+///
+/// Parameters: key, json_data
+pub fn add_item(call_context: CallContext, key: String, json_data: String) -> String {
+    log(
+        "locker",
+        "DEBUG",
+        &format!(
+            "Adding item to locker for key: {} with data: {}",
+            key, json_data
+        ),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("locker", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    // Parse JSON data
+    let data: serde_json::Value = match serde_json::from_str(&json_data) {
+        Ok(d) => d,
+        Err(e) => {
+            let error_msg = format!("Error: Invalid JSON data: {}", e);
+            log("locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    // Extract fields
+    let category = match data.get("category").and_then(|v| v.as_str()) {
+        Some(c) => c.to_string(),
+        None => {
+            let error_msg = "Error: Missing or invalid category".to_string();
+            log("locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    let classname = match data.get("classname").and_then(|v| v.as_str()) {
+        Some(c) => c.to_string(),
+        None => {
+            let error_msg = "Error: Missing or invalid classname".to_string();
+            log("locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    let amount = match data.get("amount").and_then(|v| v.as_u64()) {
+        Some(a) => a as u32,
+        None => {
+            let error_msg = "Error: Missing or invalid amount".to_string();
+            log("locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    // Create item with validation
+    let item = match Item::new(category, classname, amount) {
+        Ok(i) => i,
+        Err(e) => {
+            let error_msg = format!("Error: Validation failed: {}", e);
+            log("locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match LOCKER_SERVICE.add_item(resolved_uid.clone(), item) {
+        Ok(locker) => {
+            log(
+                "locker",
+                "INFO",
+                &format!("Successfully added item to locker for: {}", resolved_uid),
+            );
+            match serde_json::to_string(&locker.items) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize locker: {}", e);
+                    log("locker", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "locker",
+                "ERROR",
+                &format!("Failed to add item to locker '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Updates the entire locker state (Bulk Sync).
+///
+/// Parameters: key, json_data (Map of items)
+pub fn update_locker(call_context: CallContext, key: String, json_data: String) -> String {
+    log(
+        "locker",
+        "DEBUG",
+        &format!("Updating locker for key: {} with data: {}", key, json_data),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("locker", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    let items: HashMap<String, Item> = match serde_json::from_str(&json_data) {
+        Ok(d) => d,
+        Err(e) => {
+            let error_msg = format!("Error: Invalid JSON data: {}", e);
+            log("locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match LOCKER_SERVICE.update_locker(resolved_uid.clone(), items) {
+        Ok(locker) => {
+            log(
+                "locker",
+                "INFO",
+                &format!("Locker updated successfully for key: {}", resolved_uid),
+            );
+            match serde_json::to_string(&locker.items) {
+                Ok(s) => s,
+                Err(e) => format!("Error serializing locker: {}", e),
+            }
+        }
+        Err(e) => {
+            log("locker", "ERROR", &format!("Error updating locker: {}", e));
+            format!("Error: {}", e)
+        }
+    }
+}
+
+/// Patches a specific item in the locker.
+///
+/// Parameters: key, json_data (Map with classname and optional amount)
+pub fn patch_item(call_context: CallContext, key: String, json_data: String) -> String {
+    log(
+        "locker",
+        "DEBUG",
+        &format!("Patching item for key: {} with data: {}", key, json_data),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("locker", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    let data: serde_json::Value = match serde_json::from_str(&json_data) {
+        Ok(d) => d,
+        Err(e) => {
+            let error_msg = format!("Error: Invalid JSON data: {}", e);
+            log("locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    let classname = match data.get("classname").and_then(|v| v.as_str()) {
+        Some(s) => s.to_string(),
+        None => {
+            let error_msg = "Error: Missing classname".to_string();
+            log("locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    let amount = data
+        .get("amount")
+        .and_then(|v| v.as_u64())
+        .map(|v| v as u32);
+
+    match LOCKER_SERVICE.patch_item(resolved_uid.clone(), classname, amount) {
+        Ok(locker) => {
+            log(
+                "locker",
+                "INFO",
+                &format!("Successfully patched item for: {}", resolved_uid),
+            );
+            match serde_json::to_string(&locker.items) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize locker: {}", e);
+                    log("locker", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "locker",
+                "ERROR",
+                &format!("Failed to patch item '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Removes an item from the locker.
+///
+/// Parameters: key, classname
+pub fn remove_item(call_context: CallContext, key: String, classname: String) -> String {
+    log(
+        "locker",
+        "DEBUG",
+        &format!("Removing item from locker for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("locker", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match LOCKER_SERVICE.remove_item(resolved_uid.clone(), classname) {
+        Ok(locker) => {
+            log(
+                "locker",
+                "INFO",
+                &format!(
+                    "Successfully removed item from locker for: {}",
+                    resolved_uid
+                ),
+            );
+            match serde_json::to_string(&locker.items) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize locker: {}", e);
+                    log("locker", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "locker",
+                "ERROR",
+                &format!(
+                    "Failed to remove item from locker '{}': {}",
+                    resolved_uid, e
+                ),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Permanently deletes a player's locker.
+pub fn delete_locker(call_context: CallContext, key: String) -> String {
+    log(
+        "locker",
+        "DEBUG",
+        &format!("Deleting locker for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("locker", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match LOCKER_SERVICE.delete_locker(resolved_uid.clone()) {
+        Ok(()) => {
+            log(
+                "locker",
+                "INFO",
+                &format!("Successfully deleted locker for: {}", resolved_uid),
+            );
+            "OK".to_string()
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "locker",
+                "ERROR",
+                &format!("Failed to delete locker '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Checks if a player has a locker (even if empty)
+pub fn locker_exists(call_context: CallContext, key: String) -> String {
+    log(
+        "locker",
+        "DEBUG",
+        &format!("Checking if locker exists for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("locker", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match LOCKER_SERVICE.locker_exists(resolved_uid.clone()) {
+        Ok(exists) => {
+            log(
+                "locker",
+                "INFO",
+                &format!("Locker exists for: {}", resolved_uid),
+            );
+            exists.to_string()
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "locker",
+                "ERROR",
+                &format!(
+                    "Failed to check if locker exists for '{}': {}",
+                    resolved_uid, e
+                ),
+            );
+            error_msg
+        }
+    }
+}
diff --git a/arma/server/extension/src/org.rs b/arma/server/extension/src/org.rs
index 3f42545..f73ef8e 100644
--- a/arma/server/extension/src/org.rs
+++ b/arma/server/extension/src/org.rs
@@ -23,19 +23,27 @@ static ORG_SERVICE: LazyLock<OrgService<RedisOrgRepository<ExtensionRedisClient>
 
 /// Creates the Arma 3 command group for organization operations.
 ///
-/// Registers commands: `get`, `get_members`, `add_member`, `remove_member`, `exists`, `create`, `update`, `delete`.
+/// Registers commands: `get`, `exists`, `create`, `update`, `delete`.
 pub fn group() -> Group {
     Group::new()
         .command("get", get_org)
-        .command("get_members", get_members)
-        .command("add_member", add_member)
-        .command("remove_member", remove_member)
-        .command("exists", org_exists)
         .command("create", create_org)
         .command("update", update_org)
+        .command("exists", org_exists)
         .command("delete", delete_org)
+        .group(
+            "members",
+            Group::new()
+                .command("get", get_members)
+                .command("add", add_member)
+                .command("remove", remove_member),
+        )
 }
 
+// ============================================================================
+// Organization Asset Operations
+// ============================================================================
+
 /// Retrieves an organization by key/ID.
 ///
 /// Returns the organization as JSON or an error message if not found.
@@ -77,16 +85,13 @@ pub fn get_org(key: String) -> String {
     }
 }
 
-/// Retrieves organization members as a JSON object.
+/// Checks if an organization exists in the database.
 ///
-/// Returns a map of member UIDs to names. Returns empty object if not found.
-pub fn get_members(key: String) -> String {
-    match ORG_SERVICE.get_members(key) {
-        Ok(members) => match serde_json::to_string(&members) {
-            Ok(json) => json,
-            Err(_) => "{}".to_string(),
-        },
-        Err(_) => "{}".to_string(),
+/// Returns "true" if the organization exists, "false" otherwise.
+pub fn org_exists(key: String) -> String {
+    match ORG_SERVICE.org_exists(key) {
+        Ok(exists) => if exists { "true" } else { "false" }.to_string(),
+        Err(_) => "false".to_string(),
     }
 }
 
@@ -147,16 +152,6 @@ pub fn update_org(key: String, json_update: String) -> String {
     }
 }
 
-/// Checks if an organization exists in the database.
-///
-/// Returns "true" if the organization exists, "false" otherwise.
-pub fn org_exists(key: String) -> String {
-    match ORG_SERVICE.org_exists(key) {
-        Ok(exists) => if exists { "true" } else { "false" }.to_string(),
-        Err(_) => "false".to_string(),
-    }
-}
-
 /// Permanently deletes an organization.
 ///
 /// Resolves key to ID and removes the organization and associated data.
@@ -167,6 +162,23 @@ pub fn delete_org(key: String) -> String {
     }
 }
 
+// ============================================================================
+// Member Operations
+// ============================================================================
+
+/// Retrieves organization members as a JSON object.
+///
+/// Returns a map of member UIDs to names. Returns empty object if not found.
+pub fn get_members(key: String) -> String {
+    match ORG_SERVICE.get_members(key) {
+        Ok(members) => match serde_json::to_string(&members) {
+            Ok(json) => json,
+            Err(_) => "{}".to_string(),
+        },
+        Err(_) => "{}".to_string(),
+    }
+}
+
 /// Adds a new member to an organization by their UID.
 ///
 /// Resolves organization key to ID and adds the member UID.
diff --git a/arma/server/extension/src/redis/mod.rs b/arma/server/extension/src/redis/mod.rs
index 5a13dc7..a954ad7 100644
--- a/arma/server/extension/src/redis/mod.rs
+++ b/arma/server/extension/src/redis/mod.rs
@@ -1,11 +1,14 @@
 //! Redis operations and utilities for the Arma 3 server extension.
 
 use arma_rs::Group;
+use tokio::time::{Duration, timeout};
 
 pub use client::create_redis_pool;
 pub use config::RedisConfig;
 pub use helpers::{decode_b64, encode_b64};
 
+use crate::{CONNECTION_STATE, ConnectionState, REDIS_POOL, log};
+
 pub mod client;
 pub mod common;
 pub mod config;
@@ -15,6 +18,72 @@ pub mod list;
 pub mod macros;
 pub mod set;
 
+/// Initialize Redis connection pool with fallback to default config
+///
+/// This function attempts to connect to Redis using the provided config,
+/// with a 5-second timeout. If the primary config fails, it tries the
+/// default config as a fallback.
+pub async fn initialize(config: RedisConfig) {
+    // Use timeout to prevent hanging if Redis is unavailable
+    let pool_result = timeout(Duration::from_secs(5), create_redis_pool(&config)).await;
+
+    let pool = match pool_result {
+        Err(_) => {
+            log::log(
+                "redis",
+                "ERROR",
+                "Redis connection timed out after 5 seconds",
+            );
+            *CONNECTION_STATE.write().unwrap() = ConnectionState::Failed;
+            return; // Exit early
+        }
+        Ok(Ok(pool)) => {
+            log::log("redis", "INFO", "Connected to Redis server");
+            pool
+        }
+        Ok(Err(e)) => {
+            log::log(
+                "redis",
+                "WARN",
+                &format!("Failed to connect to Redis (primary config): {}", e),
+            );
+            // Try default config as fallback with timeout
+            let default_config = RedisConfig::default();
+            match timeout(Duration::from_secs(5), create_redis_pool(&default_config)).await {
+                Err(_) => {
+                    log::log(
+                        "redis",
+                        "ERROR",
+                        "Redis (default config) timed out after 5 seconds",
+                    );
+                    *CONNECTION_STATE.write().unwrap() = ConnectionState::Failed;
+                    return;
+                }
+                Ok(Ok(pool)) => {
+                    log::log("redis", "INFO", "Connected to Redis using default config");
+                    pool
+                }
+                Ok(Err(e)) => {
+                    log::log(
+                        "redis",
+                        "ERROR",
+                        &format!("Failed to connect to Redis (all attempts): {}", e),
+                    );
+                    *CONNECTION_STATE.write().unwrap() = ConnectionState::Failed;
+                    return; // Exit early, don't set pool
+                }
+            }
+        }
+    };
+
+    if REDIS_POOL.set(pool).is_ok() {
+        *CONNECTION_STATE.write().unwrap() = ConnectionState::Connected;
+    } else {
+        log::log("redis", "ERROR", "Failed to set Redis pool (already set)");
+        *CONNECTION_STATE.write().unwrap() = ConnectionState::Failed;
+    }
+}
+
 pub fn group() -> Group {
     Group::new()
         .group(
diff --git a/arma/server/extension/src/v_garage.rs b/arma/server/extension/src/v_garage.rs
new file mode 100644
index 0000000..0b015df
--- /dev/null
+++ b/arma/server/extension/src/v_garage.rs
@@ -0,0 +1,459 @@
+use arma_rs::{CallContext, Group};
+use forge_models::VehicleCategory;
+use forge_repositories::RedisVGarageRepository;
+use forge_services::VGarageService;
+use std::sync::LazyLock;
+
+use crate::adapters::ExtensionRedisClient;
+use crate::helpers::resolve_uid;
+use crate::log::log;
+
+static VGARAGE_SERVICE: LazyLock<VGarageService<RedisVGarageRepository<ExtensionRedisClient>>> =
+    LazyLock::new(|| {
+        let redis_client = ExtensionRedisClient::new();
+        let repository = RedisVGarageRepository::new(redis_client);
+        VGarageService::new(repository)
+    });
+
+/// Creates the Arma 3 command group for virtual garage operations.
+///
+/// Registers commands: `create`, `fetch`, `get`, `add`, `remove`, `delete`, `exists`.
+pub fn group() -> Group {
+    Group::new()
+        .command("create", create_vgarage)
+        .command("fetch", fetch_vgarage)
+        .command("get", get_vgarage)
+        .command("add", add_vgarage)
+        .command("remove", remove_vgarage)
+        .command("delete", delete_vgarage)
+        .command("exists", vgarage_exists)
+}
+
+/// Creates a new empty virtual garage for a player.
+///
+/// Parameters: key
+pub fn create_vgarage(call_context: CallContext, key: String) -> String {
+    log(
+        "v_garage",
+        "DEBUG",
+        &format!("Creating virtual garage for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("v_garage", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("v_garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match VGARAGE_SERVICE.create_garage(&resolved_uid) {
+        Ok(garage) => {
+            log(
+                "v_garage",
+                "INFO",
+                &format!("Successfully created virtual garage for: {}", resolved_uid),
+            );
+            match serde_json::to_string(&garage) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize garage: {}", e);
+                    log("v_garage", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "v_garage",
+                "ERROR",
+                &format!("Failed to create virtual garage '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Retrieves a player's complete virtual garage.
+///
+/// Returns JSON object with all six vehicle arrays.
+pub fn fetch_vgarage(call_context: CallContext, key: String) -> String {
+    log(
+        "v_garage",
+        "DEBUG",
+        &format!("Getting virtual garage for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("v_garage", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("v_garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match VGARAGE_SERVICE.fetch_garage(&resolved_uid) {
+        Ok(garage) => {
+            log(
+                "v_garage",
+                "INFO",
+                &format!("Successfully got virtual garage for: {}", resolved_uid),
+            );
+            match serde_json::to_string(&garage) {
+                Ok(json) => {
+                    log(
+                        "v_garage",
+                        "DEBUG",
+                        &format!("Serialized garage to JSON: {}", json),
+                    );
+                    json
+                }
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize garage: {}", e);
+                    log("v_garage", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "v_garage",
+                "ERROR",
+                &format!("Failed to get virtual garage '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Retrieves a specific field from a player's virtual garage.
+///
+/// Parameters: key, field (cars, armor, helis, planes, naval, or other)
+pub fn get_vgarage(call_context: CallContext, key: String, field: String) -> String {
+    log(
+        "v_garage",
+        "DEBUG",
+        &format!(
+            "Getting field '{}' from virtual garage for key: {}",
+            field, key
+        ),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("v_garage", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("v_garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match VGARAGE_SERVICE.get_garage(&resolved_uid, &field) {
+        Ok(items) => {
+            log(
+                "v_garage",
+                "INFO",
+                &format!(
+                    "Successfully got field '{}' from virtual garage for: {}",
+                    field, resolved_uid
+                ),
+            );
+            match serde_json::to_string(&items) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize field: {}", e);
+                    log("v_garage", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "v_garage",
+                "ERROR",
+                &format!(
+                    "Failed to get field '{}' from virtual garage '{}': {}",
+                    field, resolved_uid, e
+                ),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Adds cars/armor/helis/planes/naval/other to a player's virtual garage.
+///
+/// Parameters: key, category (cars, armor, helis, planes, naval, or other), classnames_json (JSON array string)
+pub fn add_vgarage(
+    call_context: CallContext,
+    key: String,
+    category: String,
+    classnames_json: String,
+) -> String {
+    log(
+        "v_garage",
+        "DEBUG",
+        &format!(
+            "Adding to category '{}' in virtual garage for key: {}",
+            category, key
+        ),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("v_garage", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("v_garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    // Parse category string to enum
+    let category_enum = match category.to_lowercase().as_str() {
+        "cars" => VehicleCategory::Cars,
+        "armor" => VehicleCategory::Armor,
+        "helis" => VehicleCategory::Helis,
+        "planes" => VehicleCategory::Planes,
+        "naval" => VehicleCategory::Naval,
+        "other" => VehicleCategory::Other,
+        _ => {
+            let error_msg = format!(
+                "Error: Invalid category '{}'. Valid options: cars, armor, helis, planes, naval, other",
+                category
+            );
+            log("v_garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    // Parse classnames JSON
+    let classnames: Vec<String> = match serde_json::from_str(&classnames_json) {
+        Ok(names) => names,
+        Err(e) => {
+            let error_msg = format!("Error: Invalid JSON array: {}", e);
+            log("v_garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match VGARAGE_SERVICE.add_garage(&resolved_uid, category_enum, classnames) {
+        Ok(garage) => {
+            log(
+                "v_garage",
+                "INFO",
+                &format!(
+                    "Successfully added items to category '{}' for: {}",
+                    category, resolved_uid
+                ),
+            );
+            match serde_json::to_string(&garage.get(category_enum)) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize category: {}", e);
+                    log("v_garage", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "v_garage",
+                "ERROR",
+                &format!(
+                    "Failed to add items to category '{}' for virtual garage '{}': {}",
+                    category, resolved_uid, e
+                ),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Removes an item from a player's virtual garage category.
+///
+/// Parameters: key, category (cars, armor, helis, planes, naval, or other), classname
+pub fn remove_vgarage(
+    call_context: CallContext,
+    key: String,
+    category: String,
+    classname: String,
+) -> String {
+    log(
+        "v_garage",
+        "DEBUG",
+        &format!(
+            "Removing '{}' from category '{}' in virtual garage for key: {}",
+            classname, category, key
+        ),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("v_garage", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("v_garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    // Parse category string to enum
+    let category_enum = match category.to_lowercase().as_str() {
+        "cars" => VehicleCategory::Cars,
+        "armor" => VehicleCategory::Armor,
+        "heli" => VehicleCategory::Helis,
+        "planes" => VehicleCategory::Planes,
+        "naval" => VehicleCategory::Naval,
+        "other" => VehicleCategory::Other,
+        _ => {
+            let error_msg = format!(
+                "Error: Invalid category '{}'. Valid options: cars, armor, helis, planes, naval, other",
+                category
+            );
+            log("v_garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match VGARAGE_SERVICE.remove_garage(&resolved_uid, category_enum, &classname) {
+        Ok(garage) => {
+            log(
+                "v_garage",
+                "INFO",
+                &format!(
+                    "Successfully removed item from category '{}' for: {}",
+                    category, resolved_uid
+                ),
+            );
+            match serde_json::to_string(&garage.get(category_enum)) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize category: {}", e);
+                    log("v_garage", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "v_garage",
+                "ERROR",
+                &format!(
+                    "Failed to remove item from category '{}' for virtual garage '{}': {}",
+                    category, resolved_uid, e
+                ),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Permanently deletes a player's virtual garage.
+///
+/// Parameters: key
+pub fn delete_vgarage(call_context: CallContext, key: String) -> String {
+    log(
+        "v_garage",
+        "DEBUG",
+        &format!("Deleting virtual garage for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("v_garage", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("v_garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match VGARAGE_SERVICE.delete_garage(&resolved_uid) {
+        Ok(()) => {
+            log(
+                "v_garage",
+                "INFO",
+                &format!("Successfully deleted virtual garage for: {}", resolved_uid),
+            );
+            "OK".to_string()
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "v_garage",
+                "ERROR",
+                &format!("Failed to delete virtual garage '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Checks if a player has a virtual garage (even if empty)
+///
+/// Parameters: key
+pub fn vgarage_exists(call_context: CallContext, key: String) -> String {
+    log(
+        "v_garage",
+        "DEBUG",
+        &format!("Checking if virtual garage exists for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("v_garage", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("v_garage", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match VGARAGE_SERVICE.garage_exists(&resolved_uid) {
+        Ok(exists) => {
+            log(
+                "v_garage",
+                "INFO",
+                &format!("Virtual garage exists for: {}", resolved_uid),
+            );
+            exists.to_string()
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "v_garage",
+                "ERROR",
+                &format!(
+                    "Failed to check if virtual garage exists for '{}': {}",
+                    resolved_uid, e
+                ),
+            );
+            error_msg
+        }
+    }
+}
diff --git a/arma/server/extension/src/v_locker.rs b/arma/server/extension/src/v_locker.rs
new file mode 100644
index 0000000..8b4d98a
--- /dev/null
+++ b/arma/server/extension/src/v_locker.rs
@@ -0,0 +1,455 @@
+use arma_rs::{CallContext, Group};
+use forge_models::EquipmentCategory;
+use forge_repositories::RedisVLockerRepository;
+use forge_services::VLockerService;
+use std::sync::LazyLock;
+
+use crate::adapters::ExtensionRedisClient;
+use crate::helpers::resolve_uid;
+use crate::log::log;
+
+static VLOCKER_SERVICE: LazyLock<VLockerService<RedisVLockerRepository<ExtensionRedisClient>>> =
+    LazyLock::new(|| {
+        let redis_client = ExtensionRedisClient::new();
+        let repository = RedisVLockerRepository::new(redis_client);
+        VLockerService::new(repository)
+    });
+
+/// Creates the Arma 3 command group for virtual locker operations.
+///
+/// Registers commands: `create`, `fetch`, `get`, `add`, `remove`, `delete`, `exists`.
+pub fn group() -> Group {
+    Group::new()
+        .command("create", create_vlocker)
+        .command("fetch", fetch_vlocker)
+        .command("get", get_vlocker)
+        .command("add", add_vlocker)
+        .command("remove", remove_vlocker)
+        .command("delete", delete_vlocker)
+        .command("exists", vlocker_exists)
+}
+
+/// Creates a new empty virtual locker for a player.
+///
+/// Parameters: key
+pub fn create_vlocker(call_context: CallContext, key: String) -> String {
+    log(
+        "v_locker",
+        "DEBUG",
+        &format!("Creating virtual locker for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("v_locker", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("v_locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match VLOCKER_SERVICE.create_locker(&resolved_uid) {
+        Ok(locker) => {
+            log(
+                "v_locker",
+                "INFO",
+                &format!("Successfully created virtual locker for: {}", resolved_uid),
+            );
+            match serde_json::to_string(&locker) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize locker: {}", e);
+                    log("v_locker", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "v_locker",
+                "ERROR",
+                &format!("Failed to create virtual locker '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Retrieves a player's complete virtual locker.
+///
+/// Returns JSON object with all four equipment arrays.
+pub fn fetch_vlocker(call_context: CallContext, key: String) -> String {
+    log(
+        "v_locker",
+        "DEBUG",
+        &format!("Getting virtual locker for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("v_locker", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("v_locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match VLOCKER_SERVICE.fetch_locker(&resolved_uid) {
+        Ok(locker) => {
+            log(
+                "v_locker",
+                "INFO",
+                &format!("Successfully got virtual locker for: {}", resolved_uid),
+            );
+            match serde_json::to_string(&locker) {
+                Ok(json) => {
+                    log(
+                        "v_locker",
+                        "DEBUG",
+                        &format!("Serialized locker to JSON: {}", json),
+                    );
+                    json
+                }
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize locker: {}", e);
+                    log("v_locker", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "v_locker",
+                "ERROR",
+                &format!("Failed to get virtual locker '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Retrieves a specific field from a player's virtual locker.
+///
+/// Parameters: key, field (items, weapons, magazines, or backpacks)
+pub fn get_vlocker(call_context: CallContext, key: String, field: String) -> String {
+    log(
+        "v_locker",
+        "DEBUG",
+        &format!(
+            "Getting field '{}' from virtual locker for key: {}",
+            field, key
+        ),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("v_locker", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("v_locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match VLOCKER_SERVICE.get_locker(&resolved_uid, &field) {
+        Ok(items) => {
+            log(
+                "v_locker",
+                "INFO",
+                &format!(
+                    "Successfully got field '{}' from virtual locker for: {}",
+                    field, resolved_uid
+                ),
+            );
+            match serde_json::to_string(&items) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize field: {}", e);
+                    log("v_locker", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "v_locker",
+                "ERROR",
+                &format!(
+                    "Failed to get field '{}' from virtual locker '{}': {}",
+                    field, resolved_uid, e
+                ),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Adds items/weapons/magazines/backpacks to a player's virtual locker.
+///
+/// Parameters: key, category (items/weapons/magazines/backpacks), classnames_json (JSON array string)
+pub fn add_vlocker(
+    call_context: CallContext,
+    key: String,
+    category: String,
+    classnames_json: String,
+) -> String {
+    log(
+        "v_locker",
+        "DEBUG",
+        &format!(
+            "Adding to category '{}' in virtual locker for key: {}",
+            category, key
+        ),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("v_locker", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("v_locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    // Parse category string to enum
+    let category_enum = match category.to_lowercase().as_str() {
+        "items" => EquipmentCategory::Items,
+        "weapons" => EquipmentCategory::Weapons,
+        "magazines" => EquipmentCategory::Magazines,
+        "backpacks" => EquipmentCategory::Backpacks,
+        _ => {
+            let error_msg = format!(
+                "Error: Invalid category '{}'. Valid options: items, weapons, magazines, backpacks",
+                category
+            );
+            log("v_locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    // Parse classnames JSON
+    let classnames: Vec<String> = match serde_json::from_str(&classnames_json) {
+        Ok(names) => names,
+        Err(e) => {
+            let error_msg = format!("Error: Invalid JSON array: {}", e);
+            log("v_locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match VLOCKER_SERVICE.add_locker(&resolved_uid, category_enum, classnames) {
+        Ok(locker) => {
+            log(
+                "v_locker",
+                "INFO",
+                &format!(
+                    "Successfully added items to category '{}' for: {}",
+                    category, resolved_uid
+                ),
+            );
+            match serde_json::to_string(&locker.get(category_enum)) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize category: {}", e);
+                    log("v_locker", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "v_locker",
+                "ERROR",
+                &format!(
+                    "Failed to add items to category '{}' for virtual locker '{}': {}",
+                    category, resolved_uid, e
+                ),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Removes an item from a player's virtual locker category.
+///
+/// Parameters: key, category (items/weapons/magazines/backpacks), classname
+pub fn remove_vlocker(
+    call_context: CallContext,
+    key: String,
+    category: String,
+    classname: String,
+) -> String {
+    log(
+        "v_locker",
+        "DEBUG",
+        &format!(
+            "Removing '{}' from category '{}' in virtual locker for key: {}",
+            classname, category, key
+        ),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("v_locker", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("v_locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    // Parse category string to enum
+    let category_enum = match category.to_lowercase().as_str() {
+        "items" => EquipmentCategory::Items,
+        "weapons" => EquipmentCategory::Weapons,
+        "magazines" => EquipmentCategory::Magazines,
+        "backpacks" => EquipmentCategory::Backpacks,
+        _ => {
+            let error_msg = format!(
+                "Error: Invalid category '{}'. Valid options: items, weapons, magazines, backpacks",
+                category
+            );
+            log("v_locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match VLOCKER_SERVICE.remove_locker(&resolved_uid, category_enum, &classname) {
+        Ok(locker) => {
+            log(
+                "v_locker",
+                "INFO",
+                &format!(
+                    "Successfully removed item from category '{}' for: {}",
+                    category, resolved_uid
+                ),
+            );
+            match serde_json::to_string(&locker.get(category_enum)) {
+                Ok(json) => json,
+                Err(e) => {
+                    let error_msg = format!("Error: Failed to serialize category: {}", e);
+                    log("v_locker", "ERROR", &error_msg);
+                    error_msg
+                }
+            }
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "v_locker",
+                "ERROR",
+                &format!(
+                    "Failed to remove item from category '{}' for virtual locker '{}': {}",
+                    category, resolved_uid, e
+                ),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Permanently deletes a player's virtual locker.
+///
+/// Parameters: key
+pub fn delete_vlocker(call_context: CallContext, key: String) -> String {
+    log(
+        "v_locker",
+        "DEBUG",
+        &format!("Deleting virtual locker for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("v_locker", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("v_locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match VLOCKER_SERVICE.delete_locker(&resolved_uid) {
+        Ok(()) => {
+            log(
+                "v_locker",
+                "INFO",
+                &format!("Successfully deleted virtual locker for: {}", resolved_uid),
+            );
+            "OK".to_string()
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "v_locker",
+                "ERROR",
+                &format!("Failed to delete virtual locker '{}': {}", resolved_uid, e),
+            );
+            error_msg
+        }
+    }
+}
+
+/// Checks if a player has a virtual locker (even if empty)
+///
+/// Parameters: key
+pub fn vlocker_exists(call_context: CallContext, key: String) -> String {
+    log(
+        "v_locker",
+        "DEBUG",
+        &format!("Checking if virtual locker exists for key: {}", key),
+    );
+
+    let resolved_uid = match resolve_uid(&key, &call_context) {
+        Some(uid) => {
+            log("v_locker", "DEBUG", &format!("Resolved UID: {}", uid));
+            uid
+        }
+        None => {
+            let error_msg = format!("Error: Failed to resolve UID for key: {}", key);
+            log("v_locker", "ERROR", &error_msg);
+            return error_msg;
+        }
+    };
+
+    match VLOCKER_SERVICE.locker_exists(&resolved_uid) {
+        Ok(exists) => {
+            log(
+                "v_locker",
+                "INFO",
+                &format!("Virtual locker exists for: {}", resolved_uid),
+            );
+            exists.to_string()
+        }
+        Err(e) => {
+            let error_msg = format!("Error: {}", e);
+            log(
+                "v_locker",
+                "ERROR",
+                &format!(
+                    "Failed to check if virtual locker exists for '{}': {}",
+                    resolved_uid, e
+                ),
+            );
+            error_msg
+        }
+    }
+}
diff --git a/bin/icom/Cargo.toml b/bin/icom/Cargo.toml
new file mode 100644
index 0000000..528ec1a
--- /dev/null
+++ b/bin/icom/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "forge-icom"
+version = "0.1.0"
+edition = "2024"
+build = "build.rs"
+
+[lib]
+name = "forge_icom"
+path = "src/lib.rs"
+
+[[bin]]
+name = "forge-icom"
+path = "src/main.rs"
+
+[dependencies]
+chrono = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true }
+toml = "0.9.8"
+uuid = { workspace = true }
+
+[build-dependencies]
+winres = "0.1"
diff --git a/bin/icom/README.md b/bin/icom/README.md
new file mode 100644
index 0000000..c603dc0
--- /dev/null
+++ b/bin/icom/README.md
@@ -0,0 +1,394 @@
+# Forge ICOM Server (Internal Communication)
+
+A standalone TCP server for inter-Arma3-server communication. ICOM enables multiple Arma 3 servers to communicate with each other, facilitating cross-server events like mission spawning, supply drops, and military reports.
+
+## Architecture
+
+```
+[Arma Server 1] <---> [Forge ICOM] <---> [Arma Server 2]
+   (Extension)         (TCP 9090)           (Extension)
+      Client                                    Client
+```
+
+Each Arma server's extension connects to the ICOM server as a client. ICOM routes messages between servers based on target IDs or broadcasts to all connected servers.
+
+## Configuration
+
+The ICOM server can be configured using a `config.toml` file. Create one from the example:
+
+```powershell
+cp bin/icom/config.example.toml config.toml
+```
+
+Place `config.toml` in the same directory as the `forge-icom` executable or in the current working directory.
+
+### Configuration Options
+
+```toml
+[server]
+# Host to bind to
+# "0.0.0.0" = All interfaces (allows remote connections)
+# "127.0.0.1" = Localhost only
+host = "0.0.0.0"
+
+# Port to listen on
+port = 9090
+```
+
+**Defaults**: If no config file is found, defaults to `0.0.0.0:9090`.
+
+## Building
+
+```powershell
+# Build release binary
+cargo build --release -p forge-icom
+
+# The executable will be at:
+# target/release/forge-icom.exe (Windows)
+```
+
+## Running
+
+```powershell
+# Run the ICOM server
+./target/release/forge-icom.exe
+
+# Or during development
+cargo run -p forge-icom
+```
+
+The server will listen on `0.0.0.0:9090` by default.
+
+## Design Philosophy
+
+### Generic Event System
+
+ICOM uses a **generic event-based architecture** instead of predefined message types. This means:
+
+- ✅ **Flexibility**: Add new event types without changing the ICOM server code
+- ✅ **Simplicity**: Only one `Event` message type instead of multiple specialized types
+- ✅ **Decoupled**: ICOM doesn't need to know about your game logic
+- ✅ **Future-proof**: Easy to extend as your needs evolve
+
+ICOM simply routes events between servers - your application logic determines what each event means.
+
+## Message Protocol
+
+All messages are JSON objects sent as newline-delimited strings. Each message has a `type` field that determines its structure.
+
+### Register
+
+First message from each Arma server to identify itself:
+
+```json
+{
+  "type": "register",
+  "server_id": "server_1"
+}
+```
+
+Response:
+```json
+{
+  "type": "registered",
+  "session_id": "uuid-here"
+}
+```
+
+### Event (Send to Specific Server)
+
+Send an event with arbitrary JSON data to a specific server:
+
+```json
+{
+  "type": "event",
+  "target_server": "server_2",
+  "event_name": "supply_drop",
+  "data": {
+    "coords": [1234.5, 5678.9, 0.0],
+    "supplies": ["ammo_box", "medical_supplies"]
+  }
+}
+```
+
+Another example:
+```json
+{
+  "type": "event",
+  "target_server": "server_2",
+  "event_name": "spawn_mission",
+  "data": {
+    "mission_type": "convoy_ambush",
+    "difficulty": "hard",
+    "location": [1234, 5678, 0]
+  }
+}
+```
+
+### Broadcast
+
+Send event to all connected servers (except sender):
+
+```json
+{
+  "type": "broadcast",
+  "event_name": "global_alert",
+  "data": {
+    "message": "Nuclear strike incoming!",
+    "severity": "critical"
+  }
+}
+```
+
+### Acknowledgment
+
+Response to successful message delivery:
+
+```json
+{
+  "type": "ack",
+  "message_id": null,
+  "success": true,
+  "error": null
+}
+```
+
+Error response:
+```json
+{
+  "type": "ack",
+  "message_id": null,
+  "success": false,
+  "error": "Target server 'server_3' not found"
+}
+```
+
+## Integration with Arma Extension
+
+### Client Library
+
+The `forge-icom` crate includes a `client` module that provides a high-level API for connecting to ICOM:
+
+```rust
+use forge_icom::client::IComClient;
+use forge_icom::Message;
+use serde_json::json;
+
+// Connect and register (automatically handles registration)
+let client = IComClient::connect("127.0.0.1:9090", "server_1".to_string()).await?;
+
+// Send event to another server
+client.send_event(
+    "server_2",
+    "supply_drop",
+    json!({
+        "coords": [1234.5, 5678.9, 0.0],
+        "supplies": ["ammo", "medical"]
+    })
+).await?;
+
+// Broadcast to all servers
+client.broadcast(
+    "global_alert",
+    json!({"message": "Server restart in 5 minutes"})
+).await?;
+
+// Listen for incoming events
+client.listen_for_events(|msg| {
+    match msg {
+        Message::Event { event_name, data, .. } => {
+            // Forward to Arma via callback
+        }
+        _ => {}
+    }
+    Ok(())
+}).await?;
+```
+
+### Extension Integration
+
+The Forge server extension includes full ICOM integration:
+
+1. **Initialization**: Connects to ICOM on extension startup (or manually via `icom:connect`)
+2. **Event Listener**: Spawns background task to receive events continuously
+3. **Callback System**: Forwards events to Arma via CBA event handlers
+4. **Extension Commands**: Provides SQF commands to send/receive events
+
+**Important Notes**:
+- The extension uses `try_read()` to avoid deadlocks when accessing context from async tasks
+- Broadcast events are **not** sent back to the originating server
+- Connection can be initiated manually if automatic startup connection fails
+
+### SQF Usage
+
+#### Connecting to ICOM
+
+```sqf
+// Connect manually (if not using automatic startup connection)
+private _result = "forge_server" callExtension ["icom:connect", ["127.0.0.1:9090", "server_1"]];
+systemChat _result; // "Connection initiated" or "ERROR: Already connected"
+```
+
+#### Sending Events
+
+```sqf
+// Send event to specific server
+private _data = createHashMapFromArray [
+    ["coords", [1234, 5678, 0]],
+    ["supplies", ["ammo_box", "medical_supplies"]]
+];
+"forge_server" callExtension ["icom:send_event", ["server_2", "supply_drop", (toJSON _data)]];
+
+// Spawn mission on another server
+private _missionData = createHashMapFromArray [
+    ["mission_type", "convoy_ambush"],
+    ["difficulty", "hard"],
+    ["location", [1234, 5678, 0]]
+];
+"forge_server" callExtension ["icom:send_event", ["server_2", "spawn_mission", (toJSON _missionData)]];
+
+// Broadcast to all servers (except sender)
+private _alertData = createHashMapFromArray [
+    ["message", "Nuclear strike incoming!"],
+    ["severity", "critical"]
+];
+"forge_server" callExtension ["icom:broadcast", ["global_alert", (toJSON _alertData)]];
+```
+
+#### Receiving Events
+
+Handle incoming events with a CBA event handler:
+
+```sqf
+["forge_icom_event", {
+    params ["_eventName", "_data"];
+
+    switch (_eventName) do {
+        case "supply_drop": {
+            private _coords = _data get "coords";
+            private _supplies = _data get "supplies";
+            // Create supply drop at coordinates
+            [_coords, _supplies] call YourMod_fnc_createSupplyDrop;
+        };
+        case "spawn_mission": {
+            private _missionType = _data get "mission_type";
+            private _location = _data get "location";
+            // Spawn the mission
+            [_missionType, _location] call YourMod_fnc_spawnMission;
+        };
+        case "global_alert": {
+            private _message = _data get "message";
+            // Show alert to all players
+            [_message] remoteExec ["hint", 0];
+        };
+        default {
+            diag_log format ["[ICOM] Unhandled event: %1", _eventName];
+        };
+    };
+}] call CBA_fnc_addEventHandler;
+```
+
+## Production Deployment
+
+### As Windows Service
+
+You can run ICOM as a Windows service using tools like NSSM:
+
+```powershell
+# Install NSSM
+winget install NSSM.NSSM
+
+# Create service
+nssm install ForgeICOM "C:\path\to\forge-icom.exe"
+nssm start ForgeICOM
+```
+
+### Docker (for Linux servers)
+
+```dockerfile
+FROM rust:1.70 as builder
+WORKDIR /app
+COPY . .
+RUN cargo build --release -p forge-icom
+
+FROM debian:bookworm-slim
+COPY --from=builder /app/target/release/forge-icom /usr/local/bin/
+EXPOSE 9090
+CMD ["forge-icom"]
+```
+
+```bash
+docker build -t forge-icom .
+docker run -d -p 9090:9090 --name forge-icom forge-icom
+```
+
+## Features
+
+- **Async I/O**: Non-blocking message handling using Tokio
+- **Multiple connections**: Handle dozens of Arma servers simultaneously
+- **Generic event system**: Send arbitrary JSON data without predefined message types
+- **Message routing**: Direct events to specific servers or broadcast to all
+- **Session management**: Track connected servers with UUIDs
+- **Duplicate connection handling**: Automatically replaces old connections when server reconnects
+- **Automatic cleanup**: Remove disconnected servers from registry
+- **Graceful error handling**: Clients continue running even when target servers are offline
+
+## Testing
+
+### Running Examples
+
+```powershell
+# Terminal 1: Start ICOM server
+cargo run --bin forge-icom
+
+# Terminal 2: Start server_1 (listener)
+cargo run --example server_1_client
+
+# Terminal 3: Start server_2 (sender)
+cargo run --example server_2_client
+```
+
+You should see events flow from server_2 → ICOM → server_1.
+
+### Test with Extension
+
+1. Start ICOM server
+2. Start Arma 3 server with Forge extension
+3. In Arma, connect manually (if needed):
+   ```sqf
+   "forge_server" callExtension ["icom:connect", ["127.0.0.1:9090", "server_1"]]
+   ```
+4. Set up CBA event handler in mission init:
+   ```sqf
+   ["forge_icom_event", {
+       params ["_eventName", "_data"];
+       systemChat format ["ICOM Event: %1", _eventName];
+   }] call CBA_fnc_addEventHandler;
+   ```
+5. Run example sender client to test event reception:
+   ```powershell
+   cargo run --example server_2_client
+   ```
+6. Check logs at `@forge_server/logs/icom.log` to verify events are received
+
+## Next Steps
+
+1. **Run the examples** to see the system in action
+2. **Add CBA event handler** in your mission to process `forge_icom_event`
+3. **Define your event types** (supply_drop, spawn_mission, etc.) based on your needs
+4. **Test with multiple Arma servers** locally
+5. **Deploy ICOM server** to production (Windows Service or Docker)
+6. **Configure server IDs** in extension config for each server
+
+## Monitoring
+
+The ICOM server logs all important events to stdout:
+- 🔥 Server startup
+- 📡 New connections
+- ✅ Server registrations
+- 📢 Broadcast messages
+- 📨 Message forwarding
+- 🗑️ Server disconnections
+- ❌ Errors
+
+Consider redirecting output to a file or logging service for production.
diff --git a/bin/icom/assets/forge.ico b/bin/icom/assets/forge.ico
new file mode 100644
index 0000000..17687c0
Binary files /dev/null and b/bin/icom/assets/forge.ico differ
diff --git a/bin/icom/assets/forge.png b/bin/icom/assets/forge.png
new file mode 100644
index 0000000..19914b3
Binary files /dev/null and b/bin/icom/assets/forge.png differ
diff --git a/bin/icom/build.rs b/bin/icom/build.rs
new file mode 100644
index 0000000..2aa37e8
--- /dev/null
+++ b/bin/icom/build.rs
@@ -0,0 +1,7 @@
+fn main() {
+    if cfg!(target_os = "windows") {
+        let mut res = winres::WindowsResource::new();
+        res.set_icon("assets/forge.ico");
+        res.compile().unwrap();
+    }
+}
diff --git a/bin/icom/config.example.toml b/bin/icom/config.example.toml
new file mode 100644
index 0000000..39bbe18
--- /dev/null
+++ b/bin/icom/config.example.toml
@@ -0,0 +1,22 @@
+# Forge ICOM Server Configuration
+# Copy this file to config.toml and modify as needed
+# Place this file in the same directory as the forge-icom executable
+
+[server]
+# Host to bind to
+# - "0.0.0.0" = All network interfaces (default, allows remote connections)
+# - "127.0.0.1" = Localhost only (for local testing)
+host = "0.0.0.0"
+
+# Port to listen on
+port = 9090
+
+# Example configurations for different environments:
+
+# Development (localhost only)
+# host = "127.0.0.1"
+# port = 9090
+
+# Production (all interfaces, custom port)
+# host = "0.0.0.0"
+# port = 19090
diff --git a/bin/icom/examples/server_1_client.rs b/bin/icom/examples/server_1_client.rs
new file mode 100644
index 0000000..e9358ff
--- /dev/null
+++ b/bin/icom/examples/server_1_client.rs
@@ -0,0 +1,41 @@
+use forge_icom::{Message, client::IComClient};
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    println!("Server 1 - ICOM Client");
+    println!("Connecting to ICOM server...\n");
+
+    // Connect to ICOM as server_1
+    let client = IComClient::connect("127.0.0.1:9090", "server_1".to_string()).await?;
+    println!("Registered as 'server_1'.");
+
+    println!("Listening for incoming messages...\n");
+
+    // Listen for incoming messages indefinitely
+    client
+        .listen_for_events(|msg| {
+            match msg {
+                Message::Event {
+                    event_name, data, ..
+                } => {
+                    println!("EVENT: {}", event_name);
+                    println!("Data: {:#?}", data);
+                    println!();
+                }
+                Message::Ack { .. } => {
+                    // Ignore acks in listener mode
+                }
+                Message::Error { message } => {
+                    eprintln!("Error: {}", message);
+                }
+                _ => {
+                    println!("Received: {:?}", msg);
+                    println!();
+                }
+            }
+            Ok(())
+        })
+        .await?;
+
+    Ok(())
+}
diff --git a/bin/icom/examples/server_2_client.rs b/bin/icom/examples/server_2_client.rs
new file mode 100644
index 0000000..6d7d266
--- /dev/null
+++ b/bin/icom/examples/server_2_client.rs
@@ -0,0 +1,79 @@
+use forge_icom::client::IComClient;
+use serde_json::json;
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    println!("Server 2 - ICOM Client");
+    println!("Connecting to ICOM server...\n");
+
+    // Connect to ICOM as server_2
+    let client = IComClient::connect("127.0.0.1:9090", "server_2".to_string()).await?;
+
+    println!("\nSending messages to server_1...\n");
+
+    // Wait a moment for server_2 to be ready
+    tokio::time::sleep(tokio::time::Duration::from_secs(2)).await;
+
+    // Example: Supply drop event
+    println!("Sending supply drop event...");
+    match client
+        .send_event(
+            "server_1",
+            "supply_drop",
+            json!({
+                "coords": [1234.5, 5678.9, 0.0],
+                "supplies": ["ammo_box", "medical_supplies"]
+            }),
+        )
+        .await
+    {
+        Ok(_) => println!("Supply drop event sent\n"),
+        Err(e) => println!("Supply drop failed: {}\n", e),
+    }
+
+    tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
+
+    // Example: Mission spawn event
+    println!("Sending mission spawn event...");
+    match client
+        .send_event(
+            "server_1",
+            "spawn_mission",
+            json!({
+                "mission_type": "convoy_ambush",
+                "difficulty": "hard",
+                "location": [1234, 5678, 0]
+            }),
+        )
+        .await
+    {
+        Ok(_) => println!("Mission spawn event sent\n"),
+        Err(e) => println!("Mission spawn failed: {}\n", e),
+    }
+
+    tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
+
+    // Example: Broadcast event
+    println!("Broadcasting event...");
+    match client
+        .broadcast(
+            "global_alert",
+            json!({
+                "message": "Nuclear strike incoming!",
+                "severity": "critical"
+            }),
+        )
+        .await
+    {
+        Ok(_) => println!("Broadcast sent\n"),
+        Err(e) => println!("Broadcast failed: {}\n", e),
+    }
+
+    println!("All messages sent (check above for any failures)!");
+    println!("Press Ctrl+C to exit");
+
+    // Keep running to receive any responses
+    tokio::time::sleep(tokio::time::Duration::from_secs(3)).await;
+
+    Ok(())
+}
diff --git a/bin/icom/examples/server_3_client.rs b/bin/icom/examples/server_3_client.rs
new file mode 100644
index 0000000..98a807a
--- /dev/null
+++ b/bin/icom/examples/server_3_client.rs
@@ -0,0 +1,41 @@
+use forge_icom::{Message, client::IComClient};
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    println!("Server 3 - ICOM Client");
+    println!("Connecting to ICOM server...\n");
+
+    // Connect to ICOM as server_3
+    let client = IComClient::connect("127.0.0.1:9090", "server_3".to_string()).await?;
+    println!("Registered as 'server_3'.");
+
+    println!("Listening for incoming messages...\n");
+
+    // Listen for incoming messages indefinitely
+    client
+        .listen_for_events(|msg| {
+            match msg {
+                Message::Event {
+                    event_name, data, ..
+                } => {
+                    println!("EVENT: {}", event_name);
+                    println!("Data: {:#?}", data);
+                    println!();
+                }
+                Message::Ack { .. } => {
+                    // Ignore acks in listener mode
+                }
+                Message::Error { message } => {
+                    eprintln!("Error: {}", message);
+                }
+                _ => {
+                    println!("Received: {:?}", msg);
+                    println!();
+                }
+            }
+            Ok(())
+        })
+        .await?;
+
+    Ok(())
+}
diff --git a/bin/icom/src/client.rs b/bin/icom/src/client.rs
new file mode 100644
index 0000000..b993bdf
--- /dev/null
+++ b/bin/icom/src/client.rs
@@ -0,0 +1,306 @@
+//! Forge Internal Communication (ICOM) Client Library
+//!
+//! This library provides a client for connecting to the Forge ICOM Server
+//! and sending/receiving events between Arma 3 servers.
+//!
+//! # Overview
+//!
+//! The ICOM client handles:
+//! - **Connection Management**: Connects to ICOM server and maintains persistent connection
+//! - **Registration**: Identifies itself with a unique server ID
+//! - **Event Sending**: Send events to specific servers or broadcast to all
+//! - **Event Listening**: Continuously listen for incoming events from other servers
+//!
+//! # Usage
+//!
+//! ```no_run
+//! use forge_icom::client::IComClient;
+//! use serde_json::json;
+//!
+//! #[tokio::main]
+//! async fn main() -> Result<(), Box<dyn std::error::Error>> {
+//!     // Connect and register
+//!     let client = IComClient::connect("127.0.0.1:9090", "server_1".to_string()).await?;
+//!
+//!     // Send an event to another server
+//!     client.send_event(
+//!         "server_2",
+//!         "supply_drop",
+//!         json!({"coords": [1234, 5678, 0]})
+//!     ).await?;
+//!
+//!     // Listen for incoming events
+//!     client.listen_for_events(|msg| {
+//!         // Handle event...
+//!         Ok(())
+//!     }).await?;
+//!
+//!     Ok(())
+//! }
+//! ```
+
+pub use crate::Message;
+use std::sync::Arc;
+use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
+use tokio::net::TcpStream;
+use tokio::sync::Mutex;
+
+/// ICOM client for connecting to the Forge ICOM Server
+///
+/// The client maintains a persistent TCP connection to the ICOM server and uses
+/// separate reader/writer halves wrapped in Arc<Mutex<>> to allow safe concurrent
+/// access from multiple tasks.
+///
+/// # Thread Safety
+///
+/// The client is designed to be safely shared across multiple async tasks. The
+/// internal reader and writer are protected by mutexes, allowing concurrent
+/// send/receive operations.
+pub struct IComClient {
+    writer: Arc<Mutex<tokio::net::tcp::OwnedWriteHalf>>,
+    reader: Arc<Mutex<BufReader<tokio::net::tcp::OwnedReadHalf>>>,
+    server_id: String,
+}
+
+impl IComClient {
+    /// Connect to the ICOM server and register
+    ///
+    /// Establishes a TCP connection to the ICOM server, sends a registration message,
+    /// and waits for confirmation before returning. If registration fails, an error
+    /// is returned.
+    ///
+    /// # Arguments
+    ///
+    /// * `icom_addr` - Address of the ICOM server (e.g., "127.0.0.1:9090")
+    /// * `server_id` - Unique identifier for this server (e.g., "server_1", "server_2")
+    ///
+    /// # Returns
+    ///
+    /// Returns a connected and registered `IComClient` on success, or an error if
+    /// connection or registration fails.
+    ///
+    /// # Example
+    ///
+    /// ```no_run
+    /// use forge_icom::client::IComClient;
+    ///
+    /// # async fn example() -> Result<(), Box<dyn std::error::Error>> {
+    /// let client = IComClient::connect("127.0.0.1:9090", "server_1".to_string()).await?;
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub async fn connect(
+        icom_addr: &str,
+        server_id: String,
+    ) -> Result<Self, Box<dyn std::error::Error>> {
+        let stream = TcpStream::connect(icom_addr).await?;
+        let (reader, writer) = stream.into_split();
+
+        let client = Self {
+            writer: Arc::new(Mutex::new(writer)),
+            reader: Arc::new(Mutex::new(BufReader::new(reader))),
+            server_id: server_id.clone(),
+        };
+
+        // Register with ICOM
+        let register_msg = Message::Register {
+            server_id: server_id.clone(),
+        };
+        client.send_message(&register_msg).await?;
+
+        // Wait for registration confirmation
+        let response = client.receive_message().await?;
+        match response {
+            Message::Registered { .. } => Ok(client),
+            _ => Err("Failed to register with ICOM".into()),
+        }
+    }
+
+    /// Send a message to ICOM
+    ///
+    /// Internal method that serializes a message to JSON and sends it over the wire,
+    /// terminated with a newline character.
+    async fn send_message(&self, msg: &Message) -> Result<(), Box<dyn std::error::Error>> {
+        let json = serde_json::to_string(msg)?;
+        let mut writer = self.writer.lock().await;
+        writer.write_all(json.as_bytes()).await?;
+        writer.write_all(b"\n").await?;
+        Ok(())
+    }
+
+    /// Receive a message from ICOM
+    ///
+    /// Internal method that reads a line-delimited JSON message from the server
+    /// and deserializes it into a Message enum.
+    async fn receive_message(&self) -> Result<Message, Box<dyn std::error::Error>> {
+        let mut reader = self.reader.lock().await;
+        let mut line = String::new();
+        reader.read_line(&mut line).await?;
+        let msg = serde_json::from_str(&line)?;
+        Ok(msg)
+    }
+
+    /// Send an event to another server
+    ///
+    /// Sends a custom event with arbitrary JSON data to a specific server connected
+    /// to the ICOM hub. The method waits for an acknowledgment from the server before
+    /// returning.
+    ///
+    /// # Arguments
+    ///
+    /// * `target_server` - ID of the target server (must be currently connected)
+    /// * `event_name` - Name of the event (e.g., "supply_drop", "spawn_mission")
+    /// * `data` - Arbitrary JSON data for the event
+    ///
+    /// # Returns
+    ///
+    /// Returns `Ok(())` if the event was successfully sent and acknowledged, or an
+    /// error if the target server is not found or communication fails.
+    ///
+    /// # Example
+    ///
+    /// ```no_run
+    /// use forge_icom::client::IComClient;
+    /// use serde_json::json;
+    ///
+    /// # async fn example(client: &IComClient) -> Result<(), Box<dyn std::error::Error>> {
+    /// client.send_event(
+    ///     "server_2",
+    ///     "supply_drop",
+    ///     json!({
+    ///         "coords": [1234.5, 5678.9, 0.0],
+    ///         "supplies": ["ammo", "medical"]
+    ///     })
+    /// ).await?;
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub async fn send_event(
+        &self,
+        target_server: &str,
+        event_name: &str,
+        data: serde_json::Value,
+    ) -> Result<(), Box<dyn std::error::Error>> {
+        let msg = Message::Event {
+            target_server: target_server.to_string(),
+            event_name: event_name.to_string(),
+            data,
+        };
+        self.send_message(&msg).await?;
+
+        // Wait for acknowledgment
+        let ack = self.receive_message().await?;
+        match ack {
+            Message::Ack { success: true, .. } => Ok(()),
+            Message::Ack { error: Some(e), .. } => Err(e.into()),
+            _ => Err("Unexpected response".into()),
+        }
+    }
+
+    /// Broadcast an event to all servers
+    ///
+    /// Sends an event to all servers currently connected to the ICOM hub, except
+    /// the sender itself. The method waits for an acknowledgment before returning.
+    ///
+    /// # Arguments
+    ///
+    /// * `event_name` - Name of the event (e.g., "global_alert", "server_restart")
+    /// * `data` - Arbitrary JSON data for the event
+    ///
+    /// # Returns
+    ///
+    /// Returns `Ok(())` if the broadcast was successfully sent and acknowledged,
+    /// or an error if communication fails.
+    ///
+    /// # Example
+    ///
+    /// ```no_run
+    /// use forge_icom::client::IComClient;
+    /// use serde_json::json;
+    ///
+    /// # async fn example(client: &IComClient) -> Result<(), Box<dyn std::error::Error>> {
+    /// client.broadcast(
+    ///     "global_alert",
+    ///     json!({
+    ///         "message": "Nuclear strike incoming!",
+    ///         "severity": "critical"
+    ///     })
+    /// ).await?;
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub async fn broadcast(
+        &self,
+        event_name: &str,
+        data: serde_json::Value,
+    ) -> Result<(), Box<dyn std::error::Error>> {
+        let msg = Message::Broadcast {
+            event_name: event_name.to_string(),
+            data,
+        };
+        self.send_message(&msg).await?;
+
+        // Wait for acknowledgment
+        let ack = self.receive_message().await?;
+        match ack {
+            Message::Ack { success: true, .. } => Ok(()),
+            Message::Ack { error: Some(e), .. } => Err(e.into()),
+            _ => Err("Unexpected response".into()),
+        }
+    }
+
+    /// Start listening for incoming messages from other servers
+    ///
+    /// Enters an infinite loop that continuously receives messages from the ICOM server
+    /// and passes them to the provided handler function. This method blocks until an
+    /// error occurs or the connection is closed.
+    ///
+    /// # Arguments
+    ///
+    /// * `handler` - Callback function invoked for each received message. Should return
+    ///   `Ok(())` to continue listening, or an error to stop.
+    ///
+    /// # Returns
+    ///
+    /// Returns an error if the connection is lost or if the handler returns an error.
+    ///
+    /// # Example
+    ///
+    /// ```no_run
+    /// use forge_icom::client::IComClient;
+    /// use forge_icom::Message;
+    ///
+    /// # async fn example(client: &IComClient) -> Result<(), Box<dyn std::error::Error>> {
+    /// client.listen_for_events(|msg| {
+    ///     match msg {
+    ///         Message::Event { event_name, data, .. } => {
+    ///             println!("Received event: {} with data: {:?}", event_name, data);
+    ///         }
+    ///         _ => {}
+    ///     }
+    ///     Ok(())
+    /// }).await?;
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub async fn listen_for_events<F>(
+        &self,
+        mut handler: F,
+    ) -> Result<(), Box<dyn std::error::Error>>
+    where
+        F: FnMut(Message) -> Result<(), Box<dyn std::error::Error>>,
+    {
+        loop {
+            let msg = self.receive_message().await?;
+            handler(msg)?;
+        }
+    }
+
+    /// Get the server ID for this client
+    ///
+    /// Returns the unique identifier this client registered with when connecting
+    /// to the ICOM server.
+    pub fn server_id(&self) -> &str {
+        &self.server_id
+    }
+}
diff --git a/bin/icom/src/config.rs b/bin/icom/src/config.rs
new file mode 100644
index 0000000..53a0025
--- /dev/null
+++ b/bin/icom/src/config.rs
@@ -0,0 +1,99 @@
+/// Configuration management for ICOM server.
+use serde::Deserialize;
+use std::fs;
+use std::path::PathBuf;
+
+/// ICOM server configuration.
+#[derive(Debug, Clone, Deserialize)]
+pub struct Config {
+    /// Server bind address configuration
+    #[serde(default)]
+    pub server: ServerConfig,
+}
+
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            server: ServerConfig::default(),
+        }
+    }
+}
+
+/// Server bind configuration.
+#[derive(Debug, Clone, Deserialize)]
+pub struct ServerConfig {
+    /// Host to bind to (e.g., "0.0.0.0" for all interfaces, "127.0.0.1" for localhost only)
+    #[serde(default = "default_host")]
+    pub host: String,
+    /// Port to listen on
+    #[serde(default = "default_port")]
+    pub port: u16,
+}
+
+impl Default for ServerConfig {
+    fn default() -> Self {
+        Self {
+            host: default_host(),
+            port: default_port(),
+        }
+    }
+}
+
+impl ServerConfig {
+    /// Returns the full bind address as "host:port"
+    pub fn bind_address(&self) -> String {
+        format!("{}:{}", self.host, self.port)
+    }
+}
+
+fn default_host() -> String {
+    "0.0.0.0".to_string()
+}
+
+fn default_port() -> u16 {
+    9090
+}
+
+/// Loads configuration from config.toml with graceful fallback to defaults.
+///
+/// Looks for config.toml in:
+/// 1. Current directory
+/// 2. Executable directory
+///
+/// If no config file is found, uses default values.
+pub fn load() -> Config {
+    // Try current directory first
+    let config_path = PathBuf::from("config.toml");
+
+    let config_path = if config_path.exists() {
+        config_path
+    } else {
+        // Try executable directory
+        std::env::current_exe()
+            .ok()
+            .and_then(|exe| exe.parent().map(|dir| dir.join("config.toml")))
+            .filter(|p| p.exists())
+            .unwrap_or_else(|| PathBuf::from("config.toml"))
+    };
+
+    match fs::read_to_string(&config_path) {
+        Ok(contents) => {
+            println!("Loading config from: {}", config_path.display());
+            match toml::from_str::<Config>(&contents) {
+                Ok(config) => {
+                    println!("Configuration loaded successfully");
+                    config
+                }
+                Err(e) => {
+                    eprintln!("Failed to parse config.toml: {}", e);
+                    eprintln!("Using default configuration");
+                    Config::default()
+                }
+            }
+        }
+        Err(_) => {
+            println!("No config.toml found, using defaults");
+            Config::default()
+        }
+    }
+}
diff --git a/bin/icom/src/lib.rs b/bin/icom/src/lib.rs
new file mode 100644
index 0000000..2984380
--- /dev/null
+++ b/bin/icom/src/lib.rs
@@ -0,0 +1,37 @@
+//! Forge Internal Communication (ICOM) - Message Types
+//!
+//! This library exposes the shared `Message` enum used for communication
+//! between the ICOM server and clients.
+
+use serde::{Deserialize, Serialize};
+
+pub mod client;
+
+/// Message types for inter-server communication via ICOM
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum Message {
+    /// Register a server with a unique ID
+    Register { server_id: String },
+    /// Server successfully registered
+    Registered { session_id: String },
+    /// Send event to specific server
+    Event {
+        target_server: String,
+        event_name: String,
+        data: serde_json::Value,
+    },
+    /// Broadcast event to all servers (except sender)
+    Broadcast {
+        event_name: String,
+        data: serde_json::Value,
+    },
+    /// Response/acknowledgment
+    Ack {
+        message_id: Option<String>,
+        success: bool,
+        error: Option<String>,
+    },
+    /// Error message
+    Error { message: String },
+}
diff --git a/bin/icom/src/main.rs b/bin/icom/src/main.rs
new file mode 100644
index 0000000..9166726
--- /dev/null
+++ b/bin/icom/src/main.rs
@@ -0,0 +1,350 @@
+//! Forge ICOM (Internal Communication) Server
+//!
+//! A centralized hub server that enables real-time communication between multiple
+//! Arma 3 game servers. The server maintains persistent connections with each game
+//! server and routes events between them.
+//!
+//! # Architecture
+//!
+//! - **TCP Server**: Listens on port 9090 for incoming connections
+//! - **Server Registry**: Maintains a map of connected servers by their ID
+//! - **Message Router**: Forwards events to specific servers or broadcasts to all
+//! - **Session Management**: Handles registration, disconnection, and duplicate connections
+//!
+//! # Protocol
+//!
+//! Communication uses line-delimited JSON messages. Each message is a JSON object
+//! terminated with a newline character (`\n`).
+//!
+//! ## Message Types
+//!
+//! - **Register**: Client identifies itself with a server_id
+//! - **Event**: Send event to a specific server
+//! - **Broadcast**: Send event to all connected servers
+//! - **Ack**: Acknowledgment of message receipt
+//! - **Error**: Error notification
+//!
+//! # Usage
+//!
+//! ```bash
+//! # Start the ICOM server
+//! cargo run --bin forge-icom
+//! ```
+//!
+//! The server will listen on `0.0.0.0:9090` and accept connections from game servers.
+
+use forge_icom::Message;
+use std::collections::HashMap;
+use std::net::SocketAddr;
+use std::sync::Arc;
+use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
+use tokio::net::{TcpListener, TcpStream};
+use tokio::sync::{RwLock, mpsc, oneshot};
+use uuid::Uuid;
+
+mod config;
+
+/// Represents a connected Arma server
+///
+/// Each connected server has:
+/// - A unique server_id chosen by the client
+/// - The socket address they connected from
+/// - A message sender channel for outgoing messages
+/// - A kill switch to terminate old connections when server reconnects
+#[allow(dead_code)]
+struct ServerConnection {
+    server_id: String,
+    addr: SocketAddr,
+    tx: mpsc::UnboundedSender<String>,
+    kill_tx: oneshot::Sender<()>,
+}
+
+/// Shared state across all connections
+///
+/// The registry is wrapped in Arc<RwLock<>> to allow safe concurrent access
+/// from multiple connection handler tasks.
+type ServerRegistry = Arc<RwLock<HashMap<String, ServerConnection>>>;
+
+/// Main entry point for the ICOM server
+///
+/// Initializes the TCP listener and spawns a new task for each incoming connection.
+/// The server runs indefinitely until interrupted (Ctrl+C) or encounters a fatal error.
+///
+/// # Connection Handling
+///
+/// Each connection is handled independently in its own async task, allowing the server
+/// to manage many simultaneous connections efficiently.
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    println!("🔥 Forge ICOM Server starting...");
+    println!();
+
+    // Load configuration
+    let config = config::load();
+    let addr = config.server.bind_address();
+
+    println!();
+    println!("Binding to {}", addr);
+    let listener = TcpListener::bind(&addr).await?;
+    println!("Server ready - listening for connections");
+
+    let registry: ServerRegistry = Arc::new(RwLock::new(HashMap::new()));
+
+    loop {
+        let (socket, addr) = listener.accept().await?;
+        println!("New connection from {}", addr);
+
+        let registry = Arc::clone(&registry);
+        tokio::spawn(async move {
+            if let Err(e) = handle_connection(socket, addr, registry).await {
+                eprintln!("Error handling connection from {}: {}", addr, e);
+            }
+        });
+    }
+}
+
+/// Handle an individual client connection
+///
+/// This function manages the lifecycle of a single server connection:
+///
+/// 1. Splits the socket into reader/writer for bidirectional communication
+/// 2. Creates channels for outgoing messages and connection termination
+/// 3. Spawns a writer task to handle outgoing messages asynchronously
+/// 4. Enters a loop reading incoming messages and dispatching them
+/// 5. Cleans up when the connection closes or is terminated
+///
+/// # Arguments
+///
+/// * `socket` - The TCP socket for this connection
+/// * `addr` - The client's socket address
+/// * `registry` - Shared registry of all connected servers
+///
+/// # Duplicate Connections
+///
+/// If a server with the same ID connects while already registered, the old
+/// connection is terminated via its kill switch, allowing seamless reconnection.
+async fn handle_connection(
+    socket: TcpStream,
+    addr: SocketAddr,
+    registry: ServerRegistry,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let (reader, mut writer) = socket.into_split();
+    let mut reader = BufReader::new(reader);
+
+    // Create channel for outgoing messages
+    let (tx, mut rx) = mpsc::unbounded_channel::<String>();
+
+    // Create kill switch channel
+    let (kill_tx, mut kill_rx) = oneshot::channel::<()>();
+
+    // Spawn task to handle outgoing messages
+    let writer_handle = tokio::spawn(async move {
+        while let Some(msg) = rx.recv().await {
+            if let Err(e) = writer.write_all(msg.as_bytes()).await {
+                eprintln!("Failed to write message: {}", e);
+                break;
+            }
+            if let Err(e) = writer.write_all(b"\n").await {
+                eprintln!("Failed to write newline: {}", e);
+                break;
+            }
+        }
+    });
+
+    let mut server_id: Option<String> = None;
+    let mut line = String::new();
+    let mut kill_tx = Some(kill_tx);
+
+    loop {
+        line.clear();
+
+        let read_future = reader.read_line(&mut line);
+
+        tokio::select! {
+            _ = &mut kill_rx => {
+                println!("Connection replaced by new session: {}", addr);
+                break;
+            }
+            res = read_future => {
+                match res {
+                    Ok(0) => {
+                        println!("Connection closed by {}", addr);
+                        break;
+                    }
+                    Ok(_) => {
+                        let trimmed = line.trim();
+                        if trimmed.is_empty() {
+                            continue;
+                        }
+
+                        match serde_json::from_str::<Message>(trimmed) {
+                            Ok(msg) => {
+                                match handle_message(msg, &mut server_id, addr, &tx, &registry, &mut kill_tx).await {
+                                    Ok(_) => {}
+                                    Err(e) => {
+                                        let error_msg = Message::Error {
+                                            message: e.to_string(),
+                                        };
+                                        let _ = tx.send(serde_json::to_string(&error_msg)?);
+                                    }
+                                }
+                            }
+                            Err(e) => {
+                                eprintln!("Failed to parse message from {}: {}", addr, e);
+                                let error_msg = Message::Error {
+                                    message: format!("Invalid JSON: {}", e),
+                                };
+                                let _ = tx.send(serde_json::to_string(&error_msg)?);
+                            }
+                        }
+                    }
+                    Err(e) => {
+                        eprintln!("Error reading from {}: {}", addr, e);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    // Cleanup on disconnect
+    if let Some(id) = server_id {
+        let mut registry = registry.write().await;
+        registry.remove(&id);
+        println!("Unregistered server: {}", id);
+    }
+
+    writer_handle.abort();
+    Ok(())
+}
+
+/// Process a received message and route it appropriately
+///
+/// This function implements the core message routing logic:
+///
+/// - **Register**: Adds the server to the registry with a new session ID
+/// - **Event**: Forwards the event to the target server (or returns error if not found)
+/// - **Broadcast**: Sends the event to all registered servers except the sender
+/// - **Other**: Echoes back unhandled message types
+///
+/// # Arguments
+///
+/// * `msg` - The parsed message to handle
+/// * `server_id` - Mutable reference to this connection's server ID (set on registration)
+/// * `addr` - The client's socket address (for logging)
+/// * `tx` - Channel sender for outgoing messages to this connection
+/// * `registry` - Shared registry of all connected servers
+/// * `kill_tx` - Kill switch for terminating this connection (consumed on registration)
+///
+/// # Returns
+///
+/// Returns `Ok(())` on success, or an error if message processing fails.
+async fn handle_message(
+    msg: Message,
+    server_id: &mut Option<String>,
+    addr: SocketAddr,
+    tx: &mpsc::UnboundedSender<String>,
+    registry: &ServerRegistry,
+    kill_tx: &mut Option<oneshot::Sender<()>>,
+) -> Result<(), Box<dyn std::error::Error>> {
+    match msg {
+        Message::Register { server_id: id } => {
+            // Register the server
+            let session_id = Uuid::new_v4().to_string();
+
+            // Take kill_tx
+            let ktx = kill_tx
+                .take()
+                .ok_or("Cannot register twice or kill handle missing")?;
+
+            let conn = ServerConnection {
+                server_id: id.clone(),
+                addr,
+                tx: tx.clone(),
+                kill_tx: ktx,
+            };
+
+            {
+                let mut registry = registry.write().await;
+                if let Some(old) = registry.insert(id.clone(), conn) {
+                    println!("Disconnecting old session for {}", id);
+                    let _ = old.kill_tx.send(());
+                }
+            }
+
+            *server_id = Some(id.clone());
+            println!("Registered server: {} (session: {})", id, session_id);
+
+            // Send acknowledgment
+            let response = Message::Registered { session_id };
+            tx.send(serde_json::to_string(&response)?)?;
+        }
+
+        Message::Broadcast { event_name, data } => {
+            // Broadcast to all servers except sender
+            let registry = registry.read().await;
+            let sender_id = server_id.as_ref();
+
+            println!("Broadcasting '{}' from {:?}", event_name, sender_id);
+
+            for (id, conn) in registry.iter() {
+                if sender_id.map(|s| s == id).unwrap_or(false) {
+                    continue; // Skip sender
+                }
+
+                let event = Message::Event {
+                    target_server: id.clone(),
+                    event_name: event_name.clone(),
+                    data: data.clone(),
+                };
+
+                if let Err(e) = conn.tx.send(serde_json::to_string(&event)?) {
+                    eprintln!("Failed to send to {}: {}", id, e);
+                }
+            }
+
+            // Ack to sender
+            let ack = Message::Ack {
+                message_id: None,
+                success: true,
+                error: None,
+            };
+            tx.send(serde_json::to_string(&ack)?)?;
+        }
+
+        Message::Event {
+            ref target_server, ..
+        } => {
+            // Forward to specific server
+            let registry = registry.read().await;
+
+            if let Some(target) = registry.get(target_server) {
+                println!("Forwarding message to {}", target_server);
+                target.tx.send(serde_json::to_string(&msg)?)?;
+
+                // Ack to sender
+                let ack = Message::Ack {
+                    message_id: None,
+                    success: true,
+                    error: None,
+                };
+                tx.send(serde_json::to_string(&ack)?)?;
+            } else {
+                let error = format!("Target server '{}' not found", target_server);
+                let ack = Message::Ack {
+                    message_id: None,
+                    success: false,
+                    error: Some(error),
+                };
+                tx.send(serde_json::to_string(&ack)?)?;
+            }
+        }
+
+        _ => {
+            // Echo back unhandled messages
+            tx.send(serde_json::to_string(&msg)?)?;
+        }
+    }
+
+    Ok(())
+}
diff --git a/dev-arma.ps1 b/dev-arma.ps1
new file mode 100644
index 0000000..4939b42
--- /dev/null
+++ b/dev-arma.ps1
@@ -0,0 +1,69 @@
+#!/usr/bin/env pwsh
+<#
+.SYNOPSIS
+    Build both arma/client and arma/server using hemtt
+
+.DESCRIPTION
+    This script runs hemtt dev for both the client and server Arma mods.
+    It changes to each directory and runs the build command.
+
+.PARAMETER Target
+    Specify which target to build: 'client', 'server', or 'both' (default)
+
+.EXAMPLE
+    .\build-arma.ps1
+    Builds both client and server
+
+.EXAMPLE
+    .\build-arma.ps1 -Target client
+    Builds only the client
+#>
+
+param(
+    [Parameter(Mandatory=$false)]
+    [ValidateSet('client', 'server', 'both')]
+    [string]$Target = 'both'
+)
+
+$ErrorActionPreference = "Stop"
+$scriptDir = $PSScriptRoot
+
+function Build-HemttProject {
+    param(
+        [string]$ProjectPath,
+        [string]$ProjectName
+    )
+
+    Write-Host "`n=== Building $ProjectName ===" -ForegroundColor Cyan
+
+    Push-Location $ProjectPath
+    try {
+        & hemtt utils fnl && hemtt dev
+        if ($LASTEXITCODE -ne 0) {
+            throw "hemtt dev failed for $ProjectName with exit code $LASTEXITCODE"
+        }
+        Write-Host "✓ $ProjectName build successful" -ForegroundColor Green
+    }
+    finally {
+        Pop-Location
+    }
+}
+
+$clientPath = Join-Path $scriptDir "arma\client"
+$serverPath = Join-Path $scriptDir "arma\server"
+
+try {
+    if ($Target -eq 'client' -or $Target -eq 'both') {
+        Build-HemttProject -ProjectPath $clientPath -ProjectName "Client"
+    }
+
+    if ($Target -eq 'server' -or $Target -eq 'both') {
+        Build-HemttProject -ProjectPath $serverPath -ProjectName "Server"
+    }
+
+    Write-Host "`n=== Build Complete ===" -ForegroundColor Green
+}
+catch {
+    Write-Host "`n✗ Build failed: $_" -ForegroundColor Red
+    exit 1
+}
diff --git a/docs/GARAGE_USAGE_GUIDE.md b/docs/GARAGE_USAGE_GUIDE.md
new file mode 100644
index 0000000..44218f4
--- /dev/null
+++ b/docs/GARAGE_USAGE_GUIDE.md
@@ -0,0 +1,264 @@
+# Garage System Integration Guide
+
+## Overview
+The garage system provides complete vehicle storage, retrieval, and management for Arma 3 players. Each player can store multiple vehicles with full damage and hit point tracking.
+
+## Data Storage
+- Each player's garage is stored as a single JSON object (map) at Redis key: `garage:{playerUID}`
+- The map is keyed by the vehicle's unique plate (UUID)
+- Each vehicle tracks: plate (UUID), classname, overall damage, fuel, and detailed hit points
+- **Plates are auto-generated** when vehicles are added via `garage:add`
+- **Empty garages are auto-created** when a player first fetches their garage
+
+## Extension Commands
+
+All commands are accessed via the `garage` group:
+
+### Create Garage
+Creates a new empty garage for a player. Should be called when initializing a new player.
+
+```sqf
+private _result = "forge_server" callExtension ["garage:create", [getPlayerUID player]];
+private _emptyGarage = fromJSON (_result select 0);
+// Returns: {} (empty map)
+```
+
+### Get Garage
+Retrieves all vehicles in a player's garage.
+
+```sqf
+private _result = "forge_server" callExtension ["garage:get", [getPlayerUID player]];
+private _garageMap = fromJSON (_result select 0);
+// Returns: {"plate_uuid": {"plate":"plate_uuid","classname":"...","damage":0.0,"hit_points":{...}}, ...}
+```
+
+### Add Vehicle
+Adds a new vehicle to the garage. The system automatically generates a unique plate (UUID) for the vehicle.
+
+```sqf
+private _data = createHashMapFromArray [
+    ["classname", "B_Quadbike_01_F"],
+    ["fuel", 1.0],
+    ["damage", 0.0],
+    ["hit_points", createHashMap] // Optional hit points map
+];
+
+private _result = "forge_server" callExtension ["garage:add", [
+    getPlayerUID player,
+    toJSON _data
+]];
+
+private _updatedGarage = fromJSON (_result select 0);
+// Returns updated garage map
+```
+
+### Update Garage (Sync)
+Updates the entire garage state. Useful for syncing changes made locally.
+
+```sqf
+// _garageMap is the local HashMap of vehicles
+private _result = "forge_server" callExtension ["garage:update", [
+    getPlayerUID player,
+    toJSON _garageMap
+]];
+
+private _updatedGarage = fromJSON (_result select 0);
+```
+
+### Patch Vehicle
+Updates specific fields of a vehicle without sending the entire garage. Useful for frequent updates like fuel or damage.
+
+```sqf
+private _plate = "some-plate-uuid";
+private _data = createHashMapFromArray [
+    ["plate", _plate],
+    ["fuel", 0.8],
+    ["damage", 0.1],
+    // "hit_points" is optional
+];
+
+private _result = "forge_server" callExtension ["garage:patch", [
+    getPlayerUID player,
+    toJSON _data
+]];
+
+private _updatedGarage = fromJSON (_result select 0);
+```
+
+### Remove Vehicle
+Removes a specific vehicle from the garage by plate number.
+Note: If using the GarageStore, removing a vehicle locally and saving/syncing will also remove it from the server.
+
+```sqf
+private _plate = "some-plate-uuid";
+
+private _data = createHashMapFromArray [
+    ["plate", _plate]
+];
+
+private _result = "forge_server" callExtension ["garage:remove", [
+    getPlayerUID player,
+    toJSON _data
+]];
+
+private _updatedGarage = fromJSON (_result select 0);
+```
+
+### Delete Garage
+Permanently deletes all vehicles from a player's garage.
+
+```sqf
+private _result = "forge_server" callExtension ["garage:delete", [getPlayerUID player]];
+// Returns: "OK" or "Error: ..."
+```
+
+### Check Existence
+Checks if a player has any vehicles in their garage.
+
+```sqf
+private _result = "forge_server" callExtension ["garage:exists", [getPlayerUID player]];
+private _exists = (_result select 0) == "true";
+```
+
+## Complete Integration Example
+
+### Storing a Vehicle
+
+```sqf
+fnc_storeVehicle = {
+    params ["_vehicle"];
+
+    // Get vehicle data
+    private _hitPointsData = getAllHitPointsDamage _vehicle;
+    private _hitPoints = createHashMapFromArray [
+        ["names", _hitPointsData select 0],
+        ["selections", _hitPointsData select 1],
+        ["values", _hitPointsData select 2]
+    ];
+
+    // Create data hashMap
+    private _data = createHashMapFromArray [
+        ["classname", typeOf _vehicle],
+        ["damage", damage _vehicle],
+        ["hit_points", _hitPoints]
+    ];
+
+    // Add to garage (plate is auto-generated)
+    private _result = "forge_server" callExtension ["garage:add", [
+        getPlayerUID player,
+        toJSON _data
+    ]];
+
+    // Check for error
+    if ((_result select 0) find "Error:" == 0) exitWith {
+        hint format ["Failed to store vehicle: %1", _result select 0];
+        false
+    };
+
+    // Parse result to get the new vehicle's plate
+    private _updatedGarage = fromJSON (_result select 0);
+    private _newVehicle = _updatedGarage select ((count _updatedGarage) - 1);
+    private _assignedPlate = _newVehicle get "plate";
+
+    // Delete the actual vehicle from game world
+    deleteVehicle _vehicle;
+
+    hint format ["Vehicle %1 stored with plate %2!", _data get "classname", _assignedPlate];
+    true
+};
+```
+
+### Retrieving and Spawning a Vehicle
+
+```sqf
+fnc_spawnVehicleFromGarage = {
+    params ["_vehicleIndex"];
+
+    // Get garage
+    private _result = "forge_server" callExtension ["garage:get", [getPlayerUID player]];
+    private _garage = fromJSON (_result select 0);
+
+    // Validate index
+    if (_vehicleIndex >= count _garage) exitWith {
+        hint "Invalid vehicle index!";
+        objNull
+    };
+
+    // Get vehicle data
+    private _vehicleData = _garage select _vehicleIndex;
+    private _classname = _vehicleData get "classname";
+    private _storedDamage = _vehicleData get "damage";
+    private _hitPoints = _vehicleData get "hit_points";
+
+    // Spawn vehicle
+    private _spawnPos = player getPos [10, getDir player];
+    private _vehicle = _classname createVehicle _spawnPos;
+
+    // Apply damage
+    _vehicle setDamage _storedDamage;
+
+    // Apply hit point damage
+    private _names = _hitPoints get "names";
+    private _values = _hitPoints get "values";
+
+    {
+        _vehicle setHitPointDamage [_x, _values select _forEachIndex];
+    } forEach _names;
+
+    // Store plate on vehicle for future updates
+    private _plate = _vehicleData get "plate";
+    _vehicle setVariable ["garagePlate", _plate];
+
+    // Remove from garage
+    private _removeData = createHashMapFromArray [["plate", _plate]];
+    "forge_server" callExtension ["garage:remove", [getPlayerUID player, toJSON _removeData]];
+
+    hint format ["Vehicle %1 spawned with plate %2!", _classname, _plate];
+    _vehicle
+};
+```
+
+## Hit Points Data Format
+
+The hit points data matches Arma 3's `getAllHitPointsDamage` return format:
+
+```json
+{
+  "names": ["hitlfwheel", "hitlf2wheel", "hitfuel", "hitengine", "hitbody", ...],
+  "selections": ["wheel_1_1_steering", "wheel_1_2_steering", "fuel_hitpoint", "engine_hitpoint", "body_hitpoint", ...],
+  "values": [0, 0, 0.1, 0.2, 0, ...]
+}
+```
+
+- **names**: Hit point identifiers
+- **selections**: Physical selection names (can be empty strings `""`)
+- **values**: Damage values from 0.0 (no damage) to 1.0 (destroyed)
+
+## Error Handling
+
+All commands return errors in the format `"Error: <message>"`. Always check for this:
+
+```sqf
+private _result = "forge_server" callExtension ["garage:get", [getPlayerUID player]];
+private _data = _result select 0;
+
+if (_data find "Error:" == 0) then {
+    // Handle error
+    systemChat format ["Garage error: %1", _data];
+} else {
+    // Parse and use data
+    private _garage = fromJSON _data;
+};
+```
+
+## Best Practices
+
+1. **Track Vehicle Plates**: When spawning vehicles from the garage, store the plate (UUID) as a variable so you can update them later:
+   ```sqf
+   _vehicle setVariable ["garagePlate", _plate];
+   ```
+2. **Auto-Creation**: The system automatically creates an empty garage for new players on first access
+3. **Validate Before Storage**: Check that vehicles are in good condition before allowing storage
+4. **Limit Garage Size**: Implement a maximum number of vehicles per player
+5. **Regular Updates**: Update vehicle damage periodically while in use
+6. **Clean Deleted Vehicles**: Remove vehicles from garage when they're destroyed or sold
diff --git a/docs/LOCKER_USAGE_GUIDE.md b/docs/LOCKER_USAGE_GUIDE.md
new file mode 100644
index 0000000..d0583de
--- /dev/null
+++ b/docs/LOCKER_USAGE_GUIDE.md
@@ -0,0 +1,218 @@
+# Locker System Integration Guide
+
+## Overview
+The locker system provides persistent item storage for Arma 3 players. Each player can store multiple items (weapons, magazines, equipment) with quantity tracking.
+
+## Data Storage
+- Each player's locker is stored as a single JSON object (map) at Redis key: `locker:{playerUID}`
+- The map is keyed by the item's **classname** (String)
+- Each item tracks: `category`, `classname`, and `amount`
+- **Maximum Capacity**: 25 unique items per locker
+- **Empty lockers are auto-created** when a player first fetches their locker if it doesn't exist
+
+## Extension Commands
+
+All commands are accessed via the `locker` group:
+
+### Create Locker
+Creates a new empty locker for a player. Should be called when initializing a new player if one doesn't exist.
+
+```sqf
+private _result = "forge_server" callExtension ["locker:create", [getPlayerUID player]];
+// Returns: {} (empty map) or Error message
+```
+
+### Get Locker
+Retrieves all items in a player's locker.
+
+```sqf
+private _result = "forge_server" callExtension ["locker:get", [getPlayerUID player]];
+private _lockerMap = fromJSON (_result select 0);
+// Returns: {"arifle_MX_F": {"classname":"arifle_MX_F","category":"Weapon","amount":1}, ...}
+```
+
+### Add Item
+Adds a new item to the locker or updates the amount if it already exists.
+**Checks capacity limit (25 items).**
+
+```sqf
+private _data = createHashMapFromArray [
+    ["classname", "arifle_MX_F"],
+    ["category", "Weapon"],
+    ["amount", 1]
+];
+
+private _result = "forge_server" callExtension ["locker:add", [
+    getPlayerUID player,
+    toJSON _data
+]];
+
+private _updatedLocker = fromJSON (_result select 0);
+// Returns updated locker map
+```
+
+### Update Locker (Sync)
+Updates the entire locker state. Useful for syncing changes made locally (e.g., bulk moves).
+**Replaces the entire locker content.**
+
+```sqf
+// _lockerMap is the local HashMap of items
+private _result = "forge_server" callExtension ["locker:update", [
+    getPlayerUID player,
+    toJSON _lockerMap
+]];
+
+private _updatedLocker = fromJSON (_result select 0);
+```
+
+### Patch Item
+Updates specific fields (currently `amount`) of an existing item without sending the entire locker.
+**Efficient for quantity changes.**
+
+```sqf
+private _classname = "arifle_MX_F";
+private _data = createHashMapFromArray [
+    ["classname", _classname],
+    ["amount", 5] // New amount
+];
+
+private _result = "forge_server" callExtension ["locker:patch", [
+    getPlayerUID player,
+    toJSON _data
+]];
+
+private _updatedLocker = fromJSON (_result select 0);
+```
+
+### Remove Item
+Removes a specific item from the locker by classname.
+
+```sqf
+private _classname = "arifle_MX_F";
+private _data = createHashMapFromArray [
+    ["classname", _classname]
+];
+
+private _result = "forge_server" callExtension ["locker:remove", [
+    getPlayerUID player,
+    toJSON _data
+]];
+
+private _updatedLocker = fromJSON (_result select 0);
+```
+
+### Delete Locker
+Permanently deletes all items from a player's locker.
+
+```sqf
+private _result = "forge_server" callExtension ["locker:delete", [getPlayerUID player]];
+// Returns: "OK" or "Error: ..."
+```
+
+### Check Existence
+Checks if a player has a locker created.
+
+```sqf
+private _result = "forge_server" callExtension ["locker:exists", [getPlayerUID player]];
+private _exists = (_result select 0) == "true";
+```
+
+## Complete Integration Example
+
+### Storing an Item
+
+```sqf
+fnc_storeCurrentWeapon = {
+    private _weapon = currentWeapon player;
+    if (_weapon == "") exitWith { hint "No weapon in hand!"; };
+
+    // Create item data
+    private _data = createHashMapFromArray [
+        ["classname", _weapon],
+        ["category", "Weapon"],
+        ["amount", 1]
+    ];
+
+    // Add to locker
+    private _result = "forge_server" callExtension ["locker:add", [
+        getPlayerUID player,
+        toJSON _data
+    ]];
+
+    // Check for error (e.g., full locker)
+    if ((_result select 0) find "Error:" == 0) exitWith {
+        hint format ["Failed to store item: %1", _result select 0];
+        false
+    };
+
+    // Remove weapon from player
+    player removeWeapon _weapon;
+    hint format ["Stored %1 in locker!", _weapon];
+    true
+};
+```
+
+### Retrieving an Item
+
+```sqf
+fnc_retrieveItem = {
+    params ["_classname"];
+
+    // Get locker
+    private _result = "forge_server" callExtension ["locker:get", [getPlayerUID player]];
+    private _locker = fromJSON (_result select 0);
+
+    // Check if item exists
+    private _item = _locker getOrDefault [_classname, locationNull];
+    if (_item isEqualTo locationNull) exitWith {
+        hint "Item not found in locker!";
+        false
+    };
+
+    // Get amount
+    private _amount = _item get "amount";
+    if (_amount <= 0) exitWith {
+        // Should not happen, but safe to handle
+        hint "Item out of stock!";
+        false
+    };
+
+    // Add to player
+    if (player canAdd _classname) then {
+        player addItem _classname;
+
+        // Decrement amount or remove if 0
+        if (_amount > 1) then {
+             private _patchData = createHashMapFromArray [
+                ["classname", _classname],
+                ["amount", _amount - 1]
+            ];
+            "forge_server" callExtension ["locker:patch", [getPlayerUID player, toJSON _patchData]];
+        } else {
+             private _removeData = createHashMapFromArray [
+                ["classname", _classname]
+            ];
+            "forge_server" callExtension ["locker:remove", [getPlayerUID player, toJSON _removeData]];
+        };
+
+        hint format ["Retrieved %1 from locker!", _classname];
+        true
+    } else {
+        hint "Not enough space in inventory!";
+        false
+    };
+};
+```
+
+## Error Handling
+
+All commands return errors in the format `"Error: <message>"`.
+
+```sqf
+private _result = "forge_server" callExtension ["locker:add", ...];
+private _data = _result select 0;
+
+if (_data find "Error:" == 0) then {
+    systemChat format ["Locker error: %1", _data];
+};
+```
diff --git a/examples/ext_data.sqf b/examples/ext_data.sqf
new file mode 100644
index 0000000..1318277
--- /dev/null
+++ b/examples/ext_data.sqf
@@ -0,0 +1,63 @@
+/*
+ *  Server Side Registries
+ *
+ *  These are the registries that are stored on the server and are used for
+ *  game state management.
+ */
+
+// Actor Registry
+[["_SP_PLAYER_",[["rank","CAPTAIN"],["name","Jacob Schmidt"],["holster",true],["state","HEALTHY"],["organization","0160566824"],["loadout",[[],[],[],["U_BG_Guerrilla_RF",[]],[],[],"lxWS_H_CapB_rvs_blk_ION","G_Glasses_black_RF",[],["ItemMap","ItemGPS","ItemRadio","ItemCompass","ItemWatch",""]]],["stance","CROUCH"],["uid","_SP_PLAYER_"],["phone_number","0160566824"],["direction",0],["position",[0,0.0498047,5.00144]],["email","0160566824@spearnet.mil"]]]];
+
+// Bank Registry
+[["_SP_PLAYER_",[["pin",1234],["name","Jacob Schmidt"],["earnings",0],["bank",2000],["transactions",[]],["cash",0],["uid","_SP_PLAYER_"]]]];
+// Bank Index Registry
+[["_SP_PLAYER_",[["name","Jacob Schmidt"],["uid","_SP_PLAYER_"]]]];
+
+// Garage Registry
+[["_SP_PLAYER_",[["efccebda-5f16-48f6-b4a5-da8dbfb19d02",[["plate","efccebda-5f16-48f6-b4a5-da8dbfb19d02"],["hit_points",[["names",["hitlfwheel","hitlf2wheel","hitrfwheel","hitrf2wheel","hitfuel","hithull","hitengine","hitbody","hitglass1","hitrglass","hitlglass","hitglass2","hitglass3","hitglass4","hitglass5","hitglass6","hitlbwheel","hitlmwheel","hitrbwheel","hitrmwheel","#light_1_hitpoint","#light_2_hitpoint"]],["selections",["wheel_1_1_steering","wheel_1_2_steering","wheel_2_1_steering","wheel_2_2_steering","fuel_hitpoint","fuel_hitpoint","engine_hitpoint","body_hitpoint","","","","","","","","","","","","","light_1_hitpoint","light_2_hitpoint"]],["values",[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]]],["damage",0],["classname","B_LSV_01_unarmed_F"],["fuel",1]]]]]];
+
+// Locker Registry
+[["_SP_PLAYER_",[["30Rnd_65x39_caseless_mag",[["amount",4],["classname","30Rnd_65x39_caseless_mag"],["category","magazine"]]],["arifle_MX_F",[["amount",1],["classname","arifle_MX_F"],["category","weapon"]]],["NVGoggles",[["amount",1],["classname","NVGoggles"],["category","hmd"]]]]]];
+
+// Organization Index Registry
+[["_SP_PLAYER_",[["orgID","0160566824"]]]];
+
+// Organization Registry
+[["0160566824",[["assets",[]],["name","Black Rifle Company"],["id","0160566824"],["funds",0],["reputation",0],["owner","_SP_PLAYER_"],["members",[["_SP_PLAYER_",[["name","Jacob Schmidt"],["uid","_SP_PLAYER_"]]]]]]]];
+
+// Player Session Registry
+[["_SP_PLAYER_",[["sessionToken","855837"]]]];
+
+// Virtual Arsenal Registry
+[["_SP_PLAYER_",[["items",["saber_light_ir_sand_lxWS","optic_Hamr_sand_lxWS","acc_pointer_IR_pistol_RF","U_BG_Guerrilla_RF","V_PlateCarrier1_rgr_noflag_F","lxWS_H_CapB_rvs_blk_ION","G_Glasses_black_RF","ItemMap","ItemCompass","ItemGPS","ItemRadio","ItemWatch"]],["backpacks",["B_AssaultPack_rgr"]],["weapons",["arifle_XMS_Sand_lxWS","hgun_Glock19_Tan_RF","Binocular"]],["magazines",["30Rnd_556x45_AP_Stanag_red_RF","17Rnd_9x19_red_Mag_RF"]]]]];
+
+// Virtual Garage Registry
+[["_SP_PLAYER_",[["armor",[]],["helis",[]],["cars",["B_Quadbike_01_F","B_ION_Pickup_rf"]],["other",[]],["planes",[]],["naval",[]]]]];
+
+/*
+ *  Client Side Classes
+ *
+ *  These are the classes that are stored on the client and are used for
+ *  optimistic UI updates. (Read-Only)
+ */
+
+// Actor Class
+[["rank","CAPTAIN"],["name","Jacob Schmidt"],["holster",true],["state","HEALTHY"],["organization","0160566824"],["loadout",[[],[],[],["U_BG_Guerrilla_RF",[]],[],[],"lxWS_H_CapB_rvs_blk_ION","G_Glasses_black_RF",[],["ItemMap","ItemGPS","ItemRadio","ItemCompass","ItemWatch",""]]],["stance","CROUCH"],["uid","_SP_PLAYER_"],["phone_number","0160566824"],["direction",0],["position",[0,0.0498047,5.00144]],["email","0160566824@spearnet.mil"]];
+
+// Bank Class
+[["pin",1234],["name","Jacob Schmidt"],["earnings",0],["bank",2000],["transactions",[]],["cash",0],["uid","_SP_PLAYER_"]];
+
+// Garage Class
+[["efccebda-5f16-48f6-b4a5-da8dbfb19d02",[["plate","efccebda-5f16-48f6-b4a5-da8dbfb19d02"],["hit_points",[["names",["hitlfwheel","hitlf2wheel","hitrfwheel","hitrf2wheel","hitfuel","hithull","hitengine","hitbody","hitglass1","hitrglass","hitlglass","hitglass2","hitglass3","hitglass4","hitglass5","hitglass6","hitlbwheel","hitlmwheel","hitrbwheel","hitrmwheel","#light_1_hitpoint","#light_2_hitpoint"]],["selections",["wheel_1_1_steering","wheel_1_2_steering","wheel_2_1_steering","wheel_2_2_steering","fuel_hitpoint","fuel_hitpoint","engine_hitpoint","body_hitpoint","","","","","","","","","","","","","light_1_hitpoint","light_2_hitpoint"]],["values",[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]]],["damage",0],["classname","B_LSV_01_unarmed_F"],["fuel",1]]]];
+
+// Locker Class
+[["30Rnd_65x39_caseless_mag",[["amount",4],["classname","30Rnd_65x39_caseless_mag"],["category","magazine"]]],["arifle_MX_F",[["amount",1],["classname","arifle_MX_F"],["category","weapon"]]],["NVGoggles",[["amount",1],["classname","NVGoggles"],["category","hmd"]]]];
+
+// Organization Class
+[["assets",[]],["name","Black Rifle Company"],["id","0160566824"],["funds",0],["reputation",0],["owner","_SP_PLAYER_"],["members",[["_SP_PLAYER_",[["name","Jacob Schmidt"],["uid","_SP_PLAYER_"]]]]]];
+
+// Virtual Arsenal Class
+[["items",["saber_light_ir_sand_lxWS","optic_Hamr_sand_lxWS","acc_pointer_IR_pistol_RF","U_BG_Guerrilla_RF","V_PlateCarrier1_rgr_noflag_F","lxWS_H_CapB_rvs_blk_ION","G_Glasses_black_RF","ItemMap","ItemCompass","ItemGPS","ItemRadio","ItemWatch"]],["backpacks",["B_AssaultPack_rgr"]],["weapons",["arifle_XMS_Sand_lxWS","hgun_Glock19_Tan_RF","Binocular"]],["magazines",["30Rnd_556x45_AP_Stanag_red_RF","17Rnd_9x19_red_Mag_RF"]]];
+
+// Virtual Garage Class
+[["armor",[]],["helis",[]],["cars",["B_Quadbike_01_F","B_ION_Pickup_rf"]],["other",[]],["planes",[]],["naval",[]]];
diff --git a/examples/icom_usage.sqf b/examples/icom_usage.sqf
new file mode 100644
index 0000000..e38627a
--- /dev/null
+++ b/examples/icom_usage.sqf
@@ -0,0 +1,192 @@
+// ICOM (Internal Communication) Usage Example
+// Complete guide for using ICOM to communicate between Arma 3 servers
+
+// ============================================================================
+// STEP 1: Define the event handler (in init.sqf or mission init)
+// ============================================================================
+forge_icom_event = {
+    params ["_eventName", "_data"];
+
+    systemChat format ["📡 ICOM Event: %1", _eventName];
+    diag_log format ["[ICOM] Event received: %1 | Data: %2", _eventName, _data];
+
+    // Handle specific events
+    switch (_eventName) do {
+        case "supply_drop": {
+            systemChat "📦 Supply drop incoming!";
+
+            if (_data isEqualType createHashMap) then {
+                private _coords = _data getOrDefault ["coords", []];
+                private _supplies = _data getOrDefault ["supplies", []];
+
+                // Spawn supply crate at coordinates
+                if (count _coords >= 2) then {
+                    private _pos = [_coords select 0, _coords select 1, 0];
+                    private _crate = createVehicle ["Box_NATO_Ammo_F", _pos, [], 0, "NONE"];
+
+                    systemChat format ["Supply crate spawned at %1", _pos];
+                    diag_log format ["[ICOM] Supply drop: %1 supplies at %2", _supplies, _pos];
+                };
+            };
+        };
+
+        case "spawn_mission": {
+            systemChat "🎯 New mission spawning!";
+
+            if (_data isEqualType createHashMap) then {
+                private _missionType = _data getOrDefault ["mission_type", ""];
+                private _location = _data getOrDefault ["location", []];
+                private _difficulty = _data getOrDefault ["difficulty", "normal"];
+
+                // Trigger mission spawn logic here
+                systemChat format ["Mission: %1 (%2) at %3", _missionType, _difficulty, _location];
+            };
+        };
+
+        case "global_alert": {
+            systemChat "⚠️ GLOBAL ALERT";
+
+            if (_data isEqualType createHashMap) then {
+                private _message = _data getOrDefault ["message", ""];
+                private _severity = _data getOrDefault ["severity", "info"];
+
+                if (_message != "") then {
+                    systemChat format ["Alert: %1", _message];
+
+                    // Play sound based on severity
+                    switch (_severity) do {
+                        case "critical": { playSound "alarm"; };
+                        case "warning": { playSound "hint"; };
+                    };
+                };
+            };
+        };
+
+        case "player_join": {
+            if (_data isEqualType createHashMap) then {
+                private _playerName = _data getOrDefault ["name", "Unknown"];
+                private _serverName = _data getOrDefault ["server", "Unknown"];
+
+                systemChat format ["Player %1 joined %2", _playerName, _serverName];
+            };
+        };
+
+        default {
+            diag_log format ["[ICOM] Unhandled event: %1", _eventName];
+        };
+    };
+};
+
+systemChat "✅ ICOM event handler registered";
+diag_log "[ICOM] Event handler initialized";
+
+
+// ============================================================================
+// STEP 2: Send events to other servers
+// ============================================================================
+
+// Example 1: Send supply drop to server_2
+private _supplyData = createHashMapFromArray [
+    ["coords", [1234, 5678, 0]],
+    ["supplies", ["ammo_box", "medical_supplies", "repair_kit"]]
+];
+private _result = "forge_server" callExtension ["icom:send_event", ["server_2", "supply_drop", (toJSON _supplyData)]];
+// Returns: ["OK",0,0] on success, ["ERROR: ...",0,0] on failure
+
+// Example 2: Spawn mission on server_2
+private _missionData = createHashMapFromArray [
+    ["mission_type", "convoy_ambush"],
+    ["difficulty", "hard"],
+    ["location", [2345, 6789, 0]],
+    ["reward", 5000]
+];
+"forge_server" callExtension ["icom:send_event", ["server_2", "spawn_mission", (toJSON _missionData)]];
+
+// Example 3: Broadcast to all servers
+private _alertData = createHashMapFromArray [
+    ["message", "Server restart in 5 minutes"],
+    ["severity", "warning"]
+];
+"forge_server" callExtension ["icom:broadcast", ["global_alert", (toJSON _alertData)]];
+
+// Example 4: Notify all servers when a player joins
+private _playerJoinData = createHashMapFromArray [
+    ["name", name player],
+    ["uid", getPlayerUID player],
+    ["server", "server_1"]
+];
+"forge_server" callExtension ["icom:broadcast", ["player_join", (toJSON _playerJoinData)]];
+
+
+// ============================================================================
+// STEP 3: Test the connection
+// ============================================================================
+
+// Test if ICOM is working
+"forge_server" callExtension ["icom:test_callback", []];
+// Should trigger forge_icom_event with a handshake event
+
+
+// ============================================================================
+// TIPS AND BEST PRACTICES
+// ============================================================================
+
+// 1. Always use toJSON to convert hashmaps to JSON strings
+private _data = createHashMapFromArray [["key", "value"]];
+private _json = toJSON _data;
+
+// 2. Check for errors
+private _result = "forge_server" callExtension ["icom:send_event", ["server_2", "test", _json]];
+if ((_result select 0) find "ERROR" != -1) then {
+    systemChat "Failed to send event!";
+    diag_log format ["[ICOM] Error: %1", _result select 0];
+};
+
+// 3. Handle missing data gracefully in the event handler
+// Use getOrDefault instead of direct hash access
+
+// 4. Log everything for debugging
+// All ICOM events are logged to @forge_server/logs/icom.log
+
+// 5. Server IDs must match what's configured in the extension
+// Default is "server_1", configure others as needed
+
+
+// ============================================================================
+// COMMON EVENT PATTERNS
+// ============================================================================
+
+// Pattern 1: Request-Response
+// Server 1 requests something from Server 2
+private _requestData = createHashMapFromArray [
+    ["request_id", str (random 10000)],
+    ["request_type", "player_data"],
+    ["player_uid", getPlayerUID player]
+];
+"forge_server" callExtension ["icom:send_event", ["server_2", "data_request", (toJSON _requestData)]];
+// Server 2 responds with a "data_response" event back to server_1
+
+// Pattern 2: Cross-server triggers
+// Trigger an action on all servers simultaneously
+private _triggerData = createHashMapFromArray [
+    ["trigger_type", "airdrop"],
+    ["position", [5000, 5000, 0]],
+    ["timestamp", time]
+];
+"forge_server" callExtension ["icom:broadcast", ["synchronized_trigger", (toJSON _triggerData)]];
+
+// Pattern 3: Server status updates
+// Periodically broadcast server status to other servers
+[] spawn {
+    while {true} do {
+        sleep 60;  // Every minute
+
+        private _statusData = createHashMapFromArray [
+            ["player_count", count allPlayers],
+            ["server_fps", diag_fps],
+            ["mission_time", time]
+        ];
+
+        "forge_server" callExtension ["icom:broadcast", ["server_status", (toJSON _statusData)]];
+    };
+};
diff --git a/forge.code-workspace b/forge.code-workspace
index e24ee21..deb0ab6 100644
--- a/forge.code-workspace
+++ b/forge.code-workspace
@@ -17,6 +17,51 @@
             "*.inc": "arma-config",
             "*.cfg": "arma-config",
             "*.rvmat": "arma-config"
-        }
+        },
+        "psi-header.changes-tracking": {
+            "isActive": true,
+            "include": ["sqf"],
+            "modDate": "Last Update:",
+            "modDateFormat": "YYYY-MM-DD",
+            "autoHeader": "manualSave"
+        },
+        "psi-header.lang-config": [
+            {
+                "license": "APL-SA",
+                "language": "sqf",
+                "rootDirFileName": "common_includes.hpp",
+                "beforeHeader": ["#include \"..\\script_component.hpp\"", ""],
+                "blankLinesBefore": 1,
+                "begin": "/*",
+                "prefix": " * ",
+                "end": " */",
+                "blankLinesAfter": 1,
+                "forceToTop": true
+            }
+        ],
+        "psi-header.templates": [
+            {
+                "language": "sqf",
+                "template": [
+                    "File: <<filename>>",
+                    "Author: IDSolutions",
+                    "Date: <<filecreated('YYYY-MM-DD')>>",
+                    "Last Update:",
+                    "Public: No",
+                    "",
+                    "Description:",
+                    "    No description added yet.",
+                    "",
+                    "Parameter(s):",
+                    "    N/A",
+                    "",
+                    "Returns:",
+                    "    Something [BOOL]",
+                    "",
+                    "Example(s):",
+                    "    [parameter] call forge_x_component_fnc_myFunction"
+                ]
+            }
+        ],
     }
 }
diff --git a/lib/models/src/actor.rs b/lib/models/src/actor.rs
index a2c65fc..7c37302 100644
--- a/lib/models/src/actor.rs
+++ b/lib/models/src/actor.rs
@@ -2,7 +2,9 @@ use arma_rs::{
     FromArma, IntoArma,
     loadout::{AssignedItems, Loadout as ArmaLoadout},
 };
-use forge_shared::{ActorValidationError, arma_value_to_json};
+use forge_shared::{
+    ActorValidationError, arma_value_to_json, generate_email, generate_phone_number,
+};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -44,8 +46,8 @@ impl Actor {
             return Err(ActorValidationError::InvalidUid(uid_string));
         }
 
-        let phone_number = Self::generate_phone_number(&uid_string);
-        let email = Self::generate_email(&phone_number);
+        let phone_number = generate_phone_number(&uid_string);
+        let email = generate_email(&phone_number);
 
         let actor = Self {
             uid: uid_string,
@@ -127,26 +129,6 @@ impl Actor {
         &self.uid
     }
 
-    fn generate_phone_number(uid: &str) -> String {
-        let uid_chars: Vec<char> = uid.chars().collect();
-        let uid_len = uid_chars.len();
-
-        if uid_len >= 6 {
-            let last_six: String = uid_chars[uid_len - 6..].iter().collect();
-            format!("0160{}", last_six)
-        } else {
-            format!("0160{:0>6}", uid)
-        }
-    }
-
-    fn generate_email(phone_number: &str) -> String {
-        if phone_number.is_empty() {
-            String::new()
-        } else {
-            format!("{}@spearnet.mil", phone_number)
-        }
-    }
-
     fn default_loadout_json() -> serde_json::Value {
         let mut loadout = ArmaLoadout::default();
 
@@ -177,143 +159,6 @@ impl Actor {
         let arma_value = loadout.to_arma();
         self.loadout = arma_value_to_json(&arma_value);
     }
-
-    pub fn update_from_json(&mut self, json_obj: serde_json::Value) -> Result<(), String> {
-        if let serde_json::Value::Object(map) = json_obj {
-            let mut temp_actor = self.clone();
-
-            for (field, value) in map {
-                match field.as_str() {
-                    "uid" => {
-                        return Err(
-                            "UID cannot be modified - it's the player's permanent Steam ID"
-                                .to_string(),
-                        );
-                    }
-                    "name" => {
-                        temp_actor.name = if value.is_null() {
-                            None
-                        } else {
-                            value.as_str().map(|s| s.to_string())
-                        };
-                    }
-                    "position" => {
-                        temp_actor.position = if value.is_null() {
-                            None
-                        } else if let Some(arr) = value.as_array() {
-                            let coords: Result<Vec<f64>, _> = arr
-                                .iter()
-                                .map(|v| v.as_f64().ok_or("Invalid coordinate"))
-                                .collect();
-                            match coords {
-                                Ok(pos) if pos.len() == 3 => Some(pos),
-                                _ => return Err("Position must be [x, y, z] array".to_string()),
-                            }
-                        } else {
-                            return Err("Position must be an array".to_string());
-                        };
-                    }
-                    "direction" => {
-                        if let Some(dir_val) = value.as_f64() {
-                            temp_actor.direction = dir_val % 360.0;
-                            if temp_actor.direction < 0.0 {
-                                temp_actor.direction += 360.0;
-                            }
-                        } else {
-                            return Err("Direction must be a number".to_string());
-                        }
-                    }
-                    "stance" => {
-                        temp_actor.stance = if value.is_null() {
-                            None
-                        } else {
-                            value.as_str().map(|s| s.to_string())
-                        };
-                    }
-                    "email" => {
-                        if let Some(email_str) = value.as_str() {
-                            temp_actor.email = email_str.to_string();
-                        } else {
-                            return Err("Email must be a string".to_string());
-                        }
-                    }
-                    "phone_number" => {
-                        if let Some(phone_str) = value.as_str() {
-                            let old_email = format!("{}@spearnet.mil", self.phone_number);
-                            temp_actor.phone_number = phone_str.to_string();
-
-                            let email_needs_update =
-                                temp_actor.email.is_empty() || temp_actor.email == old_email;
-
-                            if email_needs_update {
-                                temp_actor.email = Self::generate_email(&temp_actor.phone_number);
-                            }
-                        } else {
-                            return Err("Phone number must be a string".to_string());
-                        }
-                    }
-                    "state" => {
-                        if let Some(state_str) = value.as_str() {
-                            temp_actor.state = state_str.to_uppercase();
-                        } else {
-                            return Err("State must be a string".to_string());
-                        }
-                    }
-                    "holster" => {
-                        if let Some(holster_val) = value.as_bool() {
-                            temp_actor.holster = holster_val;
-                        } else {
-                            return Err("Holster must be a boolean".to_string());
-                        }
-                    }
-                    "rank" => {
-                        temp_actor.rank = if value.is_null() {
-                            None
-                        } else if let Some(rank_str) = value.as_str() {
-                            Some(rank_str.to_string())
-                        } else {
-                            return Err("Rank must be a string or null".to_string());
-                        };
-                    }
-                    "organization" => {
-                        temp_actor.organization = if value.is_null() {
-                            String::new()
-                        } else if let Some(org_str) = value.as_str() {
-                            org_str.to_string()
-                        } else {
-                            return Err("Organization must be a string or null".to_string());
-                        };
-                    }
-                    "loadout" => {
-                        temp_actor.loadout = value;
-                    }
-                    _ => return Err(format!("Unknown field: {}", field)),
-                }
-            }
-
-            if temp_actor.phone_number.is_empty() {
-                temp_actor.phone_number = Actor::generate_phone_number(&temp_actor.uid);
-            }
-            if temp_actor.email.is_empty() {
-                if temp_actor.phone_number.is_empty() {
-                    temp_actor.phone_number = Actor::generate_phone_number(&temp_actor.uid);
-                }
-                temp_actor.email = Actor::generate_email(&temp_actor.phone_number);
-            }
-            if temp_actor.organization.trim().is_empty() {
-                temp_actor.organization = String::new();
-            }
-
-            temp_actor
-                .validate()
-                .map_err(|e| format!("Validation failed: {}", e))?;
-
-            *self = temp_actor;
-            Ok(())
-        } else {
-            Err("Expected JSON object".to_string())
-        }
-    }
 }
 
 impl FromArma for Actor {
@@ -322,15 +167,6 @@ impl FromArma for Actor {
             arma_rs::FromArmaError::InvalidPrimitive(format!("Invalid JSON: {}", e))
         })?;
 
-        if actor.phone_number.is_empty() {
-            actor.phone_number = Actor::generate_phone_number(&actor.uid);
-        }
-        if actor.email.is_empty() {
-            if actor.phone_number.is_empty() {
-                actor.phone_number = Actor::generate_phone_number(&actor.uid);
-            }
-            actor.email = Actor::generate_email(&actor.phone_number);
-        }
         if actor.organization.trim().is_empty() {
             actor.organization = String::new();
         }
diff --git a/lib/models/src/bank.rs b/lib/models/src/bank.rs
index 0174778..009fc82 100644
--- a/lib/models/src/bank.rs
+++ b/lib/models/src/bank.rs
@@ -9,27 +9,20 @@ pub struct Bank {
     pub bank: f64,
     pub cash: f64,
     pub earnings: f64,
+    pub pin: u64,
     pub transactions: Vec<String>,
-    pub phone_number: String,
-    pub email: String,
 }
 
 impl Bank {
-    pub fn new<S: Into<String>>(
-        uid: S,
-        name: S,
-        phone_number: S,
-        email: S,
-    ) -> Result<Self, BankValidationError> {
+    pub fn new<S: Into<String>>(uid: S, name: S, pin: u64) -> Result<Self, BankValidationError> {
         let bank = Self {
             uid: uid.into(),
             name: name.into(),
             bank: 0.0,
             cash: 0.0,
             earnings: 0.0,
+            pin: pin,
             transactions: Vec::new(),
-            phone_number: phone_number.into(),
-            email: email.into(),
         };
 
         bank.validate()?;
@@ -53,14 +46,8 @@ impl Bank {
             return Err(BankValidationError::CashNegative);
         }
 
-        if self.phone_number.trim().is_empty() {
-            return Err(BankValidationError::InvalidPhoneNumber(
-                self.phone_number.clone(),
-            ));
-        }
-
-        if self.email.trim().is_empty() {
-            return Err(BankValidationError::InvalidEmail(self.email.clone()));
+        if self.pin < 1000 || self.pin > 9999 {
+            return Err(BankValidationError::InvalidPin(self.pin));
         }
 
         Ok(())
@@ -69,179 +56,6 @@ impl Bank {
     pub fn uid(&self) -> &str {
         &self.uid
     }
-
-    pub fn update_field(&mut self, field: &str, value: serde_json::Value) -> Result<(), String> {
-        let mut temp_bank = self.clone();
-
-        match field {
-            "uid" => {
-                if let Some(uid_str) = value.as_str() {
-                    temp_bank.uid = uid_str.to_string();
-                } else {
-                    return Err("UID must be a string".to_string());
-                }
-            }
-            "name" => {
-                if let Some(name_str) = value.as_str() {
-                    temp_bank.name = name_str.to_string();
-                } else {
-                    return Err("Name must be a string".to_string());
-                }
-            }
-            "bank" => {
-                if let Some(bank_val) = value.as_f64() {
-                    temp_bank.bank = bank_val;
-                } else {
-                    return Err("Bank must be a number".to_string());
-                }
-            }
-            "cash" => {
-                if let Some(cash_val) = value.as_f64() {
-                    temp_bank.cash = cash_val;
-                } else {
-                    return Err("Cash must be a number".to_string());
-                }
-            }
-            "earnings" => {
-                if let Some(earnings_val) = value.as_f64() {
-                    temp_bank.earnings = earnings_val;
-                } else {
-                    return Err("Earnings must be a number".to_string());
-                }
-            }
-            "transactions" => {
-                if let serde_json::Value::Array(arr) = value {
-                    temp_bank.transactions = arr
-                        .into_iter()
-                        .filter_map(|val| val.as_str().map(|s| s.to_string()))
-                        .collect();
-                } else {
-                    return Err("Transactions must be an array of strings".to_string());
-                }
-            }
-            "email" => {
-                if let Some(email_str) = value.as_str() {
-                    temp_bank.email = email_str.to_string();
-                } else {
-                    return Err("Email must be a string".to_string());
-                }
-            }
-            "phone_number" => {
-                if let Some(phone_str) = value.as_str() {
-                    temp_bank.phone_number = phone_str.to_string();
-                } else {
-                    return Err("Phone number must be a string".to_string());
-                }
-            }
-            _ => return Err(format!("Unknown field: {}", field)),
-        }
-
-        temp_bank
-            .validate()
-            .map_err(|e| format!("Validation failed: {}", e))?;
-
-        *self = temp_bank;
-        Ok(())
-    }
-
-    pub fn get_field(&self, field: &str) -> Option<serde_json::Value> {
-        match field {
-            "uid" => Some(serde_json::Value::String(self.uid.clone())),
-            "name" => Some(serde_json::Value::String(self.name.clone())),
-            "bank" => Some(serde_json::Value::from(self.bank)),
-            "cash" => Some(serde_json::Value::from(self.cash)),
-            "earnings" => Some(serde_json::Value::from(self.earnings)),
-            "transactions" => Some(serde_json::Value::Array(
-                self.transactions
-                    .iter()
-                    .map(|s| serde_json::Value::String(s.clone()))
-                    .collect(),
-            )),
-            "phone_number" => Some(serde_json::Value::String(self.phone_number.clone())),
-            "email" => Some(serde_json::Value::String(self.email.clone())),
-            _ => None,
-        }
-    }
-
-    pub fn update_from_json(&mut self, json_obj: serde_json::Value) -> Result<(), String> {
-        if let serde_json::Value::Object(map) = json_obj {
-            let mut temp_bank = self.clone();
-
-            for (field, value) in map {
-                match field.as_str() {
-                    "uid" => {
-                        if let Some(uid_str) = value.as_str() {
-                            temp_bank.uid = uid_str.to_string();
-                        } else {
-                            return Err("UID must be a string".to_string());
-                        }
-                    }
-                    "name" => {
-                        if let Some(name_str) = value.as_str() {
-                            temp_bank.name = name_str.to_string();
-                        } else {
-                            return Err("Name must be a string".to_string());
-                        }
-                    }
-                    "bank" => {
-                        if let Some(bank_val) = value.as_f64() {
-                            temp_bank.bank = bank_val;
-                        } else {
-                            return Err("Bank must be a number".to_string());
-                        }
-                    }
-                    "cash" => {
-                        if let Some(cash_val) = value.as_f64() {
-                            temp_bank.cash = cash_val;
-                        } else {
-                            return Err("Cash must be a number".to_string());
-                        }
-                    }
-                    "earnings" => {
-                        if let Some(earnings_val) = value.as_f64() {
-                            temp_bank.earnings = earnings_val;
-                        } else {
-                            return Err("Earnings must be a number".to_string());
-                        }
-                    }
-                    "transactions" => {
-                        if let serde_json::Value::Array(arr) = value {
-                            temp_bank.transactions = arr
-                                .into_iter()
-                                .filter_map(|val| val.as_str().map(|s| s.to_string()))
-                                .collect();
-                        } else {
-                            return Err("Transactions must be an array of strings".to_string());
-                        }
-                    }
-                    "phone_number" => {
-                        if let Some(phone_str) = value.as_str() {
-                            temp_bank.phone_number = phone_str.to_string();
-                        } else {
-                            return Err("Phone number must be a string".to_string());
-                        }
-                    }
-                    "email" => {
-                        if let Some(email_str) = value.as_str() {
-                            temp_bank.email = email_str.to_string();
-                        } else {
-                            return Err("Email must be a string".to_string());
-                        }
-                    }
-                    _ => return Err(format!("Unknown field: {}", field)),
-                }
-            }
-
-            temp_bank
-                .validate()
-                .map_err(|e| format!("Validation failed: {}", e))?;
-
-            *self = temp_bank;
-            Ok(())
-        } else {
-            Err("Invalid JSON object".to_string())
-        }
-    }
 }
 
 impl FromArma for Bank {
diff --git a/lib/models/src/garage.rs b/lib/models/src/garage.rs
new file mode 100644
index 0000000..d4f4a14
--- /dev/null
+++ b/lib/models/src/garage.rs
@@ -0,0 +1,155 @@
+use arma_rs::{FromArma, IntoArma};
+use forge_shared::GarageValidationError;
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Garage {
+    pub vehicles: HashMap<String, Vehicle>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Vehicle {
+    pub plate: String,
+    pub classname: String,
+    pub fuel: f64,
+    pub damage: f64,
+    pub hit_points: HitPoints,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct HitPoints {
+    pub names: Vec<String>,
+    pub selections: Vec<String>,
+    pub values: Vec<f64>,
+}
+
+impl HitPoints {
+    pub fn new() -> Self {
+        Self {
+            names: Vec::new(),
+            selections: Vec::new(),
+            values: Vec::new(),
+        }
+    }
+
+    pub fn from_json_str(json_str: &str) -> Result<Self, String> {
+        let hit_points: HitPoints = serde_json::from_str(json_str)
+            .map_err(|e| format!("Failed to parse hit_points JSON: {}", e))?;
+
+        let names_len = hit_points.names.len();
+        let selections_len = hit_points.selections.len();
+        let values_len = hit_points.values.len();
+
+        if names_len != selections_len || names_len != values_len {
+            return Err(format!(
+                "Hitpoint array length mismatch: names={}, selections={}, values={}",
+                names_len, selections_len, values_len
+            ));
+        }
+
+        Ok(hit_points)
+    }
+}
+
+impl Vehicle {
+    pub fn new<S: Into<String>>(
+        plate: S,
+        classname: S,
+        fuel: f64,
+        damage: f64,
+        hit_points: HitPoints,
+    ) -> Result<Self, GarageValidationError> {
+        let vehicle = Self {
+            plate: plate.into(),
+            classname: classname.into(),
+            fuel,
+            damage,
+            hit_points,
+        };
+
+        vehicle.validate()?;
+        Ok(vehicle)
+    }
+
+    pub fn validate(&self) -> Result<(), GarageValidationError> {
+        if self.classname.trim().is_empty() {
+            return Err(GarageValidationError::ClassnameEmpty);
+        }
+
+        if self.fuel < 0.0 || self.fuel > 1.0 {
+            return Err(GarageValidationError::FuelInvalid);
+        }
+
+        if self.damage < 0.0 || self.damage > 1.0 {
+            return Err(GarageValidationError::DamageInvalid);
+        }
+
+        let names_len = self.hit_points.names.len();
+        let selections_len = self.hit_points.selections.len();
+        let values_len = self.hit_points.values.len();
+
+        if names_len != selections_len || names_len != values_len {
+            return Err(GarageValidationError::HitpointArrayLengthMismatch);
+        }
+
+        for (i, value) in self.hit_points.values.iter().enumerate() {
+            if *value < 0.0 || *value > 1.0 {
+                return Err(GarageValidationError::HitpointValueInvalid(i));
+            }
+        }
+
+        Ok(())
+    }
+}
+
+impl Garage {
+    pub fn new() -> Result<Self, GarageValidationError> {
+        let garage = Self {
+            vehicles: HashMap::new(),
+        };
+
+        garage.validate()?;
+        Ok(garage)
+    }
+
+    pub fn validate(&self) -> Result<(), GarageValidationError> {
+        for vehicle in self.vehicles.values() {
+            vehicle.validate()?;
+        }
+
+        Ok(())
+    }
+
+    pub fn add_vehicle(&mut self, vehicle: Vehicle) -> Result<(), GarageValidationError> {
+        vehicle.validate()?;
+        self.vehicles.insert(vehicle.plate.clone(), vehicle);
+        Ok(())
+    }
+
+    pub fn remove_vehicle(&mut self, plate: &str) -> Option<Vehicle> {
+        self.vehicles.remove(plate)
+    }
+
+    pub fn get_vehicle(&self, plate: &str) -> Option<&Vehicle> {
+        self.vehicles.get(plate)
+    }
+
+    pub fn get_vehicle_mut(&mut self, plate: &str) -> Option<&mut Vehicle> {
+        self.vehicles.get_mut(plate)
+    }
+}
+
+impl FromArma for Vehicle {
+    fn from_arma(s: String) -> Result<Self, arma_rs::FromArmaError> {
+        serde_json::from_str(&s)
+            .map_err(|e| arma_rs::FromArmaError::InvalidPrimitive(format!("Invalid JSON: {}", e)))
+    }
+}
+
+impl IntoArma for Vehicle {
+    fn to_arma(&self) -> arma_rs::Value {
+        let json_str = serde_json::to_string(self).unwrap_or_default();
+        arma_rs::Value::String(json_str)
+    }
+}
diff --git a/lib/models/src/lib.rs b/lib/models/src/lib.rs
index 8d64619..b3406aa 100644
--- a/lib/models/src/lib.rs
+++ b/lib/models/src/lib.rs
@@ -1,7 +1,15 @@
 pub mod actor;
 pub mod bank;
+pub mod garage;
+pub mod locker;
 pub mod org;
+pub mod v_garage;
+pub mod v_locker;
 
 pub use actor::Actor;
 pub use bank::Bank;
+pub use garage::{Garage, HitPoints, Vehicle};
+pub use locker::{Item, Locker};
 pub use org::{MemberSummary, Org};
+pub use v_garage::{VGarage, VehicleCategory};
+pub use v_locker::{EquipmentCategory, VLocker};
diff --git a/lib/models/src/locker.rs b/lib/models/src/locker.rs
new file mode 100644
index 0000000..bee33a1
--- /dev/null
+++ b/lib/models/src/locker.rs
@@ -0,0 +1,100 @@
+use arma_rs::{FromArma, IntoArma};
+use forge_shared::LockerValidationError;
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Locker {
+    pub items: HashMap<String, Item>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Item {
+    pub category: String,
+    pub classname: String,
+    pub amount: u32,
+}
+
+impl Item {
+    pub fn new<S: Into<String>>(
+        category: S,
+        classname: S,
+        amount: u32,
+    ) -> Result<Self, LockerValidationError> {
+        let item = Self {
+            category: category.into(),
+            classname: classname.into(),
+            amount,
+        };
+
+        item.validate()?;
+        Ok(item)
+    }
+
+    pub fn validate(&self) -> Result<(), LockerValidationError> {
+        if self.category.trim().is_empty() {
+            return Err(LockerValidationError::CategoryEmpty);
+        }
+
+        if self.classname.trim().is_empty() {
+            return Err(LockerValidationError::ClassnameEmpty);
+        }
+
+        if self.amount == 0 {
+            return Err(LockerValidationError::AmountZero);
+        }
+
+        Ok(())
+    }
+}
+
+impl Locker {
+    pub fn new() -> Result<Self, LockerValidationError> {
+        let locker = Self {
+            items: HashMap::new(),
+        };
+
+        locker.validate()?;
+        Ok(locker)
+    }
+
+    pub fn validate(&self) -> Result<(), LockerValidationError> {
+        for item in self.items.values() {
+            item.validate()?;
+        }
+
+        Ok(())
+    }
+
+    pub fn add_item(&mut self, item: Item) -> Result<(), LockerValidationError> {
+        item.validate()?;
+        self.items.insert(item.classname.clone(), item);
+        Ok(())
+    }
+
+    pub fn remove_item(&mut self, classname: &str) -> Option<Item> {
+        self.items.remove(classname)
+    }
+
+    pub fn get_item(&self, classname: &str) -> Option<&Item> {
+        self.items.get(classname)
+    }
+
+    pub fn get_item_mut(&mut self, classname: &str) -> Option<&mut Item> {
+        self.items.get_mut(classname)
+    }
+}
+
+impl FromArma for Item {
+    fn from_arma(s: String) -> Result<Self, arma_rs::FromArmaError> {
+        serde_json::from_str(&s)
+            .map_err(|e| arma_rs::FromArmaError::InvalidPrimitive(format!("Invalid JSON: {}", e)))
+    }
+}
+
+impl IntoArma for Item {
+    fn to_arma(&self) -> arma_rs::Value {
+        let json_str = serde_json::to_string(self).unwrap_or_default();
+        arma_rs::Value::String(json_str)
+    }
+}
diff --git a/lib/models/src/org.rs b/lib/models/src/org.rs
index 43c3ffd..a6953d6 100644
--- a/lib/models/src/org.rs
+++ b/lib/models/src/org.rs
@@ -55,7 +55,9 @@ impl Org {
             return Err(OrgValidationError::InvalidId(self.id.clone()));
         }
 
-        if !self.owner.chars().all(|c| c.is_numeric()) || self.owner.len() != 17 {
+        if self.owner != "server"
+            && (!self.owner.chars().all(|c| c.is_numeric()) || self.owner.len() != 17)
+        {
             return Err(OrgValidationError::InvalidOwner(self.owner.clone()));
         }
 
@@ -69,123 +71,6 @@ impl Org {
     pub fn id(&self) -> &str {
         &self.id
     }
-
-    pub fn update_field(&mut self, field: &str, value: serde_json::Value) -> Result<(), String> {
-        let mut temp_org = self.clone();
-
-        match field {
-            "id" => {
-                if let Some(id_str) = value.as_str() {
-                    temp_org.id = id_str.to_string();
-                } else {
-                    return Err("ID must be a string".to_string());
-                }
-            }
-            "owner" => {
-                if let Some(owner_str) = value.as_str() {
-                    temp_org.owner = owner_str.to_string();
-                } else {
-                    return Err("Owner must be a string".to_string());
-                }
-            }
-            "name" => {
-                if let Some(name_str) = value.as_str() {
-                    temp_org.name = name_str.to_string();
-                } else {
-                    return Err("Name must be a string".to_string());
-                }
-            }
-            "funds" => {
-                if let Some(funds_val) = value.as_f64() {
-                    temp_org.funds = funds_val;
-                } else {
-                    return Err("Funds must be a number".to_string());
-                }
-            }
-            "reputation" => {
-                if let Some(rep_val) = value.as_i64() {
-                    temp_org.reputation = rep_val;
-                } else {
-                    return Err("Reputation must be an integer".to_string());
-                }
-            }
-            _ => return Err(format!("Unknown field: {}", field)),
-        }
-
-        temp_org
-            .validate()
-            .map_err(|e| format!("Validation failed: {}", e))?;
-
-        *self = temp_org;
-        Ok(())
-    }
-
-    pub fn get_field(&self, field: &str) -> Option<serde_json::Value> {
-        match field {
-            "id" => Some(serde_json::Value::String(self.id.clone())),
-            "owner" => Some(serde_json::Value::String(self.owner.clone())),
-            "name" => Some(serde_json::Value::String(self.name.clone())),
-            "funds" => Some(serde_json::Value::from(self.funds)),
-            "reputation" => Some(serde_json::Value::from(self.reputation)),
-            _ => None,
-        }
-    }
-
-    pub fn update_from_json(&mut self, json_obj: serde_json::Value) -> Result<(), String> {
-        if let serde_json::Value::Object(map) = json_obj {
-            let mut temp_org = self.clone();
-
-            for (field, value) in map {
-                match field.as_str() {
-                    "id" => {
-                        if let Some(id_str) = value.as_str() {
-                            temp_org.id = id_str.to_string();
-                        } else {
-                            return Err("ID must be a string".to_string());
-                        }
-                    }
-                    "owner" => {
-                        if let Some(owner_str) = value.as_str() {
-                            temp_org.owner = owner_str.to_string();
-                        } else {
-                            return Err("Owner must be a string".to_string());
-                        }
-                    }
-                    "name" => {
-                        if let Some(name_str) = value.as_str() {
-                            temp_org.name = name_str.to_string();
-                        } else {
-                            return Err("Name must be a string".to_string());
-                        }
-                    }
-                    "funds" => {
-                        if let Some(funds_val) = value.as_f64() {
-                            temp_org.funds = funds_val;
-                        } else {
-                            return Err("Funds must be a number".to_string());
-                        }
-                    }
-                    "reputation" => {
-                        if let Some(rep_val) = value.as_i64() {
-                            temp_org.reputation = rep_val;
-                        } else {
-                            return Err("Reputation must be an integer".to_string());
-                        }
-                    }
-                    _ => return Err(format!("Unknown field: {}", field)),
-                }
-            }
-
-            temp_org
-                .validate()
-                .map_err(|e| format!("Validation failed: {}", e))?;
-
-            *self = temp_org;
-            Ok(())
-        } else {
-            Err("Expected JSON object".to_string())
-        }
-    }
 }
 
 impl FromArma for Org {
diff --git a/lib/models/src/v_garage.rs b/lib/models/src/v_garage.rs
new file mode 100644
index 0000000..94e1101
--- /dev/null
+++ b/lib/models/src/v_garage.rs
@@ -0,0 +1,100 @@
+use arma_rs::{FromArma, IntoArma};
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum VehicleCategory {
+    Cars,
+    Armor,
+    Helis,
+    Planes,
+    Naval,
+    Other,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct VGarage {
+    pub cars: Vec<String>,
+    pub armor: Vec<String>,
+    pub helis: Vec<String>,
+    pub planes: Vec<String>,
+    pub naval: Vec<String>,
+    pub other: Vec<String>,
+}
+
+impl VGarage {
+    pub fn new() -> Self {
+        Self {
+            cars: Vec::new(),
+            armor: Vec::new(),
+            helis: Vec::new(),
+            planes: Vec::new(),
+            naval: Vec::new(),
+            other: Vec::new(),
+        }
+    }
+
+    pub fn add(&mut self, category: VehicleCategory, classnames: Vec<String>) {
+        let target_array = match category {
+            VehicleCategory::Cars => &mut self.cars,
+            VehicleCategory::Armor => &mut self.armor,
+            VehicleCategory::Helis => &mut self.helis,
+            VehicleCategory::Planes => &mut self.planes,
+            VehicleCategory::Naval => &mut self.naval,
+            VehicleCategory::Other => &mut self.other,
+        };
+
+        for classname in classnames {
+            if !target_array.contains(&classname) {
+                target_array.push(classname);
+            }
+        }
+    }
+
+    pub fn get(&self, category: VehicleCategory) -> &Vec<String> {
+        match category {
+            VehicleCategory::Cars => &self.cars,
+            VehicleCategory::Armor => &self.armor,
+            VehicleCategory::Helis => &self.helis,
+            VehicleCategory::Planes => &self.planes,
+            VehicleCategory::Naval => &self.naval,
+            VehicleCategory::Other => &self.other,
+        }
+    }
+
+    pub fn remove(&mut self, category: VehicleCategory, classname: &str) -> Option<String> {
+        let target_array = match category {
+            VehicleCategory::Cars => &mut self.cars,
+            VehicleCategory::Armor => &mut self.armor,
+            VehicleCategory::Helis => &mut self.helis,
+            VehicleCategory::Planes => &mut self.planes,
+            VehicleCategory::Naval => &mut self.naval,
+            VehicleCategory::Other => &mut self.other,
+        };
+
+        if let Some(pos) = target_array.iter().position(|x| x == classname) {
+            Some(target_array.remove(pos))
+        } else {
+            None
+        }
+    }
+}
+
+impl Default for VGarage {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl FromArma for VGarage {
+    fn from_arma(s: String) -> Result<Self, arma_rs::FromArmaError> {
+        serde_json::from_str(&s)
+            .map_err(|e| arma_rs::FromArmaError::InvalidPrimitive(format!("Invalid JSON: {}", e)))
+    }
+}
+
+impl IntoArma for VGarage {
+    fn to_arma(&self) -> arma_rs::Value {
+        let json_str = serde_json::to_string(self).unwrap_or_default();
+        arma_rs::Value::String(json_str)
+    }
+}
diff --git a/lib/models/src/v_locker.rs b/lib/models/src/v_locker.rs
new file mode 100644
index 0000000..9c2bd0a
--- /dev/null
+++ b/lib/models/src/v_locker.rs
@@ -0,0 +1,88 @@
+use arma_rs::{FromArma, IntoArma};
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum EquipmentCategory {
+    Items,
+    Weapons,
+    Magazines,
+    Backpacks,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct VLocker {
+    pub items: Vec<String>,
+    pub weapons: Vec<String>,
+    pub magazines: Vec<String>,
+    pub backpacks: Vec<String>,
+}
+
+impl VLocker {
+    pub fn new() -> Self {
+        Self {
+            items: Vec::new(),
+            weapons: Vec::new(),
+            magazines: Vec::new(),
+            backpacks: Vec::new(),
+        }
+    }
+
+    pub fn add(&mut self, category: EquipmentCategory, classnames: Vec<String>) {
+        let target_array = match category {
+            EquipmentCategory::Items => &mut self.items,
+            EquipmentCategory::Weapons => &mut self.weapons,
+            EquipmentCategory::Magazines => &mut self.magazines,
+            EquipmentCategory::Backpacks => &mut self.backpacks,
+        };
+
+        for classname in classnames {
+            if !target_array.contains(&classname) {
+                target_array.push(classname);
+            }
+        }
+    }
+
+    pub fn get(&self, category: EquipmentCategory) -> &Vec<String> {
+        match category {
+            EquipmentCategory::Items => &self.items,
+            EquipmentCategory::Weapons => &self.weapons,
+            EquipmentCategory::Magazines => &self.magazines,
+            EquipmentCategory::Backpacks => &self.backpacks,
+        }
+    }
+
+    pub fn remove(&mut self, category: EquipmentCategory, classname: &str) -> Option<String> {
+        let target_array = match category {
+            EquipmentCategory::Items => &mut self.items,
+            EquipmentCategory::Weapons => &mut self.weapons,
+            EquipmentCategory::Magazines => &mut self.magazines,
+            EquipmentCategory::Backpacks => &mut self.backpacks,
+        };
+
+        if let Some(pos) = target_array.iter().position(|x| x == classname) {
+            Some(target_array.remove(pos))
+        } else {
+            None
+        }
+    }
+}
+
+impl Default for VLocker {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl FromArma for VLocker {
+    fn from_arma(s: String) -> Result<Self, arma_rs::FromArmaError> {
+        serde_json::from_str(&s)
+            .map_err(|e| arma_rs::FromArmaError::InvalidPrimitive(format!("Invalid JSON: {}", e)))
+    }
+}
+
+impl IntoArma for VLocker {
+    fn to_arma(&self) -> arma_rs::Value {
+        let json_str = serde_json::to_string(self).unwrap_or_default();
+        arma_rs::Value::String(json_str)
+    }
+}
diff --git a/lib/repositories/src/garage.rs b/lib/repositories/src/garage.rs
new file mode 100644
index 0000000..eadab6e
--- /dev/null
+++ b/lib/repositories/src/garage.rs
@@ -0,0 +1,91 @@
+//! Garage repository implementation for vehicle data persistence operations.
+//!
+//! This module provides the data access layer for vehicle garage management.
+//! Each player's garage is stored as a single JSON string containing all their vehicles.
+
+use forge_models::{Garage, Vehicle};
+use forge_shared::RedisClient;
+use std::collections::HashMap;
+
+/// Repository trait defining the contract for garage data operations.
+pub trait GarageRepository: Send + Sync {
+    /// Creates a new garage for a player
+    fn create(&self, uid: &str, garage: &Garage) -> Result<(), String>;
+
+    /// Updates an existing garage with new vehicle data
+    fn update(&self, uid: &str, garage: &Garage) -> Result<(), String>;
+
+    /// Retrieves a player's garage
+    fn get(&self, uid: &str) -> Result<Option<Garage>, String>;
+
+    /// Deletes a player's garage (all vehicles)
+    fn delete(&self, uid: &str) -> Result<(), String>;
+
+    /// Checks if a player has a garage
+    fn exists(&self, uid: &str) -> Result<bool, String>;
+}
+
+/// Redis-based implementation of the GarageRepository trait.
+///
+/// Stores each player's garage as a single JSON string array with the key format `garage:{uid}`.
+pub struct RedisGarageRepository<C: RedisClient> {
+    client: C,
+}
+
+impl<C: RedisClient> RedisGarageRepository<C> {
+    pub fn new(client: C) -> Self {
+        Self { client }
+    }
+}
+
+impl<C: RedisClient> GarageRepository for RedisGarageRepository<C> {
+    fn create(&self, uid: &str, garage: &Garage) -> Result<(), String> {
+        let redis_key = format!("garage:{}", uid);
+
+        // Serialize just the vehicles array
+        let garage_json = serde_json::to_string(&garage.vehicles)
+            .map_err(|e| format!("Failed to serialize garage: {}", e))?;
+
+        // Store as a simple string value
+        self.client.set_key(redis_key, garage_json)
+    }
+
+    fn update(&self, uid: &str, garage: &Garage) -> Result<(), String> {
+        let redis_key = format!("garage:{}", uid);
+
+        // Serialize just the vehicles array
+        let garage_json = serde_json::to_string(&garage.vehicles)
+            .map_err(|e| format!("Failed to serialize garage: {}", e))?;
+
+        // Update the existing garage
+        self.client.set_key(redis_key, garage_json)
+    }
+
+    fn get(&self, uid: &str) -> Result<Option<Garage>, String> {
+        let redis_key = format!("garage:{}", uid);
+
+        // Get the JSON string from Redis
+        let garage_string = self.client.get_key(redis_key)?;
+
+        // Return None if no data found
+        if garage_string.is_empty() {
+            return Ok(None);
+        }
+
+        // Deserialize the vehicles data
+        match serde_json::from_str::<HashMap<String, Vehicle>>(&garage_string) {
+            Ok(vehicles) => Ok(Some(Garage { vehicles })),
+            Err(e) => Err(format!("Failed to deserialize garage: {}", e)),
+        }
+    }
+
+    fn delete(&self, uid: &str) -> Result<(), String> {
+        let redis_key = format!("garage:{}", uid);
+        self.client.delete_key(redis_key)
+    }
+
+    fn exists(&self, uid: &str) -> Result<bool, String> {
+        let redis_key = format!("garage:{}", uid);
+        self.client.key_exists(redis_key)
+    }
+}
diff --git a/lib/repositories/src/lib.rs b/lib/repositories/src/lib.rs
index 3860e2b..aca474b 100644
--- a/lib/repositories/src/lib.rs
+++ b/lib/repositories/src/lib.rs
@@ -1,10 +1,18 @@
 pub mod actor;
 pub mod bank;
+pub mod garage;
+pub mod locker;
 pub mod org;
+pub mod v_garage;
+pub mod v_locker;
 
 pub use actor::{ActorRepository, RedisActorRepository};
 pub use bank::{BankRepository, RedisBankRepository};
+pub use garage::{GarageRepository, RedisGarageRepository};
+pub use locker::{LockerRepository, RedisLockerRepository};
 pub use org::{OrgRepository, RedisOrgRepository};
+pub use v_garage::{RedisVGarageRepository, VGarageRepository};
+pub use v_locker::{RedisVLockerRepository, VLockerRepository};
 
 // Re-export RedisClient from shared library for convenience
 pub use forge_shared::RedisClient;
diff --git a/lib/repositories/src/locker.rs b/lib/repositories/src/locker.rs
new file mode 100644
index 0000000..7559a74
--- /dev/null
+++ b/lib/repositories/src/locker.rs
@@ -0,0 +1,91 @@
+//! Locker repository implementation for item data persistence operations.
+//!
+//! This module provides the data access layer for locker management.
+//! Each player's locker is stored as a single JSON string containing all their items.
+
+use forge_models::{Item, Locker};
+use forge_shared::RedisClient;
+use std::collections::HashMap;
+
+/// Repository trait defining the contract for locker data operations.
+pub trait LockerRepository: Send + Sync {
+    /// Creates a new locker for a player
+    fn create(&self, uid: &str, locker: &Locker) -> Result<(), String>;
+
+    /// Updates an existing locker with new item data
+    fn update(&self, uid: &str, locker: &Locker) -> Result<(), String>;
+
+    /// Retrieves a player's locker
+    fn get(&self, uid: &str) -> Result<Option<Locker>, String>;
+
+    /// Deletes a player's locker (all items)
+    fn delete(&self, uid: &str) -> Result<(), String>;
+
+    /// Checks if a player has a locker
+    fn exists(&self, uid: &str) -> Result<bool, String>;
+}
+
+/// Redis-based implementation of the LockerRepository trait.
+///
+/// Stores each player's locker as a single JSON string array with the key format `locker:{uid}`.
+pub struct RedisLockerRepository<C: RedisClient> {
+    client: C,
+}
+
+impl<C: RedisClient> RedisLockerRepository<C> {
+    pub fn new(client: C) -> Self {
+        Self { client }
+    }
+}
+
+impl<C: RedisClient> LockerRepository for RedisLockerRepository<C> {
+    fn create(&self, uid: &str, locker: &Locker) -> Result<(), String> {
+        let redis_key = format!("locker:{}", uid);
+
+        // Serialize just the items array
+        let locker_json = serde_json::to_string(&locker.items)
+            .map_err(|e| format!("Failed to serialize locker: {}", e))?;
+
+        // Store as a simple string value
+        self.client.set_key(redis_key, locker_json)
+    }
+
+    fn update(&self, uid: &str, locker: &Locker) -> Result<(), String> {
+        let redis_key = format!("locker:{}", uid);
+
+        // Serialize just the items array
+        let locker_json = serde_json::to_string(&locker.items)
+            .map_err(|e| format!("Failed to serialize locker: {}", e))?;
+
+        // Update the existing locker
+        self.client.set_key(redis_key, locker_json)
+    }
+
+    fn get(&self, uid: &str) -> Result<Option<Locker>, String> {
+        let redis_key = format!("locker:{}", uid);
+
+        // Get the JSON string from Redis
+        let locker_string = self.client.get_key(redis_key)?;
+
+        // Return None if no data found
+        if locker_string.is_empty() {
+            return Ok(None);
+        }
+
+        // Deserialize the items data
+        match serde_json::from_str::<HashMap<String, Item>>(&locker_string) {
+            Ok(items) => Ok(Some(Locker { items })),
+            Err(e) => Err(format!("Failed to deserialize locker: {}", e)),
+        }
+    }
+
+    fn delete(&self, uid: &str) -> Result<(), String> {
+        let redis_key = format!("locker:{}", uid);
+        self.client.delete_key(redis_key)
+    }
+
+    fn exists(&self, uid: &str) -> Result<bool, String> {
+        let redis_key = format!("locker:{}", uid);
+        self.client.key_exists(redis_key)
+    }
+}
diff --git a/lib/repositories/src/v_garage.rs b/lib/repositories/src/v_garage.rs
new file mode 100644
index 0000000..e9e0e00
--- /dev/null
+++ b/lib/repositories/src/v_garage.rs
@@ -0,0 +1,152 @@
+//! Virtual garage repository implementation for item data persistence operations.
+//!
+//! This module provides the data access layer for virtual garage management.
+//! Each player's virtual garage is stored as a Redis hash with six fields:
+//! - cars: JSON array of car classnames
+//! - armor: JSON array of armor classnames
+//! - helis: JSON array of helis classnames
+//! - planes: JSON array of plane classnames
+//! - naval: JSON array of naval classnames
+//! - other: JSON array of other classnames
+
+use forge_models::VGarage;
+use forge_shared::{RedisClient, parse_json_value, parse_redis_value};
+
+/// Repository trait defining the contract for virtual garage data operations.
+pub trait VGarageRepository: Send + Sync {
+    /// Creates a new virtual garage for a player
+    fn create(&self, uid: &str, garage: &VGarage) -> Result<(), String>;
+
+    /// Updates an existing virtual garage with new item data
+    fn update(&self, uid: &str, garage: &VGarage) -> Result<(), String>;
+
+    /// Retrieves a player's virtual garage
+    fn fetch(&self, uid: &str) -> Result<Option<VGarage>, String>;
+
+    /// Retrieves a specific field from a player's virtual garage
+    /// Fields: "cars", "armor", "helis", "planes", "naval", "other"
+    fn get(&self, uid: &str, field: &str) -> Result<Vec<String>, String>;
+
+    /// Deletes a player's virtual garage (all items)
+    fn delete(&self, uid: &str) -> Result<(), String>;
+
+    /// Checks if a player has a virtual garage
+    fn exists(&self, uid: &str) -> Result<bool, String>;
+}
+
+/// Redis-based implementation of the VGarageRepository trait.
+///
+/// Stores each player's virtual garage as a Redis hash with six fields:
+/// - cars: JSON array of car classnames
+/// - armor: JSON array of armor classnames
+/// - helis: JSON array of helis classnames
+/// - planes: JSON array of plane classnames
+/// - naval: JSON array of naval classnames
+/// - other: JSON array of other classnames
+///
+/// Key format: `vgarage:{uid}`
+pub struct RedisVGarageRepository<C: RedisClient> {
+    client: C,
+}
+
+impl<C: RedisClient> RedisVGarageRepository<C> {
+    pub fn new(client: C) -> Self {
+        Self { client }
+    }
+}
+
+impl<C: RedisClient> VGarageRepository for RedisVGarageRepository<C> {
+    fn create(&self, uid: &str, garage: &VGarage) -> Result<(), String> {
+        let redis_key = format!("owned:garage:{}", uid);
+
+        // Serialize locker to JSON string
+        let garage_json = serde_json::to_string(garage)
+            .map_err(|e| format!("Failed to serialize garage: {}", e))?;
+
+        // Parse JSON string back to Value for field extraction
+        let json_value: serde_json::Value = serde_json::from_str(&garage_json)
+            .map_err(|e| format!("Failed to parse garage JSON: {}", e))?;
+
+        // Extract fields from JSON object
+        if let serde_json::Value::Object(garage_map) = json_value {
+            // Convert each field to Redis-compatible format
+            let fields: Vec<(String, String)> = garage_map
+                .into_iter()
+                .map(|(field, value)| (field, parse_json_value(&value)))
+                .collect();
+
+            // Store all fields atomically using Redis HMSET
+            self.client.hash_mset(redis_key, fields)
+        } else {
+            Err("Failed to convert garage to object".to_string())
+        }
+    }
+
+    fn update(&self, uid: &str, garage: &VGarage) -> Result<(), String> {
+        // For a hash, update is the same as create - it's atomic
+        self.create(uid, garage)
+    }
+
+    fn fetch(&self, uid: &str) -> Result<Option<VGarage>, String> {
+        let redis_key = format!("owned:garage:{}", uid);
+
+        // Retrieve all hash fields from Redis
+        let garage_string = self.client.hash_get_all(redis_key)?;
+
+        // Return None if no data found (garage doesn't exist)
+        if garage_string.is_empty() {
+            return Ok(None);
+        }
+
+        // Parse comma-separated field-value pairs
+        let parts: Vec<&str> = garage_string.split(", ").collect();
+        let mut json_map = serde_json::Map::new();
+        let mut i = 0;
+
+        // Process pairs of field names and values
+        while i + 1 < parts.len() {
+            let key = parts[i];
+            let value = parts[i + 1];
+
+            // Convert Redis string value back to proper JSON type
+            let json_value = parse_redis_value(value);
+            json_map.insert(key.to_string(), json_value);
+
+            i += 2; // Move to next field-value pair
+        }
+
+        // Reconstruct VLocker from JSON object
+        let json_obj = serde_json::Value::Object(json_map);
+        match serde_json::from_value::<VGarage>(json_obj) {
+            Ok(garage) => Ok(Some(garage)),
+            // Return None for any deserialization errors (corrupted data)
+            Err(_) => Ok(None),
+        }
+    }
+
+    fn get(&self, uid: &str, field: &str) -> Result<Vec<String>, String> {
+        let redis_key = format!("owned:garage:{}", uid);
+
+        // Retrieve the specific field from the hash
+        let field_json = self.client.hash_get(redis_key, field.to_string())?;
+
+        // Return empty vector if field is empty
+        if field_json.is_empty() {
+            return Ok(Vec::new());
+        }
+
+        // Deserialize the JSON array
+        serde_json::from_str::<Vec<String>>(&field_json)
+            .map_err(|e| format!("Failed to deserialize field '{}': {}", field, e))
+    }
+
+    fn delete(&self, uid: &str) -> Result<(), String> {
+        let redis_key = format!("owned:garage:{}", uid);
+        self.client.delete_key(redis_key)
+    }
+
+    fn exists(&self, uid: &str) -> Result<bool, String> {
+        let redis_key = format!("owned:garage:{}", uid);
+        self.client.key_exists(redis_key)
+    }
+}
diff --git a/lib/repositories/src/v_locker.rs b/lib/repositories/src/v_locker.rs
new file mode 100644
index 0000000..54382d9
--- /dev/null
+++ b/lib/repositories/src/v_locker.rs
@@ -0,0 +1,148 @@
+//! Virtual locker repository implementation for item data persistence operations.
+//!
+//! This module provides the data access layer for virtual locker management.
+//! Each player's virtual locker is stored as a Redis hash with four fields:
+//! - items: JSON array of item classnames
+//! - weapons: JSON array of weapon classnames
+//! - magazines: JSON array of magazine classnames
+//! - backpacks: JSON array of backpack classnames
+
+use forge_models::VLocker;
+use forge_shared::{RedisClient, parse_json_value, parse_redis_value};
+
+/// Repository trait defining the contract for virtual locker data operations.
+pub trait VLockerRepository: Send + Sync {
+    /// Creates a new virtual locker for a player
+    fn create(&self, uid: &str, locker: &VLocker) -> Result<(), String>;
+
+    /// Updates an existing virtual locker with new item data
+    fn update(&self, uid: &str, locker: &VLocker) -> Result<(), String>;
+
+    /// Retrieves a player's virtual locker
+    fn fetch(&self, uid: &str) -> Result<Option<VLocker>, String>;
+
+    /// Retrieves a specific field from a player's virtual locker
+    /// Fields: "items", "weapons", "magazines", "backpacks"
+    fn get(&self, uid: &str, field: &str) -> Result<Vec<String>, String>;
+
+    /// Deletes a player's virtual locker (all items)
+    fn delete(&self, uid: &str) -> Result<(), String>;
+
+    /// Checks if a player has a virtual locker
+    fn exists(&self, uid: &str) -> Result<bool, String>;
+}
+
+/// Redis-based implementation of the VLockerRepository trait.
+///
+/// Stores each player's virtual locker as a Redis hash with four fields:
+/// - items: JSON array of item classnames
+/// - weapons: JSON array of weapon classnames
+/// - magazines: JSON array of magazine classnames
+/// - backpacks: JSON array of backpack classnames
+///
+/// Key format: `owned:locker:{uid}`
+pub struct RedisVLockerRepository<C: RedisClient> {
+    client: C,
+}
+
+impl<C: RedisClient> RedisVLockerRepository<C> {
+    pub fn new(client: C) -> Self {
+        Self { client }
+    }
+}
+
+impl<C: RedisClient> VLockerRepository for RedisVLockerRepository<C> {
+    fn create(&self, uid: &str, locker: &VLocker) -> Result<(), String> {
+        let redis_key = format!("owned:locker:{}", uid);
+
+        // Serialize locker to JSON string
+        let locker_json = serde_json::to_string(locker)
+            .map_err(|e| format!("Failed to serialize locker: {}", e))?;
+
+        // Parse JSON string back to Value for field extraction
+        let json_value: serde_json::Value = serde_json::from_str(&locker_json)
+            .map_err(|e| format!("Failed to parse locker JSON: {}", e))?;
+
+        // Extract fields from JSON object
+        if let serde_json::Value::Object(locker_map) = json_value {
+            // Convert each field to Redis-compatible format
+            let fields: Vec<(String, String)> = locker_map
+                .into_iter()
+                .map(|(field, value)| (field, parse_json_value(&value)))
+                .collect();
+
+            // Store all fields atomically using Redis HMSET
+            self.client.hash_mset(redis_key, fields)
+        } else {
+            Err("Failed to convert locker to object".to_string())
+        }
+    }
+
+    fn update(&self, uid: &str, locker: &VLocker) -> Result<(), String> {
+        // For a hash, update is the same as create - it's atomic
+        self.create(uid, locker)
+    }
+
+    fn fetch(&self, uid: &str) -> Result<Option<VLocker>, String> {
+        let redis_key = format!("owned:locker:{}", uid);
+
+        // Retrieve all hash fields from Redis
+        let locker_string = self.client.hash_get_all(redis_key)?;
+
+        // Return None if no data found (locker doesn't exist)
+        if locker_string.is_empty() {
+            return Ok(None);
+        }
+
+        // Parse comma-separated field-value pairs
+        let parts: Vec<&str> = locker_string.split(", ").collect();
+        let mut json_map = serde_json::Map::new();
+        let mut i = 0;
+
+        // Process pairs of field names and values
+        while i + 1 < parts.len() {
+            let key = parts[i];
+            let value = parts[i + 1];
+
+            // Convert Redis string value back to proper JSON type
+            let json_value = parse_redis_value(value);
+            json_map.insert(key.to_string(), json_value);
+
+            i += 2; // Move to next field-value pair
+        }
+
+        // Reconstruct VLocker from JSON object
+        let json_obj = serde_json::Value::Object(json_map);
+        match serde_json::from_value::<VLocker>(json_obj) {
+            Ok(locker) => Ok(Some(locker)),
+            // Return None for any deserialization errors (corrupted data)
+            Err(_) => Ok(None),
+        }
+    }
+
+    fn get(&self, uid: &str, field: &str) -> Result<Vec<String>, String> {
+        let redis_key = format!("owned:locker:{}", uid);
+
+        // Retrieve the specific field from the hash
+        let field_json = self.client.hash_get(redis_key, field.to_string())?;
+
+        // Return empty vector if field is empty
+        if field_json.is_empty() {
+            return Ok(Vec::new());
+        }
+
+        // Deserialize the JSON array
+        serde_json::from_str::<Vec<String>>(&field_json)
+            .map_err(|e| format!("Failed to deserialize field '{}': {}", field, e))
+    }
+
+    fn delete(&self, uid: &str) -> Result<(), String> {
+        let redis_key = format!("owned:locker:{}", uid);
+        self.client.delete_key(redis_key)
+    }
+
+    fn exists(&self, uid: &str) -> Result<bool, String> {
+        let redis_key = format!("owned:locker:{}", uid);
+        self.client.key_exists(redis_key)
+    }
+}
diff --git a/lib/services/Cargo.toml b/lib/services/Cargo.toml
index 9eb3cb1..5ddf3b2 100644
--- a/lib/services/Cargo.toml
+++ b/lib/services/Cargo.toml
@@ -6,5 +6,7 @@ edition = "2024"
 [dependencies]
 forge-models = { path = "../models" }
 forge-repositories = { path = "../repositories" }
+forge-shared = { path = "../shared" }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
+uuid = { workspace = true }
diff --git a/lib/services/src/actor.rs b/lib/services/src/actor.rs
index f095821..16a780f 100644
--- a/lib/services/src/actor.rs
+++ b/lib/services/src/actor.rs
@@ -7,6 +7,7 @@
 
 use forge_models::Actor;
 use forge_repositories::ActorRepository;
+use forge_shared::{generate_email, generate_phone_number};
 
 /// Service layer implementation for actor business logic and operations.
 ///
@@ -35,48 +36,48 @@ impl<R: ActorRepository> ActorService<R> {
     ///
     /// Handles validation, duplicate checking, and persistence.
     /// See [crate README](../README.md) for JSON format and business rules.
-    pub fn create_actor(&self, actor_id: String, json_data: String) -> Result<Actor, String> {
-        // Create base actor with the provided UID
-        let new_actor = Actor::new(actor_id.clone()).map_err(|e| e.to_string())?;
-
-        // Check if actor already exists to prevent duplicates
-        if self.repository.exists(&actor_id)? {
-            return Err(format!("Actor with UID '{}' already exists", actor_id));
-        }
-
-        // Parse and validate JSON input
-        let json_obj: serde_json::Value =
+    pub fn create_actor(&self, key: String, json_data: String) -> Result<Actor, String> {
+        // Parse JSON data to Actor struct
+        let mut actor: Actor =
             serde_json::from_str(&json_data).map_err(|e| format!("Invalid Actor JSON: {}", e))?;
 
-        // Ensure JSON is an object (not array, string, etc.)
-        if let serde_json::Value::Object(mut map) = json_obj {
-            // Remove UID field to prevent conflicts (UID is immutable)
-            map.remove("uid");
-            let update_data = serde_json::Value::Object(map);
+        // Set UID from parameter (authoritative source)
+        actor.uid = key;
 
-            // Apply JSON data to the base actor
-            let mut final_actor = new_actor;
-            final_actor.update_from_json(update_data)?;
-
-            // Store the actor in the repository
-            self.repository.create(&final_actor)?;
-            Ok(final_actor)
-        } else {
-            Err("JSON data must be an object".to_string())
+        // Check if actor already exists to prevent duplicates
+        if self.repository.exists(&actor.uid)? {
+            return Err(format!("Actor with UID '{}' already exists", actor.uid));
         }
+
+        // Generate phone number and email if they're empty (for new actors)
+        if actor.phone_number.is_empty() {
+            actor.phone_number = generate_phone_number(&actor.uid);
+        }
+        if actor.email.is_empty() {
+            actor.email = generate_email(&actor.phone_number);
+        }
+
+        // Validate before persisting
+        actor
+            .validate()
+            .map_err(|e| format!("Validation failed: {}", e))?;
+
+        // Store the actor in the repository
+        self.repository.create(&actor)?;
+        Ok(actor)
     }
 
     /// Retrieves an actor by their unique identifier with automatic fallback creation.
     ///
     /// Implements a "get-or-create" pattern: if the actor doesn't exist, a new one
     /// with default values is returned (but not persisted).
-    pub fn get_actor(&self, actor_id: String) -> Result<Actor, String> {
+    pub fn get_actor(&self, key: String) -> Result<Actor, String> {
         // Attempt to retrieve actor from repository
-        match self.repository.get_by_id(&actor_id)? {
+        match self.repository.get_by_id(&key)? {
             // Actor found - return it
             Some(actor) => Ok(actor),
             // Actor not found - create fallback actor with default values
-            None => Actor::new(actor_id).map_err(|e| e.to_string()),
+            None => Actor::new(key).map_err(|e| e.to_string()),
         }
     }
 
@@ -84,11 +85,11 @@ impl<R: ActorRepository> ActorService<R> {
     ///
     /// Handles partial updates, validation, and persistence.
     /// See [crate README](../README.md) for JSON format and concurrency details.
-    pub fn update_actor(&self, actor_id: String, json_update: String) -> Result<Actor, String> {
+    pub fn update_actor(&self, key: String, json_update: String) -> Result<Actor, String> {
         // Retrieve existing actor from repository
-        let mut actor = match self.repository.get_by_id(&actor_id)? {
+        let mut actor = match self.repository.get_by_id(&key)? {
             Some(actor) => actor,
-            None => return Err(format!("Actor with UID '{}' not found", actor_id)),
+            None => return Err(format!("Actor with UID '{}' not found", key)),
         };
 
         // Parse and validate JSON update data
@@ -100,8 +101,120 @@ impl<R: ActorRepository> ActorService<R> {
             return Err("Update data must be a JSON object".to_string());
         }
 
-        // Apply updates to the actor (this validates the changes)
-        actor.update_from_json(update_data)?;
+        // Create a temporary copy to safely apply updates with validation
+        let mut updated_actor = actor.clone();
+
+        // Apply updates field by field
+        if let Some(obj) = update_data.as_object() {
+            for (field, value) in obj {
+                match field.as_str() {
+                    "uid" => {
+                        // Skip UID - it's immutable and set by the system
+                        continue;
+                    }
+                    "name" => {
+                        updated_actor.name = if value.is_null() {
+                            None
+                        } else {
+                            value.as_str().map(|s| s.to_string())
+                        };
+                    }
+                    "position" => {
+                        updated_actor.position = if value.is_null() {
+                            None
+                        } else if let Some(arr) = value.as_array() {
+                            let coords: Result<Vec<f64>, _> = arr
+                                .iter()
+                                .map(|v| v.as_f64().ok_or("Invalid coordinate"))
+                                .collect();
+                            match coords {
+                                Ok(pos) if pos.len() == 3 => Some(pos),
+                                _ => return Err("Position must be [x, y, z] array".to_string()),
+                            }
+                        } else {
+                            return Err("Position must be an array".to_string());
+                        };
+                    }
+                    "direction" => {
+                        if let Some(dir_val) = value.as_f64() {
+                            updated_actor.direction = dir_val % 360.0;
+                            if updated_actor.direction < 0.0 {
+                                updated_actor.direction += 360.0;
+                            }
+                        } else {
+                            return Err("Direction must be a number".to_string());
+                        }
+                    }
+                    "stance" => {
+                        updated_actor.stance = if value.is_null() {
+                            None
+                        } else {
+                            value.as_str().map(|s| s.to_string())
+                        };
+                    }
+                    "email" => {
+                        if let Some(email_str) = value.as_str() {
+                            updated_actor.email = email_str.to_string();
+                        } else {
+                            return Err("Email must be a string".to_string());
+                        }
+                    }
+                    "phone_number" => {
+                        if let Some(phone_str) = value.as_str() {
+                            updated_actor.phone_number = phone_str.to_string();
+                        } else {
+                            return Err("Phone number must be a string".to_string());
+                        }
+                    }
+                    "state" => {
+                        if let Some(state_str) = value.as_str() {
+                            updated_actor.state = state_str.to_uppercase();
+                        } else {
+                            return Err("State must be a string".to_string());
+                        }
+                    }
+                    "holster" => {
+                        if let Some(holster_val) = value.as_bool() {
+                            updated_actor.holster = holster_val;
+                        } else {
+                            return Err("Holster must be a boolean".to_string());
+                        }
+                    }
+                    "rank" => {
+                        updated_actor.rank = if value.is_null() {
+                            None
+                        } else if let Some(rank_str) = value.as_str() {
+                            Some(rank_str.to_string())
+                        } else {
+                            return Err("Rank must be a string or null".to_string());
+                        };
+                    }
+                    "organization" => {
+                        updated_actor.organization = if value.is_null() {
+                            String::new()
+                        } else if let Some(org_str) = value.as_str() {
+                            org_str.to_string()
+                        } else {
+                            return Err("Organization must be a string or null".to_string());
+                        };
+                    }
+                    "loadout" => {
+                        updated_actor.loadout = value.clone();
+                    }
+                    _ => {
+                        return Err(format!("Unknown field: {}", field));
+                    }
+                }
+            }
+        }
+
+        // Validate the updated actor before committing changes
+        updated_actor
+            .validate()
+            .map_err(|e| format!("Validation failed: {}", e))?;
+
+        // Only commit changes after validation passes
+        actor = updated_actor;
 
         // Persist the updated actor to repository
         self.repository.update(&actor)?;
@@ -112,22 +225,22 @@ impl<R: ActorRepository> ActorService<R> {
     /// Permanently deletes an actor from the system.
     ///
     /// Irreversible operation. Delegates to repository.
-    pub fn delete_actor(&self, actor_id: String) -> Result<(), String> {
+    pub fn delete_actor(&self, key: String) -> Result<(), String> {
         // Delegate deletion to repository layer
         // Future enhancements could add business logic here:
         // - Authorization checks
         // - Audit logging
         // - Cascade deletion
         // - Soft deletion
-        self.repository.delete(&actor_id)
+        self.repository.delete(&key)
     }
 
     /// Checks if an actor exists in the system.
     ///
     /// Lightweight check without data retrieval.
-    pub fn actor_exists(&self, actor_id: String) -> Result<bool, String> {
+    pub fn actor_exists(&self, key: String) -> Result<bool, String> {
         // Delegate existence check to repository layer
         // This is a lightweight operation that doesn't retrieve data
-        self.repository.exists(&actor_id)
+        self.repository.exists(&key)
     }
 }
diff --git a/lib/services/src/bank.rs b/lib/services/src/bank.rs
index 2ad20eb..452c817 100644
--- a/lib/services/src/bank.rs
+++ b/lib/services/src/bank.rs
@@ -35,12 +35,13 @@ impl<R: BankRepository> BankService<R> {
     ///
     /// Handles validation, duplicate checking, and persistence.
     /// See [crate README](../README.md) for JSON format and business rules.
-    pub fn create(&self, uid: String, json_data: String) -> Result<Bank, String> {
+    pub fn create(&self, key: String, json_data: String) -> Result<Bank, String> {
         // Parse JSON data to Bank struct
         let mut bank: Bank =
             serde_json::from_str(&json_data).map_err(|e| format!("Invalid Bank JSON: {}", e))?;
 
-        bank.uid = uid;
+        // Set UID from parameter (authoritative source)
+        bank.uid = key;
 
         // Check if bank already exists to prevent duplicates
         if self.repository.exists(&bank.uid)? {
@@ -60,13 +61,13 @@ impl<R: BankRepository> BankService<R> {
     ///
     /// Implements a "get-or-create" pattern: if the bank doesn't exist, a new one
     /// with default values is returned (but not persisted).
-    pub fn get_bank(&self, bank_id: String) -> Result<Bank, String> {
+    pub fn get_bank(&self, key: String) -> Result<Bank, String> {
         // Attempt to retrieve bank from repository
-        match self.repository.get_by_id(&bank_id)? {
+        match self.repository.get_by_id(&key)? {
             // Bank found - return it
             Some(bank) => Ok(bank),
             // Bank not found - create fallback bank with default values
-            None => Err(format!("Bank with UID '{}' not found", bank_id)),
+            None => Err(format!("Bank with UID '{}' not found", key)),
         }
     }
 
@@ -74,11 +75,11 @@ impl<R: BankRepository> BankService<R> {
     ///
     /// Handles partial updates, validation, and persistence.
     /// See [crate README](../README.md) for JSON format and concurrency details.
-    pub fn update_bank(&self, bank_id: String, json_update: String) -> Result<Bank, String> {
+    pub fn update_bank(&self, key: String, json_update: String) -> Result<Bank, String> {
         // Retrieve existing bank from repository
-        let mut bank = match self.repository.get_by_id(&bank_id)? {
+        let mut bank = match self.repository.get_by_id(&key)? {
             Some(bank) => bank,
-            None => return Err(format!("Bank with UID '{}' not found", bank_id)),
+            None => return Err(format!("Bank with UID '{}' not found", key)),
         };
 
         // Parse and validate JSON update data
@@ -90,8 +91,76 @@ impl<R: BankRepository> BankService<R> {
             return Err("Update data must be a JSON object".to_string());
         }
 
-        // Apply updates to the bank (this validates the changes)
-        bank.update_from_json(update_data)?;
+        // Create a temporary copy to safely apply updates with validation
+        let mut updated_bank = bank.clone();
+
+        // Apply updates field by field
+        if let Some(obj) = update_data.as_object() {
+            for (field, value) in obj {
+                match field.as_str() {
+                    "uid" => {
+                        // Skip UID - it's immutable and set by the system
+                        continue;
+                    }
+                    "name" => {
+                        if let Some(name) = value.as_str() {
+                            updated_bank.name = name.to_string();
+                        } else {
+                            return Err("Name must be a string".to_string());
+                        }
+                    }
+                    "bank" => {
+                        if let Some(bank_val) = value.as_f64() {
+                            updated_bank.bank = bank_val;
+                        } else {
+                            return Err("Bank balance must be a number".to_string());
+                        }
+                    }
+                    "cash" => {
+                        if let Some(cash_val) = value.as_f64() {
+                            updated_bank.cash = cash_val;
+                        } else {
+                            return Err("Cash must be a number".to_string());
+                        }
+                    }
+                    "earnings" => {
+                        if let Some(earnings_val) = value.as_f64() {
+                            updated_bank.earnings = earnings_val;
+                        } else {
+                            return Err("Earnings must be a number".to_string());
+                        }
+                    }
+                    "pin" => {
+                        if let Some(pin_val) = value.as_u64() {
+                            updated_bank.pin = pin_val;
+                        } else {
+                            return Err("PIN must be a number".to_string());
+                        }
+                    }
+                    "transactions" => {
+                        if let Some(arr) = value.as_array() {
+                            updated_bank.transactions = arr
+                                .iter()
+                                .filter_map(|v| v.as_str().map(|s| s.to_string()))
+                                .collect();
+                        } else {
+                            return Err("Transactions must be an array".to_string());
+                        }
+                    }
+                    _ => {
+                        return Err(format!("Unknown field: {}", field));
+                    }
+                }
+            }
+        }
+
+        // Validate the updated bank before committing changes
+        updated_bank
+            .validate()
+            .map_err(|e| format!("Validation failed: {}", e))?;
+
+        // Only commit changes after validation passes
+        bank = updated_bank;
 
         // Persist the updated bank to repository
         self.repository.update(&bank)?;
@@ -102,22 +171,22 @@ impl<R: BankRepository> BankService<R> {
     /// Permanently deletes an bank from the system.
     ///
     /// Irreversible operation. Delegates to repository.
-    pub fn delete_bank(&self, bank_id: String) -> Result<(), String> {
+    pub fn delete_bank(&self, key: String) -> Result<(), String> {
         // Delegate deletion to repository layer
         // Future enhancements could add business logic here:
         // - Authorization checks
         // - Audit logging
         // - Cascade deletion
         // - Soft deletion
-        self.repository.delete(&bank_id)
+        self.repository.delete(&key)
     }
 
     /// Checks if an bank exists in the system.
     ///
     /// Lightweight check without data retrieval.
-    pub fn bank_exists(&self, bank_id: String) -> Result<bool, String> {
+    pub fn bank_exists(&self, key: String) -> Result<bool, String> {
         // Delegate existence check to repository layer
         // This is a lightweight operation that doesn't retrieve data
-        self.repository.exists(&bank_id)
+        self.repository.exists(&key)
     }
 }
diff --git a/lib/services/src/garage.rs b/lib/services/src/garage.rs
new file mode 100644
index 0000000..3b55f68
--- /dev/null
+++ b/lib/services/src/garage.rs
@@ -0,0 +1,172 @@
+//! Garage service layer providing business logic for vehicle garage management.
+//!
+//! Handles validation, storage, and retrieval of player vehicle garages.
+
+use forge_models::garage::{Garage, HitPoints, Vehicle};
+use forge_repositories::GarageRepository;
+use std::collections::HashMap;
+use uuid::Uuid;
+
+/// Service layer implementation for garage business logic and operations.
+pub struct GarageService<R: GarageRepository> {
+    repository: R,
+}
+
+impl<R: GarageRepository> GarageService<R> {
+    /// Creates a new garage service with the provided repository.
+    pub fn new(repository: R) -> Self {
+        Self { repository }
+    }
+
+    /// Creates a new empty garage for a player
+    pub fn create_garage(&self, key: String) -> Result<Garage, String> {
+        // Business rule: Check if garage already exists
+        if self.repository.exists(&key)? {
+            return Err(format!("Garage for '{}' already exists", key));
+        }
+
+        // Create empty garage (no vehicles)
+        let garage = Garage::new().map_err(|e| format!("Validation failed: {}", e))?;
+        self.repository.create(&key, &garage)?;
+
+        Ok(garage)
+    }
+
+    /// Replaces the entire garage content with the provided vehicles map
+    pub fn update_garage(
+        &self,
+        key: String,
+        vehicles: HashMap<String, Vehicle>,
+    ) -> Result<Garage, String> {
+        // Validate all vehicles
+        for vehicle in vehicles.values() {
+            vehicle
+                .validate()
+                .map_err(|e| format!("Validation failed for vehicle {}: {}", vehicle.plate, e))?;
+        }
+
+        // Create garage object
+        let garage = Garage { vehicles };
+
+        // Validate garage (capacity, etc.)
+        // Business rule: Check if garage has reached maximum capacity
+        if garage.vehicles.len() > 5 {
+            return Err("Garage exceeds maximum capacity of 5 vehicles.".to_string());
+        }
+
+        // Update repository
+        self.repository.update(&key, &garage)?;
+
+        Ok(garage)
+    }
+
+    pub fn patch_vehicle(
+        &self,
+        key: String,
+        plate: String,
+        damage: Option<f64>,
+        fuel: Option<f64>,
+        hit_points_json: Option<String>,
+    ) -> Result<Garage, String> {
+        let mut garage = self.repository.get(&key)?.unwrap_or(Garage {
+            vehicles: HashMap::new(),
+        });
+
+        if let Some(vehicle) = garage.vehicles.get_mut(&plate) {
+            if let Some(d) = damage {
+                vehicle.damage = d;
+            }
+            if let Some(f) = fuel {
+                vehicle.fuel = f;
+            }
+            if let Some(hp_json) = hit_points_json {
+                if let Ok(hp) = HitPoints::from_json_str(&hp_json) {
+                    vehicle.hit_points = hp;
+                }
+            }
+        } else {
+            return Err(format!("Vehicle with plate {} not found", plate));
+        }
+
+        self.repository.update(&key, &garage)?;
+        Ok(garage)
+    }
+
+    /// Adds a new vehicle to a player's garage
+    pub fn add_vehicle(
+        &self,
+        key: String,
+        classname: String,
+        fuel: f64,
+        damage: f64,
+        hit_points_json: String,
+    ) -> Result<Garage, String> {
+        // Get existing garage or create new one
+        let mut garage = match self.repository.get(&key)? {
+            Some(g) => g,
+            None => Garage::new().map_err(|e| format!("Failed to create garage: {}", e))?,
+        };
+
+        // Business rule: Check if garage has reached maximum capacity (5 vehicles)
+        if garage.vehicles.len() >= 5 {
+            return Err("Garage is full. Maximum of 5 vehicles allowed.".to_string());
+        }
+
+        // Generate a unique plate (vehicle ID) using UUID
+        let plate = Uuid::new_v4().to_string();
+
+        // Parse hit points from Arma 3 JSON
+        let hit_points = HitPoints::from_json_str(&hit_points_json)?;
+
+        // Create new vehicle entry with validation
+        let new_vehicle = Vehicle::new(plate, classname, fuel, damage, hit_points)
+            .map_err(|e| format!("Validation failed: {}", e))?;
+
+        // Add new vehicle to garage
+        garage
+            .add_vehicle(new_vehicle)
+            .map_err(|e| format!("Failed to add vehicle: {}", e))?;
+
+        // Update garage with new vehicle
+        self.repository.update(&key, &garage)?;
+
+        Ok(garage)
+    }
+
+    /// Retrieves a player's garage
+    pub fn get_garage(&self, key: String) -> Result<Garage, String> {
+        match self.repository.get(&key)? {
+            Some(garage) => Ok(garage),
+            None => Err(format!("No garage found for player '{}'", key)),
+        }
+    }
+
+    /// Removes a vehicle from the garage by plate number
+    pub fn remove_vehicle(&self, key: String, plate: String) -> Result<Garage, String> {
+        // Get existing garage
+        let mut garage = match self.repository.get(&key)? {
+            Some(g) => g,
+            None => return Err(format!("No garage found for player '{}'", key)),
+        };
+
+        // Remove the vehicle by plate
+        garage
+            .remove_vehicle(&plate)
+            .ok_or_else(|| format!("Vehicle with plate '{}' not found in garage", plate))?;
+
+        // Update garage after removing vehicle
+        self.repository.update(&key, &garage)?;
+
+        Ok(garage)
+    }
+
+    /// Deletes all vehicles from a player's garage
+    pub fn delete_garage(&self, key: String) -> Result<(), String> {
+        self.repository.delete(&key)
+    }
+
+    /// Checks if a player has a garage (even if empty)
+    pub fn garage_exists(&self, key: String) -> Result<bool, String> {
+        self.repository.exists(&key)
+    }
+}
diff --git a/lib/services/src/lib.rs b/lib/services/src/lib.rs
index 4eca7f5..e6c8162 100644
--- a/lib/services/src/lib.rs
+++ b/lib/services/src/lib.rs
@@ -1,7 +1,15 @@
 pub mod actor;
 pub mod bank;
+pub mod garage;
+pub mod locker;
 pub mod org;
+pub mod v_garage;
+pub mod v_locker;
 
 pub use actor::ActorService;
 pub use bank::BankService;
+pub use garage::GarageService;
+pub use locker::LockerService;
 pub use org::OrgService;
+pub use v_garage::VGarageService;
+pub use v_locker::VLockerService;
diff --git a/lib/services/src/locker.rs b/lib/services/src/locker.rs
new file mode 100644
index 0000000..af401b0
--- /dev/null
+++ b/lib/services/src/locker.rs
@@ -0,0 +1,143 @@
+//! Locker service layer providing business logic for item locker management.
+//!
+//! Handles validation, storage, and retrieval of player item lockers.
+
+use forge_models::locker::{Item, Locker};
+use forge_repositories::LockerRepository;
+use std::collections::HashMap;
+
+/// Service layer implementation for locker business logic and operations.
+pub struct LockerService<R: LockerRepository> {
+    repository: R,
+}
+
+impl<R: LockerRepository> LockerService<R> {
+    /// Creates a new locker service with the provided repository.
+    pub fn new(repository: R) -> Self {
+        Self { repository }
+    }
+
+    /// Creates a new empty locker for a player
+    pub fn create_locker(&self, uid: String) -> Result<Locker, String> {
+        // Business rule: Check if locker already exists
+        if self.repository.exists(&uid)? {
+            return Err(format!("Locker for '{}' already exists", uid));
+        }
+
+        // Create empty locker (no items)
+        let locker = Locker::new().map_err(|e| format!("Validation failed: {}", e))?;
+        self.repository.create(&uid, &locker)?;
+
+        Ok(locker)
+    }
+
+    /// Replaces the entire locker with new data (Bulk Sync).
+    pub fn update_locker(
+        &self,
+        key: String,
+        items: HashMap<String, Item>,
+    ) -> Result<Locker, String> {
+        let locker = Locker { items };
+
+        // Business rule: Check if locker has reached maximum capacity (25 items)
+        if locker.items.len() > 25 {
+            return Err("Locker exceeds maximum capacity of 25 items.".to_string());
+        }
+
+        self.repository.update(&key, &locker)?;
+        Ok(locker)
+    }
+
+    /// Adds a new item to a player's locker
+    pub fn add_item(&self, uid: String, item: Item) -> Result<Locker, String> {
+        // Get existing locker or create new one
+        let mut locker = match self.repository.get(&uid)? {
+            Some(l) => l,
+            None => Locker::new().map_err(|e| format!("Failed to create locker: {}", e))?,
+        };
+
+        // Business rule: Check if locker has reached maximum capacity (25 items)
+        // Only check if we are adding a NEW item (not updating existing)
+        if !locker.items.contains_key(&item.classname) && locker.items.len() >= 25 {
+            return Err("Locker is full. Maximum of 25 items allowed.".to_string());
+        }
+
+        // Add new item to locker (or overwrite existing)
+        locker
+            .add_item(item)
+            .map_err(|e| format!("Failed to add item: {}", e))?;
+
+        // Update locker with new item
+        self.repository.update(&uid, &locker)?;
+
+        Ok(locker)
+    }
+
+    /// Retrieves a player's locker
+    pub fn get_locker(&self, uid: String) -> Result<Locker, String> {
+        match self.repository.get(&uid)? {
+            Some(locker) => Ok(locker),
+            None => Err(format!("No locker found for player '{}'", uid)),
+        }
+    }
+
+    /// Patches an existing item in the locker
+    pub fn patch_item(
+        &self,
+        uid: String,
+        classname: String,
+        amount: Option<u32>,
+    ) -> Result<Locker, String> {
+        // Get existing locker
+        let mut locker = match self.repository.get(&uid)? {
+            Some(l) => l,
+            None => return Err(format!("No locker found for player '{}'", uid)),
+        };
+
+        // Find the item to update by classname
+        let existing_item = locker
+            .get_item_mut(&classname)
+            .ok_or_else(|| format!("Item with classname '{}' not found in locker", classname))?;
+
+        if let Some(a) = amount {
+            if a == 0 {
+                return Err("Amount cannot be zero".to_string());
+            }
+            existing_item.amount = a;
+        }
+
+        // Update locker with modified item
+        self.repository.update(&uid, &locker)?;
+
+        Ok(locker)
+    }
+
+    /// Removes an item from the locker
+    pub fn remove_item(&self, uid: String, classname: String) -> Result<Locker, String> {
+        // Get existing locker
+        let mut locker = match self.repository.get(&uid)? {
+            Some(l) => l,
+            None => return Err(format!("No locker found for player '{}'", uid)),
+        };
+
+        // Remove the item by classname
+        locker
+            .remove_item(&classname)
+            .ok_or_else(|| format!("Item with classname '{}' not found in locker", classname))?;
+
+        // Update locker after removing item
+        self.repository.update(&uid, &locker)?;
+
+        Ok(locker)
+    }
+
+    /// Deletes a player's locker (all items)
+    pub fn delete_locker(&self, uid: String) -> Result<(), String> {
+        self.repository.delete(&uid)
+    }
+
+    /// Checks if a player has a locker (even if empty)
+    pub fn locker_exists(&self, uid: String) -> Result<bool, String> {
+        self.repository.exists(&uid)
+    }
+}
diff --git a/lib/services/src/org.rs b/lib/services/src/org.rs
index 6c27658..58d1257 100644
--- a/lib/services/src/org.rs
+++ b/lib/services/src/org.rs
@@ -59,25 +59,20 @@ impl<R: OrgRepository> OrgService<R> {
         Ok(org)
     }
 
-    /// Retrieves an organization by its unique identifier with automatic fallback creation.
+    /// Retrieves an organization by its unique identifier with automatic fallback to default.
     ///
-    /// Implements a "get-or-create" pattern: if the organization doesn't exist, a new one
-    /// with default values is returned (but not persisted).
+    /// Implements a fallback pattern: if the organization doesn't exist, the
+    /// organization with ID "default" is retrieved from the repository.
     pub fn get_org(&self, key: String) -> Result<Org, String> {
         // Attempt to retrieve organization from repository
         match self.repository.get_by_id(&key)? {
             // Organization found - return it
             Some(org) => Ok(org),
-            // Organization not found - create fallback organization with default values
-            None => {
-                // Create new organization with empty leader and name (requires setup)
-                Org::new(
-                    key,
-                    "00000000000000000".to_string(),
-                    "Forge Dynamics".to_string(),
-                )
-                .map_err(|e| e.to_string())
-            }
+            // Organization not found - retrieve the default organization instead
+            None => self
+                .repository
+                .get_by_id("default")?
+                .ok_or_else(|| "Default organization not found".to_string()),
         }
     }
 
@@ -101,14 +96,63 @@ impl<R: OrgRepository> OrgService<R> {
             return Err("Update data must be a JSON object".to_string());
         }
 
-        // Apply updates to the organization (this validates the changes)
-        org.update_from_json(update_data)?;
+        // Create a temporary copy to safely apply updates with validation
+        let mut updated_org = org.clone();
 
-        // Validate organization name is not empty after update
-        if org.name.trim().is_empty() {
-            return Err("Organization name cannot be empty".to_string());
+        // Apply updates field by field
+        if let Some(obj) = update_data.as_object() {
+            for (field, value) in obj {
+                match field.as_str() {
+                    "id" => {
+                        if let Some(id_str) = value.as_str() {
+                            updated_org.id = id_str.to_string();
+                        } else {
+                            return Err("ID must be a string".to_string());
+                        }
+                    }
+                    "owner" => {
+                        if let Some(owner_str) = value.as_str() {
+                            updated_org.owner = owner_str.to_string();
+                        } else {
+                            return Err("Owner must be a string".to_string());
+                        }
+                    }
+                    "name" => {
+                        if let Some(name_str) = value.as_str() {
+                            updated_org.name = name_str.to_string();
+                        } else {
+                            return Err("Name must be a string".to_string());
+                        }
+                    }
+                    "funds" => {
+                        if let Some(funds_val) = value.as_f64() {
+                            updated_org.funds = funds_val;
+                        } else {
+                            return Err("Funds must be a number".to_string());
+                        }
+                    }
+                    "reputation" => {
+                        if let Some(rep_val) = value.as_i64() {
+                            updated_org.reputation = rep_val;
+                        } else {
+                            return Err("Reputation must be an integer".to_string());
+                        }
+                    }
+                    _ => {
+                        return Err(format!("Unknown field: {}", field));
+                    }
+                }
+            }
         }
 
+        // Validate the updated organization before committing changes
+        updated_org
+            .validate()
+            .map_err(|e| format!("Validation failed: {}", e))?;
+
+        // Only commit changes after validation passes
+        org = updated_org;
+
         // Persist the updated organization to repository
         self.repository.update(&org)?;
 
diff --git a/lib/services/src/v_garage.rs b/lib/services/src/v_garage.rs
new file mode 100644
index 0000000..7d8f468
--- /dev/null
+++ b/lib/services/src/v_garage.rs
@@ -0,0 +1,124 @@
+//! Virtual garage service layer providing business logic for garage management operations.
+//!
+//! Implements the service layer of the virtual garage system, handling business logic,
+//! validation, and orchestration.
+
+use forge_models::{VGarage, VehicleCategory};
+use forge_repositories::VGarageRepository;
+
+/// Service layer implementation for virtual garage business logic and operations.
+///
+/// Orchestrates virtual garage management operations, handling business logic, validation,
+/// and data transformation. Manages equipment storage across four categories: items,
+/// weapons, magazines, and backpacks.
+///
+/// # Thread Safety
+/// Thread-safe when used with a thread-safe repository.
+pub struct VGarageService<R: VGarageRepository> {
+    /// The repository instance used for all data persistence operations.
+    ///
+    /// This repository handles the actual storage and retrieval of garage data,
+    /// abstracting away the specific database implementation details.
+    repository: R,
+}
+
+impl<R: VGarageRepository> VGarageService<R> {
+    /// Creates a new garage service with the provided repository.
+    ///
+    /// The repository must be initialized and ready for use.
+    pub fn new(repository: R) -> Self {
+        Self { repository }
+    }
+
+    /// Creates a new empty virtual garage for a player.
+    ///
+    /// Handles duplicate checking and persistence.
+    pub fn create_garage(&self, uid: &str) -> Result<VGarage, String> {
+        // Business rule: Check if garage already exists
+        if self.repository.exists(uid)? {
+            return Err(format!("Garage for '{}' already exists", uid));
+        }
+
+        // Create empty garage (no items)
+        let garage = VGarage::new();
+        self.repository.create(uid, &garage)?;
+
+        Ok(garage)
+    }
+
+    /// Retrieves a player's virtual garage.
+    pub fn fetch_garage(&self, uid: &str) -> Result<VGarage, String> {
+        match self.repository.fetch(uid)? {
+            Some(garage) => Ok(garage),
+            None => Err(format!("No garage found for player '{}'", uid)),
+        }
+    }
+
+    /// Retrieves a specific field from a player's virtual garage.
+    ///
+    /// Fields: "cars", "armor", "heli", "planes", "naval", "other"
+    pub fn get_garage(&self, uid: &str, field: &str) -> Result<Vec<String>, String> {
+        self.repository.get(uid, field)
+    }
+
+    /// Adds classnames to a player's virtual garage.
+    pub fn add_garage(
+        &self,
+        uid: &str,
+        category: VehicleCategory,
+        classnames: Vec<String>,
+    ) -> Result<VGarage, String> {
+        let mut garage = match self.repository.fetch(uid)? {
+            Some(g) => g,
+            None => VGarage::new(),
+        };
+
+        garage.add(category, classnames);
+        self.repository.update(uid, &garage)?;
+
+        Ok(garage)
+    }
+
+    /// Removes a classname from a player's virtual garage.
+    pub fn remove_garage(
+        &self,
+        uid: &str,
+        category: VehicleCategory,
+        classname: &str,
+    ) -> Result<VGarage, String> {
+        let mut garage = match self.repository.fetch(uid)? {
+            Some(g) => g,
+            None => return Err(format!("No garage found for player '{}'", uid)),
+        };
+
+        if garage.remove(category, classname).is_none() {
+            return Err(format!("Item '{}' not found in garage", classname));
+        }
+
+        self.repository.update(uid, &garage)?;
+
+        Ok(garage)
+    }
+
+    /// Permanently deletes a player's virtual garage.
+    ///
+    /// Irreversible operation. Delegates to repository.
+    pub fn delete_garage(&self, uid: &str) -> Result<(), String> {
+        // Business rule: Check if garage exists
+        if !self.repository.exists(uid)? {
+            return Err(format!("No garage found for player '{}'", uid));
+        }
+
+        // Delete garage
+        self.repository.delete(uid)?;
+
+        Ok(())
+    }
+
+    /// Checks if a player has a virtual garage.
+    ///
+    /// Lightweight check without data retrieval.
+    pub fn garage_exists(&self, uid: &str) -> Result<bool, String> {
+        self.repository.exists(uid)
+    }
+}
diff --git a/lib/services/src/v_locker.rs b/lib/services/src/v_locker.rs
new file mode 100644
index 0000000..b6cf193
--- /dev/null
+++ b/lib/services/src/v_locker.rs
@@ -0,0 +1,124 @@
+//! Virtual locker service layer providing business logic for locker management operations.
+//!
+//! Implements the service layer of the virtual locker system, handling business logic,
+//! validation, and orchestration.
+
+use forge_models::{EquipmentCategory, VLocker};
+use forge_repositories::VLockerRepository;
+
+/// Service layer implementation for virtual locker business logic and operations.
+///
+/// Orchestrates virtual locker management operations, handling business logic, validation,
+/// and data transformation. Manages equipment storage across four categories: items,
+/// weapons, magazines, and backpacks.
+///
+/// # Thread Safety
+/// Thread-safe when used with a thread-safe repository.
+pub struct VLockerService<R: VLockerRepository> {
+    /// The repository instance used for all data persistence operations.
+    ///
+    /// This repository handles the actual storage and retrieval of locker data,
+    /// abstracting away the specific database implementation details.
+    repository: R,
+}
+
+impl<R: VLockerRepository> VLockerService<R> {
+    /// Creates a new locker service with the provided repository.
+    ///
+    /// The repository must be initialized and ready for use.
+    pub fn new(repository: R) -> Self {
+        Self { repository }
+    }
+
+    /// Creates a new empty locker for a player.
+    ///
+    /// Handles duplicate checking and persistence.
+    pub fn create_locker(&self, uid: &str) -> Result<VLocker, String> {
+        // Business rule: Check if locker already exists
+        if self.repository.exists(uid)? {
+            return Err(format!("Locker for '{}' already exists", uid));
+        }
+
+        // Create empty locker (no items)
+        let locker = VLocker::new();
+        self.repository.create(uid, &locker)?;
+
+        Ok(locker)
+    }
+
+    /// Retrieves a player's virtual locker.
+    pub fn fetch_locker(&self, uid: &str) -> Result<VLocker, String> {
+        match self.repository.fetch(uid)? {
+            Some(locker) => Ok(locker),
+            None => Err(format!("No locker found for player '{}'", uid)),
+        }
+    }
+
+    /// Retrieves a specific field from a player's virtual locker.
+    ///
+    /// Fields: "items", "weapons", "magazines", "backpacks"
+    pub fn get_locker(&self, uid: &str, field: &str) -> Result<Vec<String>, String> {
+        self.repository.get(uid, field)
+    }
+
+    /// Generic method to add items to any category.
+    pub fn add_locker(
+        &self,
+        uid: &str,
+        category: EquipmentCategory,
+        classnames: Vec<String>,
+    ) -> Result<VLocker, String> {
+        let mut locker = match self.repository.fetch(uid)? {
+            Some(l) => l,
+            None => VLocker::new(),
+        };
+
+        locker.add(category, classnames);
+        self.repository.update(uid, &locker)?;
+
+        Ok(locker)
+    }
+
+    /// Generic method to remove an item from any category.
+    pub fn remove_locker(
+        &self,
+        uid: &str,
+        category: EquipmentCategory,
+        classname: &str,
+    ) -> Result<VLocker, String> {
+        let mut locker = match self.repository.fetch(uid)? {
+            Some(l) => l,
+            None => return Err(format!("No locker found for player '{}'", uid)),
+        };
+
+        if locker.remove(category, classname).is_none() {
+            return Err(format!("Item '{}' not found in locker", classname));
+        }
+
+        self.repository.update(uid, &locker)?;
+
+        Ok(locker)
+    }
+
+    /// Permanently deletes a player's virtual locker.
+    ///
+    /// Irreversible operation. Delegates to repository.
+    pub fn delete_locker(&self, uid: &str) -> Result<(), String> {
+        // Business rule: Check if locker exists
+        if !self.repository.exists(uid)? {
+            return Err(format!("No locker found for player '{}'", uid));
+        }
+
+        // Delete locker
+        self.repository.delete(uid)?;
+
+        Ok(())
+    }
+
+    /// Checks if a player has a virtual locker.
+    ///
+    /// Lightweight check without data retrieval.
+    pub fn locker_exists(&self, uid: &str) -> Result<bool, String> {
+        self.repository.exists(uid)
+    }
+}
diff --git a/lib/shared/src/lib.rs b/lib/shared/src/lib.rs
index 7d92c7b..cf3eef6 100644
--- a/lib/shared/src/lib.rs
+++ b/lib/shared/src/lib.rs
@@ -2,7 +2,10 @@ pub mod redis_client;
 pub mod validation;
 
 pub use redis_client::{RedisClient, parse_json_value, parse_redis_value};
-pub use validation::{ActorValidationError, BankValidationError, OrgValidationError};
+pub use validation::{
+    ActorValidationError, BankValidationError, GarageValidationError, LockerValidationError,
+    OrgValidationError,
+};
 
 /// Converts an arma_rs::Value to a serde_json::Value.
 ///
@@ -23,3 +26,29 @@ pub fn arma_value_to_json(arma_value: &arma_rs::Value) -> serde_json::Value {
         arma_rs::Value::Unknown(s) => serde_json::Value::String(s.clone()),
     }
 }
+
+/// Generates a phone number from a UID.
+///
+/// Uses the last 6 digits of the UID and prefixes with 0160.
+pub fn generate_phone_number(uid: &str) -> String {
+    let uid_chars: Vec<char> = uid.chars().collect();
+    let uid_len = uid_chars.len();
+
+    if uid_len >= 6 {
+        let last_six: String = uid_chars[uid_len - 6..].iter().collect();
+        format!("0160{}", last_six)
+    } else {
+        format!("0160{:0>6}", uid)
+    }
+}
+
+/// Generates an email from a phone number.
+///
+/// Uses the phone number as the local part and @spearnet.mil as the domain.
+pub fn generate_email(phone_number: &str) -> String {
+    if phone_number.is_empty() {
+        String::new()
+    } else {
+        format!("{}@spearnet.mil", phone_number)
+    }
+}
diff --git a/lib/shared/src/redis_client.rs b/lib/shared/src/redis_client.rs
index 3513c5b..62503fd 100644
--- a/lib/shared/src/redis_client.rs
+++ b/lib/shared/src/redis_client.rs
@@ -17,6 +17,8 @@ pub trait RedisClient: Send + Sync {
     fn set_del(&self, key: String, member: String) -> Result<(), String>;
 
     // Common operations
+    fn get_key(&self, key: String) -> Result<String, String>;
+    fn set_key(&self, key: String, value: String) -> Result<(), String>;
     fn key_exists(&self, key: String) -> Result<bool, String>;
     fn delete_key(&self, key: String) -> Result<(), String>;
 }
diff --git a/lib/shared/src/validation.rs b/lib/shared/src/validation.rs
index 2abb143..5aa69eb 100644
--- a/lib/shared/src/validation.rs
+++ b/lib/shared/src/validation.rs
@@ -120,8 +120,7 @@ pub enum BankValidationError {
     NameEmpty,
     BankNegative,
     CashNegative,
-    InvalidEmail(String),
-    InvalidPhoneNumber(String),
+    InvalidPin(u64),
 }
 
 impl fmt::Display for BankValidationError {
@@ -131,18 +130,78 @@ impl fmt::Display for BankValidationError {
             BankValidationError::NameEmpty => write!(f, "Name cannot be empty"),
             BankValidationError::BankNegative => write!(f, "Bank balance cannot be negative"),
             BankValidationError::CashNegative => write!(f, "Cash cannot be negative"),
-            BankValidationError::InvalidEmail(email) => write!(
-                f,
-                "Invalid email format '{}' - must contain @ and end with .mil",
-                email
-            ),
-            BankValidationError::InvalidPhoneNumber(phone) => write!(
-                f,
-                "Invalid phone number '{}' - must start with 0160 and be 10 digits",
-                phone
-            ),
+            BankValidationError::InvalidPin(pin) => {
+                write!(f, "Invalid PIN format '{}' - must be a 4-digit number", pin)
+            }
         }
     }
 }
 
 impl std::error::Error for BankValidationError {}
+
+/// Validation errors for Garage model
+#[derive(Debug, Clone)]
+pub enum GarageValidationError {
+    UidEmpty,
+    ClassnameEmpty,
+    FuelInvalid,
+    DamageInvalid,
+    HitpointNamesEmpty,
+    SelectionNamesEmpty,
+    DamageValuesEmpty,
+    HitpointArrayLengthMismatch,
+    HitpointValueInvalid(usize),
+}
+
+impl fmt::Display for GarageValidationError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            GarageValidationError::UidEmpty => write!(f, "UID cannot be empty"),
+            GarageValidationError::ClassnameEmpty => write!(f, "Classname cannot be empty"),
+            GarageValidationError::FuelInvalid => write!(f, "Fuel must be between 0.0 and 1.0"),
+            GarageValidationError::DamageInvalid => write!(f, "Damage must be between 0.0 and 1.0"),
+            GarageValidationError::HitpointNamesEmpty => {
+                write!(f, "Hitpoint names cannot be empty")
+            }
+            GarageValidationError::SelectionNamesEmpty => {
+                write!(f, "Selection names cannot be empty")
+            }
+            GarageValidationError::DamageValuesEmpty => write!(f, "Damage values cannot be empty"),
+            GarageValidationError::HitpointArrayLengthMismatch => write!(
+                f,
+                "Hit point arrays (names, selections, values) must all have the same length"
+            ),
+            GarageValidationError::HitpointValueInvalid(index) => write!(
+                f,
+                "Hitpoint value at index {} is invalid - must be between 0.0 and 1.0",
+                index
+            ),
+        }
+    }
+}
+
+impl std::error::Error for GarageValidationError {}
+
+/// Validation errors for Locker model
+#[derive(Debug, Clone)]
+pub enum LockerValidationError {
+    UidEmpty,
+    CategoryEmpty,
+    ClassnameEmpty,
+    AmountZero,
+    ItemValidationError,
+}
+
+impl fmt::Display for LockerValidationError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            LockerValidationError::UidEmpty => write!(f, "UID cannot be empty"),
+            LockerValidationError::CategoryEmpty => write!(f, "Category cannot be empty"),
+            LockerValidationError::ClassnameEmpty => write!(f, "Classname cannot be empty"),
+            LockerValidationError::AmountZero => write!(f, "Amount cannot be zero"),
+            LockerValidationError::ItemValidationError => write!(f, "Item validation error"),
+        }
+    }
+}
+
+impl std::error::Error for LockerValidationError {}