diff --git a/PallyPowerValues.lua b/PallyPowerValues.lua
index b6077d6..5cf4457 100644
--- a/PallyPowerValues.lua
+++ b/PallyPowerValues.lua
@@ -5,7 +5,7 @@ C_ChatInfo.RegisterAddonMessagePrefix(PallyPower.commPrefix)
 
 PallyPower.petsShareBaseClass = PallyPower.isBCC or PallyPower.isWrath
 
-PALLYPOWER_MAXCLASSES = PallyPower.isWrath and 10 or 9
+PALLYPOWER_MAXCLASSES = PallyPower.isBCC and 9 or 10
 PALLYPOWER_MAXPERCLASS = 15
 PALLYPOWER_NORMALBLESSINGDURATION = (PallyPower.isBCC or PallyPower.isWrath) and (10 * 60) or (5 * 60)
 PALLYPOWER_GREATERBLESSINGDURATION = (PallyPower.isBCC or PallyPower.isWrath) and (30 * 60) or (15 * 60)
@@ -163,7 +163,8 @@ PallyPower.ClassID = PallyPower.isWrath and {
 	[6] = "HUNTER",
 	[7] = "MAGE",
 	[8] = "WARLOCK",
-	[9] = "PET"
+	[9] = "SHAMAN",
+	[10] = "PET",
 }
 
 PallyPower.ClassToID = PallyPower.isWrath and {
@@ -196,7 +197,8 @@ PallyPower.ClassToID = PallyPower.isWrath and {
 	["HUNTER"] = 6,
 	["MAGE"] = 7,
 	["WARLOCK"] = 8,
-	["PET"] = 9
+	["SHAMAN"] = 9,
+	["PET"] = 10,
 }
 
 PallyPower.ClassIcons = PallyPower.isWrath and {
@@ -229,7 +231,8 @@ PallyPower.ClassIcons = PallyPower.isWrath and {
 	[6] = "Interface\\Icons\\ClassIcon_Hunter",
 	[7] = "Interface\\Icons\\ClassIcon_Mage",
 	[8] = "Interface\\Icons\\ClassIcon_Warlock",
-	[9] = "Interface\\Icons\\Ability_Mount_JungleTiger"
+	[9] = "Interface\\Icons\\ClassIcon_Shaman",
+	[10] = "Interface\\Icons\\Ability_Mount_JungleTiger",
 }
 
 PallyPower.BlessingIcons = PallyPower.isWrath and {
diff --git a/PallyPower_Vanilla.xml b/PallyPower_Vanilla.xml
index 7062cef..571bea7 100755
--- a/PallyPower_Vanilla.xml
+++ b/PallyPower_Vanilla.xml
@@ -1458,12 +1458,21 @@
 					</Anchor>
 				</Anchors>
 			</Button>
+			<Button name = "$parentClass10" inherits = "BuffGridButtonTemplate">
+				<Anchors>
+					<Anchor point = "TOPLEFT" relativeTo = "$parentClass9" relativePoint = "TOPRIGHT">
+						<Offset>
+							<AbsDimension x = "2" y = "0"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+			</Button>
 		</Frames>
 	</Frame>
 
 	<Frame name = "PallyPowerBlessingsFrame" hidden = "true" toplevel = "true" frameStrata = "HIGH" enableMouse = "true" movable = "true" parent = "UIParent">
 		<Size>
-			<AbsDimension x = "1010" y = "1200"/>
+			<AbsDimension x = "1110" y = "1200"/>
 		</Size>
 		<Anchors>
 			<Anchor point = "TOPLEFT" relativeTo = "UIParent" relativePoint = "BOTTOMLEFT">
@@ -1620,6 +1629,15 @@
 					</Anchor>
 				</Anchors>
 			</Frame>
+			<Frame name = "$parentClassGroup10" inherits = "ClassGroupTemplate">
+				<Anchors>
+					<Anchor point = "TOPLEFT" relativeTo = "$parentClassGroup9" relativePoint = "TOPRIGHT">
+						<Offset>
+							<AbsDimension x = "2" y = "0"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+			</Frame>
 			<Frame name = "$parentPlayer1" inherits = "UserTemplate">
 				<Anchors>
 					<Anchor point = "TOPLEFT">
@@ -1819,7 +1837,7 @@
 						GameTooltip:Hide(self, motion);
 					</OnLeave>
 				</Scripts>
-			</Button>			
+			</Button>
 			<Button name = "$parentPreset" inherits = "GameMenuButtonTemplate" text = "PALLYPOWER_PRESET" hidden = "false">
 				<Size>
 					<AbsDimension x = "100" y = "20"/>