diff --git a/Classic/DireMaul/MagisterKalendris.lua b/Classic/DireMaul/MagisterKalendris.lua
index d05940957..f5c1aff18 100644
--- a/Classic/DireMaul/MagisterKalendris.lua
+++ b/Classic/DireMaul/MagisterKalendris.lua
@@ -6,7 +6,7 @@ local mod, CL = BigWigs:NewBoss("Magister Kalendris", 429, 408)
 if not mod then return end
 mod:RegisterEnableMob(11487) -- Magister Kalendris
 mod:SetEncounterID(348)
---mod:SetRespawnTime(0)
+--mod:SetRespawnTime(0) resets, doesn't respawn
 
 --------------------------------------------------------------------------------
 -- Initialization
@@ -14,25 +14,37 @@ mod:SetEncounterID(348)
 
 function mod:GetOptions()
 	return {
-
+		22917, -- Shadowform
+		7645, -- Dominate Mind
 	}
 end
 
 function mod:OnBossEnable()
-	if self:Retail() then
-		self:RegisterEvent("ENCOUNTER_START") -- XXX no boss frames
+	self:Log("SPELL_CAST_SUCCESS", "Shadowform", 22917)
+	self:Log("SPELL_CAST_SUCCESS", "DominateMind", 7645)
+	if self:Heroic() then -- no encounter events in Timewalking
+		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
+		self:Death("Win", 11487)
 	end
 end
 
 function mod:OnEngage()
+	if not self:Solo() then
+		self:CDBar(7645, 10.2) -- Dominate Mind
+	end
 end
 
 --------------------------------------------------------------------------------
 -- Event Handlers
 --
 
-function mod:ENCOUNTER_START(_, id) -- XXX no boss frames
-	if id == self.engageId then
-		self:Engage()
-	end
+function mod:Shadowform(args)
+	self:Message(args.spellId, "cyan", CL.percent:format(50, args.spellName))
+	self:PlaySound(args.spellId, "info")
+end
+
+function mod:DominateMind(args)
+	self:TargetMessage(args.spellId, "yellow", args.destName)
+	self:CDBar(args.spellId, 19.4)
+	self:PlaySound(args.spellId, "alert", nil, args.destName)
 end
diff --git a/Classic/DireMaul/Options/Colors.lua b/Classic/DireMaul/Options/Colors.lua
index a5ff8b6ed..e5ee47658 100644
--- a/Classic/DireMaul/Options/Colors.lua
+++ b/Classic/DireMaul/Options/Colors.lua
@@ -6,6 +6,8 @@ BigWigs:AddColors("Illyanna Ravenoak", {
 })
 
 BigWigs:AddColors("Magister Kalendris", {
+	[7645] = {"blue","yellow"},
+	[22917] = "cyan",
 })
 
 BigWigs:AddColors("Immol'thar", {
diff --git a/Classic/DireMaul/Options/Sounds.lua b/Classic/DireMaul/Options/Sounds.lua
index 1b26ef54d..07815d009 100644
--- a/Classic/DireMaul/Options/Sounds.lua
+++ b/Classic/DireMaul/Options/Sounds.lua
@@ -6,6 +6,8 @@ BigWigs:AddSounds("Illyanna Ravenoak", {
 })
 
 BigWigs:AddSounds("Magister Kalendris", {
+	[7645] = "alert",
+	[22917] = "info",
 })
 
 BigWigs:AddSounds("Immol'thar", {