diff --git a/Graveyard/DeathrattleView.cs b/Graveyard/DeathrattleView.cs
index 01b26ab..59a361d 100644
--- a/Graveyard/DeathrattleView.cs
+++ b/Graveyard/DeathrattleView.cs
@@ -13,7 +13,8 @@ public static bool isValid()
                 card.Id == HearthDb.CardIds.Collectible.Neutral.Vectus ||
                 card.Id == HearthDb.CardIds.Collectible.Hunter.NineLives ||
                 card.Id == HearthDb.CardIds.Collectible.Neutral.DaUndatakah ||
-                card.Id == HearthDb.CardIds.Collectible.Priest.TwilightsCall                
+                card.Id == HearthDb.CardIds.Collectible.Priest.TwilightsCall  ||
+                card.Id == HearthDb.CardIds.Collectible.Priest.XyrellaTheDevout              
                 ) > -1;
         }
 
diff --git a/Graveyard/Settings.Designer.cs b/Graveyard/Settings.Designer.cs
index 3ad37ad..5cc5d41 100644
--- a/Graveyard/Settings.Designer.cs
+++ b/Graveyard/Settings.Designer.cs
@@ -430,5 +430,16 @@ public bool SaurfangEnabled {
                 this["SaurfangEnabled"] = value;
             }
         }
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool ShirvallahEnabled {
+            get {
+                return ((bool)(this["ShirvallahEnabled"]));
+            }
+            set {
+                this["ShirvallahEnabled"] = value;
+            }
+        }
     }
 }
diff --git a/Graveyard/Settings.settings b/Graveyard/Settings.settings
index cb87235..e6f5be2 100644
--- a/Graveyard/Settings.settings
+++ b/Graveyard/Settings.settings
@@ -104,5 +104,8 @@
     <Setting Name="SaurfangEnabled" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="ShirvallahEnabled" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/Graveyard/SettingsView.xaml b/Graveyard/SettingsView.xaml
index 3680c06..ab11c40 100644
--- a/Graveyard/SettingsView.xaml
+++ b/Graveyard/SettingsView.xaml
@@ -207,6 +207,10 @@
                           Content="{lex:Loc Saurfang}"
                           ToolTip="{lex:Loc SaurfangDescription}" 
                           Style="{StaticResource ToggleStyle}" />
+        <mah:ToggleSwitch IsChecked="{Binding ShirvallahEnabled, Source={x:Static local:Settings.Default}}" 
+                          Content="{lex:Loc Shirvallah}"
+                          ToolTip="{lex:Loc ShirvallahDescription}" 
+                          Style="{StaticResource ToggleStyle}" />
         <mah:ToggleSwitch IsChecked="{Binding RallyEnabled, Source={x:Static local:Settings.Default}}" 
                           Content="{lex:Loc Rally}"
                           ToolTip="{lex:Loc RallyDescription}" 
diff --git a/Graveyard/ShirvallahView.cs b/Graveyard/ShirvallahView.cs
new file mode 100644
index 0000000..a82a0f2
--- /dev/null
+++ b/Graveyard/ShirvallahView.cs
@@ -0,0 +1,43 @@
+using Hearthstone_Deck_Tracker;
+using Hearthstone_Deck_Tracker.Hearthstone;
+
+namespace HDT.Plugins.Graveyard
+{
+	public class ShirvallahView : NormalView
+	{
+		public static bool isValid()
+		{
+			return Core.Game.Player.PlayerCardList.FindIndex(card => card.Id == HearthDb.CardIds.Collectible.Paladin.ShirvallahTheTiger) > -1;
+		}
+
+		public ShirvallahView()
+		{
+            Label.Text = Strings.GetLocalized("Shirvallah");
+            int mana = 25;
+		}
+
+		public bool Update(Card card)
+		{
+			if (card.Type == "Spell" && card.Cost > 0 )
+			{
+				mana =- card.Cost;
+				ShirvallahTheTiger = Database.GetCardFromId("TRL_300");
+				Card ShirvallahTheTiger { get; };
+
+				var match = Cards.FirstOrDefault(c => c.Name == "Shirvallah, the Tiger");
+				if (match != null)
+				{
+					match.Count = mana;
+				}
+				else
+				{
+					Cards.Add(ShirvallahTheTiger as Card);
+				}
+				View.Update(Cards, false);
+
+				Label.Visibility = Visibility.Visible;
+
+				return true;
+		}
+	}
+}
diff --git a/Graveyard/app.config b/Graveyard/app.config
index eadb11f..36b0be9 100644
--- a/Graveyard/app.config
+++ b/Graveyard/app.config
@@ -108,6 +108,8 @@
             </setting>
             <setting name="SaurfangEnabled" serializeAs="String">
                 <value>True</value>
+            <setting name="ShirvallahEnabled" serializeAs="String">
+                <value>True</value>
             </setting>
         </HDT.Plugins.Graveyard.Settings>
     </userSettings>
diff --git a/README.md b/README.md
index af85851..04e6f1f 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,9 @@ Displays spells that have been cast.
 * **Hoard Pillager** and **Rummaging Kobold**
 Displays equip/return chance of weapons used this game.
 
+* **Shirvallah, the Tiger**
+Displays mana expenditure on spells that have been cast.
+
 ## Installing
 1. Download *Graveyard.zip* from [here](https://github.com/RedHatter/Graveyard/releases).
 2. If needed, unblock the zip file before unzipping, by [right-clicking it and choosing properties](http://blogs.msdn.com/b/delay/p/unblockingdownloadedfile.aspx):