diff --git a/Legion/CourtOfStars/AdvisorMelandrus.lua b/Legion/CourtOfStars/AdvisorMelandrus.lua
index d452dc097..96d4ed9a3 100644
--- a/Legion/CourtOfStars/AdvisorMelandrus.lua
+++ b/Legion/CourtOfStars/AdvisorMelandrus.lua
@@ -1,3 +1,6 @@
+--TO DO
+--Fix timers
+--Confirm Enveloping Winds spellId
 
 --------------------------------------------------------------------------------
 -- Module Declaration
@@ -12,6 +15,7 @@ mod.engageId = 1870
 -- Locals
 --
 
+local bladeSurgeCount = 0
 
 --------------------------------------------------------------------------------
 -- Initialization
@@ -19,22 +23,50 @@ mod.engageId = 1870
 
 function mod:GetOptions()
 	return {
-		153764, -- Claws of Argus
-		{153392, "FLASH", "ICON", "PROXIMITY"}, -- Curtain of Flame
+		209602, -- Blade Surge
+		224333, -- Enveloping Winds
+		209628, -- Piercing Gale
+		209676, -- Slicing Maelstrom
 	}
 end
 
 function mod:OnBossEnable()
 	self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
 
+	self:Log("SPELL_CAST_START", "BladeSurge", 209602)
+	self:Log("SPELL_CAST_SUCCESS", "EnvelopingWinds", 224333)
+	self:Log("SPELL_CAST_START", "PiercingGale", 209628)
+	self:Log("SPELL_CAST_START", "SlicingMaelstrom", 209676)
+
 	self:Death("Win", 104218)
 end
 
 function mod:OnEngage()
-
+	local bladeSurgeCount = 0
+	--self:CDBar(??, ??)
 end
 
 --------------------------------------------------------------------------------
 -- Event Handlers
 --
 
+function mod:BladeSurge(args)
+	bladeSurgeCount = bladeSurgeCount + 1
+	self:Message(args.spellId, "Important", "Info", CL.count:format(args.spellName, bladeSurgeCount))
+	--self:CDBar(args.spellId, ??)
+end
+
+function mod:EnvelopingWinds(args)
+	self:Message(args.spellId, "Important", "Info")
+	--self:CDBar(args.spellId, ??)
+end
+
+function mod:PiercingGale(args)
+	self:Message(args.spellId, "Urgent", "Alarm")
+	--self:CDBar(args.spellId, ??)
+end
+
+function mod:SlicingMaelstrom(args)
+	self:Message(args.spellId, "Attention", "Warning", CL.incoming:format(args.spellName))
+	--self:CDBar(args.spellId, ??)
+end
diff --git a/Legion/CourtOfStars/PatrolCaptainGerdo.lua b/Legion/CourtOfStars/PatrolCaptainGerdo.lua
index 1d0cf554a..015d3806c 100644
--- a/Legion/CourtOfStars/PatrolCaptainGerdo.lua
+++ b/Legion/CourtOfStars/PatrolCaptainGerdo.lua
@@ -1,3 +1,5 @@
+--TO DO
+--Fix timers
 
 --------------------------------------------------------------------------------
 -- Module Declaration
@@ -8,33 +10,60 @@ if not mod then return end
 mod:RegisterEnableMob(104215)
 --mod.engageId = 1868
 
---------------------------------------------------------------------------------
--- Locals
---
-
-
 --------------------------------------------------------------------------------
 -- Initialization
 --
 
 function mod:GetOptions()
 	return {
-		153764, -- Claws of Argus
-		{153392, "FLASH", "ICON", "PROXIMITY"}, -- Curtain of Flame
+		207261, -- Resonant Slash
+		219488, -- Streetsweeper
+		207278, -- Arcane Lockdown
+		207806, -- Signal Beacon
+		207815, -- Flask of the Solemn Night
 	}
 end
 
 function mod:OnBossEnable()
 	self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
 
+	self:Log("SPELL_CAST_START", "ResonantSlash", 207261)
+	self:Log("SPELL_CAST_SUCCESS", "Streetsweeper", 219488)
+	self:Log("SPELL_CAST_START", "ArcaneLockdown", 207278)
+	self:Log("SPELL_CAST_START", "SignalBeacon", 207806)
+	self:Log("SPELL_CAST_START", "FlaskoftheSolemnNight", 207815)
+
 	self:Death("Win", 104215)
 end
 
 function mod:OnEngage()
-
+	--self:CDBar(??, ??)
 end
 
 --------------------------------------------------------------------------------
 -- Event Handlers
 --
 
+function mod:ResonantSlash(args)
+	self:Message(args.spellId, "Urgent", "Alarm")
+	--self:CDBar(args.spellId, ??)
+end
+
+function mod:Streetsweeper(args)
+	self:Message(args.spellId, "Important", "Info")
+	--self:CDBar(args.spellId, ??)
+end
+
+function mod:ArcaneLockdown(args)
+	self:Message(args.spellId, "Attention", "Long", CL.incoming:format(args.spellName))
+	--self:CDBar(args.spellId, ??)
+end
+
+function mod:SignalBeacon(args)
+	self:Message(args.spellId, "Attention", "Alert")
+	--self:CDBar(args.spellId, ??)
+end
+
+function mod:FlaskoftheSolemnNight(args)
+	self:Message(args.spellId, "Attention", "Info")
+end
diff --git a/Legion/CourtOfStars/TalixaeFlamewreath.lua b/Legion/CourtOfStars/TalixaeFlamewreath.lua
index 32822082c..e4742f709 100644
--- a/Legion/CourtOfStars/TalixaeFlamewreath.lua
+++ b/Legion/CourtOfStars/TalixaeFlamewreath.lua
@@ -1,3 +1,6 @@
+--TO DO
+--Fix timers
+--maybe some sort of dispel warning when people reach x stacks of Withering Soul?
 
 --------------------------------------------------------------------------------
 -- Module Declaration
@@ -12,6 +15,7 @@ mod:RegisterEnableMob(104217)
 -- Locals
 --
 
+local burningIntensityCount = 0
 
 --------------------------------------------------------------------------------
 -- Initialization
@@ -19,22 +23,43 @@ mod:RegisterEnableMob(104217)
 
 function mod:GetOptions()
 	return {
-		153764, -- Claws of Argus
-		{153392, "FLASH", "ICON", "PROXIMITY"}, -- Curtain of Flame
+		207881, -- Infernal Eruption
+		207906, -- Burning Intensity
+		208165, -- Withering Soul
 	}
 end
 
 function mod:OnBossEnable()
 	self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
 
+	self:Log("SPELL_CAST_START", "InfernalEruption", 207881)
+	self:Log("SPELL_CAST_START", "BurningIntensity", 207906)
+	self:Log("SPELL_CAST_START", "WitheringSoul", 208165)
+
 	self:Death("Win", 104217)
 end
 
 function mod:OnEngage()
-
+	burningIntensityCount = 0
+	--self:CDBar(??, ??)
 end
 
 --------------------------------------------------------------------------------
 -- Event Handlers
 --
 
+function mod:InfernalEruption(args)
+	self:Message(args.spellId, "Urgent", "Long")
+	--self:CDBar(args.spellId, ??)
+end
+
+function mod:BurningIntensity(args)
+	burningIntensityCount = burningIntensityCount + 1
+	self:Message(args.spellId, "Important", "Info", CL.count:format(args.spellName, burningIntensityCount))
+	--self:CDBar(args.spellId, ??)
+end
+
+function mod:WitheringSoul(args)
+	self:Message(args.spellId, "Attention", "Alert")
+	--self:CDBar(args.spellId, ??)
+end
diff --git a/modules.xml b/modules.xml
index f133d7c8f..aa959208d 100644
--- a/modules.xml
+++ b/modules.xml
@@ -84,9 +84,9 @@
 <!-- Legion -->
 <!-- <Include file="Legion\AssaultOnVioletHold\modules.xml"/> -->
 
-<Include file="Legion\BlackRookHold\modules.xml"/> 
+<Include file="Legion\BlackRookHold\modules.xml"/>
 
-<!-- <Include file="Legion\CourtOfStars\modules.xml"/> -->
+<Include file="Legion\CourtOfStars\modules.xml"/>
 
 <Include file="Legion\DarkheartThicket\modules.xml"/>
 
@@ -102,4 +102,3 @@
 
 <!-- <Include file="Legion\VaultOfTheWardens\modules.xml"/> -->
 </Ui>
-