diff --git a/Commands.txt b/Commands.txt
index 7670629..594d574 100644
--- a/Commands.txt
+++ b/Commands.txt
@@ -3,7 +3,7 @@
 --------------------------------------------------------------------------------
 
 The latest version of this document can be found online at: 
-https://github.com/wow-addon/FarmIt2/blobl/master/Commands.txt
+https://github.com/wow-addon/FarmIt2/blob/master/Commands.txt
 
 A general user guide can be found at: 
 https://github.com/wow-addon/FarmIt2/blob/master/UserGuide.txt
diff --git a/FarmIt2_Button.lua b/FarmIt2_Button.lua
index b239898..6258e3e 100644
--- a/FarmIt2_Button.lua
+++ b/FarmIt2_Button.lua
@@ -24,7 +24,7 @@
 function FI_Tooltip( self )
   -- allow user to disable item slot tooltips
   if (FI_SV_CONFIG.Tooltips.button == false) then return; end
-  
+
   -- get the button id
   local bid = FI_FrameToID( self:GetName() );
 
@@ -33,7 +33,7 @@ function FI_Tooltip( self )
   -- db queries
   local button = FI_DB.select(FI_SVPC_DATA.Buttons, {id = bid}, true);
   local bar = FI_DB.select(FI_SVPC_DATA.Groups, {id = button.group}, true);
-  
+
   -- determine where to attach the tooltip
   local anchor,x,y;
   if (bar.grow == "U") then
@@ -49,18 +49,18 @@ function FI_Tooltip( self )
     anchor = "ANCHOR_RIGHT";
     x,y = 8,0;
   end
-  
+
   GameTooltip:SetOwner(self, anchor, x,y);
-  
+
   -- BUILD TOOLTIP
   if button.item then
     local spacer = ":  ";
-    
+
     -- extra item info
-    local sName, sLink, iQuality, iLevel, iMinLevel, sType, sSubType, iStackSize = GetItemInfo(button.item);
+    local sName, sLink, iQuality, iLevel, iMinLevel, sType, sSubType, iStackSize = C_Item.GetItemInfo(button.item);
     if sLink then
       GameTooltip:SetHyperlink(sLink);
-      
+
       -- check for iTip
       if C_AddOns.IsAddOnLoaded("iTip") then
         -- let iTip do this part (prevents duplicate info)
@@ -75,17 +75,17 @@ function FI_Tooltip( self )
       GameTooltip:AddLine("(error)");
       GameTooltip:AddLine(FI_LABELS[3]..spacer..button.item, 1,1,1);
     end
-    
+
     -- FarmIt info
     GameTooltip:AddLine("\n|cFF33CCFF"..FI_LABELS[4]..spacer..button.id, 1,1,1);
-    
+
     local counts = FI_LABELS[5]..spacer..button.count;
     if iStackSize and (iStackSize > 1) then
       local stacks = LIB.round((button.count/iStackSize),2);
       counts = counts.."  ("..stacks.." "..FI_LABELS[6]..")";
     end
     GameTooltip:AddLine(counts, 1,1,1);
-    
+
     if (button.objective > 0) then
       GameTooltip:AddLine(FI_LABELS[7]..spacer..button.objective, 1,1,1);
     end
@@ -93,9 +93,9 @@ function FI_Tooltip( self )
     if (button.objective > 0) then
       GameTooltip:AddLine(FI_LABELS[9]..spacer..strupper(tostring(button.success)));
     end
-    
+
     GameTooltip:AddLine("_________________________________\n", 0.33,0.33,0.33);
-    
+
     -- show button help text
     local help_text = {
       "|cFF00FF00Click|r to select/move an item.",
@@ -111,7 +111,7 @@ function FI_Tooltip( self )
     GameTooltip:AddLine(help_text[4], 1,1,1);
     GameTooltip:AddLine(help_text[5], 1,1,1);
     GameTooltip:AddLine(help_text[6], 1,1,1);
-    
+
     -- all done!
     GameTooltip:Show();
   end
@@ -145,41 +145,41 @@ end
 -- added in v2.0 beta2
 function FI_Move_Item( bid1, bid2 )
   FI_MOVING = true;
-  
+
   local source = FI_DB.select(FI_SVPC_DATA.Buttons, {id = bid1}, true);
   local target = FI_DB.select(FI_SVPC_DATA.Buttons, {id = bid2}, true);
-  
+
   -- move the selected button data
   if FI_SV_CONFIG.debug then print("FI_Move_Item:  Moving ItemID "..source.item); end
   FI_DB.copy(FI_SVPC_DATA.Buttons, {id = source.id}, {id = target.id}); --preserves the primary key ("id" field)
   -- make sure the destination button keeps its *group* id
   FI_DB.update(FI_SVPC_DATA.Buttons, {id = target.id}, {group = target.group}); --do NOT update variable!
-  
+
   -- load new button data in destination (target) slot
   FI_Set_Button(target.id);
-  
+
   -- clear original (source) button
   FI_Clear_Button(source.id);
-  
+
   -- swapping contents with a populated button?
   if target.item then
     if FI_SV_CONFIG.debug then print("FI_Move_Item:  Swapping places with ItemID "..target.item); end
-    
+
     -- get table index of source button
     local index = FI_DB.find(FI_SVPC_DATA.Buttons, {id = source.id}, true);
-    
+
     -- copy target button data over source button
     FI_SVPC_DATA.Buttons[index] = LIB.table.copy(target);
     -- keep the original IDs so things dont get all discombobulated (technical term)
     FI_SVPC_DATA.Buttons[index]["id"] = source.id;
     FI_SVPC_DATA.Buttons[index]["group"] = source.group;
-    
+
     -- load button data
     FI_Set_Button(source.id);
   end
-  
+
   FI_Deselect();
-  
+
   FI_MOVING = false;
 end
 
@@ -189,9 +189,9 @@ end
 function FI_Click( self, click, down )
   local f_name = self:GetName();
   if FI_SV_CONFIG.debug then print("You CLICKED the "..click.." ("..tostring(down)..") on frame: "..f_name); end
-  
+
   local button = FI_DB.select(FI_SVPC_DATA.Buttons, {id = FI_FrameToID(f_name)}, true);
-  
+
   if CursorHasItem() then
     ------------------------------------------------------------
     -- NEW ITEM
@@ -205,22 +205,22 @@ function FI_Click( self, click, down )
       -- clear item from cursor
       ClearCursor();
     end
-  
+
   elseif (click == "LeftButton") then
     if _G["FI_Button_Edit_Item"] then _G["FI_Button_Edit_Item"]:Hide(); end
-    
+
     if IsShiftKeyDown() then
       ------------------------------------------------------------
       -- INCLUDE BANK
       ------------------------------------------------------------
       FI_Toggle_Bank(button.id);
-    
+
     elseif IsControlKeyDown() then
       ------------------------------------------------------------
       -- SET OBJECTIVE
       ------------------------------------------------------------
       FI_Edit_Objective(button.id);
-    
+
     elseif FI_SELECTED then
       ------------------------------------------------------------
       -- MOVE
@@ -231,14 +231,14 @@ function FI_Click( self, click, down )
       else
         FI_Move_Item(FI_SELECTED, button.id);
       end
-    
+
     elseif button.item then
       ------------------------------------------------------------
       -- SELECT ITEM
       ------------------------------------------------------------
       FI_Select(button.id);
     end
-  
+
   elseif (click == "RightButton") then
     if IsShiftKeyDown() then
       ------------------------------------------------------------
@@ -248,13 +248,13 @@ function FI_Click( self, click, down )
         FI_Clear_Button(button.id);
         PlaySound(798); -- gsTitleOptionOK
       end
-    
+
     elseif IsControlKeyDown() then
       ------------------------------------------------------------
       -- MANUAL ITEM ENTRY
       ------------------------------------------------------------
       FI_Edit_Item(self, button);
-    
+
     else
       ------------------------------------------------------------
       -- USE ITEM
@@ -263,9 +263,9 @@ function FI_Click( self, click, down )
       -- See FarmIt2_Button.xml, FI_FRAMES.Button, and FI_Set_Button
       if button.item then
         -- make sure we actually have the item in our inventory
-        if GetItemSpell(button.item) and (GetItemCount(button.item) > 0) then
+        if C_Item.GetItemSpell(button.item) and (C_Item.GetItemCount(button.item) > 0) then
           -- inform user that Right-Click action was received
-          local itemName, itemLink = GetItemInfo(button.item);
+          local itemName, itemLink = C_Item.GetItemInfo(button.item);
           if itemLink then
             FI_Message("Using "..itemLink);
           end
@@ -284,45 +284,45 @@ end
 
 function FI_Update_Button( bid, db_record )
   local button;
-  
+
   -- streamline button data access when we are doing a global update
   if db_record then
     button = db_record;
   else
     button = FI_DB.select(FI_SVPC_DATA.Buttons, {id = bid}, true);
   end
-  
+
   if button.item then
     if FI_SV_CONFIG.debug and (FI_LOADING == false) and false then
       print("Update running... ButtonID: "..button.id..", ItemID: "..button.item..", Count: "..button.count); --debug
     end
     local f_name = "FI_Button_"..button.id;
-    
+
     --------------------------------------------------------------------------------
     --  CHECK FOR FAILED SERVER QUERIES
     --------------------------------------------------------------------------------
     -- attempt to fix missing icons
     if not _G[f_name.."_Icon"]:GetTexture() then
       if FI_SV_CONFIG.debug then print("Update found a missing texture on BID "..button.id); end
-      
-      _G[f_name.."_Icon"]:SetTexture( GetItemIcon(button.item) );
+
+      _G[f_name.."_Icon"]:SetTexture( C_Item.GetItemIconByID(button.item) );
     end
-    
+
     -- make sure secure template action has been set
     if not _G[f_name]:GetAttribute("macrotext") then
       if FI_SV_CONFIG.debug then print("Update found missing macrotext on BID "..button.id); end
-      
-      local itemName = GetItemInfo(button.item);
+
+      local itemName = C_Item.GetItemInfo(button.item);
       if itemName then
         _G[f_name]:SetAttribute("macrotext", "/use "..itemName);
       end
     end
-    
+
     --------------------------------------------------------------------------------
     -- GET CURRENT ITEM COUNT
     --------------------------------------------------------------------------------
-    local newcount = GetItemCount(button.item, button.bank);
-    
+    local newcount = C_Item.GetItemCount(button.item, button.bank, nil, button.materialsBank , button.warHoundsBank);
+
     -- try to be smart about only running interface and data changes when we need to
     if FI_LOADING or FI_MOVING or (newcount ~= button.count) then
       --------------------------------------------------------------------------------
@@ -333,16 +333,16 @@ function FI_Update_Button( bid, db_record )
         ["lastcount"] = button.count,
       }
       button = FI_DB.update(FI_SVPC_DATA.Buttons, {id = button.id}, query);
-      
+
       -- update graphical counter
       _G[f_name.."_Count"]:SetText( LIB.ShortNum(button.count,1,4) );
-      
+
       --------------------------------------------------------------------------------
       --  PROGRESS TRACKING
       --------------------------------------------------------------------------------
       FI_Progress(button);
     end
-    
+
   else
     -- no item, clear the count
     _G["FI_Button_"..button.id.."_Count"]:SetText("");
@@ -351,7 +351,7 @@ end
 
 function FI_Set_Button( bid, newItem )
   local button;
-  
+
   -- update itemID before setting button elements
   if newItem then
     FI_Clear_Button(bid);
@@ -359,24 +359,24 @@ function FI_Set_Button( bid, newItem )
   else
     button = FI_DB.select(FI_SVPC_DATA.Buttons, {id = bid}, true);
   end
-  
+
   if button.item then
     local f_name = "FI_Button_"..button.id;
 
     -- set icon
-    _G[f_name.."_Icon"]:SetTexture( GetItemIcon(button.item) ); --if this fails, FI_Update_Button should fix it
+    _G[f_name.."_Icon"]:SetTexture( C_Item.GetItemIconByID(button.item) ); --if this fails, FI_Update_Button should fix it
 
     -- bank inclusion indicator
     if button.bank then
       _G[f_name.."_Bank"]:Show();
     end
-    
+
     -- set secure template action
-    local itemName, itemLink = GetItemInfo(button.item); --if this fails, FI_Update_Button should fix it
+    local itemName, itemLink = C_Item.GetItemInfo(button.item); --if this fails, FI_Update_Button should fix it
     if itemName then
       _G[f_name]:SetAttribute("macrotext", "/use "..itemName);
     end
-    
+
     -- handle objective
     if (button.objective == 0) or CursorHasItem() then
       -- no objective -OR- we are in the middle of placing a new item
@@ -389,20 +389,20 @@ function FI_Set_Button( bid, newItem )
         precision = 1;
       end
       _G[f_name.."_Objective"]:SetText(LIB.ShortNum(button.objective,precision,4));
-      
+
       local color;
       if (button.count < button.objective) then
         color = FI_SV_CONFIG.Colors.objective;
       else
         color = FI_SV_CONFIG.Colors.success;
       end
-      
+
       _G[f_name.."_Objective"]:SetVertexColor(color[1], color[2], color[3]);
       _G[f_name.."_Objective"]:Show();
     end
-    
+
     FI_Update_Button(nil, button);
-    
+
     if FI_SV_CONFIG.debug then
       if itemLink then
         print( "FI_Set_Button:  Button ID "..button.id.." set to "..itemLink ); --debug
@@ -415,7 +415,7 @@ end
 
 function FI_Clear_Button( bid )
   local button = FI_DB.select(FI_SVPC_DATA.Buttons, {id = bid}, true);
-  
+
   if button then
     -- reset button data
     local i = FI_DB.find(FI_SVPC_DATA.Buttons, {id = button.id}, true);
@@ -425,15 +425,15 @@ function FI_Clear_Button( bid )
     FI_SVPC_DATA.Buttons[i]["group"] = button.group;
 
     FI_Clear_Objective(button.id);
-    
+
     if _G["FI_Button_Edit_Item"] then _G["FI_Button_Edit_Item"]:Hide(); end
-    
+
     -- reset graphical elements
     local f_name = "FI_Button_"..button.id;
     _G[f_name.."_Icon"]:SetTexture("");
     _G[f_name.."_Count"]:SetText("");
     _G[f_name.."_Bank"]:Hide();
-    
+
     -- clear secure template action
     _G[f_name]:SetAttribute("macrotext", nil);
   elseif FI_SV_CONFIG.debug then
@@ -447,12 +447,12 @@ end
 function FI_Edit_Item( self, button )
   local f_name = self:GetName();
   local eb_name = "FI_Button_Edit_Item";
-  
+
   -- hide objective editboxes
   for i,b in ipairs(FI_SVPC_DATA.Buttons) do
     _G["FI_Button_"..b.id.."_Edit"]:Hide();
   end
-  
+
   -- create item editbox if it doesn't exist yet
   if not _G[eb_name] then
     local f = CreateFrame("EditBox", eb_name, _G["FI_PARENT"], "FI_TPL_Editbox");
@@ -471,18 +471,18 @@ function FI_Edit_Item( self, button )
     f:SetAutoFocus(true);
     f:SetHistoryLines(10);
   end
-  
+
   -- adjust anchoring as needed
   _G[eb_name]:SetParent(self);
   _G[eb_name]:SetPoint("TOP", self, "BOTTOM", 0, 0);
-  
+
   -- populate editbox
   if button.item and (button.item > 0) then
     _G[eb_name]:SetNumber(button.item);
   else
     _G[eb_name]:SetNumber(0);
   end
-  
+
   _G[eb_name]:Show();
   _G[eb_name]:HighlightText();
 end
@@ -490,14 +490,14 @@ end
 function FI_Set_Item( editbox )
   local parent = editbox:GetParent();
   local bid = FI_FrameToID( parent:GetName() );
-  
+
   -- get input
   local itemID = editbox:GetNumber();
   if itemID and (itemID > 0) then
     -- process item id
     FI_Set_Button(bid, itemID);
   end
-  
+
   editbox:Hide();
 end
 
@@ -509,27 +509,44 @@ function FI_Tooltip_Edit_Item( self )
 end
 
 --------------------------------------------------------------------------------
---  BANK INVENTORY
+--  BANK INVENTORY | WarHoundsBank | Material Bank
 --------------------------------------------------------------------------------
 function FI_Toggle_Bank( bid )
   local button = FI_DB.select(FI_SVPC_DATA.Buttons, {id = bid}, true);
   local f_name = "FI_Button_"..button.id;
-  
+
   if button.item then
     -- change setting
-    button = FI_DB.update(FI_SVPC_DATA.Buttons, {id = button.id}, {bank = LIB.toggle(button.bank)});
-    
+    button = FI_DB.update(FI_SVPC_DATA.Buttons, {id = button.id}, {
+      bank = LIB.toggle(button.bank),
+      warHoundsBank = LIB.toggle(button.warHoundsBank),
+      materialsBank = LIB.toggle(button.materialsBank)
+  });
+
     -- bank indicator
     if button.bank then
       _G[f_name.."_Bank"]:Show();
     else
       _G[f_name.."_Bank"]:Hide();
     end
-    
+
+    -- WarHoundsBank indicator
+    if button.warHoundsBank then
+      _G[f_name.."_WarHoundsBank"]:Show();
+    else
+      _G[f_name.."_WarHoundsBank"]:Hide();
+    end
+
+    if button.materialsBank then
+      _G[f_name.."_MaterialsBank"]:Show();
+    else
+      _G[f_name.."_MaterialsBank"]:Hide();
+    end
+
     -- refresh item count
     FI_Update_Button(button.id);
-    
+
     PlaySound(6145); -- TalentScreenClose
-    FI_Message("Button ID "..button.id..":  Include Bank = "..strupper(tostring(button.bank)));
+    FI_Message("Button ID "..button.id..":\n Include |cFFFFFF00Bank|r = "..strupper(tostring(button.bank))..", \n Include |cFFFFFF00Warband Bank|r = "..strupper(tostring(button.warHoundsBank))..", \n Include |cFFFFFF00Material Bank|r = "..strupper(tostring(button.materialsBank)));
   end
 end
diff --git a/FarmIt2_Button.xml b/FarmIt2_Button.xml
index fcf3bf7..89a7366 100644
--- a/FarmIt2_Button.xml
+++ b/FarmIt2_Button.xml
@@ -66,7 +66,33 @@ xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\..\FrameXML\UI.xsd">
             <Anchor point="CENTER" x="0" y="0" />
           </Anchors>
         </Texture>
-        
+
+        <Texture name="$parent_Glow" alphaMode="MOD" hidden="true">
+          <Size x="33" y="33" />
+          <Anchors>
+            <Anchor point="CENTER" x="0" y="0" />
+          </Anchors>
+        </Texture>
+        <Texture name="$parent_WarHoundsBank" file="Interface\Buttons\UI-AutoCastableOverlay" hidden="true">
+          <Size x="66" y="66" />
+          <Anchors>
+            <Anchor point="CENTER" x="0" y="0" />
+          </Anchors>
+        </Texture>
+
+        <Texture name="$parent_Glow" alphaMode="MOD" hidden="true">
+          <Size x="33" y="33" />
+          <Anchors>
+            <Anchor point="CENTER" x="0" y="0" />
+          </Anchors>
+        </Texture>
+        <Texture name="$parent_MaterialsBank" file="Interface\Buttons\UI-AutoCastableOverlay" hidden="true">
+          <Size x="66" y="66" />
+          <Anchors>
+            <Anchor point="CENTER" x="0" y="0" />
+          </Anchors>
+        </Texture>
+
         <!--Button name="$parent_Item" inherits="SecureActionButtonTemplate" hidden="true">
           <Attributes>
             <Attribute name="type" type="string" value="item" />
diff --git a/FarmIt2_Currency.lua b/FarmIt2_Currency.lua
index 0509a0c..84e4e9c 100644
--- a/FarmIt2_Currency.lua
+++ b/FarmIt2_Currency.lua
@@ -21,16 +21,16 @@
 
 -- if currency name given, returns full info if available
 function FI_HasTokens( currency )
-  
+
   local currencyName
   if currency then currencyName = currency.name end
 
     -- check if player has any trackable currencies available
   for index=1, C_CurrencyInfo.GetCurrencyListSize() do
     local name, isHeader, isExpanded, isUnused, isWatched, count, icon, maximum, hasWeeklyLimit, currentWeeklyAmount = C_CurrencyInfo.GetCurrencyListInfo(index);
-    
+
     if name then name = name.name end
-        
+
     -- NOTE: new characters start out with [Player vs. Player, Conquest Points = 0] 
     -- even though they have NO currency tab on their character window
     if name and (not isHeader) and (C_CurrencyInfo.GetCurrencyListSize() > 2) then
@@ -50,18 +50,18 @@ end
 -- currency bootstrap
 function FI_Init_Currency( event )
   if FI_SV_CONFIG.debug then print("[FI_Init_Currency]  Called."); end
-  
+
   if FI_HasTokens() then
     -- register for "watch currency" updates
     --BruteForceRemovalForInitialDragonFlightCompatibility--_G["TokenFramePopupBackpackCheckBox"]:HookScript("OnClick", FI_Update_Currency);
-    
+
     -- one-time startup check
     if (FI_CURRENCY_LOADED == false) then
       FI_DB.scan("Currencies");
     end
-    
+
     FI_Update_Currency(event);
-    
+
     FI_CURRENCY_LOADED = true;
   end
 end
@@ -72,23 +72,23 @@ function FI_Update_Currency( event )
   if ((FI_LOADING == true) and (FI_CURRENCY_LOADED == true)) or ((FI_CURRENCY_LOADED == true) and (FI_Uptime(FI_MIN_UPTIME) == false)) then
     return;
   end
-  
+
   if FI_SV_CONFIG.debug then print("[FI_Update_Currency]  Called."); end
-  
+
   -- config check
   if (FI_SVPC_CONFIG.Currency.tracking == false) then
     if FI_SV_CONFIG.debug then print("[FI_Update_Currency]  Currency tracking is OFF."); end
     return
   end
-  
+
   -- take a snapshot of current data
   local temp = LIB.table.copy(FI_SVPC_DATA.Currencies);
-  
+
   -- process DATA UPDATES for all three "watched currency" slots
   for cid=1,3 do
     -- API query
     local name,count,icon = C_CurrencyInfo.GetBackpackCurrencyInfo(cid);
-    
+
     local results;
     if name then
       -- server returned something for the current slot
@@ -97,7 +97,7 @@ function FI_Update_Currency( event )
         ["count"] = count,
         ["icon"] = icon,
       }
-      
+
       -- check for lastcount data in snapshot
       local existing = FI_DB.select(temp, {["name"] = name}, true);
       if existing then
@@ -116,25 +116,25 @@ function FI_Update_Currency( event )
           query["success"] = false;
         end
       end
-      
+
       ------------------------------------------------------------
       -- save updated record
       ------------------------------------------------------------
       results = FI_DB.update(FI_SVPC_DATA.Currencies, {id = cid}, query);
-    
+
     elseif (FI_LOADING == false) then
       ------------------------------------------------------------
       -- clear unused "slot"
       ------------------------------------------------------------
       results = FI_Clear_Currency(cid);
-    
+
     else
       ------------------------------------------------------------
       -- use existing data
       ------------------------------------------------------------
       results = FI_DB.select(FI_SVPC_DATA.Currencies, {id = cid}, true);
     end
-    
+
     ------------------------------------------------------------
     -- progress tracking
     ------------------------------------------------------------
@@ -142,7 +142,7 @@ function FI_Update_Currency( event )
       FI_Progress(results);
     end
   end
-  
+
   ------------------------------------------------------------
   -- update interface
   ------------------------------------------------------------
@@ -156,11 +156,11 @@ function FI_Clear_Currency( cid )
 
   -- get default data
   local query = LIB.table.copy(FI_DEFAULTS.DB.Currency);
-  
+
   -- update record
   query.id = cid;
   local results = FI_DB.update(FI_SVPC_DATA.Currencies, {id = cid}, query);
-  
+
   return results;
 end
 
@@ -185,11 +185,11 @@ function FI_Update_Currency_Slot( currency )
   if FI_SV_CONFIG.debug then print("[FI_Update_Currency_Slot]  Called."); end
 
   local slot = "FI_Currency_"..currency.id;
-  
+
   -- Currency .name is currently a table of the result of currency, hence currency.name.name hack
   if (currency ~= nil and currency.name ~= nil and currency.name.name ~= nil and strlen(currency.name.name) > 0) then
     -- populate slot
-    
+
     _G[slot.."_Icon"]:SetTexture(currency.name.iconFileID);
     _G[slot.."_Count"]:SetText(currency.name.quantity);
     --_G[slot.."_Objective"]:SetText(currency.objective);
@@ -206,11 +206,11 @@ end
 -- apply visual style rules
 function FI_UI_Currency()
   if FI_SV_CONFIG.debug then print("[FI_UI_Currency]  Called."); end
-  
+
   for cid=1,3 do
     local f_name = "FI_Currency_"..cid;
     local currency = FI_DB.select(FI_SVPC_DATA.Currencies, {id = cid}, true);
-    
+
     if currency.name then
       local color = FI_SV_CONFIG.Colors.progress;
       if (currency.objective > 0) then
@@ -220,34 +220,34 @@ function FI_UI_Currency()
           color = FI_SV_CONFIG.Colors.objective;
         end
       end
-      
+
       _G[f_name.."_Count"]:SetVertexColor(color[1], color[2], color[3]);
-      
+
       -- color the backpack token text
       local name,count,icon = C_CurrencyInfo.GetBackpackCurrencyInfo(cid);
       --BruteForceRemovalForInitialDragonFlightCompatibility--if name then
       --BruteForceRemovalForInitialDragonFlightCompatibility--  _G["BackpackTokenFrameToken"..cid].count:SetVertexColor(color[1], color[2], color[3]);
       --BruteForceRemovalForInitialDragonFlightCompatibility--end
-      
+
       _G[f_name]:Show();
     else
       _G[f_name]:Hide();
     end
   end
-  
+
   -- parent frame settings
   _G["FI_Currency"]:SetScale(FI_SVPC_CONFIG.Currency.scale);
   _G["FI_Currency"]:SetAlpha(FI_SVPC_CONFIG.Currency.alpha);
-  
+
   if (FI_SVPC_CONFIG.Currency.show == true) then
     _G["FI_Currency"]:Show();
-  
+
   elseif (FI_SVPC_CONFIG.Currency.show == false) then
     _G["FI_Currency"]:Hide();
-  
+
   elseif (FI_SVPC_CONFIG.Currency.show == nil) then
     -- something wrong with config...
-    if FI_SV_CONFIG.debug then 
+    if FI_SV_CONFIG.debug then
       print("[FI_UI_Currency]  ERROR: Missing config variable!");
       --FI_SVPC_CONFIG.Currency = LIB.table.copy(FI_DEFAULTS.SVPC.CONFIG.Currency);
     end
@@ -260,7 +260,7 @@ end
 function FI_Currency_Tooltip( cid )
   -- grab currency record for the slot
   local currency = FI_DB.select(FI_SVPC_DATA.Currencies, {id = cid}, true);
-  
+
   local line = "";
   if currency.name and (currency.objective > 0) then
     -- set color
@@ -270,14 +270,14 @@ function FI_Currency_Tooltip( cid )
     else
       color = FI_SV_CONFIG.Colors.success[4];
     end
-    
+
     line = "|nObjective: |cFF"..color..currency.objective.."|r|n";
   else
-    
+
   end
-  
+
   local hint = "|cFF00FF00Right-Click|cFFFFFFFF to set farming objective.|r";
-  
+
   return line.."|n"..hint;
 end
 
@@ -289,17 +289,17 @@ function FI_Tooltip_Currency( self )
   local cid = FI_FrameToID( self:GetName() );
   local name = C_CurrencyInfo.GetBackpackCurrencyInfo(cid);
   local index = FI_HasTokens(name);
-  
+
   -- create tooltip
   GameTooltip:SetOwner(self,"ANCHOR_BOTTOMLEFT",50,-30);
-  
+
   if name then
     -- insert the normal tooltip for this currency
     GameTooltip:SetCurrencyToken(index);
     -- insert FarmIt lines
     GameTooltip:AddLine(FI_Currency_Tooltip(cid).."|n|cFFFFFFFFHold |cFF00FF00Shift|cFFFFFFFF to move Currency Bar.|r");
   end
-  
+
   GameTooltip:Show();
 end
 
@@ -307,12 +307,8 @@ end
 function FI_Hook_Currency( tooltip )
   if (FI_SVPC_CONFIG.Currency.tracking == true) and tooltip:GetOwner() then
     local owner = tooltip:GetOwner();
-    
-    -- THIS LINE CAUSES A TAINTED CODE ERROR WHEN USING BLIZZARD'S TWITTER INTEGRATION INTERFACE!!
-    -- Try getting the parent frame's name right off instead of getting the whole object, and if it's not a backpack or currency window frame just exit.
-    local parent = owner:GetParent();
-    
     -- Sometimes cid can be nil? BugSack show Error
+    -- Eventually broken with the Dragonflight Update ( see @BruteForceRemovalForInitialDragonFlightCompatibility)
 	  if cid == nil then 
       if FI_SV_CONFIG.debug then print("BackpackTokenFrame Error!"); end
       else
@@ -320,7 +316,7 @@ function FI_Hook_Currency( tooltip )
         -- show objective if set
         local line = FI_Currency_Tooltip(cid);
         if line then GameTooltip:AddLine(line);	tooltip:Show(); end
-      end 
+      end
     end
 end
 
@@ -329,13 +325,13 @@ end
 function FI_Click_Currency( self, click, down )
   local f_name = self:GetName();
   if FI_SV_CONFIG.debug then print("You CLICKED the "..click.." ("..tostring(down)..") on frame: "..f_name); end
-  
+
   -- config check
   if (FI_SVPC_CONFIG.Currency.tracking == false) then return; end
-  
+
   if (click == "LeftButton") then
     local parent = "FI_Currency";
-    
+
     if IsShiftKeyDown() then
       ------------------------------------------------------------
       -- DRAG BAR
@@ -345,7 +341,7 @@ function FI_Click_Currency( self, click, down )
       else
         _G[parent]:StopMovingOrSizing();
       end
-    
+
     else
       ------------------------------------------------------------
       -- 
@@ -355,15 +351,15 @@ function FI_Click_Currency( self, click, down )
       else
         _G[parent]:StopMovingOrSizing();
       end
-      
+
     end
-  
+
   elseif (click == "RightButton") then
     if IsShiftKeyDown() then
       ------------------------------------------------------------
       -- 
       ------------------------------------------------------------
-      
+
     else
       ------------------------------------------------------------
       -- EDIT OBJECTIVE
@@ -380,61 +376,61 @@ end
 function FI_Edit_Currency( self, click, down )
   -- configuration check
   if (not FI_SVPC_CONFIG.Currency.tracking) then return; end
-  
+
   if (click == "RightButton") then
     local f_name = self:GetName();
     local parent = self:GetParent();
     local cid;
-    
+
     -- determine the slot id
     if (parent:GetName() == "BackpackTokenFrame") then
       cid = tonumber(strsub(f_name, -1)); --BackpackTokenFrameToken1
     else
       cid = FI_FrameToID(f_name); --FI_Currency_1
     end
-    
+
     local eb_name = "FI_Currency_"..cid.."_Editbox";
 
     if FI_SV_CONFIG.debug then print("You CLICKED the "..click.." ("..tostring(down)..") on frame:  "..f_name); end
-    
+
     -- hide existing editboxes
     for cid=1,3 do
       local eb_n = "FI_Currency_"..cid.."_Editbox";
       if _G[eb_n] then _G[eb_n]:Hide(); end
     end
-    
+
     -- create editbox if it doesn't exist yet
     if not _G[eb_name] then
       local s = FI_SVPC_STYLE.anchor;
-      
+
       local f = CreateFrame("EditBox", eb_name, parent, "FI_TPL_Editbox");
       f:SetSize(100,35);
       f:SetJustifyH("CENTER");
       f:SetPoint("TOP", _G["BackpackTokenFrameToken"..cid], "BOTTOM", 0, 0);
-      
+
       f:SetScript("OnEnterPressed", FI_Set_Objective_Currency);
       f:SetScript("OnEscapePressed", f.Hide);
       f:SetScript("OnEditFocusLost", f.Hide);
-      
+
       f:SetMaxBytes(8);
       f:SetNumeric(true);
       f:SetAutoFocus(true);
       f:SetHistoryLines(6);
     end
-    
+
     -- adjust anchoring as needed
     _G[eb_name]:SetPoint("TOP", self, "BOTTOM", 0, 0);
-    
+
     -- get current data
     local currency = FI_DB.select(FI_SVPC_DATA.Currencies, {id = cid}, true);
-    
+
     -- update the interface
     if currency then
       _G[eb_name]:SetNumber(currency.objective);
       _G[eb_name]:Show();
       _G[eb_name]:HighlightText();
       --FI_Message("Enter a |cFF"..FI_SV_CONFIG.Colors.currency[4]..currency.name.."|r objective...");
-    
+
     elseif FI_SV_CONFIG.debug then
       print("[FI_Edit_Currency]  DB query failed for 'cid':  "..cid); --debug
     end
@@ -444,38 +440,38 @@ end
 -- FI_Set_Objective wrapper
 function FI_Set_Objective_Currency( editbox, id, input )
   local cid,amt;
-  
+
   if editbox then
     cid = FI_FrameToID( editbox:GetName() );
     amt = editbox:GetNumber();
-    
+
   elseif id and input then
     cid = tonumber(id);
     amt = tonumber(input);
-    
+
   elseif FI_SV_CONFIG.debug then
     -- error
     print("[FI_Set_Objective_Currency]  Input error."); --debug
   end
-  
+
   -- select record
   local currency = FI_DB.select(FI_SVPC_DATA.Currencies, {["id"] = cid}, true);
-  
+
   if currency then
     -- skip updating if input matches current objective
     if (amt ~= currency.objective) then
       -- dew it!
       FI_Set_Objective("Currencies", currency.id, amt);
       FI_Update_Currency();
-    
+
     elseif FI_SV_CONFIG.debug then
       print("[FI_Set_Objective_Currency]  Duplicate objective input, update skipped."); --debug
     end
-      
+
   elseif FI_SV_CONFIG.debug then
     print("[FI_Set_Objective_Currency]  DB query failed for CID:  "..cid); --debug
   end
-  
+
   --hide input frame
   editbox:Hide();
 end
diff --git a/FarmIt2_Templates.lua b/FarmIt2_Templates.lua
index 8690a15..12f8ab5 100644
--- a/FarmIt2_Templates.lua
+++ b/FarmIt2_Templates.lua
@@ -208,6 +208,11 @@ FI_TPL.Templates.TBC.Ink = {39342,43124,43108,43125}
 FI_TPL.Templates.WOTLK.Ink = {39343,43126,43109,43127}
 FI_TPL.Templates.CATA.Ink = {61979,61978,61980,61981}
 
+-- The War Within
+FI_TPL.Templates.TWW.Ink = {222618,222612,224802,224805}
+FI_TPL.Templates.TWW.InkT2 = {222619,222613,224801,224804}
+FI_TPL.Templates.TWW.InkT3 = {222620,222614,224800,224803}
+
 -- Jewelcrafting
 FI_TPL.Templates.WOW.JC = {774,818,1210,1206,1705,1529,3864}
 FI_TPL.Templates.WOW.JC2 = {7910,7909,12799,12800,12361,12364,12363}
@@ -222,6 +227,10 @@ FI_TPL.Templates.CATA.JC = {52177,52178,52179,52180,52181,52182}
 FI_TPL.Templates.CATA.JC2 = {52190,52191,52192,52193,52194,52195}
 FI_TPL.Templates.CATA.JC3 = {71805,71806,71807,71808,71809,71810}
 
+-- The War Within [JC2 -> Crushed Gemstones]
+FI_TPL.Templates.TWW.JC = {213398,213399,212495,212505,212508,212511}
+FI_TPL.Templates.TWW.JC2 = {213219,213220,213221}
+
 -- Leatherworking
 -- (see Skinning)
 
@@ -230,6 +239,10 @@ FI_TPL.Templates.WOW.Cloth = {2589,2996,2592,2997,4306,4305,4338,4339,14047,1404
 FI_TPL.Templates.TBC.Cloth = {21877,21840,21842,21844,24271,24272,21845}
 FI_TPL.Templates.WOTLK.Cloth = {33470,41510,41511,41595,41593,41594}
 FI_TPL.Templates.CATA.Cloth = {53010,53643,54440}
+-- The War Within
+FI_TPL.Templates.TWW.Cloth = {221557}
+FI_TPL.Templates.TWW.Cloth = {221558}
+FI_TPL.Templates.TWW.Cloth = {221559}
 
 --------------------------------------------------------------------------------
 --  MISC