diff --git a/BossTimelines/Beloren.lua b/BossTimelines/Beloren.lua
new file mode 100644
index 0000000..1c4624f
--- /dev/null
+++ b/BossTimelines/Beloren.lua
@@ -0,0 +1,37 @@
+local _, NSI = ... -- Internal namespace
+
+--------------------------------------------------------------------------------
+-- BELO'REN (3182)
+-- Phoenix fight with ~110s cycles, intermissions at Death Drop
+--------------------------------------------------------------------------------
+
+local abilities = {
+    {name = "Voidlight Convergence", spellID = 1242515, category = "damage", phase = 1, times = {1, 82, 192, 302, 412}, duration = 4},
+    {name = "Light Dive", spellID = 1241291, category = "movement", phase = 1, times = {20, 101, 211, 321, 431}, duration = 3},
+    {name = "Void Edict", spellID = 1261218, category = "soak", phase = 1, times = {21, 107, 137, 217, 247, 327, 357, 437, 467, 487}, duration = 3},
+    {name = "Light Edict", spellID = 1261217, category = "soak", phase = 1, times = {26, 102, 132, 152, 212, 242, 262, 322, 352, 372, 432, 462, 482}, duration = 3},
+    {name = "Holy Burn", spellID = 1244348, category = "damage", phase = 1, times = {27, 108, 126, 148, 218, 236, 258, 328, 346, 368, 438, 456, 478}, duration = 3},
+    {name = "Death Drop", spellID = 1246709, category = "intermission", phase = 1, times = {40, 46, 150, 156, 260, 266, 370, 376}, duration = 3},
+    {name = "Incubation of Flames", spellID = 1242792, category = "intermission", phase = 1, times = {47, 157, 267, 377}, duration = 8},
+    {name = "Voidlight Edict", spellID = 1241640, category = "soak", phase = 1, times = {72, 112, 142, 222, 252, 332, 362}, duration = 3},
+    {name = "Light Quill", spellID = 1241992, category = "damage", phase = 1, times = {122, 232, 342, 452, 472}, duration = 3},
+    {name = "Guardian's Edict", spellID = 1260826, category = "soak", phase = 1, times = {128, 237, 347, 458}, duration = 4},
+    {name = "Radiant Echoes", spellID = 1242981, category = "damage", phase = 1, times = {158, 268, 378, 442, 488}, duration = 4},
+}
+
+local phases = {
+    [1] = {start = 0},
+}
+
+NSI.BossTimelines[3182] = {
+    Mythic = {
+        duration = 540,
+        phases = phases,
+        abilities = abilities,
+    },
+    Heroic = {
+        duration = 540,
+        phases = phases,
+        abilities = abilities,
+    },
+}
diff --git a/BossTimelines/BossTimelines.lua b/BossTimelines/BossTimelines.lua
new file mode 100644
index 0000000..afac9a3
--- /dev/null
+++ b/BossTimelines/BossTimelines.lua
@@ -0,0 +1,298 @@
+local _, NSI = ... -- Internal namespace
+
+--[[
+    Boss Timeline Data
+
+    Structure (nested by difficulty):
+    NSI.BossTimelines[encounterID] = {
+        Mythic = { ... },   -- Mythic difficulty timeline
+        Heroic = { ... },   -- Heroic difficulty timeline
+    }
+
+    Each difficulty contains:
+    {
+        duration = number,          -- Total fight duration in seconds
+        phases = {
+            [phaseNum] = {
+                start = number,     -- Default phase start time in seconds
+                name = string,      -- (optional) Phase display name
+                color = {r, g, b},  -- (optional) RGB color for phase (0-1 range)
+            },
+        },
+        abilities = {
+            {
+                name = string,          -- Ability name
+                spellID = number,       -- WoW spell ID for icon lookup
+                category = string,      -- Comma-separated keywords (see below)
+                phase = number,         -- Phase number (1, 2, 3, etc.)
+                times = {number, ...},  -- Array of cast times (seconds from phase start)
+                duration = number,      -- Ability duration in seconds (0 if instant)
+            },
+        },
+    }
+
+    Category Keywords (comma-separated, e.g. "raid damage, debuffs"):
+    - raid damage / damage: Raid-wide damage requiring healing cooldowns
+    - tankbuster / tank: Tank-specific mechanics (busters, swaps)
+    - frontal: Frontal cone attacks (often combined with tankbuster)
+    - movement: Positioning/movement mechanics
+    - soak / group soak: Soak mechanics requiring assignments
+    - debuffs: Debuff application mechanics
+    - healing absorb: Healing absorption effects
+    - knock: Knockback mechanics
+    - event: Special event or intermission
+    - intermission: Phase transition abilities
+]]
+
+-- Initialize the BossTimelines table
+NSI.BossTimelines = NSI.BossTimelines or {}
+
+-- Category colors for timeline display
+-- Maps category keywords to colors (supports compound categories like "raid damage, debuffs")
+NSI.BossTimelineColors = {
+    -- Damage categories (Red)
+    damage = {0.9, 0.3, 0.3},
+    ["raid damage"] = {0.9, 0.3, 0.3},
+
+    -- Tank categories (Blue)
+    tank = {0.3, 0.5, 0.9},
+    tankbuster = {0.3, 0.5, 0.9},
+    frontal = {0.3, 0.5, 0.9},
+
+    -- Movement categories (Yellow/Orange)
+    movement = {0.9, 0.7, 0.2},
+    knock = {0.9, 0.7, 0.2},
+
+    -- Soak categories (Green)
+    soak = {0.5, 0.9, 0.5},
+    ["group soak"] = {0.5, 0.9, 0.5},
+
+    -- Debuff/Healing categories (Pink/Magenta)
+    debuffs = {0.9, 0.5, 0.7},
+    ["healing absorb"] = {0.9, 0.5, 0.7},
+
+    -- Event/Intermission categories (Purple)
+    intermission = {0.7, 0.4, 0.9},
+    event = {0.7, 0.4, 0.9},
+}
+
+-- Category sort priority (lower = higher priority)
+NSI.BossTimelineCategoryOrder = {
+    -- Damage first
+    damage = 1,
+    ["raid damage"] = 1,
+    -- Then soak
+    soak = 2,
+    ["group soak"] = 2,
+    -- Then tank
+    tank = 3,
+    tankbuster = 3,
+    frontal = 3,
+    -- Then debuffs
+    debuffs = 4,
+    ["healing absorb"] = 4,
+    -- Then movement
+    movement = 5,
+    knock = 5,
+    -- Then events/intermission
+    event = 6,
+    intermission = 6,
+}
+
+-- Parse a compound category string and return color and sort order
+-- e.g., "raid damage, debuffs" -> color for "raid damage", order 1
+function NSI:ParseCategoryForDisplay(categoryStr)
+    if not categoryStr or categoryStr == "" then
+        return {0.7, 0.7, 0.7}, 99, "unknown" -- default gray
+    end
+
+    local color = nil
+    local order = 99
+    local primaryCategory = "unknown"
+
+    -- Split by comma and check each keyword
+    for keyword in categoryStr:gmatch("([^,]+)") do
+        keyword = strtrim(keyword):lower()
+
+        -- Check for color match (use first match found)
+        if not color and self.BossTimelineColors[keyword] then
+            color = self.BossTimelineColors[keyword]
+            primaryCategory = keyword
+        end
+
+        -- Check for sort order (use lowest/highest priority found)
+        local keywordOrder = self.BossTimelineCategoryOrder[keyword]
+        if keywordOrder and keywordOrder < order then
+            order = keywordOrder
+            if not color then
+                primaryCategory = keyword
+            end
+        end
+    end
+
+    return color or {0.7, 0.7, 0.7}, order, primaryCategory
+end
+
+-- Encounter name lookup
+NSI.BossTimelineNames = {
+    [3176] = "Imperator Averzian",
+    [3177] = "Vorasius",
+    [3178] = "Vaelgor & Ezzorak",
+    [3179] = "Fallen King Salhadaar",
+    [3180] = "Lightblinded Vanguard",
+    [3181] = "Crown of the Cosmos",
+    [3182] = "Belo'ren",
+    [3183] = "Midnight Falls",
+    [3306] = "Chimaerus",
+}
+
+--------------------------------------------------------------------------------
+-- HELPER FUNCTIONS
+--------------------------------------------------------------------------------
+
+-- Difficulty ID to name mapping
+NSI.DifficultyNames = {
+    [15] = "Heroic",
+    [16] = "Mythic",
+}
+
+-- Get current difficulty name, defaults to "Mythic" if unknown
+function NSI:GetCurrentDifficultyName()
+    local _, _, difficultyID = GetInstanceInfo()
+    return self.DifficultyNames[difficultyID] or "Mythic"
+end
+
+-- Get the timeline data for a specific encounter and difficulty
+-- Falls back to Mythic > Heroic > Normal if requested difficulty not available
+function NSI:GetBossTimeline(encounterID, difficulty)
+    local bossData = self.BossTimelines[encounterID]
+    if not bossData then return nil end
+
+    -- If difficulty specified, try that first
+    if difficulty and bossData[difficulty] then
+        return bossData[difficulty], difficulty
+    end
+
+    -- Auto-detect current difficulty
+    local currentDiff = self:GetCurrentDifficultyName()
+    if bossData[currentDiff] then
+        return bossData[currentDiff], currentDiff
+    end
+
+    -- Fallback chain: Mythic > Heroic
+    if bossData.Mythic then return bossData.Mythic, "Mythic" end
+    if bossData.Heroic then return bossData.Heroic, "Heroic" end
+
+    return nil
+end
+
+-- Get user-adjusted phase start time, or default if not set
+function NSI:GetPhaseStart(encounterID, phaseNum, difficulty)
+    -- Phase 1 always starts at 0
+    if phaseNum == 1 then return 0 end
+
+    local timeline = self:GetBossTimeline(encounterID, difficulty)
+    if not timeline or not timeline.phases or not timeline.phases[phaseNum] then return 0 end
+
+    -- Check for user adjustment
+    if NSRT.PhaseTimings and NSRT.PhaseTimings[encounterID] and NSRT.PhaseTimings[encounterID][phaseNum] then
+        return NSRT.PhaseTimings[encounterID][phaseNum]
+    end
+
+    return timeline.phases[phaseNum].start
+end
+
+-- Set user-adjusted phase start time
+function NSI:SetPhaseStart(encounterID, phaseNum, time)
+    -- Cannot adjust phase 1
+    if phaseNum == 1 then return end
+
+    if not NSRT.PhaseTimings then
+        NSRT.PhaseTimings = {}
+    end
+    if not NSRT.PhaseTimings[encounterID] then
+        NSRT.PhaseTimings[encounterID] = {}
+    end
+
+    NSRT.PhaseTimings[encounterID][phaseNum] = time
+end
+
+-- Reset phase timing to default
+function NSI:ResetPhaseStart(encounterID, phaseNum)
+    if NSRT.PhaseTimings and NSRT.PhaseTimings[encounterID] then
+        NSRT.PhaseTimings[encounterID][phaseNum] = nil
+    end
+end
+
+-- Get all abilities for an encounter with absolute times
+function NSI:GetBossTimelineAbilities(encounterID, difficulty)
+    local timeline, actualDifficulty = self:GetBossTimeline(encounterID, difficulty)
+    if not timeline then return nil end
+
+    -- Pre-calculate all phase start times for filtering
+    local phaseStarts = {}
+    local maxPhase = 0
+    for phaseNum, _ in pairs(timeline.phases) do
+        phaseStarts[phaseNum] = self:GetPhaseStart(encounterID, phaseNum, actualDifficulty)
+        if phaseNum > maxPhase then
+            maxPhase = phaseNum
+        end
+    end
+
+    local result = {}
+
+    for i, ability in ipairs(timeline.abilities) do
+        local phaseStart = self:GetPhaseStart(encounterID, ability.phase, actualDifficulty)
+        local absoluteTimes = {}
+
+        -- Get the start time of the next phase (if it exists)
+        -- Abilities from this phase should not extend past the next phase start
+        local nextPhaseStart = nil
+        if ability.phase < maxPhase then
+            nextPhaseStart = phaseStarts[ability.phase + 1]
+        end
+
+        for _, time in ipairs(ability.times) do
+            local absoluteTime = phaseStart + time
+            -- Filter out abilities that occur after the next phase has started
+            if not nextPhaseStart or absoluteTime < nextPhaseStart then
+                table.insert(absoluteTimes, absoluteTime)
+            end
+        end
+
+        -- Only add ability if it has any visible times
+        if #absoluteTimes > 0 then
+            -- Parse compound category for color and sort order
+            local color, sortOrder, primaryCategory = self:ParseCategoryForDisplay(ability.category)
+
+            table.insert(result, {
+                name = ability.name,
+                spellID = ability.spellID,
+                category = ability.category,           -- Keep original for tooltip display
+                primaryCategory = primaryCategory,     -- Parsed primary category
+                sortOrder = sortOrder,                 -- For sorting in timeline
+                phase = ability.phase,
+                times = absoluteTimes,
+                duration = ability.duration,
+                color = color,
+            })
+        end
+    end
+
+    -- Build phases with adjusted times
+    local phases = {}
+    for phaseNum, phaseData in pairs(timeline.phases) do
+        phases[phaseNum] = {
+            name = phaseData.name,                                  -- May be nil
+            start = self:GetPhaseStart(encounterID, phaseNum, actualDifficulty),
+            color = phaseData.color,                                -- May be nil
+        }
+    end
+
+    return result, timeline.duration, phases, actualDifficulty
+end
+
+-- Get encounter name from ID
+function NSI:GetEncounterName(encounterID)
+    return self.BossTimelineNames[encounterID] or ("Encounter " .. encounterID)
+end
diff --git a/BossTimelines/BossTimelines.xml b/BossTimelines/BossTimelines.xml
new file mode 100644
index 0000000..1a7e59d
--- /dev/null
+++ b/BossTimelines/BossTimelines.xml
@@ -0,0 +1,13 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ https://raw.githubusercontent.com/Gethe/wow-ui-source/live/Interface/FrameXML/UI.xsd">
+    <!-- Core initialization and helper functions (must load first) -->
+    <Script file="BossTimelines.lua"/>
+
+    <!-- Individual boss timelines -->
+    <Script file="ImperatorAverzian.lua"/>
+    <Script file="Vorasius.lua"/>
+    <Script file="VaelgorEzzorak.lua"/>
+    <Script file="FallenKingSalhadaar.lua"/>
+    <Script file="LightblindedVanguard.lua"/>
+    <Script file="Beloren.lua"/>
+    <Script file="Chimaerus.lua"/>
+</Ui>
diff --git a/BossTimelines/Chimaerus.lua b/BossTimelines/Chimaerus.lua
new file mode 100644
index 0000000..472121b
--- /dev/null
+++ b/BossTimelines/Chimaerus.lua
@@ -0,0 +1,61 @@
+local _, NSI = ... -- Internal namespace
+
+--------------------------------------------------------------------------------
+-- CHIMAERUS (3306)
+-- 3-phase fight, Ravenous Dive marks transitions
+--------------------------------------------------------------------------------
+
+local abilities = {
+    -- Phase 1
+    {name = "Rift Emergence", spellID = 1258610, category = "damage", phase = 1, times = {9, 64}, duration = 3},
+    {name = "Rift Sickness", spellID = 1250953, category = "damage", phase = 1, times = {14, 68}, duration = 4},
+    {name = "Alndust Upheaval", spellID = 1262289, category = "damage", phase = 1, times = {19, 71, 139}, duration = 3},
+    {name = "Caustic Phlegm", spellID = 1246621, category = "damage", phase = 1, times = {26, 53, 81, 103, 147}, duration = 3},
+    {name = "Rift Madness", spellID = 1264756, category = "soak", phase = 1, times = {30, 85}, duration = 8},
+    {name = "Colossal Strikes", spellID = 1262020, category = "tank", phase = 1, times = {32, 86, 164}, duration = 2},
+    {name = "Rending Tear", spellID = 1272726, category = "tank", phase = 1, times = {36, 40, 89, 93}, duration = 2},
+    {name = "Consume", spellID = 1245396, category = "damage", phase = 1, times = {123}, duration = 5},
+    {name = "Corrupted Devastation", spellID = 1245452, category = "damage", phase = 1, times = {155, 179, 204}, duration = 4},
+    {name = "Ravenous Dive", spellID = 1245404, category = "intermission", phase = 1, times = {227}, duration = 9},
+    -- Phase 2
+    {name = "Rift Emergence", spellID = 1258610, category = "damage", phase = 2, times = {9, 64}, duration = 3},
+    {name = "Rift Sickness", spellID = 1250953, category = "damage", phase = 2, times = {14, 68}, duration = 4},
+    {name = "Alndust Upheaval", spellID = 1262289, category = "damage", phase = 2, times = {19, 71, 139}, duration = 3},
+    {name = "Caustic Phlegm", spellID = 1246621, category = "damage", phase = 2, times = {26, 53, 81, 103, 147}, duration = 3},
+    {name = "Rift Madness", spellID = 1264756, category = "soak", phase = 2, times = {30, 85}, duration = 8},
+    {name = "Colossal Strikes", spellID = 1262020, category = "tank", phase = 2, times = {32, 82, 102, 165, 184}, duration = 2},
+    {name = "Rending Tear", spellID = 1272726, category = "tank", phase = 2, times = {36, 40, 89, 93}, duration = 2},
+    {name = "Consume", spellID = 1245396, category = "damage", phase = 2, times = {123}, duration = 5},
+    {name = "Corrupted Devastation", spellID = 1245452, category = "damage", phase = 2, times = {155, 179, 204}, duration = 4},
+    {name = "Ravenous Dive", spellID = 1245404, category = "intermission", phase = 2, times = {227}, duration = 9},
+    -- Phase 3
+    {name = "Rift Emergence", spellID = 1258610, category = "damage", phase = 3, times = {9, 64}, duration = 3},
+    {name = "Rift Sickness", spellID = 1250953, category = "damage", phase = 3, times = {14, 68}, duration = 4},
+    {name = "Alndust Upheaval", spellID = 1262289, category = "damage", phase = 3, times = {19, 71, 139}, duration = 3},
+    {name = "Caustic Phlegm", spellID = 1246621, category = "damage", phase = 3, times = {26, 53, 81, 103, 147}, duration = 3},
+    {name = "Rift Madness", spellID = 1264756, category = "soak", phase = 3, times = {30, 85}, duration = 8},
+    {name = "Colossal Strikes", spellID = 1262020, category = "tank", phase = 3, times = {32, 82, 102, 165, 184}, duration = 2},
+    {name = "Rending Tear", spellID = 1272726, category = "tank", phase = 3, times = {36, 40, 89, 93}, duration = 2},
+    {name = "Consume", spellID = 1245396, category = "damage", phase = 3, times = {123}, duration = 5},
+    {name = "Corrupted Devastation", spellID = 1245452, category = "damage", phase = 3, times = {155, 179, 204}, duration = 4},
+    {name = "Ravenous Dive", spellID = 1245404, category = "intermission", phase = 3, times = {227}, duration = 0},
+}
+
+local phases = {
+    [1] = {start = 0},
+    [2] = {start = 227},
+    [3] = {start = 454},
+}
+
+NSI.BossTimelines[3306] = {
+    Mythic = {
+        duration = 720,
+        phases = phases,
+        abilities = abilities,
+    },
+    Heroic = {
+        duration = 720,
+        phases = phases,
+        abilities = abilities,
+    },
+}
diff --git a/BossTimelines/FallenKingSalhadaar.lua b/BossTimelines/FallenKingSalhadaar.lua
new file mode 100644
index 0000000..2f54fc3
--- /dev/null
+++ b/BossTimelines/FallenKingSalhadaar.lua
@@ -0,0 +1,34 @@
+local _, NSI = ... -- Internal namespace
+
+--------------------------------------------------------------------------------
+-- FALLEN KING SALHADAAR (3179)
+-- Single phase, Cosmic Unraveling every ~122s
+--------------------------------------------------------------------------------
+
+local abilities = {
+    {name = "Desperate Measures", spellID = 1243453, category = "movement", phase = 1, times = {14, 60, 135, 258, 303, 381, 427, 502}, duration = 3},
+    {name = "Twisting Obscurity", spellID = 1250686, category = "damage", phase = 1, times = {16, 62, 139, 185, 261, 307, 383, 429, 505}, duration = 4},
+    {name = "Fractured Projection", spellID = 1254081, category = "movement", phase = 1, times = {18, 64, 141, 187, 263, 309, 385, 431, 508}, duration = 5},
+    {name = "Galactic Miasma", spellID = 1250991, category = "damage", phase = 1, times = {26, 40, 77, 98, 162, 181, 202, 221, 289, 299, 332, 397, 416, 449}, duration = 3},
+    {name = "Despotic Command", spellID = 1260823, category = "tank", phase = 1, times = {29, 76, 150, 197, 273, 319, 396, 442}, duration = 5},
+    {name = "Shattering Twilight", spellID = 1253032, category = "damage", phase = 1, times = {48, 94, 171, 217, 293, 338, 414, 459}, duration = 4},
+    {name = "Twilight Spikes", spellID = 1251213, category = "movement", phase = 1, times = {53, 99, 101, 174, 296, 340, 422, 462}, duration = 3},
+    {name = "Cosmic Unraveling", spellID = 1246175, category = "damage", phase = 1, times = {102, 225, 347, 469}, duration = 33},
+}
+
+local phases = {
+    [1] = {start = 0},
+}
+
+NSI.BossTimelines[3179] = {
+    Mythic = {
+        duration = 550,
+        phases = phases,
+        abilities = abilities,
+    },
+    Heroic = {
+        duration = 550,
+        phases = phases,
+        abilities = abilities,
+    },
+}
diff --git a/BossTimelines/ImperatorAverzian.lua b/BossTimelines/ImperatorAverzian.lua
new file mode 100644
index 0000000..013acdd
--- /dev/null
+++ b/BossTimelines/ImperatorAverzian.lua
@@ -0,0 +1,59 @@
+local _, NSI = ... -- Internal namespace
+
+--------------------------------------------------------------------------------
+-- IMPERATOR AVERZIAN (3176)
+-- 4-phase fight, Void Fall marks intermissions
+--------------------------------------------------------------------------------
+
+local abilities = {
+    -- Phase 1
+    {name = "Dark Upheaval", spellID = 1249251, category = "damage", phase = 1, times = {7, 55, 91}, duration = 3},
+    {name = "Shadow's Advance", spellID = 1262776, category = "movement", phase = 1, times = {17, 97}, duration = 4},
+    {name = "Void Marked", spellID = 1280015, category = "soak", phase = 1, times = {23, 103}, duration = 5},
+    {name = "Umbral Collapse", spellID = 1249266, category = "damage", phase = 1, times = {38, 45, 118, 125}, duration = 3},
+    {name = "Void Rupture", spellID = 1262036, category = "movement", phase = 1, times = {53, 133}, duration = 4},
+    {name = "Cosmic Eruption", spellID = 1261249, category = "damage", phase = 1, times = {58, 138}, duration = 2},
+    {name = "Oblivion's Wrath", spellID = 1260712, category = "damage", phase = 1, times = {63, 81}, duration = 4},
+    {name = "Void Fall", spellID = 1258880, category = "intermission", phase = 1, times = {166}, duration = 27},
+    -- Phase 2
+    {name = "Dark Upheaval", spellID = 1249251, category = "damage", phase = 2, times = {0, 48, 84}, duration = 3},
+    {name = "Shadow's Advance", spellID = 1262776, category = "movement", phase = 2, times = {10, 90}, duration = 4},
+    {name = "Void Marked", spellID = 1280015, category = "soak", phase = 2, times = {16, 96}, duration = 5},
+    {name = "Umbral Collapse", spellID = 1249266, category = "damage", phase = 2, times = {31, 38, 111, 118}, duration = 3},
+    {name = "Void Rupture", spellID = 1262036, category = "movement", phase = 2, times = {46, 126}, duration = 4},
+    {name = "Cosmic Eruption", spellID = 1261249, category = "damage", phase = 2, times = {51, 131}, duration = 2},
+    {name = "Oblivion's Wrath", spellID = 1260712, category = "damage", phase = 2, times = {56, 74}, duration = 4},
+    {name = "Void Fall", spellID = 1258880, category = "intermission", phase = 2, times = {159}, duration = 27},
+    -- Phase 3
+    {name = "Dark Upheaval", spellID = 1249251, category = "damage", phase = 3, times = {0, 48, 84}, duration = 3},
+    {name = "Shadow's Advance", spellID = 1262776, category = "movement", phase = 3, times = {10, 90}, duration = 4},
+    {name = "Umbral Collapse", spellID = 1249266, category = "damage", phase = 3, times = {31, 38, 111, 118}, duration = 3},
+    {name = "Void Rupture", spellID = 1262036, category = "movement", phase = 3, times = {46, 126}, duration = 4},
+    {name = "Cosmic Eruption", spellID = 1261249, category = "damage", phase = 3, times = {51, 131}, duration = 2},
+    {name = "Oblivion's Wrath", spellID = 1260712, category = "damage", phase = 3, times = {56, 74}, duration = 4},
+    {name = "Void Fall", spellID = 1258880, category = "intermission", phase = 3, times = {159}, duration = 27},
+    -- Phase 4 (Burn)
+    {name = "Dark Upheaval", spellID = 1249251, category = "damage", phase = 4, times = {0}, duration = 3},
+    {name = "Shadow's Advance", spellID = 1262776, category = "movement", phase = 4, times = {10}, duration = 4},
+    {name = "Umbral Collapse", spellID = 1249266, category = "damage", phase = 4, times = {31, 38}, duration = 3},
+}
+
+local phases = {
+    [1] = {start = 0},
+    [2] = {start = 193},
+    [3] = {start = 379},
+    [4] = {start = 565},
+}
+
+NSI.BossTimelines[3176] = {
+    Mythic = {
+        duration = 650,
+        phases = phases,
+        abilities = abilities,
+    },
+    Heroic = {
+        duration = 650,
+        phases = phases,
+        abilities = abilities,
+    },
+}
diff --git a/BossTimelines/LightblindedVanguard.lua b/BossTimelines/LightblindedVanguard.lua
new file mode 100644
index 0000000..fd21618
--- /dev/null
+++ b/BossTimelines/LightblindedVanguard.lua
@@ -0,0 +1,40 @@
+local _, NSI = ... -- Internal namespace
+
+--------------------------------------------------------------------------------
+-- LIGHTBLINDED VANGUARD (3180)
+-- Single phase, Tyr's Wrath bursts of 4
+--------------------------------------------------------------------------------
+
+local abilities = {
+    {name = "Light Infused", spellID = 1258659, category = "damage", phase = 1, times = {0, 26, 79, 134, 238, 344}, duration = 0},
+    {name = "Searing Radiance", spellID = 1255738, category = "damage", phase = 1, times = {12, 62, 114, 184, 236, 343}, duration = 3},
+    {name = "Divine Storm", spellID = 1246765, category = "damage", phase = 1, times = {15, 33, 51, 69, 123, 141, 159, 177, 195, 213, 231, 267, 285, 303, 321, 339, 357}, duration = 2},
+    {name = "Sacred Toll", spellID = 1246749, category = "damage", phase = 1, times = {23, 41, 59, 77, 113, 131, 149, 167, 185, 203, 221, 239, 257, 275, 293, 311, 329, 347, 365}, duration = 2},
+    {name = "Judgment", spellID = 1251857, category = "tank", phase = 1, times = {22, 58, 112, 116, 130, 166, 168, 220, 224, 232, 274, 278, 292, 296, 310, 314, 328, 332}, duration = 2},
+    {name = "Shield of the Righteous", spellID = 1251859, category = "tank", phase = 1, times = {25, 61, 115, 133, 151, 169, 187, 205, 223, 243, 277, 295, 313, 331}, duration = 2},
+    {name = "Aura of Devotion", spellID = 1246162, category = "movement", phase = 1, times = {29, 35, 188}, duration = 6},
+    {name = "Tyr's Wrath", spellID = 1248710, category = "damage", phase = 1, times = {34, 37, 40, 43, 144, 147, 150, 153, 193, 196, 199, 202, 352, 355, 358, 361}, duration = 3},
+    {name = "Final Verdict", spellID = 1251812, category = "tank", phase = 1, times = {65, 119, 137, 155, 173, 191, 209, 227, 245, 263, 281, 299, 317, 335}, duration = 2},
+    {name = "Execution Sentence", spellID = 1250839, category = "soak", phase = 1, times = {82, 92, 139, 149}, duration = 10},
+    {name = "Divine Toll", spellID = 1248644, category = "damage", phase = 1, times = {87, 246}, duration = 4},
+    {name = "Avenger's Shield", spellID = 1246497, category = "tank", phase = 1, times = {105, 305}, duration = 2},
+    {name = "Blinding Light", spellID = 1258514, category = "movement", phase = 1, times = {170, 214, 265, 326}, duration = 3},
+    {name = "Aura of Wrath", spellID = 1248449, category = "intermission", phase = 1, times = {241}, duration = 120},
+}
+
+local phases = {
+    [1] = {start = 0},
+}
+
+NSI.BossTimelines[3180] = {
+    Mythic = {
+        duration = 400,
+        phases = phases,
+        abilities = abilities,
+    },
+    Heroic = {
+        duration = 400,
+        phases = phases,
+        abilities = abilities,
+    },
+}
diff --git a/BossTimelines/VaelgorEzzorak.lua b/BossTimelines/VaelgorEzzorak.lua
new file mode 100644
index 0000000..d5df76c
--- /dev/null
+++ b/BossTimelines/VaelgorEzzorak.lua
@@ -0,0 +1,49 @@
+local _, NSI = ... -- Internal namespace
+
+--------------------------------------------------------------------------------
+-- VAELGOR & EZZORAK (3178)
+-- Dual-boss fight, Shadowmark phase at ~2:13
+--------------------------------------------------------------------------------
+
+local abilities = {
+    -- Phase 1 - Dragon (Vaelgor)
+    {name = "Vaelwing", spellID = 1265131, category = "movement", phase = 1, times = {6, 31, 83, 107}, duration = 3},
+    {name = "Tail Lash", spellID = 1264467, category = "tank", phase = 1, times = {9, 34, 59, 90}, duration = 2},
+    {name = "Dread Breath", spellID = 1244221, category = "damage", phase = 1, times = {12, 56, 101}, duration = 4},
+    {name = "Nullbeam", spellID = 1262623, category = "tank", phase = 1, times = {18, 75}, duration = 3},
+    {name = "Nullzone", spellID = 1244672, category = "movement", phase = 1, times = {22, 79}, duration = 30},
+    -- Phase 1 - Hound (Ezzorak)
+    {name = "Void Howl", spellID = 1244917, category = "damage", phase = 1, times = {28, 73, 119}, duration = 3},
+    {name = "Rakfang", spellID = 1245645, category = "tank", phase = 1, times = {37, 62, 87, 112}, duration = 2},
+    {name = "Gloom", spellID = 1245391, category = "damage", phase = 1, times = {41, 91}, duration = 3},
+    {name = "Gloomfield", spellID = 1245420, category = "movement", phase = 1, times = {45, 95}, duration = 20},
+    -- Phase 2
+    {name = "Shadowmark", spellID = 1270497, category = "soak", phase = 2, times = {0, 6, 12, 18, 24, 30, 36, 42}, duration = 5},
+    {name = "Vaelwing", spellID = 1265131, category = "movement", phase = 2, times = {46, 71, 96}, duration = 3},
+    {name = "Nullbeam", spellID = 1262623, category = "tank", phase = 2, times = {7, 50}, duration = 3},
+    {name = "Nullzone", spellID = 1244672, category = "movement", phase = 2, times = {11, 54}, duration = 30},
+    {name = "Dread Breath", spellID = 1244221, category = "damage", phase = 2, times = {15, 21, 61}, duration = 4},
+    {name = "Void Howl", spellID = 1244917, category = "damage", phase = 2, times = {3, 78}, duration = 3},
+    {name = "Impale", spellID = 1265152, category = "tank", phase = 2, times = {32, 57, 85}, duration = 2},
+    {name = "Rakfang", spellID = 1245645, category = "tank", phase = 2, times = {52, 80}, duration = 2},
+    {name = "Gloom", spellID = 1245391, category = "damage", phase = 2, times = {56}, duration = 3},
+    {name = "Gloomfield", spellID = 1245420, category = "movement", phase = 2, times = {60}, duration = 20},
+}
+
+local phases = {
+    [1] = {start = 0},
+    [2] = {start = 133},
+}
+
+NSI.BossTimelines[3178] = {
+    Mythic = {
+        duration = 280,
+        phases = phases,
+        abilities = abilities,
+    },
+    Heroic = {
+        duration = 280,
+        phases = phases,
+        abilities = abilities,
+    },
+}
diff --git a/BossTimelines/Vorasius.lua b/BossTimelines/Vorasius.lua
new file mode 100644
index 0000000..854e37b
--- /dev/null
+++ b/BossTimelines/Vorasius.lua
@@ -0,0 +1,32 @@
+local _, NSI = ... -- Internal namespace
+
+--------------------------------------------------------------------------------
+-- VORASIUS (3177)
+-- Single phase fight with repeating ~2 minute cycles
+--------------------------------------------------------------------------------
+
+local abilities = {
+    {name = "Primordial Roar", spellID = 1260052, category = "damage", phase = 1, times = {12, 132, 253}, duration = 3},
+    {name = "Smashing Frenzy", spellID = 1241836, category = "tank", phase = 1, times = {17, 22, 27, 32, 36, 41, 46, 51, 68, 73, 78, 83, 137, 142, 147, 152, 157, 162, 166, 171, 191, 196, 201, 205, 258, 263, 267, 272, 277, 282, 287, 292, 314, 319, 328}, duration = 2},
+    {name = "Parasite Expulsion", spellID = 1254199, category = "movement", phase = 1, times = {60, 182, 305}, duration = 4},
+    {name = "Fixate", spellID = 1254113, category = "movement", phase = 1, times = {67, 189, 313}, duration = 10},
+    {name = "Blisterburst", spellID = 1259186, category = "damage", phase = 1, times = {77, 199, 323}, duration = 2},
+    {name = "Void Breath", spellID = 1256855, category = "damage", phase = 1, times = {101, 222, 343}, duration = 5},
+}
+
+local phases = {
+    [1] = {start = 0},
+}
+
+NSI.BossTimelines[3177] = {
+    Mythic = {
+        duration = 400,
+        phases = phases,
+        abilities = abilities,
+    },
+    Heroic = {
+        duration = 400,
+        phases = phases,
+        abilities = abilities,
+    },
+}
diff --git a/EventHandler.lua b/EventHandler.lua
index 562df37..5055a7a 100644
--- a/EventHandler.lua
+++ b/EventHandler.lua
@@ -84,12 +84,18 @@ function NSI:EventHandler(e, wowevent, internal, ...) -- internal checks whether
             if not NSRT.PASettings then
                 NSRT.PASettings = {Spacing = -1, Limit = 5, GrowDirection = "RIGHT", enabled = false, Width = 100, Height = 100, Anchor = "CENTER", relativeTo = "CENTER", xOffset = -450, yOffset = -100}
             end
+            NSRT.PASettings.Spacing = NSRT.PASettings.Spacing or -1
+            NSRT.PASettings.Limit = NSRT.PASettings.Limit or 5
             if not NSRT.PATankSettings then
                 NSRT.PATankSettings = {Spacing = -1, Limit = 5, MultiTankGrowDirection = "UP", GrowDirection = "LEFT", enabled = false, Width = 100, Height = 100, Anchor = "CENTER", relativeTo = "CENTER", xOffset = -549, yOffset = -199}
             end
+            NSRT.PATankSettings.Spacing = NSRT.PATankSettings.Spacing or -1
+            NSRT.PATankSettings.Limit = NSRT.PATankSettings.Limit or 5
             if not NSRT.PARaidSettings then
                 NSRT.PARaidSettings = {Spacing = -1, Limit = 5, GrowDirection = "RIGHT", enabled = false, Width = 25, Height = 25, Anchor = "BOTTOMLEFT", relativeTo = "BOTTOMLEFT", xOffset = 0, yOffset = 0}
             end
+            NSRT.PARaidSettings.Spacing = NSRT.PARaidSettings.Spacing or -1
+            NSRT.PARaidSettings.Limit = NSRT.PARaidSettings.Limit or 5
             if not NSRT.PASounds then NSRT.PASounds = {} end
             NSRT.UseDefaultPASounds = NSRT.UseDefaultPASounds or false
             NSRT.Settings["MyNickName"] = NSRT.Settings["MyNickName"] or nil
diff --git a/NSUI.lua b/NSUI.lua
index cec26b3..e37d34b 100644
--- a/NSUI.lua
+++ b/NSUI.lua
@@ -18,6 +18,7 @@ local TABS_LIST = {
     { name = "Assignments", text = "Assignments"},
     { name = "EncounterAlerts", text = "Encounter Alerts"},
     { name = "PrivateAura", text = "Private Auras"},
+    { name = "Timeline", text = "Timeline"},
 }
 local authorsString = "By Reloe & Rav"
 
@@ -1658,6 +1659,270 @@ local function BuildPASoundEditUI()
     PASound_edit_frame:Hide()
     return PASound_edit_frame
 end
+
+-- Build embedded timeline UI for the Timeline tab
+local function BuildTimelineTabUI(parent)
+    local header_width = 180
+    local timeline_width = window_width - 40 - header_width
+    local timeline_height = window_height - 250  -- Account for tab bar, controls, title, zoom slider, and status bar
+    local top_offset = -100  -- Standard offset for tab content (below tab buttons)
+
+    -- Mode: "my" = My Reminders, "all" = All Reminders
+    parent.timelineMode = "my"
+    parent.showBossAbilities = true
+
+    -- Mode dropdown
+    local function BuildModeDropdownOptions()
+        return {
+            {
+                label = "My Reminders",
+                value = "my",
+                onclick = function(_, _, value)
+                    parent.timelineMode = value
+                    parent.reminderLabel:Hide()
+                    parent.reminderDropdown:Hide()
+                    NSI:RefreshEmbeddedTimeline(parent)
+                end
+            },
+            {
+                label = "All Reminders (Raid Leader)",
+                value = "all",
+                onclick = function(_, _, value)
+                    parent.timelineMode = value
+                    parent.reminderLabel:Show()
+                    parent.reminderDropdown:Show()
+                    NSI:RefreshEmbeddedTimeline(parent)
+                end
+            },
+        }
+    end
+
+    local modeLabel = DF:CreateLabel(parent, "View:", 11, "white")
+    modeLabel:SetPoint("TOPLEFT", parent, "TOPLEFT", 10, top_offset)
+
+    local modeDropdown = DF:CreateDropDown(parent, BuildModeDropdownOptions, "my", 200)
+    modeDropdown:SetTemplate(options_dropdown_template)
+    modeDropdown:SetPoint("LEFT", modeLabel, "RIGHT", 10, 0)
+    parent.modeDropdown = modeDropdown
+
+    -- Reminder selection dropdown (for All mode)
+    local function BuildReminderDropdownOptions()
+        local options = {}
+        local sharedList = NSI:GetAllReminderNames(false)
+        for _, data in ipairs(sharedList) do
+            table.insert(options, {
+                label = data.name,
+                value = {name = data.name, personal = false},
+                onclick = function(_, _, value)
+                    parent.currentReminder = value
+                    NSI:RefreshEmbeddedTimeline(parent)
+                end
+            })
+        end
+        local personalList = NSI:GetAllReminderNames(true)
+        if #personalList > 0 then
+            table.insert(options, { label = "--- Personal ---", value = nil })
+            for _, data in ipairs(personalList) do
+                table.insert(options, {
+                    label = data.name .. " (Personal)",
+                    value = {name = data.name, personal = true},
+                    onclick = function(_, _, value)
+                        parent.currentReminder = value
+                        NSI:RefreshEmbeddedTimeline(parent)
+                    end
+                })
+            end
+        end
+        return options
+    end
+
+    local reminderLabel = DF:CreateLabel(parent, "Reminder Set:", 11, "white")
+    reminderLabel:SetPoint("LEFT", modeDropdown, "RIGHT", 20, 0)
+    parent.reminderLabel = reminderLabel
+    reminderLabel:Hide()
+
+    local reminderDropdown = DF:CreateDropDown(parent, BuildReminderDropdownOptions, nil, 300)
+    reminderDropdown:SetTemplate(options_dropdown_template)
+    reminderDropdown:SetPoint("LEFT", reminderLabel, "RIGHT", 10, 0)
+    parent.reminderDropdown = reminderDropdown
+    reminderDropdown:Hide()
+
+    -- Boss abilities toggle
+    local bossAbilitiesToggle = DF:CreateSwitch(parent,
+        function(self, _, value)
+            parent.showBossAbilities = value
+            NSI:RefreshEmbeddedTimeline(parent)
+        end,
+        true, 20, 20, nil, nil, nil, "TimelineBossAbilitiesToggle", nil, nil, nil, nil, options_switch_template)
+    bossAbilitiesToggle:SetAsCheckBox()
+    bossAbilitiesToggle:SetPoint("TOPRIGHT", parent, "TOPRIGHT", -15, top_offset + 2)
+    parent.bossAbilitiesToggle = bossAbilitiesToggle
+
+    local bossAbilitiesLabel = DF:CreateLabel(parent, "Show Boss Abilities", 11, "white")
+    bossAbilitiesLabel:SetPoint("RIGHT", bossAbilitiesToggle, "LEFT", -5, 0)
+
+    -- No data label
+    local noDataLabel = DF:CreateLabel(parent, "No reminders to display. Load a reminder set first with /ns", 14, "gray")
+    noDataLabel:SetPoint("CENTER", parent, "CENTER", 0, 0)
+    parent.noDataLabel = noDataLabel
+    noDataLabel:Hide()
+
+    -- Title label (shows boss name and difficulty) - positioned on second row
+    local titleLabel = DF:CreateLabel(parent, "", 12, "white")
+    titleLabel:SetPoint("TOPLEFT", parent, "TOPLEFT", 10, top_offset - 25)
+    parent.titleLabel = titleLabel
+
+    -- Timeline component
+    local timelineOptions = {
+        width = timeline_width,
+        height = timeline_height,
+        header_width = header_width,
+        header_detached = true,
+        line_height = 22,
+        line_padding = 1,
+        pixels_per_second = 15,
+        scale_min = 0.1,
+        scale_max = 2.0,
+        show_elapsed_timeline = true,
+        elapsed_timeline_height = 20,
+        can_resize = false,
+        use_perpixel_buttons = false,
+        backdrop = {edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\Tooltips\UI-Tooltip-Background]], tileSize = 64, tile = true},
+        backdrop_color = {0.1, 0.1, 0.1, 0.8},
+        backdrop_color_highlight = {0.2, 0.2, 0.3, 0.9},
+        backdrop_border_color = {0.1, 0.1, 0.1, 0.3},
+
+        on_enter = function(line)
+            line:SetBackdropColor(unpack(line.backdrop_color_highlight))
+        end,
+        on_leave = function(line)
+            -- Restore alternating row color based on index
+            local idx = line.dataIndex or 0
+            if idx % 2 == 1 then
+                line:SetBackdropColor(0, 0, 0, 0)
+            else
+                line:SetBackdropColor(0.1, 0.1, 0.1, 0.8)
+            end
+        end,
+
+        on_create_line = function(line)
+            if line.lineHeader then
+                line.lineHeader:EnableMouse(true)
+                line.lineHeader:SetScript("OnEnter", function(self)
+                    line:SetBackdropColor(unpack(line.backdrop_color_highlight))
+                    if line.lineData and line.lineData.spellId then
+                        GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
+                        GameTooltip:SetSpellByID(line.lineData.spellId)
+                        GameTooltip:Show()
+                    end
+                end)
+                line.lineHeader:SetScript("OnLeave", function(self)
+                    -- Restore alternating row color based on index
+                    local idx = line.dataIndex or 0
+                    if idx % 2 == 1 then
+                        line:SetBackdropColor(0, 0, 0, 0)
+                    else
+                        line:SetBackdropColor(0.1, 0.1, 0.1, 0.8)
+                    end
+                    GameTooltip:Hide()
+                end)
+            end
+            if line.text then
+                line.text:SetWordWrap(false)
+                line.text:SetWidth(150)
+            end
+        end,
+
+        block_on_enter = function(block)
+            if block.info and block.info.time then
+                GameTooltip:SetOwner(block, "ANCHOR_RIGHT")
+                local minutes = math.floor(block.info.time / 60)
+                local seconds = math.floor(block.info.time % 60)
+                local timeStr = string.format("%d:%02d", minutes, seconds)
+
+                local spellName = ""
+                if block.info.spellId then
+                    local spellInfo = C_Spell.GetSpellInfo(block.info.spellId)
+                    if spellInfo then
+                        spellName = spellInfo.name or ""
+                    end
+                end
+
+                GameTooltip:AddLine(spellName ~= "" and spellName or "Reminder", 1, 1, 1)
+                GameTooltip:AddLine("Time: " .. timeStr, 0.7, 0.7, 0.7)
+                local duration = tonumber(block.info.duration) or 0
+                if duration > 0 then
+                    GameTooltip:AddLine("Duration: " .. duration .. "s", 0.7, 0.7, 0.7)
+                end
+
+                if block.blockData and block.blockData.payload then
+                    local payload = block.blockData.payload
+                    if payload.isBossAbility and payload.category then
+                        local categoryColors = {
+                            damage = "|cffe64c4c",
+                            tank = "|cff4c80e6",
+                            movement = "|cffe6b333",
+                            soak = "|cff80e680",
+                            intermission = "|cffb366e6",
+                        }
+                        local colorCode = categoryColors[payload.category] or "|cffb3b3b3"
+                        GameTooltip:AddLine("Category: " .. colorCode .. payload.category .. "|r", 0.7, 0.7, 0.7)
+                        if payload.important then
+                            GameTooltip:AddLine("|cffff9900Use Healing CDs!|r", 1, 0.6, 0)
+                        end
+                    elseif payload.phase then
+                        GameTooltip:AddLine("Phase: " .. payload.phase, 0.7, 0.7, 0.7)
+                    end
+                    if payload.text then
+                        GameTooltip:AddLine("Text: " .. payload.text, 0.5, 0.8, 0.5)
+                    end
+                end
+                GameTooltip:Show()
+            end
+        end,
+        block_on_leave = function(block)
+            GameTooltip:Hide()
+        end,
+    }
+
+    local timelineFrame = DF:CreateTimeLineFrame(parent, "$parentTimeLine", timelineOptions)
+    parent.timeline = timelineFrame
+
+    -- Setup zoom-to-cursor and sticky ruler hooks
+    NSI:SetupTimelineHooks(timelineFrame)
+
+    -- Position the timeline (below the title row)
+    local timeline_top = top_offset - 45
+    if timelineFrame.headerFrame then
+        timelineFrame.headerFrame:SetPoint("TOPLEFT", parent, "TOPLEFT", 10, timeline_top)
+        timelineFrame.headerFrame:SetHeight(timeline_height)
+        timelineFrame:SetPoint("TOPLEFT", timelineFrame.headerFrame, "TOPRIGHT", 0, 0)
+    else
+        timelineFrame:SetPoint("TOPLEFT", parent, "TOPLEFT", 10, timeline_top)
+    end
+
+    -- Hook scale slider to update phase markers
+    if timelineFrame.scaleSlider then
+        timelineFrame.scaleSlider:HookScript("OnValueChanged", function()
+            NSI:UpdateEmbeddedPhaseMarkers(parent)
+        end)
+
+        -- Help text positioned below the zoom slider
+        local helpLabel = DF:CreateLabel(parent, "Scroll: Navigate | Ctrl+Scroll: Zoom | Shift+Scroll: Vertical", 10, "gray")
+        helpLabel:SetPoint("TOPLEFT", timelineFrame.scaleSlider, "BOTTOMLEFT", 0, -5)
+    end
+
+    -- Phase markers container
+    parent.phaseMarkers = {}
+
+    -- Refresh timeline when tab becomes visible
+    parent:SetScript("OnShow", function(self)
+        NSI:RefreshEmbeddedTimeline(self)
+    end)
+
+    return parent
+end
+
 function NSUI:Init()
     -- Create the scale bar
     DF:CreateScaleBar(NSUI, NSRT.NSUI)
@@ -1684,6 +1949,7 @@ function NSUI:Init()
     local encounteralerts_tab = tabContainer:GetTabFrameByName("EncounterAlerts")
     local readycheck_tab = tabContainer:GetTabFrameByName("ReadyCheck")
     local privateaura_tab = tabContainer:GetTabFrameByName("PrivateAura")
+    local timeline_tab = tabContainer:GetTabFrameByName("Timeline")
 
     -- generic text display
     local generic_display = CreateFrame("Frame", "NSUIGenericDisplay", UIParent, "BackdropTemplate")
@@ -4011,6 +4277,7 @@ Press 'Enter' to hear the TTS]],
     NSUI.reminders_frame = BuildRemindersEditUI()
     NSUI.pasound_frame = BuildPASoundEditUI()
     NSUI.personal_reminders_frame = BuildPersonalRemindersEditUI()
+    NSUI.timeline_tab = BuildTimelineTabUI(timeline_tab)
 
     -- Version Number in status bar
     local versionTitle = C_AddOns.GetAddOnMetadata("NorthernSkyRaidTools", "Title")
@@ -4066,4 +4333,4 @@ function NSI:DisplayText(text, duration)
     end
 end
 
-NSI.NSUI = NSUI
\ No newline at end of file
+NSI.NSUI = NSUI
diff --git a/NorthernSkyRaidTools.toc b/NorthernSkyRaidTools.toc
index b1468f4..3a388b5 100755
--- a/NorthernSkyRaidTools.toc
+++ b/NorthernSkyRaidTools.toc
@@ -16,6 +16,8 @@ Libs\libs.xml
 NorthernSkyRaidTools.lua
 Functions.lua
 Reminders.lua
+BossTimelines\BossTimelines.xml
+Timeline.lua
 Media.lua
 Comms.lua
 NickNames.lua
diff --git a/Reminders.lua b/Reminders.lua
index 29bf85a..8b3d4be 100644
--- a/Reminders.lua
+++ b/Reminders.lua
@@ -844,8 +844,23 @@ end
 
 function NSI:ImportReminder(name, values, activate, personal)
     if not name then name = "Default Reminder" end
-    local diff = values:match("Difficulty:([^;]+)")
-    local newname = diff and name.." - "..diff or name
+    local diff = values:match("Difficulty:([^;\n]+)")
+    -- Normalize difficulty: capitalize first letter, default to Mythic
+    if diff then
+        diff = strtrim(diff)
+        diff = diff:sub(1,1):upper() .. diff:sub(2):lower()
+        -- Ensure it's a valid difficulty
+        if diff ~= "Mythic" and diff ~= "Heroic" then
+            diff = "Mythic"
+        end
+        -- Update the values string with normalized difficulty
+        values = values:gsub("Difficulty:[^;\n]+", "Difficulty:" .. diff)
+    else
+        diff = "Mythic"
+        -- Add difficulty to the first line if not present
+        values = values:gsub("(EncounterID:%d+)", "%1;Difficulty:" .. diff)
+    end
+    local newname = name .. " - " .. diff
     if personal then
         if NSRT.PersonalReminders[newname] then -- if name already exists we add a 2 at the end and also update the string to reflect the new name.
             values = values:gsub("Name:[^\n]*", "Name:"..name.." 2")
diff --git a/SlashCommands.lua b/SlashCommands.lua
index eb39cb2..8f104c9 100644
--- a/SlashCommands.lua
+++ b/SlashCommands.lua
@@ -31,6 +31,8 @@ SlashCmdList["NSUI"] = function(msg)
         else
             NSI.NSUI.cooldowns_frame:Show()
         end
+    elseif msg == "timeline" then
+        NSI:ToggleTimelineWindow()
     else
         NSI.NSUI:ToggleOptions()
     end
diff --git a/Timeline.lua b/Timeline.lua
new file mode 100644
index 0000000..6c169f6
--- /dev/null
+++ b/Timeline.lua
@@ -0,0 +1,1558 @@
+local _, NSI = ... -- Internal namespace
+
+local DF = _G["DetailsFramework"]
+local expressway = [[Interface\AddOns\NorthernSkyRaidTools\Media\Fonts\Expressway.TTF]]
+
+-- Setup timeline hooks for zoom-to-cursor and sticky ruler
+-- Call this after creating a timeline with DF:CreateTimeLineFrame
+function NSI:SetupTimelineHooks(timeline)
+    if not timeline then return end
+
+    local horizontalSlider = timeline.horizontalSlider
+    local scaleSlider = timeline.scaleSlider
+    local elapsedTimeFrame = timeline.elapsedTimeFrame
+
+    -- Hook mousewheel for zoom-to-cursor behavior
+    -- We need to capture state BEFORE the zoom, then adjust AFTER
+    if scaleSlider and horizontalSlider then
+        -- Storage for pre-zoom state
+        timeline.preZoomState = {}
+
+        timeline:HookScript("OnMouseWheel", function(self, delta)
+            if IsControlKeyDown() then
+                -- Capture state before zoom
+                local pixelPerSecond = timeline.options.pixels_per_second or 15
+                local currentScale = timeline.currentScale or 1
+
+                -- Get mouse X position relative to the visible timeline frame
+                local cursorX = GetCursorPosition()
+                local uiScale = 1 / UIParent:GetEffectiveScale()
+                cursorX = cursorX * uiScale
+                local frameLeft = timeline:GetLeft() or 0
+                local mouseXInFrame = cursorX - frameLeft
+
+                -- Get current scroll position
+                local scrollPosition = horizontalSlider:GetValue()
+
+                -- Calculate time under mouse
+                local timeUnderMouse = (scrollPosition + mouseXInFrame) / (pixelPerSecond * currentScale)
+
+                -- Store for post-zoom adjustment
+                timeline.preZoomState.timeUnderMouse = timeUnderMouse
+                timeline.preZoomState.mouseXInFrame = mouseXInFrame
+                timeline.preZoomState.pixelPerSecond = pixelPerSecond
+            end
+        end)
+
+        -- Hook scale slider to adjust scroll after zoom
+        scaleSlider:HookScript("OnValueChanged", function(self)
+            local state = timeline.preZoomState
+            if state and state.timeUnderMouse then
+                local newScale = timeline.currentScale or 1
+
+                -- Calculate where the time under mouse is now
+                local timeInNewScale = state.timeUnderMouse * state.pixelPerSecond * newScale
+
+                -- Set scroll so the time stays under the mouse
+                local newScrollValue = max(0, timeInNewScale - state.mouseXInFrame)
+                local _, maxScroll = horizontalSlider:GetMinMaxValues()
+                horizontalSlider:SetValue(min(newScrollValue, maxScroll))
+
+                -- Clear state
+                timeline.preZoomState = {}
+            end
+        end)
+    end
+
+    -- Sticky ruler - keep elapsedTimeFrame fixed at top when scrolling vertically
+    -- but scroll horizontally with content
+    if elapsedTimeFrame and timeline.verticalSlider and horizontalSlider then
+        local headerWidth = timeline.options.header_width or 0
+        if timeline.options.header_detached then
+            headerWidth = 0
+        end
+
+        -- Create a clipping container for the ruler
+        local rulerContainer = CreateFrame("Frame", nil, timeline)
+        rulerContainer:SetPoint("TOPLEFT", timeline, "TOPLEFT", 0, 0)
+        rulerContainer:SetPoint("TOPRIGHT", timeline, "TOPRIGHT", 0, 0)
+        rulerContainer:SetHeight(timeline.options.elapsed_timeline_height or 20)
+        rulerContainer:SetClipsChildren(true)
+        rulerContainer:SetFrameLevel(timeline.body:GetFrameLevel() + 10)
+
+        -- Reparent elapsedTimeFrame to the clipping container
+        elapsedTimeFrame:SetParent(rulerContainer)
+        elapsedTimeFrame:SetFrameLevel(rulerContainer:GetFrameLevel() + 1)
+        elapsedTimeFrame:EnableMouse(false)
+
+        local function updateRulerPosition()
+            local scrollX = horizontalSlider:GetValue() or 0
+            local bodyWidth = timeline.body:GetWidth() or timeline:GetWidth()
+            elapsedTimeFrame:ClearAllPoints()
+            elapsedTimeFrame:SetPoint("TOPLEFT", rulerContainer, "TOPLEFT", -scrollX, 0)
+            elapsedTimeFrame:SetWidth(bodyWidth)
+            elapsedTimeFrame:SetHeight(timeline.options.elapsed_timeline_height or 20)
+        end
+
+        -- Reposition vertical time lines to be anchored to body
+        -- so they scroll with content while ruler stays fixed
+        local function repositionLines()
+            if elapsedTimeFrame.labels then
+                local bodyHeight = timeline.body:GetHeight() or 400
+                local rulerHeight = elapsedTimeFrame:GetHeight() or 20
+
+                for i, label in pairs(elapsedTimeFrame.labels) do
+                    if label.line and label:IsShown() then
+                        -- Get the label's X position relative to elapsedTimeFrame
+                        local labelX = label:GetLeft() - elapsedTimeFrame:GetLeft()
+
+                        -- Re-parent line to body and anchor it there
+                        label.line:SetParent(timeline.body)
+                        label.line:ClearAllPoints()
+                        -- Position at top of body content area (below ruler height)
+                        label.line:SetPoint("TOPLEFT", timeline.body, "TOPLEFT", headerWidth + labelX, -rulerHeight)
+                        label.line:SetHeight(bodyHeight - rulerHeight)
+                        label.line:SetDrawLayer("BACKGROUND", -8)
+                        label.line:Show()
+                    end
+                end
+            end
+        end
+
+        updateRulerPosition()
+
+        -- Update ruler position when scrolling horizontally
+        horizontalSlider:HookScript("OnValueChanged", function()
+            updateRulerPosition()
+        end)
+
+        hooksecurefunc(timeline, "SetData", function()
+            C_Timer.After(0.01, function()
+                updateRulerPosition()
+                repositionLines()
+            end)
+        end)
+
+        if scaleSlider then
+            scaleSlider:HookScript("OnValueChanged", function()
+                C_Timer.After(0.01, function()
+                    updateRulerPosition()
+                    repositionLines()
+                end)
+            end)
+        end
+    end
+end
+
+-- Get boss ability lines for the timeline
+-- Returns array of timeline lines and max time
+function NSI:GetBossAbilityLines(encounterID, filterImportantOnly, requestedDifficulty)
+    if not encounterID or not self.BossTimelines or not self.BossTimelines[encounterID] then
+        return {}, 0
+    end
+
+    local abilities, duration, phases, difficulty = self:GetBossTimelineAbilities(encounterID, requestedDifficulty)
+    if not abilities then return {}, 0 end
+
+    local lines = {}
+    local maxTime = duration or 0
+
+    -- Group abilities by name (since same ability can appear in multiple phases)
+    local abilityGroups = {}
+    for _, ability in ipairs(abilities) do
+        local key = ability.name
+        if not abilityGroups[key] then
+            abilityGroups[key] = {
+                name = ability.name,
+                spellID = ability.spellID,
+                category = ability.category,
+                color = ability.color,
+                sortOrder = ability.sortOrder,
+                times = {},
+                durations = {},
+            }
+        end
+        -- Add all times from this ability
+        for i, time in ipairs(ability.times) do
+            table.insert(abilityGroups[key].times, time)
+            table.insert(abilityGroups[key].durations, ability.duration)
+        end
+    end
+
+    -- Convert to timeline lines, sorted by category then name
+    local sortedAbilities = {}
+    for _, data in pairs(abilityGroups) do
+        table.insert(sortedAbilities, data)
+    end
+    table.sort(sortedAbilities, function(a, b)
+        -- Sort by pre-computed sort order from ParseCategoryForDisplay
+        local aOrder = a.sortOrder or 99
+        local bOrder = b.sortOrder or 99
+        if aOrder ~= bOrder then
+            return aOrder < bOrder
+        end
+        return a.name < b.name
+    end)
+
+    for _, abilityData in ipairs(sortedAbilities) do
+        local timeline = {}
+
+        -- Sort times
+        local sortedTimes = {}
+        for i, time in ipairs(abilityData.times) do
+            table.insert(sortedTimes, {time = time, dur = abilityData.durations[i] or 3})
+        end
+        table.sort(sortedTimes, function(a, b) return a.time < b.time end)
+
+        -- Create timeline blocks
+        for _, entry in ipairs(sortedTimes) do
+            table.insert(timeline, {
+                entry.time,
+                0,
+                true,
+                entry.dur,
+                abilityData.spellID,
+                payload = {
+                    category = abilityData.category,
+                    important = abilityData.important,
+                    isBossAbility = true,
+                },
+            })
+        end
+
+        -- Get icon
+        local lineIcon = nil
+        if abilityData.spellID then
+            local spellInfo = C_Spell.GetSpellInfo(abilityData.spellID)
+            if spellInfo then
+                lineIcon = spellInfo.iconID
+            end
+        end
+
+        -- Color-code the name by category
+        local color = abilityData.color or {0.7, 0.7, 0.7}
+        local coloredName = string.format("|cff%02x%02x%02x%s|r",
+            math.floor(color[1] * 255),
+            math.floor(color[2] * 255),
+            math.floor(color[3] * 255),
+            abilityData.name)
+
+        table.insert(lines, {
+            spellId = abilityData.spellID,
+            icon = lineIcon or "Interface\\ICONS\\INV_Misc_QuestionMark",
+            text = coloredName,
+            timeline = timeline,
+            isBossAbility = true,
+            category = abilityData.category,
+        })
+    end
+
+    return lines, maxTime, phases, difficulty
+end
+
+-- Get timeline data from ProcessedReminder (player's own filtered reminders)
+-- Returns data in DetailsFramework timeline format
+function NSI:GetMyTimelineData(includeBossAbilities)
+    if not self.ProcessedReminder then return nil end
+
+    -- Find which encounter has data
+    local encID = self.EncounterID
+    if not encID then
+        -- Try to find any encounter with data
+        for id, _ in pairs(self.ProcessedReminder) do
+            encID = id
+            break
+        end
+    end
+
+    if not encID or not self.ProcessedReminder[encID] then return nil end
+
+    -- Get difficulty from active reminder (default to Mythic)
+    local reminderDifficulty = "Mythic"
+    local activeReminder = NSRT.ActiveReminder
+    local reminderSource = NSRT.Reminders
+    if not activeReminder or activeReminder == "" then
+        activeReminder = NSRT.ActivePersonalReminder
+        reminderSource = NSRT.PersonalReminders
+    end
+    if activeReminder and activeReminder ~= "" and reminderSource[activeReminder] then
+        local diff = reminderSource[activeReminder]:match("Difficulty:([^;\n]+)")
+        if diff then
+            reminderDifficulty = strtrim(diff)
+        end
+    end
+
+    -- Data structure: playerReminders[playerName][spellKey] = {entries}
+    local playerReminders = {}
+    local maxTime = 0
+
+    -- Pre-calculate all phase start times for converting phase-relative times to absolute times
+    local phaseStarts = {}
+    for phase, _ in pairs(self.ProcessedReminder[encID]) do
+        phaseStarts[phase] = self:GetPhaseStart(encID, phase, reminderDifficulty) or 0
+    end
+
+    -- Iterate through all phases
+    for phase, reminders in pairs(self.ProcessedReminder[encID]) do
+        local phaseStart = phaseStarts[phase] or 0
+        for _, reminder in ipairs(reminders) do
+            local time = reminder.time
+            local dur = reminder.dur or 8
+            local spellID = reminder.spellID
+            local text = reminder.text or reminder.rawtext
+
+            if time then
+                -- Convert phase-relative time to absolute time
+                local absoluteTime = phaseStart + time
+
+                -- Track max time for timeline length
+                if absoluteTime + dur > maxTime then
+                    maxTime = absoluteTime + dur
+                end
+
+                -- For processed reminders, we don't have tag info
+                -- Use "You" as the player name since these are your reminders
+                local player = "You"
+
+                -- Determine the key for this ability
+                local abilityKey = spellID and tostring(spellID) or "text"
+
+                playerReminders[player] = playerReminders[player] or {}
+                playerReminders[player][abilityKey] = playerReminders[player][abilityKey] or {
+                    spellID = spellID,
+                    text = text,
+                    entries = {}
+                }
+
+                table.insert(playerReminders[player][abilityKey].entries, {
+                    time = absoluteTime,
+                    dur = dur,
+                    phase = phase,
+                    text = text,
+                })
+            end
+        end
+    end
+
+    -- Convert to timeline format
+    local lines = {}
+
+    -- Sort abilities by spellID then text
+    local sortedAbilities = {}
+    if playerReminders["You"] then
+        for abilityKey, data in pairs(playerReminders["You"]) do
+            table.insert(sortedAbilities, {key = abilityKey, data = data})
+        end
+    end
+    table.sort(sortedAbilities, function(a, b)
+        local aNum = tonumber(a.key)
+        local bNum = tonumber(b.key)
+        if aNum and bNum then
+            return aNum < bNum
+        elseif aNum then
+            return true
+        elseif bNum then
+            return false
+        else
+            return a.key < b.key
+        end
+    end)
+
+    -- Create lines
+    for _, ability in ipairs(sortedAbilities) do
+        local abilityData = ability.data
+        local spellID = abilityData.spellID
+        local timeline = {}
+
+        -- Sort entries by time
+        table.sort(abilityData.entries, function(a, b) return a.time < b.time end)
+
+        -- Create timeline blocks
+        for _, entry in ipairs(abilityData.entries) do
+            table.insert(timeline, {
+                entry.time,
+                0,
+                true,
+                entry.dur,
+                spellID,
+                payload = {phase = entry.phase, text = entry.text},
+            })
+        end
+
+        -- Get display info
+        local lineIcon = nil
+        local lineName = ""
+        local lineSpellId = spellID
+
+        if spellID then
+            local spellInfo = C_Spell.GetSpellInfo(spellID)
+            if spellInfo then
+                lineIcon = spellInfo.iconID
+                lineName = spellInfo.name or ""
+            end
+        else
+            lineName = "Notes"
+            lineIcon = "Interface\\ICONS\\INV_Misc_Note_01"
+        end
+
+        table.insert(lines, {
+            spellId = lineSpellId,
+            icon = lineIcon or "Interface\\ICONS\\INV_Misc_QuestionMark",
+            text = lineName,
+            timeline = timeline,
+        })
+    end
+
+    -- Add boss abilities if requested (at the top)
+    local phases = nil
+    local difficulty = nil
+    local finalLines = {}
+    if includeBossAbilities and encID then
+        local bossLines, bossMaxTime, bossPhases, bossDifficulty = self:GetBossAbilityLines(encID, false, reminderDifficulty)
+        phases = bossPhases
+        difficulty = bossDifficulty
+
+        -- Add boss ability lines first
+        for _, line in ipairs(bossLines) do
+            table.insert(finalLines, line)
+        end
+
+        -- Add separator line if we have both player and boss abilities
+        if #lines > 0 and #bossLines > 0 then
+            table.insert(finalLines, {
+                spellId = nil,
+                icon = "Interface\\ICONS\\INV_Misc_Gear_01",
+                text = "|cff888888--- Your Reminders ---|r",
+                timeline = {},
+                isSeparator = true,
+            })
+        end
+
+        -- Use boss timeline length if longer
+        if bossMaxTime > maxTime then
+            maxTime = bossMaxTime
+        end
+    end
+
+    -- Append player reminder lines
+    for _, line in ipairs(lines) do
+        table.insert(finalLines, line)
+    end
+
+    local timelineLength = math.max(60, math.ceil(maxTime / 30) * 30)
+
+    return {
+        length = timelineLength,
+        defaultColor = {1, 1, 1, 1},
+        useIconOnBlocks = true,
+        lines = finalLines,
+    }, encID, phases, difficulty
+end
+
+-- Get timeline data from a reminder set (ALL reminders, for raid leaders)
+-- Returns data in DetailsFramework timeline format
+function NSI:GetAllTimelineData(reminderName, personal, includeBossAbilities)
+    local source = personal and NSRT.PersonalReminders or NSRT.Reminders
+    local reminderStr = source[reminderName]
+    if not reminderStr then return nil end
+
+    -- Extract encounter ID from the reminder string
+    local encID = reminderStr:match("EncounterID:(%d+)")
+    encID = encID and tonumber(encID)
+
+    -- Extract difficulty from the reminder string (default to Mythic)
+    local reminderDifficulty = reminderStr:match("Difficulty:([^;\n]+)")
+    reminderDifficulty = reminderDifficulty and strtrim(reminderDifficulty) or "Mythic"
+
+    -- Data structure: playerReminders[playerName][spellKey] = {entries}
+    -- where spellKey is spellID or text (if no spellID)
+    local playerReminders = {}
+    local maxTime = 0
+    local discoveredPhases = {}
+
+    for line in reminderStr:gmatch('[^\r\n]+') do
+        local tag = line:match("tag:([^;]+)")
+        local time = line:match("time:(%d*%.?%d+)")
+        local spellID = line:match("spellid:(%d+)")
+        local dur = line:match("dur:(%d+)") or "8"
+        local text = line:match("text:([^;]+)")
+        local phase = line:match("ph:(%d+)") or "1"
+
+        if tag and time then
+            time = tonumber(time)
+            dur = tonumber(dur)
+            phase = tonumber(phase)
+            spellID = spellID and tonumber(spellID)
+
+            -- Track discovered phases for later phase start calculation
+            discoveredPhases[phase] = true
+
+            -- Determine the key for this ability
+            -- For spells: use spellID so each spell gets its own lane
+            -- For text-only: use "text" so all text reminders for a player are on one lane
+            local abilityKey = spellID and tostring(spellID) or "text"
+
+            -- Parse player names from tag (use [^,]+ to support UTF-8/accented characters)
+            for player in tag:gmatch("([^,]+)") do
+                player = strtrim(player)
+                local lowerPlayer = strlower(player)
+
+                -- Convert "everyone" and "all" to a unified "Everyone" lane
+                if lowerPlayer == "everyone" or lowerPlayer == "all" then
+                    player = "Everyone"
+                -- Skip role/group tags
+                elseif lowerPlayer == "healer" or
+                       lowerPlayer == "tank" or
+                       lowerPlayer == "dps" or
+                       lowerPlayer == "melee" or
+                       lowerPlayer == "ranged" or
+                       lowerPlayer:match("^group%d+$") or
+                       lowerPlayer:match("^%d+$") then -- skip spec IDs
+                    player = nil
+                end
+
+                if player then
+                    playerReminders[player] = playerReminders[player] or {}
+                    playerReminders[player][abilityKey] = playerReminders[player][abilityKey] or {
+                        spellID = spellID,
+                        text = text,
+                        entries = {}
+                    }
+
+                    table.insert(playerReminders[player][abilityKey].entries, {
+                        time = time,
+                        dur = dur,
+                        phase = phase,
+                        text = text, -- store text per entry for tooltips
+                    })
+                end
+            end
+        end
+    end
+
+    -- Pre-calculate phase start times for converting phase-relative times to absolute times
+    local phaseStarts = {}
+    for phase, _ in pairs(discoveredPhases) do
+        phaseStarts[phase] = encID and self:GetPhaseStart(encID, phase, reminderDifficulty) or 0
+    end
+
+    -- Convert to timeline format
+    local lines = {}
+
+    -- First, get sorted list of players (Everyone first, then alphabetical)
+    local sortedPlayers = {}
+    for player in pairs(playerReminders) do
+        table.insert(sortedPlayers, player)
+    end
+    table.sort(sortedPlayers, function(a, b)
+        if a == "Everyone" then return true end
+        if b == "Everyone" then return false end
+        return a < b
+    end)
+
+    -- For each player, add all their abilities as separate lines
+    for _, player in ipairs(sortedPlayers) do
+        local abilities = playerReminders[player]
+
+        -- Sort abilities by spellID (numeric) or text (alphabetic)
+        local sortedAbilities = {}
+        for abilityKey, data in pairs(abilities) do
+            table.insert(sortedAbilities, {key = abilityKey, data = data})
+        end
+        table.sort(sortedAbilities, function(a, b)
+            -- Numeric keys (spellIDs) come before text keys
+            local aNum = tonumber(a.key)
+            local bNum = tonumber(b.key)
+            if aNum and bNum then
+                return aNum < bNum
+            elseif aNum then
+                return true
+            elseif bNum then
+                return false
+            else
+                return a.key < b.key
+            end
+        end)
+
+        -- Create a line for each ability
+        for _, ability in ipairs(sortedAbilities) do
+            local abilityData = ability.data
+            local spellID = abilityData.spellID
+            local timeline = {}
+
+            -- Sort entries by phase-relative time for consistent ordering
+            table.sort(abilityData.entries, function(a, b)
+                if a.phase ~= b.phase then return a.phase < b.phase end
+                return a.time < b.time
+            end)
+
+            -- Create timeline blocks with absolute times
+            for _, entry in ipairs(abilityData.entries) do
+                -- Convert phase-relative time to absolute time
+                local phaseStart = phaseStarts[entry.phase] or 0
+                local absoluteTime = phaseStart + entry.time
+
+                -- Track max time for timeline length
+                if absoluteTime + entry.dur > maxTime then
+                    maxTime = absoluteTime + entry.dur
+                end
+
+                -- Format: {time, length, isAura, auraDuration, blockSpellId}
+                table.insert(timeline, {
+                    absoluteTime,   -- [1] time in seconds (absolute)
+                    0,              -- [2] length (0 for icon-based display)
+                    true,           -- [3] isAura (shows duration bar)
+                    entry.dur,      -- [4] auraDuration
+                    spellID,        -- [5] blockSpellId
+                    payload = {phase = entry.phase, text = entry.text}, -- use entry-specific text
+                })
+            end
+
+            -- Get display info
+            local lineIcon = nil
+            local lineName = ""
+            local lineSpellId = spellID
+
+            if spellID then
+                local spellInfo = C_Spell.GetSpellInfo(spellID)
+                if spellInfo then
+                    lineIcon = spellInfo.iconID
+                    lineName = spellInfo.name or ""
+                end
+            else
+                -- Text-only reminders: label the lane as "Notes"
+                lineName = "Notes"
+                lineIcon = "Interface\\ICONS\\INV_Misc_Note_01"
+            end
+
+            -- Get shortened player name with color
+            local shortPlayer = NSAPI:Shorten(player, 12, false, "GlobalNickNames") or player
+
+            table.insert(lines, {
+                spellId = lineSpellId,
+                icon = lineIcon or "Interface\\ICONS\\INV_Misc_QuestionMark",
+                text = shortPlayer .. " - " .. lineName,
+                timeline = timeline,
+            })
+        end
+    end
+
+    -- Add boss abilities if requested (at the top)
+    local phases = nil
+    local difficulty = nil
+    local finalLines = {}
+    if includeBossAbilities and encID then
+        local bossLines, bossMaxTime, bossPhases, bossDifficulty = self:GetBossAbilityLines(encID, false, reminderDifficulty)
+        phases = bossPhases
+        difficulty = bossDifficulty
+
+        -- Add boss ability lines first
+        for _, line in ipairs(bossLines) do
+            table.insert(finalLines, line)
+        end
+
+        -- Add separator line if we have both player and boss abilities
+        if #lines > 0 and #bossLines > 0 then
+            table.insert(finalLines, {
+                spellId = nil,
+                icon = "Interface\\ICONS\\INV_Misc_Gear_01",
+                text = "|cff888888--- Player Assignments ---|r",
+                timeline = {},
+                isSeparator = true,
+            })
+        end
+
+        -- Use boss timeline length if longer
+        if bossMaxTime > maxTime then
+            maxTime = bossMaxTime
+        end
+    end
+
+    -- Append player reminder lines
+    for _, line in ipairs(lines) do
+        table.insert(finalLines, line)
+    end
+
+    -- Round up max time to nearest 30 seconds, minimum 60 seconds
+    local timelineLength = math.max(60, math.ceil(maxTime / 30) * 30)
+
+    return {
+        length = timelineLength,
+        defaultColor = {1, 1, 1, 1},
+        useIconOnBlocks = true,
+        lines = finalLines,
+    }, encID, phases, difficulty
+end
+
+-- Create the timeline window
+function NSI:CreateTimelineWindow()
+    local window_width = 1100
+    local window_height = 550
+
+    local timelineWindow = DF:CreateSimplePanel(UIParent, window_width, window_height,
+        "|cFF00FFFFNorthern Sky|r Timeline", "NSUITimelineWindow", {
+        DontRightClickClose = true,
+        UseStatusBar = false,
+    })
+    timelineWindow:SetPoint("CENTER")
+    timelineWindow:SetFrameStrata("HIGH")
+    timelineWindow:EnableMouse(true)
+    timelineWindow:SetMovable(true)
+    timelineWindow:RegisterForDrag("LeftButton")
+    timelineWindow:SetScript("OnDragStart", timelineWindow.StartMoving)
+    timelineWindow:SetScript("OnDragStop", timelineWindow.StopMovingOrSizing)
+
+    local options_dropdown_template = DF:GetTemplate("dropdown", "OPTIONS_DROPDOWN_TEMPLATE")
+
+    -- Mode: "my" = My Reminders (from ProcessedReminder), "all" = All Reminders (from raw strings)
+    timelineWindow.mode = "my"
+
+    -- Mode toggle dropdown
+    local function BuildModeDropdownOptions()
+        return {
+            {
+                label = "My Reminders",
+                value = "my",
+                onclick = function(_, _, value)
+                    timelineWindow.mode = value
+                    timelineWindow.reminderLabel:Hide()
+                    timelineWindow.reminderDropdown:Hide()
+                    self:RefreshTimelineForMode()
+                end
+            },
+            {
+                label = "All Reminders (Raid Leader)",
+                value = "all",
+                onclick = function(_, _, value)
+                    timelineWindow.mode = value
+                    timelineWindow.reminderLabel:Show()
+                    timelineWindow.reminderDropdown:Show()
+                    self:RefreshTimelineForMode()
+                end
+            },
+        }
+    end
+
+    local modeLabel = DF:CreateLabel(timelineWindow, "View:", 11, "white")
+    modeLabel:SetPoint("TOPLEFT", timelineWindow, "TOPLEFT", 10, -30)
+
+    local modeDropdown = DF:CreateDropDown(timelineWindow, BuildModeDropdownOptions, "my", 200)
+    modeDropdown:SetTemplate(options_dropdown_template)
+    modeDropdown:SetPoint("LEFT", modeLabel, "RIGHT", 10, 0)
+    timelineWindow.modeDropdown = modeDropdown
+
+    -- Build reminder dropdown options function (for "All Reminders" mode)
+    local function BuildReminderDropdownOptions()
+        local options = {}
+
+        -- Add shared reminders
+        local sharedList = self:GetAllReminderNames(false)
+        for _, data in ipairs(sharedList) do
+            table.insert(options, {
+                label = data.name,
+                value = {name = data.name, personal = false},
+                onclick = function(_, _, value)
+                    self:RefreshAllRemindersTimeline(value.name, value.personal)
+                    timelineWindow.currentReminder = value
+                end
+            })
+        end
+
+        -- Add personal reminders with separator
+        local personalList = self:GetAllReminderNames(true)
+        if #personalList > 0 then
+            table.insert(options, {
+                label = "--- Personal ---",
+                value = nil,
+            })
+            for _, data in ipairs(personalList) do
+                table.insert(options, {
+                    label = data.name .. " (Personal)",
+                    value = {name = data.name, personal = true},
+                    onclick = function(_, _, value)
+                        self:RefreshAllRemindersTimeline(value.name, value.personal)
+                        timelineWindow.currentReminder = value
+                    end
+                })
+            end
+        end
+
+        return options
+    end
+
+    -- Reminder selection dropdown (only shown in "All Reminders" mode)
+    local reminderLabel = DF:CreateLabel(timelineWindow, "Reminder Set:", 11, "white")
+    reminderLabel:SetPoint("LEFT", modeDropdown, "RIGHT", 20, 0)
+    timelineWindow.reminderLabel = reminderLabel
+    reminderLabel:Hide() -- Hidden by default (My Reminders mode)
+
+    local reminderDropdown = DF:CreateDropDown(timelineWindow, BuildReminderDropdownOptions, nil, 300)
+    reminderDropdown:SetTemplate(options_dropdown_template)
+    reminderDropdown:SetPoint("LEFT", reminderLabel, "RIGHT", 10, 0)
+    timelineWindow.reminderDropdown = reminderDropdown
+    reminderDropdown:Hide() -- Hidden by default (My Reminders mode)
+
+    -- Boss abilities toggle
+    timelineWindow.showBossAbilities = true -- Default to showing boss abilities
+
+    local options_switch_template = DF:GetTemplate("switch", "OPTIONS_CHECKBOX_TEMPLATE")
+
+    local bossAbilitiesToggle = DF:CreateSwitch(timelineWindow,
+        function(self, _, value)
+            timelineWindow.showBossAbilities = value
+            NSI:RefreshTimelineForMode()
+        end,
+        true, 20, 20, nil, nil, nil, "BossAbilitiesToggle", nil, nil, nil, nil, options_switch_template)
+    bossAbilitiesToggle:SetAsCheckBox()
+    bossAbilitiesToggle:SetPoint("TOPRIGHT", timelineWindow, "TOPRIGHT", -15, -28)
+    timelineWindow.bossAbilitiesToggle = bossAbilitiesToggle
+
+    local bossAbilitiesLabel = DF:CreateLabel(timelineWindow, "Show Boss Abilities", 11, "white")
+    bossAbilitiesLabel:SetPoint("RIGHT", bossAbilitiesToggle, "LEFT", -5, 0)
+
+    -- No data label (shown when no reminders)
+    local noDataLabel = DF:CreateLabel(timelineWindow, "No reminders to display. Load a reminder set first with /ns", 14, "gray")
+    noDataLabel:SetPoint("CENTER", timelineWindow, "CENTER", 0, 0)
+    timelineWindow.noDataLabel = noDataLabel
+    noDataLabel:Hide()
+
+    -- Create timeline component
+    -- Height calculation: window_height - top_offset(60) - sliders(45) - help_text(25) = 420
+    local header_width = 180
+    local timelineOptions = {
+        width = window_width - 40 - header_width,  -- Subtract header width when detached
+        height = window_height - 130,
+        header_width = header_width,
+        header_detached = true,
+        line_height = 22,
+        line_padding = 1,
+        pixels_per_second = 15,
+        scale_min = 0.1,
+        scale_max = 2.0,
+        show_elapsed_timeline = true,
+        elapsed_timeline_height = 20,
+        can_resize = false,
+        use_perpixel_buttons = false,
+        backdrop = {edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\Tooltips\UI-Tooltip-Background]], tileSize = 64, tile = true},
+        backdrop_color = {0.1, 0.1, 0.1, 0.8},
+        backdrop_color_highlight = {0.2, 0.2, 0.3, 0.9},
+        backdrop_border_color = {0.1, 0.1, 0.1, 0.3},
+
+        -- Line hover callback
+        on_enter = function(line)
+            line:SetBackdropColor(unpack(line.backdrop_color_highlight))
+        end,
+        on_leave = function(line)
+            -- Restore alternating row color based on index
+            local idx = line.dataIndex or 0
+            if idx % 2 == 1 then
+                line:SetBackdropColor(0, 0, 0, 0)
+            else
+                line:SetBackdropColor(0.1, 0.1, 0.1, 0.8)
+            end
+        end,
+
+        -- Called when a line is created - add tooltip to the header
+        on_create_line = function(line)
+            if line.lineHeader then
+                line.lineHeader:EnableMouse(true)
+                line.lineHeader:SetScript("OnEnter", function(self)
+                    -- Highlight the line
+                    line:SetBackdropColor(unpack(line.backdrop_color_highlight))
+                    -- Show spell tooltip
+                    if line.lineData and line.lineData.spellId then
+                        GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
+                        GameTooltip:SetSpellByID(line.lineData.spellId)
+                        GameTooltip:Show()
+                    end
+                end)
+                line.lineHeader:SetScript("OnLeave", function(self)
+                    -- Restore alternating row color based on index
+                    local idx = line.dataIndex or 0
+                    if idx % 2 == 1 then
+                        line:SetBackdropColor(0, 0, 0, 0)
+                    else
+                        line:SetBackdropColor(0.1, 0.1, 0.1, 0.8)
+                    end
+                    GameTooltip:Hide()
+                end)
+            end
+            -- Constrain text width to prevent overflow
+            if line.text then
+                line.text:SetWordWrap(false)
+                line.text:SetWidth(150) -- header_width (180) - icon (22) - padding (8)
+            end
+        end,
+
+        -- Block hover tooltip
+        block_on_enter = function(block)
+            if block.info and block.info.time then
+                GameTooltip:SetOwner(block, "ANCHOR_RIGHT")
+                local minutes = math.floor(block.info.time / 60)
+                local seconds = math.floor(block.info.time % 60)
+                local timeStr = string.format("%d:%02d", minutes, seconds)
+
+                local spellName = ""
+                if block.info.spellId then
+                    local spellInfo = C_Spell.GetSpellInfo(block.info.spellId)
+                    if spellInfo then
+                        spellName = spellInfo.name or ""
+                    end
+                end
+
+                GameTooltip:AddLine(spellName ~= "" and spellName or "Reminder", 1, 1, 1)
+                GameTooltip:AddLine("Time: " .. timeStr, 0.7, 0.7, 0.7)
+                local duration = tonumber(block.info.duration) or 0
+                if duration > 0 then
+                    GameTooltip:AddLine("Duration: " .. duration .. "s", 0.7, 0.7, 0.7)
+                end
+
+                -- Show category for boss abilities
+                if block.blockData and block.blockData.payload then
+                    local payload = block.blockData.payload
+                    if payload.isBossAbility and payload.category then
+                        local categoryColors = {
+                            damage = "|cffe64c4c",
+                            tank = "|cff4c80e6",
+                            movement = "|cffe6b333",
+                            soak = "|cff80e680",
+                            intermission = "|cffb366e6",
+                        }
+                        local colorCode = categoryColors[payload.category] or "|cffb3b3b3"
+                        GameTooltip:AddLine("Category: " .. colorCode .. payload.category .. "|r", 0.7, 0.7, 0.7)
+                        if payload.important then
+                            GameTooltip:AddLine("|cffff9900Use Healing CDs!|r", 1, 0.6, 0)
+                        end
+                    elseif payload.phase then
+                        GameTooltip:AddLine("Phase: " .. payload.phase, 0.7, 0.7, 0.7)
+                    end
+                    if payload.text then
+                        GameTooltip:AddLine("Text: " .. payload.text, 0.5, 0.8, 0.5)
+                    end
+                end
+                GameTooltip:Show()
+            end
+        end,
+        block_on_leave = function(block)
+            GameTooltip:Hide()
+        end,
+    }
+
+    local timelineFrame = DF:CreateTimeLineFrame(timelineWindow, "$parentTimeLine", timelineOptions)
+    timelineWindow.timeline = timelineFrame
+
+    -- Setup zoom-to-cursor and sticky ruler hooks
+    self:SetupTimelineHooks(timelineFrame)
+
+    -- Position the detached header (sticky first column) and timeline
+    if timelineFrame.headerFrame then
+        timelineFrame.headerFrame:SetPoint("TOPLEFT", timelineWindow, "TOPLEFT", 10, -60)
+        timelineFrame.headerFrame:SetHeight(timelineOptions.height)
+        timelineFrame:SetPoint("TOPLEFT", timelineFrame.headerFrame, "TOPRIGHT", 0, 0)
+    else
+        timelineFrame:SetPoint("TOPLEFT", timelineWindow, "TOPLEFT", 10, -60)
+    end
+
+    -- Hook scale slider to update phase markers when zooming
+    if timelineFrame.scaleSlider then
+        timelineFrame.scaleSlider:HookScript("OnValueChanged", function()
+            NSI:UpdatePhaseMarkers()
+        end)
+    end
+
+    -- Help text (positioned at bottom, below the sliders)
+    local helpLabel = DF:CreateLabel(timelineWindow, "Scroll: Navigate | Ctrl+Scroll: Zoom | Shift+Scroll: Vertical", 10, "gray")
+    helpLabel:SetPoint("BOTTOMLEFT", timelineWindow, "BOTTOMLEFT", 10, 5)
+
+    timelineWindow:Hide()
+    return timelineWindow
+end
+
+-- Toggle the timeline window
+function NSI:ToggleTimelineWindow()
+    if not self.TimelineWindow then
+        self.TimelineWindow = self:CreateTimelineWindow()
+    end
+
+    if self.TimelineWindow:IsShown() then
+        self.TimelineWindow:Hide()
+    else
+        self.TimelineWindow:Show()
+        -- Default to "My Reminders" mode
+        self:RefreshTimelineForMode()
+    end
+end
+
+-- Refresh timeline based on current mode
+function NSI:RefreshTimelineForMode()
+    if not self.TimelineWindow then return end
+
+    if self.TimelineWindow.mode == "my" then
+        self:RefreshMyRemindersTimeline()
+    else
+        -- "all" mode - need to select a reminder set
+        local currentReminder = self.TimelineWindow.currentReminder
+        if currentReminder then
+            self:RefreshAllRemindersTimeline(currentReminder.name, currentReminder.personal)
+        else
+            -- Try to select active reminder
+            local activeReminder = NSRT.ActiveReminder
+            local isPersonal = false
+            if not activeReminder or activeReminder == "" then
+                activeReminder = NSRT.ActivePersonalReminder
+                isPersonal = true
+            end
+            if activeReminder and activeReminder ~= "" then
+                self:RefreshAllRemindersTimeline(activeReminder, isPersonal)
+                self.TimelineWindow.currentReminder = {name = activeReminder, personal = isPersonal}
+                self.TimelineWindow.reminderDropdown:Select({name = activeReminder, personal = isPersonal})
+            else
+                self.TimelineWindow.noDataLabel:SetText("Select a reminder set from the dropdown.")
+                self.TimelineWindow.noDataLabel:Show()
+                self.TimelineWindow.timeline:Hide()
+            end
+        end
+    end
+end
+
+-- Refresh timeline with player's own processed reminders (My Reminders mode)
+function NSI:RefreshMyRemindersTimeline()
+    if not self.TimelineWindow or not self.TimelineWindow.timeline then return end
+
+    local includeBossAbilities = self.TimelineWindow.showBossAbilities
+    local data, encID, phases, difficulty = self:GetMyTimelineData(includeBossAbilities)
+
+    if data and data.lines and #data.lines > 0 then
+        self.TimelineWindow.noDataLabel:Hide()
+        self.TimelineWindow.timeline:Show()
+        self.TimelineWindow.timeline:SetData(data)
+        self.TimelineWindow.currentEncounterID = encID
+        self.TimelineWindow.currentPhases = phases
+        self.TimelineWindow.currentDifficulty = difficulty
+        self:UpdatePhaseMarkers()
+        self:UpdateTimelineTitle()
+    else
+        -- If no player reminders but boss abilities enabled, show just boss abilities
+        if includeBossAbilities then
+            -- Get encounter ID and difficulty from active reminder
+            local bossEncID = self.EncounterID
+            local fallbackDifficulty = "Mythic"
+            local activeReminder = NSRT.ActiveReminder
+            local reminderSource = NSRT.Reminders
+            if not activeReminder or activeReminder == "" then
+                activeReminder = NSRT.ActivePersonalReminder
+                reminderSource = NSRT.PersonalReminders
+            end
+            if activeReminder and activeReminder ~= "" and reminderSource[activeReminder] then
+                local reminderStr = reminderSource[activeReminder]
+                -- Get encounter ID from reminder if not in encounter
+                if not bossEncID then
+                    local encIDStr = reminderStr:match("EncounterID:(%d+)")
+                    bossEncID = encIDStr and tonumber(encIDStr)
+                end
+                -- Get difficulty
+                local diff = reminderStr:match("Difficulty:([^;\n]+)")
+                if diff then
+                    fallbackDifficulty = strtrim(diff)
+                end
+            end
+
+            if bossEncID and self.BossTimelines and self.BossTimelines[bossEncID] then
+                local bossLines, bossMaxTime, bossPhases, bossDifficulty = self:GetBossAbilityLines(bossEncID, false, fallbackDifficulty)
+                if #bossLines > 0 then
+                    local bossData = {
+                        length = math.max(60, math.ceil(bossMaxTime / 30) * 30),
+                        defaultColor = {1, 1, 1, 1},
+                        useIconOnBlocks = true,
+                        lines = bossLines,
+                    }
+                    self.TimelineWindow.noDataLabel:Hide()
+                    self.TimelineWindow.timeline:Show()
+                    self.TimelineWindow.timeline:SetData(bossData)
+                    self.TimelineWindow.currentEncounterID = bossEncID
+                    self.TimelineWindow.currentPhases = bossPhases
+                    self.TimelineWindow.currentDifficulty = bossDifficulty
+                    self:UpdatePhaseMarkers()
+                    self:UpdateTimelineTitle()
+                    return
+                end
+            end
+        end
+
+        self.TimelineWindow.noDataLabel:SetText("No reminders loaded for you.\nLoad a reminder set with /ns and ensure it contains assignments for you.")
+        self.TimelineWindow.noDataLabel:Show()
+        self.TimelineWindow.timeline:SetData({
+            length = 300,
+            defaultColor = {1, 1, 1, 1},
+            useIconOnBlocks = true,
+            lines = {},
+        })
+        self.TimelineWindow.currentEncounterID = nil
+        self.TimelineWindow.currentPhases = nil
+        self.TimelineWindow.currentDifficulty = nil
+        self:UpdatePhaseMarkers()
+        self:UpdateTimelineTitle()
+    end
+end
+
+-- Refresh timeline with all reminders from a reminder set (All Reminders mode)
+function NSI:RefreshAllRemindersTimeline(reminderName, personal)
+    if not self.TimelineWindow or not self.TimelineWindow.timeline then return end
+
+    local includeBossAbilities = self.TimelineWindow.showBossAbilities
+    local data, encID, phases, difficulty = self:GetAllTimelineData(reminderName, personal, includeBossAbilities)
+
+    if data and data.lines and #data.lines > 0 then
+        self.TimelineWindow.noDataLabel:Hide()
+        self.TimelineWindow.timeline:Show()
+        self.TimelineWindow.timeline:SetData(data)
+        self.TimelineWindow.currentEncounterID = encID
+        self.TimelineWindow.currentPhases = phases
+        self.TimelineWindow.currentDifficulty = difficulty
+        self:UpdatePhaseMarkers()
+        self:UpdateTimelineTitle()
+    else
+        self.TimelineWindow.noDataLabel:SetText("No player-specific reminders found in this reminder set.\n(Only showing named player assignments, not role/group tags)")
+        self.TimelineWindow.noDataLabel:Show()
+        self.TimelineWindow.timeline:SetData({
+            length = 300,
+            defaultColor = {1, 1, 1, 1},
+            useIconOnBlocks = true,
+            lines = {},
+        })
+        self.TimelineWindow.currentEncounterID = nil
+        self.TimelineWindow.currentPhases = nil
+        self.TimelineWindow.currentDifficulty = nil
+        self:UpdatePhaseMarkers()
+        self:UpdateTimelineTitle()
+    end
+end
+
+-- Update timeline window title with boss name and difficulty
+function NSI:UpdateTimelineTitle()
+    local window = self.TimelineWindow
+    if not window then return end
+
+    local title = "|cFF00FFFFNorthern Sky|r Timeline"
+
+    local encID = window.currentEncounterID
+    if encID then
+        local bossName = self:GetEncounterName(encID)
+        local difficulty = window.currentDifficulty
+
+        if difficulty then
+            title = string.format("|cFF00FFFFNorthern Sky|r Timeline - %s (%s)", bossName, difficulty)
+        else
+            title = string.format("|cFF00FFFFNorthern Sky|r Timeline - %s", bossName)
+        end
+    end
+
+    -- Update the title text
+    if window.TitleBar and window.TitleBar.Text then
+        window.TitleBar.Text:SetText(title)
+    elseif window.Title then
+        window.Title:SetText(title)
+    end
+end
+
+-- Update phase markers on the timeline
+function NSI:UpdatePhaseMarkers()
+    local window = self.TimelineWindow
+    if not window then return end
+
+    -- Create phase markers container if needed
+    if not window.phaseMarkers then
+        window.phaseMarkers = {}
+    end
+
+    -- Hide all existing markers
+    for _, marker in pairs(window.phaseMarkers) do
+        marker:Hide()
+    end
+
+    local phases = window.currentPhases
+    local encID = window.currentEncounterID
+    if not phases or not encID then return end
+
+    local timeline = window.timeline
+    if not timeline then return end
+
+    -- Get timeline scroll frame info for positioning
+    local body = timeline.body
+    if not body then return end
+
+    local basePixelsPerSecond = timeline.options.pixels_per_second or 15
+    local currentScale = timeline.currentScale or 1
+    local pixelsPerSecond = basePixelsPerSecond * currentScale
+    local headerWidth = timeline.options.header_width or 180
+    local elapsedHeight = timeline.options.elapsed_timeline_height or 20
+
+    -- Create/update phase markers
+    for phaseNum, phaseData in pairs(phases) do
+        -- Skip phase 1 (always at 0)
+        if phaseNum > 1 then
+            local marker = window.phaseMarkers[phaseNum]
+            if not marker then
+                -- Create new marker
+                marker = CreateFrame("Frame", nil, body, "BackdropTemplate")
+                marker:SetSize(4, body:GetHeight() - elapsedHeight)
+                marker:SetBackdrop({bgFile = "Interface\\Buttons\\WHITE8X8"})
+
+                -- Make it draggable
+                marker:EnableMouse(true)
+                marker:SetMovable(true)
+                marker:RegisterForDrag("LeftButton")
+
+                marker.phaseNum = phaseNum
+                marker.encID = encID
+
+                marker:SetScript("OnDragStart", function(self)
+                    self.isDragging = true
+                    self:StartMoving()
+                end)
+
+                marker:SetScript("OnDragStop", function(self)
+                    self:StopMovingOrSizing()
+                    self.isDragging = false
+
+                    -- Calculate new time based on position (use current scale)
+                    local currentPPS = (timeline.options.pixels_per_second or 15) * (timeline.currentScale or 1)
+                    local bodyLeft = body:GetLeft() or 0
+                    local markerLeft = self:GetLeft() or 0
+                    local xOffset = markerLeft - bodyLeft
+
+                    local newTime = math.max(0, xOffset / currentPPS)
+                    newTime = math.floor(newTime) -- Round to nearest second
+
+                    -- Save the new phase timing
+                    NSI:SetPhaseStart(self.encID, self.phaseNum, newTime)
+
+                    -- Refresh the timeline
+                    NSI:RefreshTimelineForMode()
+                end)
+
+                -- Tooltip
+                marker:SetScript("OnEnter", function(self)
+                    GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
+                    local phaseName = phases[self.phaseNum] and phases[self.phaseNum].name or ("Phase " .. self.phaseNum)
+                    local time = NSI:GetPhaseStart(self.encID, self.phaseNum)
+                    local minutes = math.floor(time / 60)
+                    local seconds = math.floor(time % 60)
+                    GameTooltip:AddLine(phaseName, 1, 1, 1)
+                    GameTooltip:AddLine(string.format("Start: %d:%02d", minutes, seconds), 0.7, 0.7, 0.7)
+                    GameTooltip:AddLine("|cff00ff00Drag to adjust timing|r", 0, 1, 0)
+                    GameTooltip:AddLine("|cffff9900Right-click to reset|r", 1, 0.6, 0)
+                    GameTooltip:Show()
+                end)
+
+                marker:SetScript("OnLeave", function(self)
+                    GameTooltip:Hide()
+                end)
+
+                -- Right-click to reset
+                marker:SetScript("OnMouseDown", function(self, button)
+                    if button == "RightButton" then
+                        NSI:ResetPhaseStart(self.encID, self.phaseNum)
+                        NSI:RefreshTimelineForMode()
+                    end
+                end)
+
+                window.phaseMarkers[phaseNum] = marker
+            end
+
+            -- Position the marker
+            local phaseStart = self:GetPhaseStart(encID, phaseNum)
+            local xPos = phaseStart * pixelsPerSecond
+
+            -- Set color from phase data (default to red for visibility)
+            local color = phaseData.color or {0.8, 0.2, 0.2}
+            marker:SetBackdropColor(color[1], color[2], color[3], 0.8)
+
+            marker:ClearAllPoints()
+            marker:SetPoint("TOPLEFT", body, "TOPLEFT", xPos, -elapsedHeight)
+            marker:SetHeight(body:GetHeight() - elapsedHeight)
+            marker:SetFrameLevel(body:GetFrameLevel() + 10)
+            marker:Show()
+
+            -- Update stored data
+            marker.encID = encID
+        end
+    end
+end
+
+--------------------------------------------------------------------------------
+-- EMBEDDED TIMELINE FUNCTIONS (for NSUI tab)
+--------------------------------------------------------------------------------
+
+-- Refresh the embedded timeline based on current mode
+function NSI:RefreshEmbeddedTimeline(tab)
+    if not tab or not tab.timeline then return end
+
+    if tab.timelineMode == "my" then
+        self:RefreshEmbeddedMyReminders(tab)
+    else
+        local currentReminder = tab.currentReminder
+        if currentReminder then
+            self:RefreshEmbeddedAllReminders(tab, currentReminder.name, currentReminder.personal)
+        else
+            -- Try to select active reminder
+            local activeReminder = NSRT.ActiveReminder
+            local isPersonal = false
+            if not activeReminder or activeReminder == "" then
+                activeReminder = NSRT.ActivePersonalReminder
+                isPersonal = true
+            end
+            if activeReminder and activeReminder ~= "" then
+                self:RefreshEmbeddedAllReminders(tab, activeReminder, isPersonal)
+                tab.currentReminder = {name = activeReminder, personal = isPersonal}
+                tab.reminderDropdown:Select({name = activeReminder, personal = isPersonal})
+            else
+                tab.noDataLabel:SetText("Select a reminder set from the dropdown.")
+                tab.noDataLabel:Show()
+                tab.timeline:Hide()
+            end
+        end
+    end
+end
+
+-- Refresh embedded timeline with player's own processed reminders
+function NSI:RefreshEmbeddedMyReminders(tab)
+    if not tab or not tab.timeline then return end
+
+    local includeBossAbilities = tab.showBossAbilities
+    local data, encID, phases, difficulty = self:GetMyTimelineData(includeBossAbilities)
+
+    if data and data.lines and #data.lines > 0 then
+        tab.noDataLabel:Hide()
+        tab.timeline:Show()
+        tab.timeline:SetData(data)
+        tab.currentEncounterID = encID
+        tab.currentPhases = phases
+        tab.currentDifficulty = difficulty
+        self:UpdateEmbeddedPhaseMarkers(tab)
+        self:UpdateEmbeddedTimelineTitle(tab)
+    else
+        -- If no player reminders but boss abilities enabled, show just boss abilities
+        if includeBossAbilities then
+            -- Get encounter ID and difficulty from active reminder
+            local bossEncID = self.EncounterID
+            local fallbackDifficulty = "Mythic"
+            local activeReminder = NSRT.ActiveReminder
+            local reminderSource = NSRT.Reminders
+            if not activeReminder or activeReminder == "" then
+                activeReminder = NSRT.ActivePersonalReminder
+                reminderSource = NSRT.PersonalReminders
+            end
+            if activeReminder and activeReminder ~= "" and reminderSource[activeReminder] then
+                local reminderStr = reminderSource[activeReminder]
+                -- Get encounter ID from reminder if not in encounter
+                if not bossEncID then
+                    local encIDStr = reminderStr:match("EncounterID:(%d+)")
+                    bossEncID = encIDStr and tonumber(encIDStr)
+                end
+                -- Get difficulty
+                local diff = reminderStr:match("Difficulty:([^;\n]+)")
+                if diff then
+                    fallbackDifficulty = strtrim(diff)
+                end
+            end
+
+            if bossEncID and self.BossTimelines and self.BossTimelines[bossEncID] then
+                local bossLines, bossMaxTime, bossPhases, bossDifficulty = self:GetBossAbilityLines(bossEncID, false, fallbackDifficulty)
+                if #bossLines > 0 then
+                    local bossData = {
+                        length = math.max(60, math.ceil(bossMaxTime / 30) * 30),
+                        defaultColor = {1, 1, 1, 1},
+                        useIconOnBlocks = true,
+                        lines = bossLines,
+                    }
+                    tab.noDataLabel:Hide()
+                    tab.timeline:Show()
+                    tab.timeline:SetData(bossData)
+                    tab.currentEncounterID = bossEncID
+                    tab.currentPhases = bossPhases
+                    tab.currentDifficulty = bossDifficulty
+                    self:UpdateEmbeddedPhaseMarkers(tab)
+                    self:UpdateEmbeddedTimelineTitle(tab)
+                    return
+                end
+            end
+        end
+
+        tab.noDataLabel:SetText("No reminders loaded for you.\nLoad a reminder set with /ns and ensure it contains assignments for you.")
+        tab.noDataLabel:Show()
+        tab.timeline:SetData({
+            length = 300,
+            defaultColor = {1, 1, 1, 1},
+            useIconOnBlocks = true,
+            lines = {},
+        })
+        tab.currentEncounterID = nil
+        tab.currentPhases = nil
+        tab.currentDifficulty = nil
+        self:UpdateEmbeddedPhaseMarkers(tab)
+        self:UpdateEmbeddedTimelineTitle(tab)
+    end
+end
+
+-- Refresh embedded timeline with all reminders from a reminder set
+function NSI:RefreshEmbeddedAllReminders(tab, reminderName, personal)
+    if not tab or not tab.timeline then return end
+
+    local includeBossAbilities = tab.showBossAbilities
+    local data, encID, phases, difficulty = self:GetAllTimelineData(reminderName, personal, includeBossAbilities)
+
+    if data and data.lines and #data.lines > 0 then
+        tab.noDataLabel:Hide()
+        tab.timeline:Show()
+        tab.timeline:SetData(data)
+        tab.currentEncounterID = encID
+        tab.currentPhases = phases
+        tab.currentDifficulty = difficulty
+        self:UpdateEmbeddedPhaseMarkers(tab)
+        self:UpdateEmbeddedTimelineTitle(tab)
+    else
+        tab.noDataLabel:SetText("No player-specific reminders found in this reminder set.\n(Only showing named player assignments, not role/group tags)")
+        tab.noDataLabel:Show()
+        tab.timeline:SetData({
+            length = 300,
+            defaultColor = {1, 1, 1, 1},
+            useIconOnBlocks = true,
+            lines = {},
+        })
+        tab.currentEncounterID = nil
+        tab.currentPhases = nil
+        tab.currentDifficulty = nil
+        self:UpdateEmbeddedPhaseMarkers(tab)
+        self:UpdateEmbeddedTimelineTitle(tab)
+    end
+end
+
+-- Update embedded timeline title with boss name and difficulty
+function NSI:UpdateEmbeddedTimelineTitle(tab)
+    if not tab or not tab.titleLabel then return end
+
+    local title = ""
+    local encID = tab.currentEncounterID
+    if encID then
+        local bossName = self:GetEncounterName(encID)
+        local difficulty = tab.currentDifficulty
+        if difficulty then
+            title = string.format("%s (%s)", bossName, difficulty)
+        else
+            title = bossName
+        end
+    end
+
+    tab.titleLabel:SetText(title)
+end
+
+-- Update phase markers on the embedded timeline
+function NSI:UpdateEmbeddedPhaseMarkers(tab)
+    if not tab then return end
+
+    -- Create phase markers container if needed
+    if not tab.phaseMarkers then
+        tab.phaseMarkers = {}
+    end
+
+    -- Hide all existing markers
+    for _, marker in pairs(tab.phaseMarkers) do
+        marker:Hide()
+    end
+
+    local phases = tab.currentPhases
+    local encID = tab.currentEncounterID
+    if not phases or not encID then return end
+
+    local timeline = tab.timeline
+    if not timeline then return end
+
+    local body = timeline.body
+    if not body then return end
+
+    local basePixelsPerSecond = timeline.options.pixels_per_second or 15
+    local currentScale = timeline.currentScale or 1
+    local pixelsPerSecond = basePixelsPerSecond * currentScale
+    local elapsedHeight = timeline.options.elapsed_timeline_height or 20
+
+    for phaseNum, phaseData in pairs(phases) do
+        if phaseNum > 1 then
+            local marker = tab.phaseMarkers[phaseNum]
+            if not marker then
+                marker = CreateFrame("Frame", nil, body, "BackdropTemplate")
+                marker:SetSize(4, body:GetHeight() - elapsedHeight)
+                marker:SetBackdrop({bgFile = "Interface\\Buttons\\WHITE8X8"})
+
+                marker:EnableMouse(true)
+                marker:SetMovable(true)
+                marker:RegisterForDrag("LeftButton")
+
+                marker.phaseNum = phaseNum
+                marker.encID = encID
+                marker.parentTab = tab
+
+                marker:SetScript("OnDragStart", function(self)
+                    self.isDragging = true
+                    self:StartMoving()
+                end)
+
+                marker:SetScript("OnDragStop", function(self)
+                    self:StopMovingOrSizing()
+                    self.isDragging = false
+
+                    local currentPPS = (timeline.options.pixels_per_second or 15) * (timeline.currentScale or 1)
+                    local bodyLeft = body:GetLeft() or 0
+                    local markerLeft = self:GetLeft() or 0
+                    local xOffset = markerLeft - bodyLeft
+
+                    local newTime = math.max(0, xOffset / currentPPS)
+                    newTime = math.floor(newTime)
+
+                    NSI:SetPhaseStart(self.encID, self.phaseNum, newTime)
+                    NSI:RefreshEmbeddedTimeline(self.parentTab)
+                end)
+
+                marker:SetScript("OnEnter", function(self)
+                    GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
+                    local phaseName = phases[self.phaseNum] and phases[self.phaseNum].name or ("Phase " .. self.phaseNum)
+                    local time = NSI:GetPhaseStart(self.encID, self.phaseNum)
+                    local minutes = math.floor(time / 60)
+                    local seconds = math.floor(time % 60)
+                    GameTooltip:AddLine(phaseName, 1, 1, 1)
+                    GameTooltip:AddLine(string.format("Start: %d:%02d", minutes, seconds), 0.7, 0.7, 0.7)
+                    GameTooltip:AddLine("|cff00ff00Drag to adjust timing|r", 0, 1, 0)
+                    GameTooltip:AddLine("|cffff9900Right-click to reset|r", 1, 0.6, 0)
+                    GameTooltip:Show()
+                end)
+
+                marker:SetScript("OnLeave", function(self)
+                    GameTooltip:Hide()
+                end)
+
+                marker:SetScript("OnMouseDown", function(self, button)
+                    if button == "RightButton" then
+                        NSI:ResetPhaseStart(self.encID, self.phaseNum)
+                        NSI:RefreshEmbeddedTimeline(self.parentTab)
+                    end
+                end)
+
+                tab.phaseMarkers[phaseNum] = marker
+            end
+
+            local phaseStart = self:GetPhaseStart(encID, phaseNum)
+            local xPos = phaseStart * pixelsPerSecond
+
+            local color = phaseData.color or {0.8, 0.2, 0.2}
+            marker:SetBackdropColor(color[1], color[2], color[3], 0.8)
+
+            marker:ClearAllPoints()
+            marker:SetPoint("TOPLEFT", body, "TOPLEFT", xPos, -elapsedHeight)
+            marker:SetHeight(body:GetHeight() - elapsedHeight)
+            marker:SetFrameLevel(body:GetFrameLevel() + 10)
+            marker:Show()
+
+            marker.encID = encID
+        end
+    end
+end