diff --git a/Heimdall.lua b/Heimdall.lua
index 0996c16..2aa1c6b 100644
--- a/Heimdall.lua
+++ b/Heimdall.lua
@@ -37,6 +37,8 @@ local function init()
     ---@field Echoer InitTable
     ---@field Macroer InitTable
     ---@field Commander InitTable
+    ---@field StinkyTracker InitTable
+    ---@field CombatAlerter InitTable
 
     --- Config ---
     ---@class HeimdallConfig
@@ -52,6 +54,8 @@ local function init()
     ---@field echoer HeimdallEchoerConfig
     ---@field macroer HeimdallMacroerConfig
     ---@field commander HeimdallCommanderConfig
+    ---@field stinkyTracker HeimdallStinkyTrackerConfig
+    ---@field combatAlerter HeimdallCombatAlerterConfig
     ---@field whisperNotify table<string, string>
     ---@field stinkies table<string, boolean>
     ---@field agents table<string, string>
@@ -128,6 +132,14 @@ local function init()
     ---@field commander string
     ---@field commands table<string, boolean>
 
+    ---@class HeimdallStinkyTrackerConfig
+    ---@field enabled boolean
+    ---@field masterChannel string
+
+    ---@class HeimdallCombatAlerterConfig
+    ---@field enabled boolean
+    ---@field masterChannel string
+
     --- Data ---
     ---@class HeimdallMessengerData
     ---@field queue table<string, Message>
@@ -204,8 +216,8 @@ local function init()
             zoneOverride = shared.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "zoneOverride" }, nil),
             duelThrottle = shared.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "duelThrottle" }, 5),
         },
-        whisperNotify = shared.GetOrDefault(Heimdall_Data, { "config", "whisperNotify" }, { }),
-        stinkies = shared.GetOrDefault(Heimdall_Data, { "config", "stinkies" }, { }),
+        whisperNotify = shared.GetOrDefault(Heimdall_Data, { "config", "whisperNotify" }, {}),
+        stinkies = shared.GetOrDefault(Heimdall_Data, { "config", "stinkies" }, {}),
         inviter = {
             enabled = shared.GetOrDefault(Heimdall_Data, { "config", "inviter", "enabled" }, false),
             listeningChannel = shared.GetOrDefault(Heimdall_Data, { "config", "inviter", "listeningChannel" }, "Agent"),
@@ -226,7 +238,7 @@ local function init()
         },
         agentTracker = {
             enabled = shared.GetOrDefault(Heimdall_Data, { "config", "agentTracker", "enabled" }, false),
-           masterChannel = shared.GetOrDefault(Heimdall_Data, { "config", "agentTracker", "masterChannel" }, "Agent"),
+            masterChannel = shared.GetOrDefault(Heimdall_Data, { "config", "agentTracker", "masterChannel" }, "Agent"),
         },
         emoter = {
             enabled = shared.GetOrDefault(Heimdall_Data, { "config", "emoter", "enabled" }, false),
@@ -249,6 +261,14 @@ local function init()
             commander = shared.GetOrDefault(Heimdall_Data, { "config", "commander", "commander" }, "Heimdállr"),
             commands = shared.GetOrDefault(Heimdall_Data, { "config", "commander", "commands" }, {}),
         },
+        stinkyTracker = {
+            enabled = shared.GetOrDefault(Heimdall_Data, { "config", "stinkyTracker", "enabled" }, false),
+            masterChannel = shared.GetOrDefault(Heimdall_Data, { "config", "stinkyTracker", "masterChannel" }, "Agent"),
+        },
+        combatAlerter = {
+            enabled = shared.GetOrDefault(Heimdall_Data, { "config", "combatAlerter", "enabled" }, false),
+            masterChannel = shared.GetOrDefault(Heimdall_Data, { "config", "combatAlerter", "masterChannel" }, "Agent"),
+        },
     }
 
     shared.raceMap = {
@@ -343,6 +363,8 @@ local function init()
     shared.AgentTracker.Init()
     shared.Macroer.Init()
     shared.Commander.Init()
+    shared.StinkyTracker.Init()
+    shared.CombatAlerter.Init()
     print("Heimdall loaded!")
 end
 
@@ -352,4 +374,4 @@ loadedFrame:SetScript("OnEvent", function(self, event, addonName)
     if addonName == addonname then
         init()
     end
-end)
\ No newline at end of file
+end)
diff --git a/Heimdall.toc b/Heimdall.toc
index 254d6e4..7affc63 100644
--- a/Heimdall.toc
+++ b/Heimdall.toc
@@ -20,4 +20,6 @@ Modules/Emoter.lua
 Modules/Echoer.lua
 Modules/Macroer.lua
 Modules/Commander.lua
+Modules/StinkyTracker.lua
+Modules/CombatAlerter.lua
 Heimdall.lua
\ No newline at end of file
diff --git a/Modules/CombatAlerter.lua b/Modules/CombatAlerter.lua
new file mode 100644
index 0000000..9724e8b
--- /dev/null
+++ b/Modules/CombatAlerter.lua
@@ -0,0 +1,9 @@
+local addonname, shared = ...
+---@cast shared HeimdallShared
+---@cast addonname string
+
+---@diagnostic disable-next-line: missing-fields
+shared.CombatAlerter = {}
+function shared.CombatAlerter.Init()
+	print("Heimdall - CombatAlerter loaded")
+end
diff --git a/Modules/StinkyTracker.lua b/Modules/StinkyTracker.lua
new file mode 100644
index 0000000..93faaeb
--- /dev/null
+++ b/Modules/StinkyTracker.lua
@@ -0,0 +1,9 @@
+local addonname, shared = ...
+---@cast shared HeimdallShared
+---@cast addonname string
+
+---@diagnostic disable-next-line: missing-fields
+shared.StinkyTracker = {}
+function shared.StinkyTracker.Init()
+	print("Heimdall - StinkyTracker loaded")
+end