Convert remaining tradeskills to the new wrapper function. Need flags converted but that's not an asap thing.

Ackis [10-13-09 - 20:49]

Convert remaining tradeskills to the new wrapper function.  Need flags converted but that's not an asap thing.

Filename
RecipeDB/ARL-Blacksmith.lua
RecipeDB/ARL-Enchant.lua
RecipeDB/ARL-Engineer.lua
RecipeDB/ARL-Inscription.lua
RecipeDB/ARL-Jewelcraft.lua
RecipeDB/ARL-Leatherwork.lua
RecipeDB/ARL-Smelt.lua
RecipeDB/ARL-Tailor.lua

diff --git a/RecipeDB/ARL-Blacksmith.lua b/RecipeDB/ARL-Blacksmith.lua
index 352d048..c06a16b 100644
--- a/RecipeDB/ARL-Blacksmith.lua
+++ b/RecipeDB/ARL-Blacksmith.lua
@@ -1,598 +1,619 @@
---[[
-************************************************************************
-
-ARL-Blacksmith.lua
-
-Blacksmithing data for all of Ackis Recipe List
-
-************************************************************************
-
-File date: @file-date-iso@
-File revision: @file-revision@
-Project revision: @project-revision@
-Project version: @project-version@
-
-************************************************************************
-
-Format:
-
-	self:addTradeSkill(RecipeDB, Spell ID, Skill Level, Item ID, Rarity, Specialty)
-
-************************************************************************
-
-Please see http://www.wowace.com/projects/arl/for more information.
-
-License:
-	Please see LICENSE.txt
-
-This source code is released under All Rights Reserved.
-
-************************************************************************
-]]--
-
-local MODNAME		= "Ackis Recipe List"
-local addon		= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
-local L			= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
-
-local initialized	= false
+--------------------------------------------------------------------------------------------------------------------
+-- ARL-Blacksmith.lua
+-- Blacksmithing data for all of Ackis Recipe List
+--------------------------------------------------------------------------------------------------------------------
+-- File date: @file-date-iso@
+-- File revision: @file-revision@
+-- Project revision: @project-revision@
+-- Project version: @project-version@
+--------------------------------------------------------------------------------------------------------------------
+-- Please see http://www.wowace.com/projects/arl/for more information.
+--------------------------------------------------------------------------------------------------------------------
+-- License:
+-- Please see LICENSE.txt
+-- This source code is released under All Rights Reserved.
+--------------------------------------------------------------------------------------------------------------------
+
+local MODNAME = "Ackis Recipe List"
+local addon	= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
+local L	= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
+
+--------------------------------------------------------------------------------------------------------------------
+-- Item "rarity"
+--------------------------------------------------------------------------------------------------------------------
+local R_COMMON, R_UNCOMMON, R_RARE, R_EPIC, R_LEGENDARY, R_ARTIFACT = 1, 2, 3, 4, 5, 6
+
+--------------------------------------------------------------------------------------------------------------------
+-- Origin
+--------------------------------------------------------------------------------------------------------------------
+local GAME_ORIG, GAME_TBC, GAME_WOTLK = 0, 1, 2
+
+--------------------------------------------------------------------------------------------------------------------
+-- Filter flags
+--------------------------------------------------------------------------------------------------------------------
+local F_ALLIANCE, F_HORDE, F_TRAINER, F_VENDOR, F_INSTANCE, F_RAID = 1, 2, 3, 4, 5, 6
+local F_SEASONAL, F_QUEST, F_PVP, F_WORLD_DROP, F_MOB_DROP, F_DISC = 7, 8, 9, 10, 11, 12
+local F_DK, F_DRUID, F_HUNTER, F_MAGE, F_PALADIN, F_PRIEST, F_SHAMAN, F_ROGUE, F_WARLOCK, F_WARRIOR = 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
+local F_IBOE, F_IBOP, F_IBOA, F_RBOE, F_RBOP, F_RBOA = 36, 37, 38, 40, 41, 42
+local F_DPS, F_TANK, F_HEALER, F_CASTER = 51, 52, 53, 54
+local F_CLOTH, F_LEATHER, F_MAIL, F_PLATE, F_CLOAK, F_TRINKET, F_RING, F_NECK, F_SHIELD = 56, 57, 58, 59, 60, 61, 62, 63, 64
+local F_1H, F_2H, F_AXE, F_SWORD, F_MACE, F_POLEARM, F_DAGGER = 66, 67, 68, 69, 70, 71, 72
+local F_STAFF, F_WAND, F_THROWN, F_BOW, F_XBOW, F_AMMO, F_FIST, F_GUN = 73, 74, 75, 76, 77, 78, 79, 80
+
+--------------------------------------------------------------------------------------------------------------------
+-- Acquire types
+--------------------------------------------------------------------------------------------------------------------
+local A_TRAINER, A_VENDOR, A_MOB, A_QUEST, A_SEASONAL, A_REPUTATION, A_WORLD_DROP, A_CUSTOM = 1, 2, 3, 4, 5, 6, 7, 8
+
+
+local initialized = false
+local num_recipes = 0

 function addon:InitBlacksmithing(RecipeDB)

 	if initialized then
-		return
+		return num_recipes
 	end

 	initialized = true

+	--------------------------------------------------------------------------------------------------------------------
+	-- Counter and wrapper function
+	--------------------------------------------------------------------------------------------------------------------
+	local function AddRecipe(SpellID, Skill, ItemID, Rarity, Game, Orange, Yellow, Green, Gray, Speciality)
+		num_recipes = num_recipes + 1
+		self:addTradeSkill(RecipeDB, SpellID, Skill, ItemID, Rarity, 2018, Speciality, Game, Orange, Yellow, Green, Gray)
+	end
+
 	-- Rough Sharpening Stone -- 2660
-	self:addTradeSkill(RecipeDB,2660,1,2862,1,2018,nil,GAME_ORIG,1,15,35,55)
+	AddRecipe(2660,1,2862,1,GAME_ORIG,1,15,35,55)
 	self:addTradeFlags(RecipeDB,2660,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,2660,8,8)

 	-- Copper Chain Belt -- 2661
-	self:addTradeSkill(RecipeDB,2661,35,2851,1,2018,nil,GAME_ORIG,35,75,95,115)
+	AddRecipe(2661,35,2851,1,GAME_ORIG,35,75,95,115)
 	self:addTradeFlags(RecipeDB,2661,1,2,3,36,41,58)
 	self:addTradeAcquire(RecipeDB,2661,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3478,1,3557,1,4258,1,4596,1,5511,
 	1,6299,1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,19341,1,28694,1,27034,1,33591,1,26988,
 	1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Copper Chain Pants -- 2662
-	self:addTradeSkill(RecipeDB,2662,1,2852,1,2018,nil,GAME_ORIG,1,50,70,90)
+	AddRecipe(2662,1,2852,1,GAME_ORIG,1,50,70,90)
 	self:addTradeFlags(RecipeDB,2662,1,2,3,36,41,58)
 	self:addTradeAcquire(RecipeDB,2662,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3557,1,4258,1,4596,1,5511,1,6299,
     1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,19341,1,28694,1,27034,1,33591,1,3478,1,26988,
 	1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Copper Bracers -- 2663
-	self:addTradeSkill(RecipeDB,2663,1,2853,1,2018,nil,GAME_ORIG,1,20,40,60)
+	AddRecipe(2663,1,2853,1,GAME_ORIG,1,20,40,60)
 	self:addTradeFlags(RecipeDB,2663,1,2,3,36,41,58)
 	self:addTradeAcquire(RecipeDB,2663,8,8)

 	-- Runed Copper Bracers -- 2664
-	self:addTradeSkill(RecipeDB,2664,90,2854,1,2018,nil,GAME_ORIG,90,115,127,140)
+	AddRecipe(2664,90,2854,1,GAME_ORIG,90,115,127,140)
 	self:addTradeFlags(RecipeDB,2664,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,2664,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,
 	1,27034,1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Coarse Sharpening Stone -- 2665
-	self:addTradeSkill(RecipeDB,2665,65,2863,1,2018,nil,GAME_ORIG,65,65,72,80)
+	AddRecipe(2665,65,2863,1,GAME_ORIG,65,65,72,80)
 	self:addTradeFlags(RecipeDB,2665,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,2665,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3478,1,3557,1,4258,1,4596,1,5511,1,6299,
 	1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,
 	1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Runed Copper Belt -- 2666
-	self:addTradeSkill(RecipeDB,2666,70,2857,1,2018,nil,GAME_ORIG,70,110,130,150)
+	AddRecipe(2666,70,2857,1,GAME_ORIG,70,110,130,150)
 	self:addTradeFlags(RecipeDB,2666,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,2666,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3478,1,3557,1,4258,1,4596,1,5511,1,6299,
 	1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,
 	1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Runed Copper Breastplate -- 2667
-	self:addTradeSkill(RecipeDB,2667,80,2864,2,2018,nil,GAME_ORIG,80,120,140,160)
+	AddRecipe(2667,80,2864,2,GAME_ORIG,80,120,140,160)
 	self:addTradeFlags(RecipeDB,2667,1,2,10,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,2667,7,2)

 	-- Rough Bronze Leggings -- 2668
-	self:addTradeSkill(RecipeDB,2668,105,2865,1,2018,nil,GAME_ORIG,105,145,160,175)
+	AddRecipe(2668,105,2865,1,GAME_ORIG,105,145,160,175)
 	self:addTradeFlags(RecipeDB,2668,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,2668,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,28694,1,27034,1,514,
 	1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Rough Bronze Cuirass -- 2670
-	self:addTradeSkill(RecipeDB,2670,105,2866,1,2018,nil,GAME_ORIG,105,145,160,175)
+	AddRecipe(2670,105,2866,1,GAME_ORIG,105,145,160,175)
 	self:addTradeFlags(RecipeDB,2670,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,2670,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,1,27034,
 	1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Patterned Bronze Bracers -- 2672
-	self:addTradeSkill(RecipeDB,2672,120,2868,1,2018,nil,GAME_ORIG,120,150,165,180)
+	AddRecipe(2672,120,2868,1,GAME_ORIG,120,150,165,180)
 	self:addTradeFlags(RecipeDB,2672,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,2672,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,1,27034,
 	1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Silvered Bronze Breastplate -- 2673
-	self:addTradeSkill(RecipeDB,2673,130,2869,2,2018,nil,GAME_ORIG,130,160,175,190)
+	AddRecipe(2673,130,2869,2,GAME_ORIG,130,160,175,190)
 	self:addTradeFlags(RecipeDB,2673,1,2,10,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,2673,7,2)

 	-- Heavy Sharpening Stone -- 2674
-	self:addTradeSkill(RecipeDB,2674,125,2871,1,2018,nil,GAME_ORIG,125,125,132,140)
+	AddRecipe(2674,125,2871,1,GAME_ORIG,125,125,132,140)
 	self:addTradeFlags(RecipeDB,2674,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,2674,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,1,27034,
 	1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Shining Silver Breastplate -- 2675
-	self:addTradeSkill(RecipeDB,2675,145,2870,1,2018,nil,GAME_ORIG,145,175,190,205)
+	AddRecipe(2675,145,2870,1,GAME_ORIG,145,175,190,205)
 	self:addTradeFlags(RecipeDB,2675,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,2675,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,1,27034,
 	1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Copper Mace -- 2737
-	self:addTradeSkill(RecipeDB,2737,15,2844,1,2018,nil,GAME_ORIG,15,55,75,95)
+	AddRecipe(2737,15,2844,1,GAME_ORIG,15,55,75,95)
 	self:addTradeFlags(RecipeDB,2737,1,2,3,36,41,66,70)
 	self:addTradeAcquire(RecipeDB,2737,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3478,1,3557,1,4258,1,4596,1,5511,1,6299,
 	1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,
 	1,26952,1,26904,1,29924)

 	-- Copper Axe -- 2738
-	self:addTradeSkill(RecipeDB,2738,20,2845,1,2018,nil,GAME_ORIG,20,60,80,100)
+	AddRecipe(2738,20,2845,1,GAME_ORIG,20,60,80,100)
 	self:addTradeFlags(RecipeDB,2738,1,2,3,36,41,66,68)
 	self:addTradeAcquire(RecipeDB,2738,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3478,1,3557,1,4258,1,4596,1,5511,1,6299,
 	1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,
 	1,26952,1,26904,1,29924)

 	-- Copper Shortsword -- 2739
-	self:addTradeSkill(RecipeDB,2739,25,2847,1,2018,nil,GAME_ORIG,25,65,85,105)
+	AddRecipe(2739,25,2847,1,GAME_ORIG,25,65,85,105)
 	self:addTradeFlags(RecipeDB,2739,1,2,3,36,41,66,69)
 	self:addTradeAcquire(RecipeDB,2739,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3478,1,3557,1,4258,1,4596,1,5511,1,6299,
 	1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,
 	1,26952,1,26904,1,29924)

 	-- Bronze Mace -- 2740
-	self:addTradeSkill(RecipeDB,2740,110,2848,1,2018,nil,GAME_ORIG,110,140,155,170)
+	AddRecipe(2740,110,2848,1,GAME_ORIG,110,140,155,170)
 	self:addTradeFlags(RecipeDB,2740,1,2,3,36,41,66,70)
 	self:addTradeAcquire(RecipeDB,2740,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,
 	1,27034,1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Bronze Axe -- 2741
-	self:addTradeSkill(RecipeDB,2741,115,2849,1,2018,nil,GAME_ORIG,115,145,160,175)
+	AddRecipe(2741,115,2849,1,GAME_ORIG,115,145,160,175)
 	self:addTradeFlags(RecipeDB,2741,1,2,3,36,41,66,68)
 	self:addTradeAcquire(RecipeDB,2741,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,
 	1,27034,1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Bronze Shortsword -- 2742
-	self:addTradeSkill(RecipeDB,2742,120,2850,1,2018,nil,GAME_ORIG,120,150,165,180)
+	AddRecipe(2742,120,2850,1,GAME_ORIG,120,150,165,180)
 	self:addTradeFlags(RecipeDB,2742,1,2,3,36,41,51,66,69)
 	self:addTradeAcquire(RecipeDB,2742,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,
 	1,27034,1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Rough Weightstone -- 3115
-	self:addTradeSkill(RecipeDB,3115,1,3239,1,2018,nil,GAME_ORIG,1,15,35,55)
+	AddRecipe(3115,1,3239,1,GAME_ORIG,1,15,35,55)
 	self:addTradeFlags(RecipeDB,3115,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3115,8,8)

 	-- Coarse Weightstone -- 3116
-	self:addTradeSkill(RecipeDB,3116,65,3240,1,2018,nil,GAME_ORIG,65,65,72,80)
+	AddRecipe(3116,65,3240,1,GAME_ORIG,65,65,72,80)
 	self:addTradeFlags(RecipeDB,3116,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3116,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3478,1,3557,1,4258,1,4596,1,5511,1,6299,
 	1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,
 	1,26952,1,26904,1,29924)

 	-- Heavy Weightstone -- 3117
-	self:addTradeSkill(RecipeDB,3117,125,3241,1,2018,nil,GAME_ORIG,125,125,132,140)
+	AddRecipe(3117,125,3241,1,GAME_ORIG,125,125,132,140)
 	self:addTradeFlags(RecipeDB,3117,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3117,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,1,27034,
 	1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Heavy Copper Broadsword -- 3292
-	self:addTradeSkill(RecipeDB,3292,95,3487,1,2018,nil,GAME_ORIG,95,135,155,175)
+	AddRecipe(3292,95,3487,1,GAME_ORIG,95,135,155,175)
 	self:addTradeFlags(RecipeDB,3292,1,2,3,36,41,67,69)
 	self:addTradeAcquire(RecipeDB,3292,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,1,27034,
 	1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Copper Battle Axe -- 3293
-	self:addTradeSkill(RecipeDB,3293,35,3488,1,2018,nil,GAME_ORIG,35,75,95,115)
+	AddRecipe(3293,35,3488,1,GAME_ORIG,35,75,95,115)
 	self:addTradeFlags(RecipeDB,3293,1,2,3,36,41,67,68)
 	self:addTradeAcquire(RecipeDB,3293,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3478,1,3557,1,4258,1,4596,1,5511,1,6299,
 	1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,
 	1,26952,1,26904,1,29924)

 	-- Thick War Axe -- 3294
-	self:addTradeSkill(RecipeDB,3294,70,3489,1,2018,nil,GAME_ORIG,70,110,130,150)
+	AddRecipe(3294,70,3489,1,GAME_ORIG,70,110,130,150)
 	self:addTradeFlags(RecipeDB,3294,1,2,3,36,41,51,66,68)
 	self:addTradeAcquire(RecipeDB,3294,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3478,1,3557,1,4258,1,4596,1,5511,1,6299,
 	1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,
 	1,26952,1,26904,1,29924)

 	-- Deadly Bronze Poniard -- 3295
-	self:addTradeSkill(RecipeDB,3295,125,3490,2,2018,nil,GAME_ORIG,125,155,170,195)
+	AddRecipe(3295,125,3490,2,GAME_ORIG,125,155,170,195)
 	self:addTradeFlags(RecipeDB,3295,1,2,10,36,40,51,66,72)
 	self:addTradeAcquire(RecipeDB,3295,7,2)

 	-- Heavy Bronze Mace -- 3296
-	self:addTradeSkill(RecipeDB,3296,130,3491,1,2018,nil,GAME_ORIG,130,160,175,190)
+	AddRecipe(3296,130,3491,1,GAME_ORIG,130,160,175,190)
 	self:addTradeFlags(RecipeDB,3296,1,2,3,36,41,51,66,70)
 	self:addTradeAcquire(RecipeDB,3296,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,1,27034,
 	1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Mighty Iron Hammer -- 3297
-	self:addTradeSkill(RecipeDB,3297,145,3492,2,2018,nil,GAME_ORIG,145,175,190,205)
+	AddRecipe(3297,145,3492,2,GAME_ORIG,145,175,190,205)
 	self:addTradeFlags(RecipeDB,3297,1,2,10,36,40,51,66,70)
 	self:addTradeAcquire(RecipeDB,3297,7,2)

 	-- Copper Chain Boots -- 3319
-	self:addTradeSkill(RecipeDB,3319,20,3469,1,2018,nil,GAME_ORIG,20,60,80,100)
+	AddRecipe(3319,20,3469,1,GAME_ORIG,20,60,80,100)
 	self:addTradeFlags(RecipeDB,3319,1,2,3,36,41,58)
 	self:addTradeAcquire(RecipeDB,3319,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3557,1,4258,1,4596,1,5511,1,6299,
 	1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,19341,1,28694,1,27034,1,33591,1,3478,1,26988,1,33609,1,33631,1,33675,
 	1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Rough Grinding Stone -- 3320
-	self:addTradeSkill(RecipeDB,3320,25,3470,1,2018,nil,GAME_ORIG,25,45,65,85)
+	AddRecipe(3320,25,3470,1,GAME_ORIG,25,45,65,85)
 	self:addTradeFlags(RecipeDB,3320,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3320,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3557,1,4258,1,4596,1,5511,1,6299,
 	1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,28694,1,27034,1,33591,1,3478,1,26988,1,33609,1,33631,1,33675,1,26981,
 	1,26564,1,26952,1,26904,1,29924)

 	-- Copper Chain Vest -- 3321
-	self:addTradeSkill(RecipeDB,3321,35,3471,2,2018,nil,GAME_ORIG,35,75,95,115)
+	AddRecipe(3321,35,3471,2,GAME_ORIG,35,75,95,115)
 	self:addTradeFlags(RecipeDB,3321,1,2,10,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,3321,7,2)

 	-- Runed Copper Gauntlets -- 3323
-	self:addTradeSkill(RecipeDB,3323,40,3472,1,2018,nil,GAME_ORIG,40,80,100,120)
+	AddRecipe(3323,40,3472,1,GAME_ORIG,40,80,100,120)
 	self:addTradeFlags(RecipeDB,3323,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,3323,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3478,1,3557,1,4258,1,4596,1,5511,1,6299,
 	1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,
 	1,26952,1,26904,1,29924)

 	-- Runed Copper Pants -- 3324
-	self:addTradeSkill(RecipeDB,3324,45,3473,1,2018,nil,GAME_ORIG,45,85,105,125)
+	AddRecipe(3324,45,3473,1,GAME_ORIG,45,85,105,125)
 	self:addTradeFlags(RecipeDB,3324,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,3324,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3478,1,3557,1,4258,1,4596,1,5511,1,6299,
 	1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,
 	1,26952,1,26904,1,29924)

 	-- Gemmed Copper Gauntlets -- 3325
-	self:addTradeSkill(RecipeDB,3325,60,3474,2,2018,nil,GAME_ORIG,60,100,120,140)
+	AddRecipe(3325,60,3474,2,GAME_ORIG,60,100,120,140)
 	self:addTradeFlags(RecipeDB,3325,1,2,10,36,40,58)
 	self:addTradeAcquire(RecipeDB,3325,7,2)

 	-- Coarse Grinding Stone -- 3326
-	self:addTradeSkill(RecipeDB,3326,75,3478,1,2018,nil,GAME_ORIG,75,75,87,100)
+	AddRecipe(3326,75,3478,1,GAME_ORIG,75,75,87,100)
 	self:addTradeFlags(RecipeDB,3326,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3326,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3478,1,3557,1,4258,1,4596,1,5511,1,6299,
 	1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,
 	1,26904,1,29924)

 	-- Rough Bronze Shoulders -- 3328
-	self:addTradeSkill(RecipeDB,3328,110,3480,1,2018,nil,GAME_ORIG,110,140,155,170)
+	AddRecipe(3328,110,3480,1,GAME_ORIG,110,140,155,170)
 	self:addTradeFlags(RecipeDB,3328,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,3328,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,1,27034,
 	1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Silvered Bronze Shoulders -- 3330
-	self:addTradeSkill(RecipeDB,3330,125,3481,2,2018,nil,GAME_ORIG,125,155,170,185)
+	AddRecipe(3330,125,3481,2,GAME_ORIG,125,155,170,185)
 	self:addTradeFlags(RecipeDB,3330,1,2,10,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,3330,7,2)

 	-- Silvered Bronze Boots -- 3331
-	self:addTradeSkill(RecipeDB,3331,130,3482,1,2018,nil,GAME_ORIG,130,160,175,190)
+	AddRecipe(3331,130,3482,1,GAME_ORIG,130,160,175,190)
 	self:addTradeFlags(RecipeDB,3331,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,3331,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,1,27034,
 	1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Silvered Bronze Gauntlets -- 3333
-	self:addTradeSkill(RecipeDB,3333,135,3483,1,2018,nil,GAME_ORIG,135,165,180,195)
+	AddRecipe(3333,135,3483,1,GAME_ORIG,135,165,180,195)
 	self:addTradeFlags(RecipeDB,3333,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,3333,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,1,27034,
 	1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Green Iron Boots -- 3334
-	self:addTradeSkill(RecipeDB,3334,145,3484,2,2018,nil,GAME_ORIG,145,175,190,205)
+	AddRecipe(3334,145,3484,2,GAME_ORIG,145,175,190,205)
 	self:addTradeFlags(RecipeDB,3334,1,2,10,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,3334,7,2)

 	-- Green Iron Gauntlets -- 3336
-	self:addTradeSkill(RecipeDB,3336,150,3485,2,2018,nil,GAME_ORIG,150,180,195,210)
+	AddRecipe(3336,150,3485,2,GAME_ORIG,150,180,195,210)
 	self:addTradeFlags(RecipeDB,3336,1,2,10,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,3336,7,2)

 	-- Heavy Grinding Stone -- 3337
-	self:addTradeSkill(RecipeDB,3337,125,3486,1,2018,nil,GAME_ORIG,125,125,137,150)
+	AddRecipe(3337,125,3486,1,GAME_ORIG,125,125,137,150)
 	self:addTradeFlags(RecipeDB,3337,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3337,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,28694,1,27034,
 	1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Big Bronze Knife -- 3491
-	self:addTradeSkill(RecipeDB,3491,105,3848,1,2018,nil,GAME_ORIG,105,135,150,165)
+	AddRecipe(3491,105,3848,1,GAME_ORIG,105,135,150,165)
 	self:addTradeFlags(RecipeDB,3491,1,2,3,36,41,66,72)
 	self:addTradeAcquire(RecipeDB,3491,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,
 	1,28694,1,27034,1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Hardened Iron Shortsword -- 3492
-	self:addTradeSkill(RecipeDB,3492,160,3849,1,2018,nil,GAME_ORIG,160,185,197,210)
+	AddRecipe(3492,160,3849,1,GAME_ORIG,160,185,197,210)
 	self:addTradeFlags(RecipeDB,3492,1,2,4,36,40,51,66,69)
 	self:addTradeAcquire(RecipeDB,3492,2,2843,2,5512)

 	-- Jade Serpentblade -- 3493
-	self:addTradeSkill(RecipeDB,3493,175,3850,2,2018,nil,GAME_ORIG,175,200,212,225)
+	AddRecipe(3493,175,3850,2,GAME_ORIG,175,200,212,225)
 	self:addTradeFlags(RecipeDB,3493,1,2,10,36,40,51,66,69)
 	self:addTradeAcquire(RecipeDB,3493,7,2)

 	-- Solid Iron Maul -- 3494
-	self:addTradeSkill(RecipeDB,3494,155,3851,1,2018,nil,GAME_ORIG,155,180,192,205)
+	AddRecipe(3494,155,3851,1,GAME_ORIG,155,180,192,205)
 	self:addTradeFlags(RecipeDB,3494,1,2,4,36,41,67,70)
 	self:addTradeAcquire(RecipeDB,3494,2,1471,2,8878,2,9179)

 	-- Golden Iron Destroyer -- 3495
-	self:addTradeSkill(RecipeDB,3495,170,3852,2,2018,nil,GAME_ORIG,170,195,207,220)
+	AddRecipe(3495,170,3852,2,GAME_ORIG,170,195,207,220)
 	self:addTradeFlags(RecipeDB,3495,1,2,10,36,40,51,67,70)
 	self:addTradeAcquire(RecipeDB,3495,7,2)

 	-- Moonsteel Broadsword -- 3496
-	self:addTradeSkill(RecipeDB,3496,180,3853,1,2018,nil,GAME_ORIG,180,205,217,230)
+	AddRecipe(3496,180,3853,1,GAME_ORIG,180,205,217,230)
 	self:addTradeFlags(RecipeDB,3496,1,2,4,36,41,67,69)
 	self:addTradeAcquire(RecipeDB,3496,2,2482)

 	-- Frost Tiger Blade -- 3497
-	self:addTradeSkill(RecipeDB,3497,200,3854,2,2018,nil,0)
+	AddRecipe(3497,200,3854,2,0)
 	self:addTradeFlags(RecipeDB,3497,1,2,10,36,40,67,69)
 	self:addTradeAcquire(RecipeDB,3497,7,2)

 	-- Massive Iron Axe -- 3498
-	self:addTradeSkill(RecipeDB,3498,185,3855,1,2018,nil,GAME_ORIG,185,210,222,235)
+	AddRecipe(3498,185,3855,1,GAME_ORIG,185,210,222,235)
 	self:addTradeFlags(RecipeDB,3498,1,2,4,36,40,51,67,68)
 	self:addTradeAcquire(RecipeDB,3498,2,2483)

 	-- Shadow Crescent Axe -- 3500
-	self:addTradeSkill(RecipeDB,3500,200,3856,2,2018,nil,GAME_ORIG,200,225,237,250)
+	AddRecipe(3500,200,3856,2,GAME_ORIG,200,225,237,250)
 	self:addTradeFlags(RecipeDB,3500,1,2,10,36,40,51,67,68)
 	self:addTradeAcquire(RecipeDB,3500,7,2)

 	-- Green Iron Bracers -- 3501
-	self:addTradeSkill(RecipeDB,3501,165,3835,1,2018,nil,GAME_ORIG,165,190,202,215)
+	AddRecipe(3501,165,3835,1,GAME_ORIG,165,190,202,215)
 	self:addTradeFlags(RecipeDB,3501,1,2,3,36,41,58)
 	self:addTradeAcquire(RecipeDB,3501,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,28694,1,27034,1,5511,1,514,1,1241,1,16724,1,33591,
 	1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Green Iron Helm -- 3502
-	self:addTradeSkill(RecipeDB,3502,170,3836,1,2018,nil,GAME_ORIG,170,195,207,220)
+	AddRecipe(3502,170,3836,1,GAME_ORIG,170,195,207,220)
 	self:addTradeFlags(RecipeDB,3502,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,3502,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,19341,1,28694,1,27034,1,5511,1,514,1,1241,1,16724,
 	1,33591,1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Golden Scale Coif -- 3503
-	self:addTradeSkill(RecipeDB,3503,190,3837,1,2018,nil,GAME_ORIG,190,215,227,240)
+	AddRecipe(3503,190,3837,1,GAME_ORIG,190,215,227,240)
 	self:addTradeFlags(RecipeDB,3503,1,2,4,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,3503,2,5411)

 	-- Green Iron Shoulders -- 3504
-	self:addTradeSkill(RecipeDB,3504,160,3840,2,2018,nil,GAME_ORIG,160,185,197,210)
+	AddRecipe(3504,160,3840,2,GAME_ORIG,160,185,197,210)
 	self:addTradeFlags(RecipeDB,3504,1,2,10,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,3504,7,2)

 	-- Golden Scale Shoulders -- 3505
-	self:addTradeSkill(RecipeDB,3505,175,3841,3,2018,nil,GAME_ORIG,175,200,212,225)
+	AddRecipe(3505,175,3841,3,GAME_ORIG,175,200,212,225)
 	self:addTradeFlags(RecipeDB,3505,1,2,10,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,3505,7,3)

 	-- Green Iron Leggings -- 3506
-	self:addTradeSkill(RecipeDB,3506,155,3842,1,2018,nil,GAME_ORIG,155,180,192,205)
+	AddRecipe(3506,155,3842,1,GAME_ORIG,155,180,192,205)
 	self:addTradeFlags(RecipeDB,3506,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,3506,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,19341,1,28694,1,27034,1,5511,1,514,1,1241,
 	1,16724,1,33591,1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,
 	1,26952,1,3557,1,26904,1,29924)

 	-- Golden Scale Leggings -- 3507
-	self:addTradeSkill(RecipeDB,3507,170,3843,2,2018,nil,GAME_ORIG,170,195,207,220)
+	AddRecipe(3507,170,3843,2,GAME_ORIG,170,195,207,220)
 	self:addTradeFlags(RecipeDB,3507,1,2,10,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,3507,7,2)

 	-- Green Iron Hauberk -- 3508
-	self:addTradeSkill(RecipeDB,3508,180,3844,1,2018,nil,GAME_ORIG,180,205,217,230)
+	AddRecipe(3508,180,3844,1,GAME_ORIG,180,205,217,230)
 	self:addTradeFlags(RecipeDB,3508,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,3508,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,19341,1,28694,1,27034,1,5511,1,514,
 	1,1241,1,16724,1,33591,1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,
 	1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Golden Scale Cuirass -- 3511
-	self:addTradeSkill(RecipeDB,3511,195,3845,2,2018,nil,GAME_ORIG,195,220,232,245)
+	AddRecipe(3511,195,3845,2,GAME_ORIG,195,220,232,245)
 	self:addTradeFlags(RecipeDB,3511,1,2,10,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,3511,7,2)

 	-- Polished Steel Boots -- 3513
-	self:addTradeSkill(RecipeDB,3513,185,3846,2,2018,nil,GAME_ORIG,185,210,222,235)
+	AddRecipe(3513,185,3846,2,GAME_ORIG,185,210,222,235)
 	self:addTradeFlags(RecipeDB,3513,1,2,10,36,40,58)
 	self:addTradeAcquire(RecipeDB,3513,7,2)

 	-- Golden Scale Boots -- 3515
-	self:addTradeSkill(RecipeDB,3515,200,3847,3,2018,nil,0)
+	AddRecipe(3515,200,3847,3,0)
 	self:addTradeFlags(RecipeDB,3515,1,2,5,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,3515,7,2)

 	-- Pearl-handled Dagger -- 6517
-	self:addTradeSkill(RecipeDB,6517,110,5540,1,2018,nil,GAME_ORIG,110,140,155,170)
+	AddRecipe(6517,110,5540,1,GAME_ORIG,110,140,155,170)
 	self:addTradeFlags(RecipeDB,6517,1,2,3,36,41,51,66,72)
 	self:addTradeAcquire(RecipeDB,6517,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,
 	1,16669,1,16724,1,16823,1,19341,1,28694,1,27034,1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,
 	1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Iridescent Hammer -- 6518
-	self:addTradeSkill(RecipeDB,6518,140,5541,2,2018,nil,GAME_ORIG,140,170,185,200)
+	AddRecipe(6518,140,5541,2,GAME_ORIG,140,170,185,200)
 	self:addTradeFlags(RecipeDB,6518,1,2,10,36,40,51,66,70)
 	self:addTradeAcquire(RecipeDB,6518,7,2)

 	-- Iron Shield Spike -- 7221
-	self:addTradeSkill(RecipeDB,7221,150,6042,2,2018,nil,GAME_ORIG,150,180,195,210)
+	AddRecipe(7221,150,6042,2,GAME_ORIG,150,180,195,210)
 	self:addTradeFlags(RecipeDB,7221,1,2,10,36,40,52,64)
 	self:addTradeAcquire(RecipeDB,7221,7,2)

 	-- Iron Counterweight -- 7222
-	self:addTradeSkill(RecipeDB,7222,165,6043,2,2018,nil,GAME_ORIG,165,190,202,215)
+	AddRecipe(7222,165,6043,2,GAME_ORIG,165,190,202,215)
 	self:addTradeFlags(RecipeDB,7222,1,2,10,36,40,68)
 	self:addTradeAcquire(RecipeDB,7222,7,2)

 	-- Golden Scale Bracers -- 7223
-	self:addTradeSkill(RecipeDB,7223,185,6040,1,2018,nil,GAME_ORIG,185,210,222,235)
+	AddRecipe(7223,185,6040,1,GAME_ORIG,185,210,222,235)
 	self:addTradeFlags(RecipeDB,7223,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,7223,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,19341,1,28694,1,27034,1,5511,
 	1,514,1,1241,1,16724,1,33591,1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,
 	1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Steel Weapon Chain -- 7224
-	self:addTradeSkill(RecipeDB,7224,190,6041,2,2018,nil,GAME_ORIG,190,215,227,240)
+	AddRecipe(7224,190,6041,2,GAME_ORIG,190,215,227,240)
 	self:addTradeFlags(RecipeDB,7224,1,2,5,11,36,40)
 	self:addTradeAcquire(RecipeDB,7224,7,2)

 	-- Heavy Copper Maul -- 7408
-	self:addTradeSkill(RecipeDB,7408,65,6214,1,2018,nil,GAME_ORIG,65,105,125,145)
+	AddRecipe(7408,65,6214,1,GAME_ORIG,65,105,125,145)
 	self:addTradeFlags(RecipeDB,7408,1,2,3,36,41,51,67,70)
 	self:addTradeAcquire(RecipeDB,7408,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3478,1,3557,1,4258,1,4596,1,5511,1,6299,
 	1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,
 	1,26952,1,26904,1,29924)

 	-- Rough Bronze Boots -- 7817
-	self:addTradeSkill(RecipeDB,7817,95,6350,1,2018,nil,GAME_ORIG,95,125,140,155)
+	AddRecipe(7817,95,6350,1,GAME_ORIG,95,125,140,155)
 	self:addTradeFlags(RecipeDB,7817,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,7817,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,1,27034,
 	1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Silver Rod -- 7818
-	self:addTradeSkill(RecipeDB,7818,100,6338,1,2018,nil,GAME_ORIG,100,105,107,110)
+	AddRecipe(7818,100,6338,1,GAME_ORIG,100,105,107,110)
 	self:addTradeFlags(RecipeDB,7818,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,7818,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,28694,1,27034,1,514,
 	1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Ironforge Breastplate -- 8367
-	self:addTradeSkill(RecipeDB,8367,100,6731,2,2018,nil,GAME_ORIG,100,140,160,180)
+	AddRecipe(8367,100,6731,2,GAME_ORIG,100,140,160,180)
 	self:addTradeFlags(RecipeDB,8367,1,8,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,8367,4,1618)

 	-- Iron Buckle -- 8768
-	self:addTradeSkill(RecipeDB,8768,150,7071,1,2018,nil,GAME_ORIG,150,150,152,155)
+	AddRecipe(8768,150,7071,1,GAME_ORIG,150,150,152,155)
 	self:addTradeFlags(RecipeDB,8768,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,8768,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,
 	1,27034,1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Copper Dagger -- 8880
-	self:addTradeSkill(RecipeDB,8880,30,7166,1,2018,nil,GAME_ORIG,30,70,90,110)
+	AddRecipe(8880,30,7166,1,GAME_ORIG,30,70,90,110)
 	self:addTradeFlags(RecipeDB,8880,1,2,3,36,41,66,72)
 	self:addTradeAcquire(RecipeDB,8880,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3478,1,3557,1,4258,1,4596,1,5511,1,6299,
 	1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,
 	1,26952,1,26904,1,29924)

 	-- Barbaric Iron Shoulders -- 9811
-	self:addTradeSkill(RecipeDB,9811,160,7913,2,2018,nil,GAME_ORIG,160,185,197,210)
+	AddRecipe(9811,160,7913,2,GAME_ORIG,160,185,197,210)
 	self:addTradeFlags(RecipeDB,9811,2,8,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,9811,4,2752)

 	-- Barbaric Iron Breastplate -- 9813
-	self:addTradeSkill(RecipeDB,9813,160,7914,2,2018,nil,GAME_ORIG,160,185,197,210)
+	AddRecipe(9813,160,7914,2,GAME_ORIG,160,185,197,210)
 	self:addTradeFlags(RecipeDB,9813,2,8,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,9813,4,2751)

 	-- Barbaric Iron Helm -- 9814
-	self:addTradeSkill(RecipeDB,9814,175,7915,2,2018,nil,GAME_ORIG,175,200,212,225)
+	AddRecipe(9814,175,7915,2,GAME_ORIG,175,200,212,225)
 	self:addTradeFlags(RecipeDB,9814,2,8,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,9814,4,2754)

 	-- Barbaric Iron Boots -- 9818
-	self:addTradeSkill(RecipeDB,9818,180,7916,2,2018,nil,GAME_ORIG,180,205,217,230)
+	AddRecipe(9818,180,7916,2,GAME_ORIG,180,205,217,230)
 	self:addTradeFlags(RecipeDB,9818,2,8,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,9818,4,2753)

 	-- Barbaric Iron Gloves -- 9820
-	self:addTradeSkill(RecipeDB,9820,185,7917,2,2018,nil,GAME_ORIG,185,210,222,235)
+	AddRecipe(9820,185,7917,2,GAME_ORIG,185,210,222,235)
 	self:addTradeFlags(RecipeDB,9820,2,8,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,9820,4,2755)

 	-- Steel Breastplate -- 9916
-	self:addTradeSkill(RecipeDB,9916,200,7963,1,2018,nil,GAME_ORIG,200,225,237,250)
+	AddRecipe(9916,200,7963,1,GAME_ORIG,200,225,237,250)
 	self:addTradeFlags(RecipeDB,9916,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,9916,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,19341,1,28694,1,27034,1,5511,1,514,1,1241,1,16724,1,33591,1,2998,
 	1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Solid Sharpening Stone -- 9918
-	self:addTradeSkill(RecipeDB,9918,200,7964,1,2018,nil,GAME_ORIG,200,200,205,210)
+	AddRecipe(9918,200,7964,1,GAME_ORIG,200,200,205,210)
 	self:addTradeFlags(RecipeDB,9918,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,9918,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,19341,1,28694,1,27034,1,5511,1,514,1,1241,1,16724,1,33591,1,2998,
 	1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Solid Grinding Stone -- 9920
-	self:addTradeSkill(RecipeDB,9920,200,7966,1,2018,nil,GAME_ORIG,200,200,205,210)
+	AddRecipe(9920,200,7966,1,GAME_ORIG,200,200,205,210)
 	self:addTradeFlags(RecipeDB,9920,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,9920,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,28694,1,27034,1,5511,1,514,1,1241,1,16724,1,33591,1,2998,
 	1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Solid Weightstone -- 9921
-	self:addTradeSkill(RecipeDB,9921,200,7965,1,2018,nil,GAME_ORIG,200,200,205,210)
+	AddRecipe(9921,200,7965,1,GAME_ORIG,200,200,205,210)
 	self:addTradeFlags(RecipeDB,9921,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,9921,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,19341,1,28694,1,27034,1,5511,1,514,1,1241,1,16724,1,33591,
 	1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Heavy Mithril Shoulder -- 9926
-	self:addTradeSkill(RecipeDB,9926,205,7918,1,2018,nil,GAME_ORIG,205,225,235,245)
+	AddRecipe(9926,205,7918,1,GAME_ORIG,205,225,235,245)
 	self:addTradeFlags(RecipeDB,9926,1,2,3,36,41,59)
 	self:addTradeAcquire(RecipeDB,9926,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,19341,1,28694,1,27034,1,5511,1,514,1,1241,1,16724,1,33591,
 	1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Heavy Mithril Gauntlet -- 9928
-	self:addTradeSkill(RecipeDB,9928,205,7919,1,2018,nil,GAME_ORIG,205,225,235,245)
+	AddRecipe(9928,205,7919,1,GAME_ORIG,205,225,235,245)
 	self:addTradeFlags(RecipeDB,9928,1,2,3,36,41,59)
 	self:addTradeAcquire(RecipeDB,9928,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,19341,1,28694,1,27034,1,5511,1,514,1,1241,1,16724,1,33591,
 	1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Mithril Scale Pants -- 9931
-	self:addTradeSkill(RecipeDB,9931,210,7920,1,2018,nil,GAME_ORIG,210,230,240,250)
+	AddRecipe(9931,210,7920,1,GAME_ORIG,210,230,240,250)
 	self:addTradeFlags(RecipeDB,9931,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,9931,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,19341,1,28694,1,27034,1,5511,1,514,1,1241,1,16724,1,33591,
 	1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Heavy Mithril Pants -- 9933
-	self:addTradeSkill(RecipeDB,9933,210,7921,2,2018,nil,GAME_ORIG,210,230,240,250)
+	AddRecipe(9933,210,7921,2,GAME_ORIG,210,230,240,250)
 	self:addTradeFlags(RecipeDB,9933,1,2,10,36,40,59)
 	self:addTradeAcquire(RecipeDB,9933,7,2)

 	-- Steel Plate Helm -- 9935
-	self:addTradeSkill(RecipeDB,9935,215,7922,1,2018,nil,GAME_ORIG,215,235,245,255)
+	AddRecipe(9935,215,7922,1,GAME_ORIG,215,235,245,255)
 	self:addTradeFlags(RecipeDB,9935,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,9935,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,19341,1,28694,1,27034,1,5511,1,514,1,1241,1,16724,1,33591,
 	1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Mithril Scale Bracers -- 9937
-	self:addTradeSkill(RecipeDB,9937,215,7924,1,2018,nil,GAME_ORIG,215,235,245,255)
+	AddRecipe(9937,215,7924,1,GAME_ORIG,215,235,245,255)
 	self:addTradeFlags(RecipeDB,9937,1,2,4,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,9937,2,8161,2,8176)

 	-- Mithril Shield Spike -- 9939
-	self:addTradeSkill(RecipeDB,9939,215,7967,3,2018,nil,GAME_ORIG,215,235,245,255)
+	AddRecipe(9939,215,7967,3,GAME_ORIG,215,235,245,255)
 	self:addTradeFlags(RecipeDB,9939,1,2,10,36,40,52,64)
 	self:addTradeAcquire(RecipeDB,9939,7,3)

 	-- Ornate Mithril Pants -- 9945
-	self:addTradeSkill(RecipeDB,9945,220,7926,2,2018,nil,GAME_ORIG,220,240,250,260)
+	AddRecipe(9945,220,7926,2,GAME_ORIG,220,240,250,260)
 	self:addTradeFlags(RecipeDB,9945,1,2,8,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,9945,4,2761)

 	-- Ornate Mithril Gloves -- 9950
-	self:addTradeSkill(RecipeDB,9950,220,7927,2,2018,nil,GAME_ORIG,220,240,250,260)
+	AddRecipe(9950,220,7927,2,GAME_ORIG,220,240,250,260)
 	self:addTradeFlags(RecipeDB,9950,1,2,8,36,41,59)
 	self:addTradeAcquire(RecipeDB,9950,4,2762)

 	-- Ornate Mithril Shoulder -- 9952
-	self:addTradeSkill(RecipeDB,9952,225,7928,2,2018,nil,GAME_ORIG,225,245,255,265)
+	AddRecipe(9952,225,7928,2,GAME_ORIG,225,245,255,265)
 	self:addTradeFlags(RecipeDB,9952,1,2,8,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,9952,4,2763)

 	-- Truesilver Gauntlets -- 9954
-	self:addTradeSkill(RecipeDB,9954,225,7938,1,2018,nil,GAME_ORIG,225,245,255,265)
+	AddRecipe(9954,225,7938,1,GAME_ORIG,225,245,255,265)
 	self:addTradeFlags(RecipeDB,9954,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,9954,1,5164,1,7230,1,11177,1,20125,1,29506)

 	-- Heavy Mithril Breastplate -- 9959
-	self:addTradeSkill(RecipeDB,9959,230,7930,1,2018,nil,GAME_ORIG,230,250,260,270)
+	AddRecipe(9959,230,7930,1,GAME_ORIG,230,250,260,270)
 	self:addTradeFlags(RecipeDB,9959,1,2,3,36,41,59)
 	self:addTradeAcquire(RecipeDB,9959,1,2836,1,16583,1,16823,1,19341,1,28694,1,27034,
 	1,4258,1,5511,1,514,1,1241,1,16724,1,3355,1,33591,1,2998,1,3478,1,3136,1,4596,1,3174,
@@ -600,24 +621,24 @@ function addon:InitBlacksmithing(RecipeDB)
 	1,26904,1,29924)

 	-- Mithril Coif -- 9961
-	self:addTradeSkill(RecipeDB,9961,230,7931,1,2018,nil,GAME_ORIG,230,250,260,270)
+	AddRecipe(9961,230,7931,1,GAME_ORIG,230,250,260,270)
 	self:addTradeFlags(RecipeDB,9961,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,9961,1,2836,1,16583,1,16823,1,19341,1,28694,1,27034,1,4258,1,5511,
 	1,514,1,1241,1,16724,1,3355,1,33591,1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,
 	1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Mithril Spurs -- 9964
-	self:addTradeSkill(RecipeDB,9964,235,7969,2,2018,nil,GAME_ORIG,235,255,265,275)
+	AddRecipe(9964,235,7969,2,GAME_ORIG,235,255,265,275)
 	self:addTradeFlags(RecipeDB,9964,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,9964,7,2)

 	-- Mithril Scale Shoulders -- 9966
-	self:addTradeSkill(RecipeDB,9966,235,7932,3,2018,nil,GAME_ORIG,235,255,265,275)
+	AddRecipe(9966,235,7932,3,GAME_ORIG,235,255,265,275)
 	self:addTradeFlags(RecipeDB,9966,1,2,5,6,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,9966,7, 3, 8, 33)

 	-- Heavy Mithril Boots -- 9968
-	self:addTradeSkill(RecipeDB,9968,235,7933,1,2018,nil,GAME_ORIG,235,255,265,275)
+	AddRecipe(9968,235,7933,1,GAME_ORIG,235,255,265,275)
 	self:addTradeFlags(RecipeDB,9968,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,9968,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,
 	1,3478,1,3557,1,4258,1,4596,1,5511,1,6299,1,15400,1,16583,
@@ -625,1975 +646,1974 @@ function addon:InitBlacksmithing(RecipeDB)
 	1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Heavy Mithril Helm -- 9970
-	self:addTradeSkill(RecipeDB,9970,245,7934,2,2018,nil,GAME_ORIG,245,255,265,275)
+	AddRecipe(9970,245,7934,2,GAME_ORIG,245,255,265,275)
 	self:addTradeFlags(RecipeDB,9970,1,2,10,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,9970,7,2)

 	-- Ornate Mithril Breastplate -- 9972
-	self:addTradeSkill(RecipeDB,9972,260,7935,2,2018,nil,GAME_ORIG,260,260,270,280)
+	AddRecipe(9972,260,7935,2,GAME_ORIG,260,260,270,280)
 	self:addTradeFlags(RecipeDB,9972,1,2,8,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,9972,4,2773)

 	-- Truesilver Breastplate -- 9974
-	self:addTradeSkill(RecipeDB,9974,245,7939,1,2018,nil,GAME_ORIG,245,265,275,285)
+	AddRecipe(9974,245,7939,1,GAME_ORIG,245,265,275,285)
 	self:addTradeFlags(RecipeDB,9974,1,2,3,36,41,59)
 	self:addTradeAcquire(RecipeDB,9974,1,5164,1,7230,1,11177,1,20125,1,29506)

 	-- Ornate Mithril Boots -- 9979
-	self:addTradeSkill(RecipeDB,9979,265,7936,2,2018,nil,GAME_ORIG,265,265,275,285)
+	AddRecipe(9979,265,7936,2,GAME_ORIG,265,265,275,285)
 	self:addTradeFlags(RecipeDB,9979,1,2,8,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,9979,4,2772)

 	-- Ornate Mithril Helm -- 9980
-	self:addTradeSkill(RecipeDB,9980,265,7937,2,2018,nil,GAME_ORIG,265,265,275,285)
+	AddRecipe(9980,265,7937,2,GAME_ORIG,265,265,275,285)
 	self:addTradeFlags(RecipeDB,9980,1,2,8,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,9980,4,2771)

 	-- Copper Claymore -- 9983
-	self:addTradeSkill(RecipeDB,9983,30,7955,1,2018,nil,GAME_ORIG,30,70,90,110)
+	AddRecipe(9983,30,7955,1,GAME_ORIG,30,70,90,110)
 	self:addTradeFlags(RecipeDB,9983,1,2,3,36,41,67,69)
 	self:addTradeAcquire(RecipeDB,9983,1,514,1,1241,1,2836,1,2998,1,3136,1,3174,1,3355,1,3478,1,3557,1,4258,1,4596,1,5511,1,6299,
 	1,15400,1,16583,1,16669,1,16724,1,16823,1,17245,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,
 	1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Bronze Warhammer -- 9985
-	self:addTradeSkill(RecipeDB,9985,125,7956,1,2018,nil,GAME_ORIG,125,155,170,185)
+	AddRecipe(9985,125,7956,1,GAME_ORIG,125,155,170,185)
 	self:addTradeFlags(RecipeDB,9985,1,2,3,36,41,51,67,70)
 	self:addTradeAcquire(RecipeDB,9985,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,
 	1,27034,1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Bronze Greatsword -- 9986
-	self:addTradeSkill(RecipeDB,9986,130,7957,1,2018,nil,GAME_ORIG,130,160,175,190)
+	AddRecipe(9986,130,7957,1,GAME_ORIG,130,160,175,190)
 	self:addTradeFlags(RecipeDB,9986,1,2,3,36,41,51,67,69)
 	self:addTradeAcquire(RecipeDB,9986,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,
 	1,27034,1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Bronze Battle Axe -- 9987
-	self:addTradeSkill(RecipeDB,9987,135,7958,1,2018,nil,GAME_ORIG,135,165,180,195)
+	AddRecipe(9987,135,7958,1,GAME_ORIG,135,165,180,195)
 	self:addTradeFlags(RecipeDB,9987,1,2,3,36,41,51,67,68)
 	self:addTradeAcquire(RecipeDB,9987,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,1,19341,1,28694,
 	1,27034,1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Heavy Mithril Axe -- 9993
-	self:addTradeSkill(RecipeDB,9993,210,7941,1,2018,nil,GAME_ORIG,210,235,247,260)
+	AddRecipe(9993,210,7941,1,GAME_ORIG,210,235,247,260)
 	self:addTradeFlags(RecipeDB,9993,1,2,3,36,41,51,66,68)
 	self:addTradeAcquire(RecipeDB,9993,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,19341,1,28694,1,27034,1,5511,1,514,1,1241,1,16724,1,33591,1,2998,1,3478,
 	1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Blue Glittering Axe -- 9995
-	self:addTradeSkill(RecipeDB,9995,220,7942,2,2018,nil,GAME_ORIG,220,245,257,270)
+	AddRecipe(9995,220,7942,2,GAME_ORIG,220,245,257,270)
 	self:addTradeFlags(RecipeDB,9995,1,2,10,36,40,51,66,68)
 	self:addTradeAcquire(RecipeDB,9995,7,2)

 	-- Wicked Mithril Blade -- 9997
-	self:addTradeSkill(RecipeDB,9997,225,7943,2,2018,nil,GAME_ORIG,225,250,262,275)
+	AddRecipe(9997,225,7943,2,GAME_ORIG,225,250,262,275)
 	self:addTradeFlags(RecipeDB,9997,1,2,10,36,41,51,66,69)
 	self:addTradeAcquire(RecipeDB,9997,7,2)

 	-- Big Black Mace -- 10001
-	self:addTradeSkill(RecipeDB,10001,230,7945,1,2018,nil,GAME_ORIG,230,255,267,280)
+	AddRecipe(10001,230,7945,1,GAME_ORIG,230,255,267,280)
 	self:addTradeFlags(RecipeDB,10001,1,2,3,36,41,51,66,70)
 	self:addTradeAcquire(RecipeDB,10001,1,2836,1,16583,1,16823,1,19341,1,28694,1,27034,1,4258,1,5511,1,514,1,1241,1,16724,1,3355,1,33591,1,2998,
 	1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- The Shatterer -- 10003
-	self:addTradeSkill(RecipeDB,10003,235,7954,1,2018,nil,GAME_ORIG,235,260,272,285)
+	AddRecipe(10003,235,7954,1,GAME_ORIG,235,260,272,285)
 	self:addTradeFlags(RecipeDB,10003,1,2,3,36,41,66,70)
 	self:addTradeAcquire(RecipeDB,10003,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Dazzling Mithril Rapier -- 10005
-	self:addTradeSkill(RecipeDB,10005,240,7944,2,2018,nil,GAME_ORIG,240,265,277,290)
+	AddRecipe(10005,240,7944,2,GAME_ORIG,240,265,277,290)
 	self:addTradeFlags(RecipeDB,10005,1,2,10,36,40,51,66,69)
 	self:addTradeAcquire(RecipeDB,10005,7,2)

 	-- Phantom Blade -- 10007
-	self:addTradeSkill(RecipeDB,10007,245,7961,1,2018,nil,GAME_ORIG,245,270,282,295)
+	AddRecipe(10007,245,7961,1,GAME_ORIG,245,270,282,295)
 	self:addTradeFlags(RecipeDB,10007,1,2,3,36,41,66,69)
 	self:addTradeAcquire(RecipeDB,10007,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Runed Mithril Hammer -- 10009
-	self:addTradeSkill(RecipeDB,10009,245,7946,3,2018,nil,GAME_ORIG,245,270,282,295)
+	AddRecipe(10009,245,7946,3,GAME_ORIG,245,270,282,295)
 	self:addTradeFlags(RecipeDB,10009,1,2,5,6,11,36,40,51,66,70)
 	self:addTradeAcquire(RecipeDB,10009,7, 3, 8, 33)

 	-- Blight -- 10011
-	self:addTradeSkill(RecipeDB,10011,250,7959,1,2018,nil,GAME_ORIG,250,275,287,300)
+	AddRecipe(10011,250,7959,1,GAME_ORIG,250,275,287,300)
 	self:addTradeFlags(RecipeDB,10011,1,2,3,36,41,67,71)
 	self:addTradeAcquire(RecipeDB,10011,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Ebon Shiv -- 10013
-	self:addTradeSkill(RecipeDB,10013,255,7947,1,2018,nil,GAME_ORIG,255,280,292,305)
+	AddRecipe(10013,255,7947,1,GAME_ORIG,255,280,292,305)
 	self:addTradeFlags(RecipeDB,10013,1,2,4,36,41,51,66,72)
 	self:addTradeAcquire(RecipeDB,10013,2,11278)

 	-- Truesilver Champion -- 10015
-	self:addTradeSkill(RecipeDB,10015,260,7960,1,2018,nil,GAME_ORIG,260,285,297,310)
+	AddRecipe(10015,260,7960,1,GAME_ORIG,260,285,297,310)
 	self:addTradeFlags(RecipeDB,10015,1,2,3,36,41,67,69)
 	self:addTradeAcquire(RecipeDB,10015,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Inlaid Mithril Cylinder -- 11454
-	self:addTradeSkill(RecipeDB,11454,200,9060,1,2018,nil,GAME_ORIG,200,225,237,250)
+	AddRecipe(11454,200,9060,1,GAME_ORIG,200,225,237,250)
 	self:addTradeFlags(RecipeDB,11454,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,11454,8,9)

 	-- Golden Scale Gauntlets -- 11643
-	self:addTradeSkill(RecipeDB,11643,205,9366,2,2018,nil,GAME_ORIG,205,225,235,245)
+	AddRecipe(11643,205,9366,2,GAME_ORIG,205,225,235,245)
 	self:addTradeFlags(RecipeDB,11643,1,8,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,11643,4,2758)

 	-- Silvered Bronze Leggings -- 12259
-	self:addTradeSkill(RecipeDB,12259,155,10423,2,2018,nil,GAME_ORIG,155,180,192,205)
+	AddRecipe(12259,155,10423,2,GAME_ORIG,155,180,192,205)
 	self:addTradeFlags(RecipeDB,12259,1,2,10,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,12259,7,2)

 	-- Rough Copper Vest -- 12260
-	self:addTradeSkill(RecipeDB,12260,1,10421,1,2018,nil,GAME_ORIG,1,15,35,55)
+	AddRecipe(12260,1,10421,1,GAME_ORIG,1,15,35,55)
 	self:addTradeFlags(RecipeDB,12260,1,2,3,36,41,58)
 	self:addTradeAcquire(RecipeDB,12260,8,8)

 	-- Golden Rod -- 14379
-	self:addTradeSkill(RecipeDB,14379,150,11128,1,2018,nil,GAME_ORIG,150,155,157,160)
+	AddRecipe(14379,150,11128,1,GAME_ORIG,150,155,157,160)
 	self:addTradeFlags(RecipeDB,14379,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,14379,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,
 	1,19341,1,28694,1,27034,1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,
 	1,26904,1,29924)

 	-- Truesilver Rod -- 14380
-	self:addTradeSkill(RecipeDB,14380,200,11144,1,2018,nil,GAME_ORIG,200,205,207,210)
+	AddRecipe(14380,200,11144,1,GAME_ORIG,200,205,207,210)
 	self:addTradeFlags(RecipeDB,14380,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,14380,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,19341,1,28694,1,27034,1,5511,1,514,1,1241,1,16724,
 	1,33591,1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,
 	1,26904,1,29924)

 	-- Dark Iron Pulverizer -- 15292
-	self:addTradeSkill(RecipeDB,15292,265,11608,3,2018,nil,GAME_ORIG,265,285,295,305)
+	AddRecipe(15292,265,11608,3,GAME_ORIG,265,285,295,305)
 	self:addTradeFlags(RecipeDB,15292,1,2,5,11,36,40,67,70)
 	self:addTradeAcquire(RecipeDB,15292,3,9028)

 	-- Dark Iron Sunderer -- 15294
-	self:addTradeSkill(RecipeDB,15294,275,11607,3,2018,nil,GAME_ORIG,275,295,305,315)
+	AddRecipe(15294,275,11607,3,GAME_ORIG,275,295,305,315)
 	self:addTradeFlags(RecipeDB,15294,1,2,5,36,40,67,68)
 	self:addTradeAcquire(RecipeDB,15294,3,9554,3,10043)

 	-- Dark Iron Plate -- 15296
-	self:addTradeSkill(RecipeDB,15296,285,11604,3,2018,nil,GAME_ORIG,285,305,315,325)
+	AddRecipe(15296,285,11604,3,GAME_ORIG,285,305,315,325)
 	self:addTradeFlags(RecipeDB,15296,1,2,5,37,41,59)
 	self:addTradeAcquire(RecipeDB,15296,3,9543)

 	-- Glinting Steel Dagger -- 15972
-	self:addTradeSkill(RecipeDB,15972,180,12259,1,2018,nil,GAME_ORIG,180,205,217,230)
+	AddRecipe(15972,180,12259,1,GAME_ORIG,180,205,217,230)
 	self:addTradeFlags(RecipeDB,15972,1,2,3,36,41,51,66,72)
 	self:addTradeAcquire(RecipeDB,15972,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,19341,1,28694,1,27034,1,5511,1,514,1,1241,
 	1,16724,1,33591,1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,
 	1,3557,1,26904,1,29924)

 	-- Searing Golden Blade -- 15973
-	self:addTradeSkill(RecipeDB,15973,190,12260,2,2018,nil,GAME_ORIG,190,215,227,240)
+	AddRecipe(15973,190,12260,2,GAME_ORIG,190,215,227,240)
 	self:addTradeFlags(RecipeDB,15973,1,2,10,36,40,53,54,66,72)
 	self:addTradeAcquire(RecipeDB,15973,7,2)

 	-- Dense Grinding Stone -- 16639
-	self:addTradeSkill(RecipeDB,16639,250,12644,1,2018,nil,GAME_ORIG,250,255,257,260)
+	AddRecipe(16639,250,12644,1,GAME_ORIG,250,255,257,260)
 	self:addTradeFlags(RecipeDB,16639,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,16639,1,2836,1,16583,1,16823,1,19341,1,28694,1,27034,1,4258,1,5511,1,514,1,1241,1,16724,1,3355,1,33591,
 	1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Dense Weightstone -- 16640
-	self:addTradeSkill(RecipeDB,16640,250,12643,1,2018,nil,GAME_ORIG,250,255,257,260)
+	AddRecipe(16640,250,12643,1,GAME_ORIG,250,255,257,260)
 	self:addTradeFlags(RecipeDB,16640,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,16640,1,2836,1,16583,1,16823,1,19341,1,28694,1,27034,1,4258,1,5511,1,514,1,1241,1,16724,1,3355,1,33591,
 	1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26952,1,3557,1,26904,1,29924)

 	-- Dense Sharpening Stone -- 16641
-	self:addTradeSkill(RecipeDB,16641,250,12404,1,2018,nil,GAME_ORIG,250,255,257,260)
+	AddRecipe(16641,250,12404,1,GAME_ORIG,250,255,257,260)
 	self:addTradeFlags(RecipeDB,16641,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,16641,1,2836,1,16583,1,16823,1,19341,1,28694,1,27034,1,4258,1,5511,1,514,1,1241,1,16724,1,3355,1,33591,
 	1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26952,1,3557,1,26904,1,29924)

 	-- Thorium Armor -- 16642
-	self:addTradeSkill(RecipeDB,16642,250,12405,2,2018,nil,GAME_ORIG,250,270,280,290)
+	AddRecipe(16642,250,12405,2,GAME_ORIG,250,270,280,290)
 	self:addTradeFlags(RecipeDB,16642,1,2,3,10,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,16642,7,2,1,4258,1,5511,1,514,1,1241,1,16724,1,3355,1,2836,1,2998,1,3478,
 	1,3136,1,4596,1,3174,1,33609,1,33631,1,16823,1,15400,1,33675,1,17245,1,6299,1,3557)

 	-- Thorium Belt -- 16643
-	self:addTradeSkill(RecipeDB,16643,250,12406,2,2018,nil,GAME_ORIG,250,270,280,290)
+	AddRecipe(16643,250,12406,2,GAME_ORIG,250,270,280,290)
 	self:addTradeFlags(RecipeDB,16643,1,2,3,10,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,16643,7,2,1,4258,1,5511,1,514,1,1241,1,16724,1,3355,1,2836,1,2998,1,3478,
 	1,3136,1,4596,1,3174,1,33609,1,33631,1,16823,1,15400,1,33675,1,17245,1,6299,1,3557)

 	-- Thorium Bracers -- 16644
-	self:addTradeSkill(RecipeDB,16644,255,12408,2,2018,nil,GAME_ORIG,255,275,285,295)
+	AddRecipe(16644,255,12408,2,GAME_ORIG,255,275,285,295)
 	self:addTradeFlags(RecipeDB,16644,1,2,3,10,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,16644,7,2,1,4258,1,5511,1,514,1,1241,1,16724,1,3355,1,2836,1,2998,1,3478,
 	1,3136,1,4596,1,3174,1,33609,1,33631,1,16823,1,15400,1,33675,1,17245,1,6299,1,3557)

 	-- Radiant Belt -- 16645
-	self:addTradeSkill(RecipeDB,16645,260,12416,2,2018,nil,GAME_ORIG,260,280,290,300)
+	AddRecipe(16645,260,12416,2,GAME_ORIG,260,280,290,300)
 	self:addTradeFlags(RecipeDB,16645,1,2,6,11,36,40,58)
 	self:addTradeAcquire(RecipeDB,16645,7,2,8,33)

 	-- Imperial Plate Shoulders -- 16646
-	self:addTradeSkill(RecipeDB,16646,265,12428,2,2018,nil,GAME_ORIG,265,285,295,305)
+	AddRecipe(16646,265,12428,2,GAME_ORIG,265,285,295,305)
 	self:addTradeFlags(RecipeDB,16646,1,2,8,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,16646,4,7659)

 	-- Imperial Plate Belt -- 16647
-	self:addTradeSkill(RecipeDB,16647,265,12424,2,2018,nil,GAME_ORIG,265,285,295,305)
+	AddRecipe(16647,265,12424,2,GAME_ORIG,265,285,295,305)
 	self:addTradeFlags(RecipeDB,16647,1,2,8,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,16647,4,7653)

 	-- Radiant Breastplate -- 16648
-	self:addTradeSkill(RecipeDB,16648,270,12415,2,2018,nil,GAME_ORIG,270,290,300,310)
+	AddRecipe(16648,270,12415,2,GAME_ORIG,270,290,300,310)
 	self:addTradeFlags(RecipeDB,16648,1,2,10,36,40,58)
 	self:addTradeAcquire(RecipeDB,16648,7,2)

 	-- Imperial Plate Bracers -- 16649
-	self:addTradeSkill(RecipeDB,16649,270,12425,2,2018,nil,GAME_ORIG,270,290,300,310)
+	AddRecipe(16649,270,12425,2,GAME_ORIG,270,290,300,310)
 	self:addTradeFlags(RecipeDB,16649,1,2,8,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,16649,4,7655)

 	-- Wildthorn Mail -- 16650
-	self:addTradeSkill(RecipeDB,16650,270,12624,2,2018,nil,GAME_ORIG,270,290,300,310)
+	AddRecipe(16650,270,12624,2,GAME_ORIG,270,290,300,310)
 	self:addTradeFlags(RecipeDB,16650,1,2,10,36,40,53,54,58)
 	self:addTradeAcquire(RecipeDB,16650,7,2)

 	-- Thorium Shield Spike -- 16651
-	self:addTradeSkill(RecipeDB,16651,275,12645,2,2018,nil,GAME_ORIG,275,295,305,315)
+	AddRecipe(16651,275,12645,2,GAME_ORIG,275,295,305,315)
 	self:addTradeFlags(RecipeDB,16651,1,2,6,11,36,40,52)
 	self:addTradeAcquire(RecipeDB,16651,7,2,8,33)

 	-- Thorium Boots -- 16652
-	self:addTradeSkill(RecipeDB,16652,280,12409,2,2018,nil,GAME_ORIG,280,300,310,320)
+	AddRecipe(16652,280,12409,2,GAME_ORIG,280,300,310,320)
 	self:addTradeFlags(RecipeDB,16652,1,2,3,10,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,16652,7,2,1,4258,1,5511,1,514,1,1241,1,16724,1,3355,1,2836,1,2998,1,3478,
 	1,3136,1,4596,1,3174,1,33609,1,33631,1,16823,1,15400,1,33675,1,17245,1,6299,1,3557)

 	-- Thorium Helm -- 16653
-	self:addTradeSkill(RecipeDB,16653,280,12410,2,2018,nil,GAME_ORIG,280,300,310,320)
+	AddRecipe(16653,280,12410,2,GAME_ORIG,280,300,310,320)
 	self:addTradeFlags(RecipeDB,16653,1,2,3,10,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,16653,7,2,1,4258,1,5511,1,514,1,1241,1,16724,1,3355,1,2836,1,2998,1,3478,
 	1,3136,1,4596,1,3174,1,33609,1,33631,1,16823,1,15400,1,33675,1,17245,1,6299,1,3557)

 	-- Radiant Gloves -- 16654
-	self:addTradeSkill(RecipeDB,16654,285,12418,2,2018,nil,GAME_ORIG,285,305,315,325)
+	AddRecipe(16654,285,12418,2,GAME_ORIG,285,305,315,325)
 	self:addTradeFlags(RecipeDB,16654,1,2,10,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,16654,7,2)

 	-- Fiery Plate Gauntlets -- 16655
-	self:addTradeSkill(RecipeDB,16655,290,12631,3,2018,nil,GAME_ORIG,290,310,320,330)
+	AddRecipe(16655,290,12631,3,GAME_ORIG,290,310,320,330)
 	self:addTradeFlags(RecipeDB,16655,1,2,8,36,41,59)
 	self:addTradeAcquire(RecipeDB,16655,4,5124)

 	-- Radiant Boots -- 16656
-	self:addTradeSkill(RecipeDB,16656,290,12419,2,2018,nil,GAME_ORIG,290,310,320,330)
+	AddRecipe(16656,290,12419,2,GAME_ORIG,290,310,320,330)
 	self:addTradeFlags(RecipeDB,16656,1,2,10,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,16656,7,2)

 	-- Imperial Plate Boots -- 16657
-	self:addTradeSkill(RecipeDB,16657,295,12426,2,2018,nil,GAME_ORIG,295,315,325,335)
+	AddRecipe(16657,295,12426,2,GAME_ORIG,295,315,325,335)
 	self:addTradeFlags(RecipeDB,16657,1,2,8,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,16657,4,7654)

 	-- Imperial Plate Helm -- 16658
-	self:addTradeSkill(RecipeDB,16658,295,12427,2,2018,nil,GAME_ORIG,295,315,325,335)
+	AddRecipe(16658,295,12427,2,GAME_ORIG,295,315,325,335)
 	self:addTradeFlags(RecipeDB,16658,1,2,8,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,16658,4,7657)

 	-- Radiant Circlet -- 16659
-	self:addTradeSkill(RecipeDB,16659,295,12417,2,2018,nil,GAME_ORIG,295,315,325,335)
+	AddRecipe(16659,295,12417,2,GAME_ORIG,295,315,325,335)
 	self:addTradeFlags(RecipeDB,16659,1,2,6,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,16659,7,2)

 	-- Dawnbringer Shoulders -- 16660
-	self:addTradeSkill(RecipeDB,16660,290,12625,3,2018,nil,GAME_ORIG,290,310,320,330)
+	AddRecipe(16660,290,12625,3,GAME_ORIG,290,310,320,330)
 	self:addTradeFlags(RecipeDB,16660,1,2,6,11,36,40,53,54,59)
 	self:addTradeAcquire(RecipeDB,16660,7,2)

 	-- Storm Gauntlets -- 16661
-	self:addTradeSkill(RecipeDB,16661,295,12632,3,2018,nil,GAME_ORIG,295,315,325,335)
+	AddRecipe(16661,295,12632,3,GAME_ORIG,295,315,325,335)
 	self:addTradeFlags(RecipeDB,16661,1,2,4,5,6,11,36,40,53,54,58)
 	self:addTradeAcquire(RecipeDB,16661,7,2,2,11278)

 	-- Thorium Leggings -- 16662
-	self:addTradeSkill(RecipeDB,16662,300,12414,2,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16662,300,12414,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16662,1,2,3,10,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,16662,7,2,1,4258,1,5511,1,514,1,1241,1,16724,1,3355,1,2836,1,2998,1,3478,
 	1,3136,1,4596,1,33609,1,33631,1,3174,1,16823,1,15400,1,33675,1,17245,1,6299,1,3557)

 	-- Imperial Plate Chest -- 16663
-	self:addTradeSkill(RecipeDB,16663,300,12422,2,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16663,300,12422,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16663,1,2,8,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,16663,4,7656)

 	-- Runic Plate Shoulders -- 16664
-	self:addTradeSkill(RecipeDB,16664,300,12610,2,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16664,300,12610,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16664,1,2,11,36,41,59)
 	self:addTradeAcquire(RecipeDB,16664,3,4366)

 	-- Runic Plate Boots -- 16665
-	self:addTradeSkill(RecipeDB,16665,300,12611,2,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16665,300,12611,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16665,1,2,11,36,41,59)
 	self:addTradeAcquire(RecipeDB,16665,3,1836)

 	-- Demon Forged Breastplate -- 16667
-	self:addTradeSkill(RecipeDB,16667,285,12628,3,2018,nil,GAME_ORIG,285,305,315,325)
+	AddRecipe(16667,285,12628,3,GAME_ORIG,285,305,315,325)
 	self:addTradeFlags(RecipeDB,16667,1,2,8,36,41,59)
 	self:addTradeAcquire(RecipeDB,16667,4,5127)

 	-- Whitesoul Helm -- 16724
-	self:addTradeSkill(RecipeDB,16724,300,12633,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16724,300,12633,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16724,1,2,5,6,11,36,40,53,54,59)
 	self:addTradeAcquire(RecipeDB,16724,7,2)

 	-- Radiant Leggings -- 16725
-	self:addTradeSkill(RecipeDB,16725,300,12420,2,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16725,300,12420,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16725,1,2,10,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,16725,7,2)

 	-- Runic Plate Helm -- 16726
-	self:addTradeSkill(RecipeDB,16726,300,12612,2,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16726,300,12612,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16726,1,2,11,36,41,59)
 	self:addTradeAcquire(RecipeDB,16726,3,4364)

 	-- Helm of the Great Chief -- 16728
-	self:addTradeSkill(RecipeDB,16728,300,12636,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16728,300,12636,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16728,1,2,5,6,11,36,40,53,54,58)
 	self:addTradeAcquire(RecipeDB,16728,7,2)

 	-- Lionheart Helm -- 16729
-	self:addTradeSkill(RecipeDB,16729,300,12640,4,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16729,300,12640,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16729,1,2,6,11,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,16729,7,2)

 	-- Imperial Plate Leggings -- 16730
-	self:addTradeSkill(RecipeDB,16730,300,12429,2,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16730,300,12429,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16730,1,2,8,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,16730,4,7658)

 	-- Runic Breastplate -- 16731
-	self:addTradeSkill(RecipeDB,16731,300,12613,2,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16731,300,12613,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16731,1,2,11,36,41,59)
 	self:addTradeAcquire(RecipeDB,16731,3,4368,3,16072)

 	-- Runic Plate Leggings -- 16732
-	self:addTradeSkill(RecipeDB,16732,300,12614,2,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16732,300,12614,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16732,1,2,11,36,41,59)
 	self:addTradeAcquire(RecipeDB,16732,3,1885)

 	-- Stronghold Gauntlets -- 16741
-	self:addTradeSkill(RecipeDB,16741,300,12639,4,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16741,300,12639,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16741,1,2,6,11,36,40,52,59)
 	self:addTradeAcquire(RecipeDB,16741,7,2)

 	-- Enchanted Thorium Helm -- 16742
-	self:addTradeSkill(RecipeDB,16742,300,12620,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16742,300,12620,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16742,1,2,8,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,16742,4,7651)

 	-- Enchanted Thorium Leggings -- 16744
-	self:addTradeSkill(RecipeDB,16744,300,12619,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16744,300,12619,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16744,1,2,8,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,16744,4,7650)

 	-- Enchanted Thorium Breastplate -- 16745
-	self:addTradeSkill(RecipeDB,16745,300,12618,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16745,300,12618,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16745,1,2,8,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,16745,4,7649)

 	-- Invulnerable Mail -- 16746
-	self:addTradeSkill(RecipeDB,16746,300,12641,4,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16746,300,12641,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16746,1,2,5,6,11,36,40,52,58)
 	self:addTradeAcquire(RecipeDB,16746,7,2)

 	-- Ornate Thorium Handaxe -- 16969
-	self:addTradeSkill(RecipeDB,16969,275,12773,2,2018,nil,GAME_ORIG,275,300,312,325)
+	AddRecipe(16969,275,12773,2,GAME_ORIG,275,300,312,325)
 	self:addTradeFlags(RecipeDB,16969,1,2,3,4,37,41,51,66,68)
 	self:addTradeAcquire(RecipeDB,16969,2,11278,1,4258,1,5511,1,514,1,1241,1,16724,1,3355,1,2836,1,2998,1,3478,
 	1,3136,1,4596,1,3174,1,33609,1,33631,1,16823,1,15400,1,33675,1,17245,1,6299,1,3557)

 	-- Dawn's Edge -- 16970
-	self:addTradeSkill(RecipeDB,16970,275,12774,3,2018,nil,GAME_ORIG,275,300,312,325)
+	AddRecipe(16970,275,12774,3,GAME_ORIG,275,300,312,325)
 	self:addTradeFlags(RecipeDB,16970,1,2,8,36,40,66,68)
 	self:addTradeAcquire(RecipeDB,16970,4,5306)

 	-- Huge Thorium Battleaxe -- 16971
-	self:addTradeSkill(RecipeDB,16971,280,12775,1,2018,nil,GAME_ORIG,280,305,317,330)
+	AddRecipe(16971,280,12775,1,GAME_ORIG,280,305,317,330)
 	self:addTradeFlags(RecipeDB,16971,1,2,3,4,36,41,51,67,68)
 	self:addTradeAcquire(RecipeDB,16971,2,11278,1,4258,1,5511,1,514,1,1241,1,16724,1,3355,1,2836,1,2998,
 	1,3478,1,3136,1,4596,1,3174,1,33609,1,33631,1,16823,1,15400,1,33675,1,17245,1,6299,1,3557)

 	-- Enchanted Battlehammer -- 16973
-	self:addTradeSkill(RecipeDB,16973,280,12776,2,2018,nil,GAME_ORIG,280,305,317,330)
+	AddRecipe(16973,280,12776,2,GAME_ORIG,280,305,317,330)
 	self:addTradeFlags(RecipeDB,16973,1,2,8,36,40,52,67,70)
 	self:addTradeAcquire(RecipeDB,16973,4,5305)

 	-- Blazing Rapier -- 16978
-	self:addTradeSkill(RecipeDB,16978,280,12777,2,2018,nil,GAME_ORIG,280,305,317,330)
+	AddRecipe(16978,280,12777,2,GAME_ORIG,280,305,317,330)
 	self:addTradeFlags(RecipeDB,16978,1,2,8,36,40,66,69)
 	self:addTradeAcquire(RecipeDB,16978,4,5307)

 	-- Serenity -- 16983
-	self:addTradeSkill(RecipeDB,16983,285,12781,2,2018,nil,GAME_ORIG,285,310,322,335)
+	AddRecipe(16983,285,12781,2,GAME_ORIG,285,310,322,335)
 	self:addTradeFlags(RecipeDB,16983,1,2,5,36,40,66,70)
 	self:addTradeAcquire(RecipeDB,16983,8,31)

 	-- Volcanic Hammer -- 16984
-	self:addTradeSkill(RecipeDB,16984,290,12792,2,2018,nil,GAME_ORIG,290,315,327,340)
+	AddRecipe(16984,290,12792,2,GAME_ORIG,290,315,327,340)
 	self:addTradeFlags(RecipeDB,16984,1,2,11,36,40,66,70)
 	self:addTradeAcquire(RecipeDB,16984,3,10119)

 	-- Corruption -- 16985
-	self:addTradeSkill(RecipeDB,16985,290,12782,1,2018,nil,GAME_ORIG,290,315,327,340)
+	AddRecipe(16985,290,12782,1,GAME_ORIG,290,315,327,340)
 	self:addTradeFlags(RecipeDB,16985,1,2,5,37,41,53,54,67,69)
 	self:addTradeAcquire(RecipeDB,16985,8,31)

 	-- Hammer of the Titans -- 16988
-	self:addTradeSkill(RecipeDB,16988,300,12796,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16988,300,12796,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16988,1,2,5,36,40,51,70)
 	self:addTradeAcquire(RecipeDB,16988,3,10438)

 	-- Arcanite Champion -- 16990
-	self:addTradeSkill(RecipeDB,16990,300,12790,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16990,300,12790,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16990,1,2,5,36,40,51,67,69)
 	self:addTradeAcquire(RecipeDB,16990,3,10899)

 	-- Annihilator -- 16991
-	self:addTradeSkill(RecipeDB,16991,300,12798,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16991,300,12798,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16991,1,2,5,36,40,66,68)
 	self:addTradeAcquire(RecipeDB,16991,3,9736)

 	-- Frostguard -- 16992
-	self:addTradeSkill(RecipeDB,16992,300,12797,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16992,300,12797,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16992,1,2,11,36,40,66,69)
 	self:addTradeAcquire(RecipeDB,16992,3,1844)

 	-- Masterwork Stormhammer -- 16993
-	self:addTradeSkill(RecipeDB,16993,300,12794,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16993,300,12794,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16993,1,2,5,36,40,66,70)
 	self:addTradeAcquire(RecipeDB,16993,3,10899)

 	-- Arcanite Reaper -- 16994
-	self:addTradeSkill(RecipeDB,16994,300,12784,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16994,300,12784,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16994,1,2,5,36,40,51,67,68)
 	self:addTradeAcquire(RecipeDB,16994,3,9596)

 	-- Heartseeker -- 16995
-	self:addTradeSkill(RecipeDB,16995,300,12783,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(16995,300,12783,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,16995,1,2,5,36,40,51,66,72)
 	self:addTradeAcquire(RecipeDB,16995,3,10997)

 	-- Silver Skeleton Key -- 19666
-	self:addTradeSkill(RecipeDB,19666,100,15869,1,2018,nil,GAME_ORIG,100,100,110,120)
+	AddRecipe(19666,100,15869,1,GAME_ORIG,100,100,110,120)
 	self:addTradeFlags(RecipeDB,19666,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,19666,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,
 	1,19341,1,28694,1,27034,1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,
 	1,26904,1,29924)

 	-- Golden Skeleton Key -- 19667
-	self:addTradeSkill(RecipeDB,19667,150,15870,1,2018,nil,GAME_ORIG,150,150,160,170)
+	AddRecipe(19667,150,15870,1,GAME_ORIG,150,150,160,170)
 	self:addTradeFlags(RecipeDB,19667,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,19667,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,1,16823,
 	1,19341,1,28694,1,27034,1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,
 	1,26904,1,29924)

 	-- Truesilver Skeleton Key -- 19668
-	self:addTradeSkill(RecipeDB,19668,200,15871,1,2018,nil,GAME_ORIG,200,200,210,220)
+	AddRecipe(19668,200,15871,1,GAME_ORIG,200,200,210,220)
 	self:addTradeFlags(RecipeDB,19668,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,19668,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,19341,1,28694,1,27034,1,5511,1,514,1,1241,1,16724,1,33591,
 	1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Arcanite Skeleton Key -- 19669
-	self:addTradeSkill(RecipeDB,19669,275,15872,1,2018,nil,GAME_ORIG,275,275,280,285)
+	AddRecipe(19669,275,15872,1,GAME_ORIG,275,275,280,285)
 	self:addTradeFlags(RecipeDB,19669,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,19669,1,2836,1,16583,1,16823,1,19341,1,28694,1,27034,1,4258,1,5511,1,514,1,1241,1,16724,1,3355,1,33591,
 	1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Arcanite Rod -- 20201
-	self:addTradeSkill(RecipeDB,20201,275,16206,1,2018,nil,GAME_ORIG,275,275,280,285)
+	AddRecipe(20201,275,16206,1,GAME_ORIG,275,275,280,285)
 	self:addTradeFlags(RecipeDB,20201,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,20201,1,2836,1,16583,1,16823,1,19341,1,28694,1,27034,1,4258,1,5511,1,514,1,1241,1,16724,1,3355,1,33591,
 	1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,1,26952,1,3557,1,26904,1,29924)

 	-- Fiery Chain Girdle -- 20872
-	self:addTradeSkill(RecipeDB,20872,295,16989,3,2018,nil,GAME_ORIG,295,315,325,335)
+	AddRecipe(20872,295,16989,3,GAME_ORIG,295,315,325,335)
 	self:addTradeFlags(RecipeDB,20872,1,2,4,36,41,53,54,58,98)
 	self:addTradeAcquire(RecipeDB,20872,6,59,2,12944)

 	-- Fiery Chain Shoulders -- 20873
-	self:addTradeSkill(RecipeDB,20873,300,16988,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(20873,300,16988,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,20873,1,2,4,36,41,58,98)
 	self:addTradeAcquire(RecipeDB,20873,6,59,3,12944)

 	-- Dark Iron Bracers -- 20874
-	self:addTradeSkill(RecipeDB,20874,295,17014,3,2018,nil,GAME_ORIG,295,315,325,335)
+	AddRecipe(20874,295,17014,3,GAME_ORIG,295,315,325,335)
 	self:addTradeFlags(RecipeDB,20874,1,2,4,36,41,59,98)
 	self:addTradeAcquire(RecipeDB,20874,6,59,1,12944)

 	-- Dark Iron Leggings -- 20876
-	self:addTradeSkill(RecipeDB,20876,300,17013,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(20876,300,17013,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,20876,1,2,4,36,41,59,98)
 	self:addTradeAcquire(RecipeDB,20876,6,59,3,12944)

 	-- Dark Iron Reaver -- 20890
-	self:addTradeSkill(RecipeDB,20890,300,17015,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(20890,300,17015,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,20890,1,2,4,36,41,66,69,98)
 	self:addTradeAcquire(RecipeDB,20890,6,59,2,12944)

 	-- Dark Iron Destroyer -- 20897
-	self:addTradeSkill(RecipeDB,20897,300,17016,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(20897,300,17016,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,20897,1,2,4,36,41,51,66,68,98)
 	self:addTradeAcquire(RecipeDB,20897,6,59,2,12944)

 	-- Sulfuron Hammer -- 21161
-	self:addTradeSkill(RecipeDB,21161,300,17193,4,2018,nil,GAME_ORIG,300,325,337,350)
+	AddRecipe(21161,300,17193,4,GAME_ORIG,300,325,337,350)
 	self:addTradeFlags(RecipeDB,21161,1,2,8,36,40,67,70)
 	self:addTradeAcquire(RecipeDB,21161,4,7604)

 	-- Edge of Winter -- 21913
-	self:addTradeSkill(RecipeDB,21913,190,17704,2,2018,nil,GAME_ORIG,190,215,227,240)
+	AddRecipe(21913,190,17704,2,GAME_ORIG,190,215,227,240)
 	self:addTradeFlags(RecipeDB,21913,1,2,7,11,36,40,66,68)
 	self:addTradeAcquire(RecipeDB,21913,5,1)

 	-- Elemental Sharpening Stone -- 22757
-	self:addTradeSkill(RecipeDB,22757,300,18262,3,2018,nil,GAME_ORIG,300,300,310,320)
+	AddRecipe(22757,300,18262,3,GAME_ORIG,300,300,310,320)
 	self:addTradeFlags(RecipeDB,22757,1,2,6,36,41)
 	self:addTradeAcquire(RecipeDB,22757,8,26)

 	-- Heavy Timbermaw Belt -- 23628
-	self:addTradeSkill(RecipeDB,23628,290,19043,1,2018,nil,GAME_ORIG,290,310,320,330)
+	AddRecipe(23628,290,19043,1,GAME_ORIG,290,310,320,330)
 	self:addTradeFlags(RecipeDB,23628,1,2,4,36,41,51,58,99)
 	self:addTradeAcquire(RecipeDB,23628,6,576,2,11557)

 	-- Heavy Timbermaw Boots -- 23629
-	self:addTradeSkill(RecipeDB,23629,300,19048,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(23629,300,19048,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,23629,1,2,4,36,41,51,58,99)
 	self:addTradeAcquire(RecipeDB,23629,6,576,3,11557)

 	-- Girdle of the Dawn -- 23632
-	self:addTradeSkill(RecipeDB,23632,290,19051,1,2018,nil,GAME_ORIG,290,310,320,330)
+	AddRecipe(23632,290,19051,1,GAME_ORIG,290,310,320,330)
 	self:addTradeFlags(RecipeDB,23632,1,2,4,36,41,51,59,96)
 	self:addTradeAcquire(RecipeDB,23632,6,529,2,10856,6,529,2,10857,6,529,2,11536)

 	-- Gloves of the Dawn -- 23633
-	self:addTradeSkill(RecipeDB,23633,300,19057,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(23633,300,19057,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,23633,1,2,4,36,41,51,59,96)
 	self:addTradeAcquire(RecipeDB,23633,6,529,3,10856,6,529,3,10857,6,529,3,11536)

 	-- Dark Iron Helm -- 23636
-	self:addTradeSkill(RecipeDB,23636,300,19148,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(23636,300,19148,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,23636,1,2,4,36,41,59,98)
 	self:addTradeAcquire(RecipeDB,23636,6,59,2,12944)

 	-- Dark Iron Gauntlets -- 23637
-	self:addTradeSkill(RecipeDB,23637,300,19164,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(23637,300,19164,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,23637,1,2,4,36,41,51,59,98)
 	self:addTradeAcquire(RecipeDB,23637,6,59,3,12944)

 	-- Black Amnesty -- 23638
-	self:addTradeSkill(RecipeDB,23638,300,19166,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(23638,300,19166,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,23638,1,2,4,36,41,66,72,98)
 	self:addTradeAcquire(RecipeDB,23638,6,59,3,12944)

 	-- Blackfury -- 23639
-	self:addTradeSkill(RecipeDB,23639,300,19167,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(23639,300,19167,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,23639,1,2,4,36,41,51,67,71,98)
 	self:addTradeAcquire(RecipeDB,23639,6,59,3,12944)

 	-- Ebon Hand -- 23650
-	self:addTradeSkill(RecipeDB,23650,300,19170,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(23650,300,19170,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,23650,1,2,4,36,41,66,70,98)
 	self:addTradeAcquire(RecipeDB,23650,6,59,2,12944)

 	-- Blackguard -- 23652
-	self:addTradeSkill(RecipeDB,23652,300,19168,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(23652,300,19168,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,23652,1,2,4,36,41,52,66,69,98)
 	self:addTradeAcquire(RecipeDB,23652,6,59,2,12944)

 	-- Nightfall -- 23653
-	self:addTradeSkill(RecipeDB,23653,300,19169,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(23653,300,19169,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,23653,1,2,4,36,41,67,68,98)
 	self:addTradeAcquire(RecipeDB,23653,6,59,4,12944)

 	-- Bloodsoul Breastplate -- 24136
-	self:addTradeSkill(RecipeDB,24136,300,19690,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24136,300,19690,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24136,1,2,4,36,41,51,58,100)
 	self:addTradeAcquire(RecipeDB,24136,6,270,3,14921)

 	-- Bloodsoul Shoulders -- 24137
-	self:addTradeSkill(RecipeDB,24137,300,19691,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24137,300,19691,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24137,1,2,4,36,41,51,58,100)
 	self:addTradeAcquire(RecipeDB,24137,6,270,2,14921)

 	-- Bloodsoul Gauntlets -- 24138
-	self:addTradeSkill(RecipeDB,24138,300,19692,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24138,300,19692,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24138,1,2,4,36,41,51,58,100)
 	self:addTradeAcquire(RecipeDB,24138,6,270,1,14921)

 	-- Darksoul Breastplate -- 24139
-	self:addTradeSkill(RecipeDB,24139,300,19693,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24139,300,19693,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24139,1,2,4,36,41,52,59,100)
 	self:addTradeAcquire(RecipeDB,24139,6,270,3,14921)

 	-- Darksoul Leggings -- 24140
-	self:addTradeSkill(RecipeDB,24140,300,19694,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24140,300,19694,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24140,1,2,4,36,41,52,59,100)
 	self:addTradeAcquire(RecipeDB,24140,6,270,2,14921)

 	-- Darksoul Shoulders -- 24141
-	self:addTradeSkill(RecipeDB,24141,300,19695,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24141,300,19695,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24141,1,2,4,36,41,52,59,100)
 	self:addTradeAcquire(RecipeDB,24141,6,270,1,14921)

 	-- Dark Iron Boots -- 24399
-	self:addTradeSkill(RecipeDB,24399,300,20039,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24399,300,20039,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24399,1,2,4,36,41,59,98)
 	self:addTradeAcquire(RecipeDB,24399,6,59,4,12944)

 	-- Darkrune Gauntlets -- 24912
-	self:addTradeSkill(RecipeDB,24912,300,20549,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24912,300,20549,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24912,1,2,8,36,40,52,59)
 	self:addTradeAcquire(RecipeDB,24912,4,8323)

 	-- Darkrune Helm -- 24913
-	self:addTradeSkill(RecipeDB,24913,300,20551,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24913,300,20551,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24913,1,2,8,36,40,59)
 	self:addTradeAcquire(RecipeDB,24913,4,8323)

 	-- Darkrune Breastplate -- 24914
-	self:addTradeSkill(RecipeDB,24914,300,20550,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24914,300,20550,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24914,1,2,8,36,40,52,59)
 	self:addTradeAcquire(RecipeDB,24914,4,8323)

 	-- Heavy Obsidian Belt -- 27585
-	self:addTradeSkill(RecipeDB,27585,300,22197,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(27585,300,22197,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,27585,1,2,4,36,41,51,59,97)
 	self:addTradeAcquire(RecipeDB,27585,6,609,1,15176)

 	-- Jagged Obsidian Shield -- 27586
-	self:addTradeSkill(RecipeDB,27586,300,22198,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(27586,300,22198,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,27586,1,2,4,36,41,52,64,66,97)
 	self:addTradeAcquire(RecipeDB,27586,6,609,3,15471)

 	-- Thick Obsidian Breastplate -- 27587
-	self:addTradeSkill(RecipeDB,27587,300,22196,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(27587,300,22196,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,27587,1,2,6,11,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,27587,3,15263)

 	-- Light Obsidian Belt -- 27588
-	self:addTradeSkill(RecipeDB,27588,300,22195,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(27588,300,22195,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,27588,1,2,4,36,41,51,58,97)
 	self:addTradeAcquire(RecipeDB,27588,6,609,2,15176)

 	-- Black Grasp of the Destroyer -- 27589
-	self:addTradeSkill(RecipeDB,27589,300,22194,3,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(27589,300,22194,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,27589,1,2,6,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,27589,3,15340)

 	-- Obsidian Mail Tunic -- 27590
-	self:addTradeSkill(RecipeDB,27590,300,22191,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(27590,300,22191,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,27590,1,2,4,36,41,51,58,97)
 	self:addTradeAcquire(RecipeDB,27590,6,609,4,15471)

 	-- Titanic Leggings -- 27829
-	self:addTradeSkill(RecipeDB,27829,300,22385,4,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(27829,300,22385,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,27829,1,2,6,11,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,27829,7,2)

 	-- Persuader -- 27830
-	self:addTradeSkill(RecipeDB,27830,300,22384,4,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(27830,300,22384,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,27830,1,2,6,11,36,40,66,70)
 	self:addTradeAcquire(RecipeDB,27830,7,2)

 	-- Sageblade -- 27832
-	self:addTradeSkill(RecipeDB,27832,300,22383,4,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(27832,300,22383,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,27832,1,2,6,11,36,40,54,66,69)
 	self:addTradeAcquire(RecipeDB,27832,7,2)

 	-- Icebane Breastplate -- 28242
-	self:addTradeSkill(RecipeDB,28242,300,22669,4,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(28242,300,22669,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,28242,1,2,4,6,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,28242,6,529,4,16365,8,41)

 	-- Icebane Gauntlets -- 28243
-	self:addTradeSkill(RecipeDB,28243,300,22670,4,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(28243,300,22670,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,28243,1,2,4,6,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,28243,6,529,3,16365,8,41)

 	-- Icebane Bracers -- 28244
-	self:addTradeSkill(RecipeDB,28244,300,22671,4,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(28244,300,22671,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,28244,1,2,4,6,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,28244,6,529,3,16365,8,41)

 	-- Ironvine Breastplate -- 28461
-	self:addTradeSkill(RecipeDB,28461,300,22762,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(28461,300,22762,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,28461,1,2,4,36,41,52,59,97)
 	self:addTradeAcquire(RecipeDB,28461,6,609,3,15176)

 	-- Ironvine Gloves -- 28462
-	self:addTradeSkill(RecipeDB,28462,300,22763,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(28462,300,22763,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,28462,1,2,4,36,41,52,59,97)
 	self:addTradeAcquire(RecipeDB,28462,6,609,2,15176)

 	-- Ironvine Belt -- 28463
-	self:addTradeSkill(RecipeDB,28463,300,22764,1,2018,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(28463,300,22764,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,28463,1,2,4,36,41,52,59,97)
 	self:addTradeAcquire(RecipeDB,28463,6,609,1,15176)

 	-- Fel Iron Plate Gloves -- 29545
-	self:addTradeSkill(RecipeDB,29545,300,23482,1,2018,nil,1,300,310,320,330)
+	AddRecipe(29545,300,23482,1,1,300,310,320,330)
 	self:addTradeFlags(RecipeDB,29545,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,29545,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Fel Iron Plate Belt -- 29547
-	self:addTradeSkill(RecipeDB,29547,305,23484,1,2018,nil,1,305,315,325,335)
+	AddRecipe(29547,305,23484,1,1,305,315,325,335)
 	self:addTradeFlags(RecipeDB,29547,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,29547,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Fel Iron Plate Boots -- 29548
-	self:addTradeSkill(RecipeDB,29548,315,23487,1,2018,nil,1,315,325,335,345)
+	AddRecipe(29548,315,23487,1,1,315,325,335,345)
 	self:addTradeFlags(RecipeDB,29548,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,29548,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Fel Iron Plate Pants -- 29549
-	self:addTradeSkill(RecipeDB,29549,315,23488,1,2018,nil,1,315,325,335,345)
+	AddRecipe(29549,315,23488,1,1,315,325,335,345)
 	self:addTradeFlags(RecipeDB,29549,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,29549,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Fel Iron Breastplate -- 29550
-	self:addTradeSkill(RecipeDB,29550,325,23489,1,2018,nil,1,325,335,345,355)
+	AddRecipe(29550,325,23489,1,1,325,335,345,355)
 	self:addTradeFlags(RecipeDB,29550,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,29550,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Fel Iron Chain Coif -- 29551
-	self:addTradeSkill(RecipeDB,29551,300,23493,1,2018,nil,1,300,320,330,340)
+	AddRecipe(29551,300,23493,1,1,300,320,330,340)
 	self:addTradeFlags(RecipeDB,29551,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,29551,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Fel Iron Chain Gloves -- 29552
-	self:addTradeSkill(RecipeDB,29552,310,23491,1,2018,nil,1,310,320,330,340)
+	AddRecipe(29552,310,23491,1,1,310,320,330,340)
 	self:addTradeFlags(RecipeDB,29552,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,29552,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Fel Iron Chain Bracers -- 29553
-	self:addTradeSkill(RecipeDB,29553,315,23494,1,2018,nil,1,315,325,335,345)
+	AddRecipe(29553,315,23494,1,1,315,325,335,345)
 	self:addTradeFlags(RecipeDB,29553,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,29553,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Fel Iron Chain Tunic -- 29556
-	self:addTradeSkill(RecipeDB,29556,320,23490,1,2018,nil,1,320,330,340,350)
+	AddRecipe(29556,320,23490,1,1,320,330,340,350)
 	self:addTradeFlags(RecipeDB,29556,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,29556,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Fel Iron Hatchet -- 29557
-	self:addTradeSkill(RecipeDB,29557,310,23497,1,2018,nil,1,310,320,330,340)
+	AddRecipe(29557,310,23497,1,1,310,320,330,340)
 	self:addTradeFlags(RecipeDB,29557,1,2,3,36,41,51,66,68)
 	self:addTradeAcquire(RecipeDB,29557,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Fel Iron Hammer -- 29558
-	self:addTradeSkill(RecipeDB,29558,315,23498,1,2018,nil,1,315,325,335,345)
+	AddRecipe(29558,315,23498,1,1,315,325,335,345)
 	self:addTradeFlags(RecipeDB,29558,1,2,3,36,41,66,70)
 	self:addTradeAcquire(RecipeDB,29558,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Fel Iron Greatsword -- 29565
-	self:addTradeSkill(RecipeDB,29565,320,23499,1,2018,nil,1,320,330,340,350)
+	AddRecipe(29565,320,23499,1,1,320,330,340,350)
 	self:addTradeFlags(RecipeDB,29565,1,2,3,36,41,51,67,69)
 	self:addTradeAcquire(RecipeDB,29565,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Adamantite Maul -- 29566
-	self:addTradeSkill(RecipeDB,29566,325,23502,1,2018,nil,1,325,335,345,355)
+	AddRecipe(29566,325,23502,1,1,325,335,345,355)
 	self:addTradeFlags(RecipeDB,29566,1,2,4,36,40,51,67,70)
 	self:addTradeAcquire(RecipeDB,29566,2,16670,2,16713,2,19662)

 	-- Adamantite Cleaver -- 29568
-	self:addTradeSkill(RecipeDB,29568,330,23503,1,2018,nil,1,330,340,350,360)
+	AddRecipe(29568,330,23503,1,1,330,340,350,360)
 	self:addTradeFlags(RecipeDB,29568,1,2,4,36,40,51,67,68)
 	self:addTradeAcquire(RecipeDB,29568,2,16670,2,16713,2,19662)

 	-- Adamantite Dagger -- 29569
-	self:addTradeSkill(RecipeDB,29569,330,23504,1,2018,nil,1,330,340,350,360)
+	AddRecipe(29569,330,23504,1,1,330,340,350,360)
 	self:addTradeFlags(RecipeDB,29569,1,2,4,36,40,66,72)
 	self:addTradeAcquire(RecipeDB,29569,2,16670,2,16713,2,19662)

 	-- Adamantite Rapier -- 29571
-	self:addTradeSkill(RecipeDB,29571,335,23505,1,2018,nil,1,335,345,355,365)
+	AddRecipe(29571,335,23505,1,1,335,345,355,365)
 	self:addTradeFlags(RecipeDB,29571,1,2,4,36,40,52,66,69)
 	self:addTradeAcquire(RecipeDB,29571,2,16670,2,16713,2,19662)

 	-- Adamantite Plate Bracers -- 29603
-	self:addTradeSkill(RecipeDB,29603,335,23506,1,2018,nil,1,335,345,355,365)
+	AddRecipe(29603,335,23506,1,1,335,345,355,365)
 	self:addTradeFlags(RecipeDB,29603,1,2,4,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,29603,2,19342,2,19694)

 	-- Adamantite Plate Gloves -- 29605
-	self:addTradeSkill(RecipeDB,29605,335,23508,1,2018,nil,1,335,345,355,365)
+	AddRecipe(29605,335,23508,1,1,335,345,355,365)
 	self:addTradeFlags(RecipeDB,29605,1,2,4,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,29605,2,19342,2,19694)

 	-- Adamantite Breastplate -- 29606
-	self:addTradeSkill(RecipeDB,29606,340,23507,1,2018,nil,1,340,350,360,370)
+	AddRecipe(29606,340,23507,1,1,340,350,360,370)
 	self:addTradeFlags(RecipeDB,29606,1,2,4,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,29606,2,19342,2,19694)

 	-- Enchanted Adamantite Belt -- 29608
-	self:addTradeSkill(RecipeDB,29608,355,23510,1,2018,nil,1,355,365,375,385)
+	AddRecipe(29608,355,23510,1,1,355,365,375,385)
 	self:addTradeFlags(RecipeDB,29608,1,2,4,36,41,52,59,110)
 	self:addTradeAcquire(RecipeDB,29608,6,934,1,19331)

 	-- Enchanted Adamantite Breastplate -- 29610
-	self:addTradeSkill(RecipeDB,29610,360,23509,1,2018,nil,1,360,370,380,390)
+	AddRecipe(29610,360,23509,1,1,360,370,380,390)
 	self:addTradeFlags(RecipeDB,29610,1,2,4,36,41,52,59,110)
 	self:addTradeAcquire(RecipeDB,29610,6,934,3,19331)

 	-- Enchanted Adamantite Boots -- 29611
-	self:addTradeSkill(RecipeDB,29611,355,23511,1,2018,nil,1,355,365,375,385)
+	AddRecipe(29611,355,23511,1,1,355,365,375,385)
 	self:addTradeFlags(RecipeDB,29611,1,2,4,36,41,52,59,110)
 	self:addTradeAcquire(RecipeDB,29611,6,934,2,19331)

 	-- Enchanted Adamantite Leggings -- 29613
-	self:addTradeSkill(RecipeDB,29613,365,23512,1,2018,nil,1,365,375,385,395)
+	AddRecipe(29613,365,23512,1,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29613,1,2,4,36,41,52,59,110)
 	self:addTradeAcquire(RecipeDB,29613,6,934,4,19331)

 	-- Flamebane Bracers -- 29614
-	self:addTradeSkill(RecipeDB,29614,350,23515,1,2018,nil,1,350,360,370,380)
+	AddRecipe(29614,350,23515,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,29614,1,4,36,41,52,59,101)
 	self:addTradeAcquire(RecipeDB,29614,6,932,1,19321)

 	-- Flamebane Helm -- 29615
-	self:addTradeSkill(RecipeDB,29615,355,23516,1,2018,nil,1,355,365,375,385)
+	AddRecipe(29615,355,23516,1,1,355,365,375,385)
 	self:addTradeFlags(RecipeDB,29615,1,4,36,41,52,59,101)
 	self:addTradeAcquire(RecipeDB,29615,6,932,4,19321)

 	-- Flamebane Gloves -- 29616
-	self:addTradeSkill(RecipeDB,29616,360,23514,1,2018,nil,1,360,370,380,390)
+	AddRecipe(29616,360,23514,1,1,360,370,380,390)
 	self:addTradeFlags(RecipeDB,29616,1,4,36,41,52,59,101)
 	self:addTradeAcquire(RecipeDB,29616,6,932,2,19321)

 	-- Flamebane Breastplate -- 29617
-	self:addTradeSkill(RecipeDB,29617,365,23513,1,2018,nil,1,365,375,385,395)
+	AddRecipe(29617,365,23513,1,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29617,1,4,36,41,52,59,101)
 	self:addTradeAcquire(RecipeDB,29617,6,932,3,19321)

 	-- Felsteel Gloves -- 29619
-	self:addTradeSkill(RecipeDB,29619,360,23517,3,2018,nil,1,360,370,380,390)
+	AddRecipe(29619,360,23517,3,1,360,370,380,390)
 	self:addTradeFlags(RecipeDB,29619,1,2,5,11,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,29619,3,18497)

 	-- Felsteel Leggings -- 29620
-	self:addTradeSkill(RecipeDB,29620,360,23518,3,2018,nil,1,360,370,380,390)
+	AddRecipe(29620,360,23518,3,1,360,370,380,390)
 	self:addTradeFlags(RecipeDB,29620,1,2,5,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,29620,3,20900)

 	-- Felsteel Helm -- 29621
-	self:addTradeSkill(RecipeDB,29621,365,23519,3,2018,nil,1,365,375,385,395)
+	AddRecipe(29621,365,23519,3,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29621,1,2,5,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,29621,3,18830)

 	-- Gauntlets of the Iron Tower -- 29622
-	self:addTradeSkill(RecipeDB,29622,365,23532,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29622,365,23532,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29622,1,2,6,36,40,52,59)
 	self:addTradeAcquire(RecipeDB,29622,7,4)

 	-- Khorium Belt -- 29628
-	self:addTradeSkill(RecipeDB,29628,360,23524,3,2018,nil,1,360,370,380,390)
+	AddRecipe(29628,360,23524,3,1,360,370,380,390)
 	self:addTradeFlags(RecipeDB,29628,1,2,11,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,29628,3,18203)

 	-- Khorium Pants -- 29629
-	self:addTradeSkill(RecipeDB,29629,360,23523,3,2018,nil,1,360,370,380,390)
+	AddRecipe(29629,360,23523,3,1,360,370,380,390)
 	self:addTradeFlags(RecipeDB,29629,1,2,11,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,29629,3,20878)

 	-- Khorium Boots -- 29630
-	self:addTradeSkill(RecipeDB,29630,365,23525,3,2018,nil,1,365,375,385,395)
+	AddRecipe(29630,365,23525,3,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29630,1,2,11,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,29630,3,18873)

 	-- Ragesteel Gloves -- 29642
-	self:addTradeSkill(RecipeDB,29642,365,23520,3,2018,nil,1,365,375,385,395)
+	AddRecipe(29642,365,23520,3,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29642,1,2,11,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,29642,3,17136)

 	-- Ragesteel Helm -- 29643
-	self:addTradeSkill(RecipeDB,29643,365,23521,3,2018,nil,1,365,375,385,395)
+	AddRecipe(29643,365,23521,3,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29643,1,2,11,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,29643,3,16952)

 	-- Ragesteel Breastplate -- 29645
-	self:addTradeSkill(RecipeDB,29645,370,23522,3,2018,nil,1,370,380,390,400)
+	AddRecipe(29645,370,23522,3,1,370,380,390,400)
 	self:addTradeFlags(RecipeDB,29645,1,2,11,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,29645,3,21454,3,23305,3,23324)

 	-- Swiftsteel Gloves -- 29648
-	self:addTradeSkill(RecipeDB,29648,370,23526,3,2018,nil,1,370,380,390,400)
+	AddRecipe(29648,370,23526,3,1,370,380,390,400)
 	self:addTradeFlags(RecipeDB,29648,1,2,5,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,29648,3,18314)

 	-- Earthpeace Breastplate -- 29649
-	self:addTradeSkill(RecipeDB,29649,370,23527,3,2018,nil,1,370,380,390,400)
+	AddRecipe(29649,370,23527,3,1,370,380,390,400)
 	self:addTradeFlags(RecipeDB,29649,1,2,5,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,29649,3,17975)

 	-- Fel Sharpening Stone -- 29654
-	self:addTradeSkill(RecipeDB,29654,300,23528,1,2018,nil,1,300,300,305,310)
+	AddRecipe(29654,300,23528,1,1,300,300,305,310)
 	self:addTradeFlags(RecipeDB,29654,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,29654,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Adamantite Sharpening Stone -- 29656
-	self:addTradeSkill(RecipeDB,29656,350,23529,1,2018,nil,1,350,350,355,360)
+	AddRecipe(29656,350,23529,1,1,350,350,355,360)
 	self:addTradeFlags(RecipeDB,29656,1,2,4,36,41,51,103)
 	self:addTradeAcquire(RecipeDB,29656,6,942,2,17904)

 	-- Felsteel Shield Spike -- 29657
-	self:addTradeSkill(RecipeDB,29657,360,23530,1,2018,nil,1,360,370,380,390)
+	AddRecipe(29657,360,23530,1,1,360,370,380,390)
 	self:addTradeFlags(RecipeDB,29657,1,2,4,36,41,52,104)
 	self:addTradeAcquire(RecipeDB,29657,6,946,4,17657,6,947,4,17585)

 	-- Felfury Gauntlets -- 29658
-	self:addTradeSkill(RecipeDB,29658,365,23531,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29658,365,23531,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29658,1,2,6,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,29658,7,2)

 	-- Steelgrip Gauntlets -- 29662
-	self:addTradeSkill(RecipeDB,29662,365,23533,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29662,365,23533,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29662,1,2,6,11,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,29662,7,4)

 	-- Storm Helm -- 29663
-	self:addTradeSkill(RecipeDB,29663,365,23534,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29663,365,23534,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29663,1,2,5,6,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,29663,7,4)

 	-- Helm of the Stalwart Defender -- 29664
-	self:addTradeSkill(RecipeDB,29664,365,23535,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29664,365,23535,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29664,1,2,5,6,36,40,52,59)
 	self:addTradeAcquire(RecipeDB,29664,7,4)

 	-- Oathkeeper's Helm -- 29668
-	self:addTradeSkill(RecipeDB,29668,365,23536,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29668,365,23536,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29668,1,2,5,6,11,36,40,52,59)
 	self:addTradeAcquire(RecipeDB,29668,7,4)

 	-- Black Felsteel Bracers -- 29669
-	self:addTradeSkill(RecipeDB,29669,365,23537,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29669,365,23537,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29669,1,2,6,11,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,29669,7,4)

 	-- Bracers of the Green Fortress -- 29671
-	self:addTradeSkill(RecipeDB,29671,365,23538,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29671,365,23538,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29671,1,2,6,11,36,40,52,59)
 	self:addTradeAcquire(RecipeDB,29671,7,4)

 	-- Blessed Bracers -- 29672
-	self:addTradeSkill(RecipeDB,29672,365,23539,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29672,365,23539,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29672,1,2,10,36,40,53,54,59)
 	self:addTradeAcquire(RecipeDB,29672,7,4)

 	-- Felsteel Longblade -- 29692
-	self:addTradeSkill(RecipeDB,29692,365,23540,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29692,365,23540,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29692,1,2,6,11,36,40,51,66,69)
 	self:addTradeAcquire(RecipeDB,29692,7,2)

 	-- Khorium Champion -- 29693
-	self:addTradeSkill(RecipeDB,29693,365,23541,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29693,365,23541,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29693,1,2,6,11,36,40,51,67,69)
 	self:addTradeAcquire(RecipeDB,29693,7,4)

 	-- Fel Edged Battleaxe -- 29694
-	self:addTradeSkill(RecipeDB,29694,365,23542,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29694,365,23542,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29694,1,2,6,11,36,40,66,68)
 	self:addTradeAcquire(RecipeDB,29694,7,4)

 	-- Felsteel Reaper -- 29695
-	self:addTradeSkill(RecipeDB,29695,365,23543,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29695,365,23543,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29695,1,2,5,6,11,36,40,51,67,68)
 	self:addTradeAcquire(RecipeDB,29695,7,4)

 	-- Runic Hammer -- 29696
-	self:addTradeSkill(RecipeDB,29696,365,23544,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29696,365,23544,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29696,1,2,5,6,11,36,40,51,66,70)
 	self:addTradeAcquire(RecipeDB,29696,7,2)

 	-- Fel Hardened Maul -- 29697
-	self:addTradeSkill(RecipeDB,29697,365,23546,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29697,365,23546,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29697,1,2,6,11,36,40,51,67,70)
 	self:addTradeAcquire(RecipeDB,29697,7,4)

 	-- Eternium Runed Blade -- 29698
-	self:addTradeSkill(RecipeDB,29698,365,23554,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29698,365,23554,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29698,1,2,5,6,11,36,40,53,54,66,72)
 	self:addTradeAcquire(RecipeDB,29698,7,4)

 	-- Dirge -- 29699
-	self:addTradeSkill(RecipeDB,29699,365,23555,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29699,365,23555,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29699,1,2,5,6,11,36,40,51,66,72)
 	self:addTradeAcquire(RecipeDB,29699,7,2)

 	-- Hand of Eternity -- 29700
-	self:addTradeSkill(RecipeDB,29700,365,23556,4,2018,nil,1,365,375,385,395)
+	AddRecipe(29700,365,23556,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,29700,1,2,6,11,36,40,53,54,66,70)
 	self:addTradeAcquire(RecipeDB,29700,7,2)

 	-- Lesser Ward of Shielding -- 29728
-	self:addTradeSkill(RecipeDB,29728,340,23575,1,2018,nil,1,340,340,345,350)
+	AddRecipe(29728,340,23575,1,1,340,340,345,350)
 	self:addTradeFlags(RecipeDB,29728,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,29728,2,16583,2,19373)

 	-- Greater Ward of Shielding -- 29729
-	self:addTradeSkill(RecipeDB,29729,375,23576,3,2018,nil,1,375,375,375,375)
+	AddRecipe(29729,375,23576,3,1,375,375,375,375)
 	self:addTradeFlags(RecipeDB,29729,1,2,11,36,41)
 	self:addTradeAcquire(RecipeDB,29729,3,18853)

 	-- Lesser Rune of Warding -- 32284
-	self:addTradeSkill(RecipeDB,32284,325,23559,1,2018,nil,1,325,325,330,335)
+	AddRecipe(32284,325,23559,1,1,325,325,330,335)
 	self:addTradeFlags(RecipeDB,32284,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,32284,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Greater Rune of Warding -- 32285
-	self:addTradeSkill(RecipeDB,32285,350,25521,1,2018,nil,1,350,350,355,360)
+	AddRecipe(32285,350,25521,1,1,350,350,355,360)
 	self:addTradeFlags(RecipeDB,32285,1,2,4,36,41,103)
 	self:addTradeAcquire(RecipeDB,32285,6,942,2,17904)

 	-- Fel Iron Rod -- 32655
-	self:addTradeSkill(RecipeDB,32655,300,25843,1,2018,nil,1,300,300,305,310)
+	AddRecipe(32655,300,25843,1,1,300,300,305,310)
 	self:addTradeFlags(RecipeDB,32655,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,32655,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Adamantite Rod -- 32656
-	self:addTradeSkill(RecipeDB,32656,350,25844,1,2018,nil,1,350,350,355,360)
+	AddRecipe(32656,350,25844,1,1,350,350,355,360)
 	self:addTradeFlags(RecipeDB,32656,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,32656,2,19662)

 	-- Eternium Rod -- 32657
-	self:addTradeSkill(RecipeDB,32657,375,25845,1,2018,nil,1,360,365,370,375)
+	AddRecipe(32657,375,25845,1,1,360,365,370,375)
 	self:addTradeFlags(RecipeDB,32657,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,32657,2,16583,2,19373)

 	-- Nether Chain Shirt -- 34529
-	self:addTradeSkill(RecipeDB,34529,350,23563,1,2018,9788,1,350,360,370,380)
+	AddRecipe(34529,350,23563,1,1,350,360,370,380,9788)
 	self:addTradeFlags(RecipeDB,34529,1,2,3,37,41,51,58)
 	self:addTradeAcquire(RecipeDB,34529,1,5164,1,7230,1,11177,1,20125,1,29506)

 	-- Twisting Nether Chain Shirt -- 34530
-	self:addTradeSkill(RecipeDB,34530,375,23564,1,2018,9788,1,375,385,395,405)
+	AddRecipe(34530,375,23564,1,1,375,385,395,405,9788)
 	self:addTradeFlags(RecipeDB,34530,1,2,3,37,41,51,58)
 	self:addTradeAcquire(RecipeDB,34530,1,5164,1,7230,1,11177,1,20125,1,29506)

 	-- Breastplate of Kings -- 34533
-	self:addTradeSkill(RecipeDB,34533,350,28483,1,2018,9788,1,350,360,370,380)
+	AddRecipe(34533,350,28483,1,2018,9788,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,34533,1,2,3,37,41,51,59)
 	self:addTradeAcquire(RecipeDB,34533,1,5164,1,7230,1,11177,1,20125,1,29506)

 	-- Bulwark of Kings -- 34534
-	self:addTradeSkill(RecipeDB,34534,375,28484,1,2018,9788,1,375,385,395,405)
+	AddRecipe(34534,375,28484,1,1,375,385,395,405,9788)
 	self:addTradeFlags(RecipeDB,34534,1,2,3,37,41,51,59)
 	self:addTradeAcquire(RecipeDB,34534,1,5164,1,7230,1,11177,1,20125,1,29506)

 	-- Fireguard -- 34535
-	self:addTradeSkill(RecipeDB,34535,350,28425,1,2018,17039,1,350,360,370,380)
+	AddRecipe(34535,350,28425,1,1,350,360,370,380,17039)
 	self:addTradeFlags(RecipeDB,34535,1,2,3,37,41,51,66,69)
 	self:addTradeAcquire(RecipeDB,34535,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Blazeguard -- 34537
-	self:addTradeSkill(RecipeDB,34537,375,28426,1,2018,17039,1,375,385,395,405)
+	AddRecipe(34537,375,28426,1,1,375,385,395,405,17039)
 	self:addTradeFlags(RecipeDB,34537,1,2,3,37,41,51,66,69)
 	self:addTradeAcquire(RecipeDB,34537,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Lionheart Blade -- 34538
-	self:addTradeSkill(RecipeDB,34538,350,28428,1,2018,17039,1,350,360,370,380)
+	AddRecipe(34538,350,28428,1,1,350,360,370,380,17039)
 	self:addTradeFlags(RecipeDB,34538,1,2,3,37,41,51,67,69)
 	self:addTradeAcquire(RecipeDB,34538,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Lionheart Champion -- 34540
-	self:addTradeSkill(RecipeDB,34540,375,28429,1,2018,17039,1,375,385,395,405)
+	AddRecipe(34540,375,28429,1,1,375,385,395,405,17039)
 	self:addTradeFlags(RecipeDB,34540,1,2,3,37,41,51,67,69)
 	self:addTradeAcquire(RecipeDB,34540,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- The Planar Edge -- 34541
-	self:addTradeSkill(RecipeDB,34541,350,28431,1,2018,17041,1,350,360,370,380)
+	AddRecipe(34541,350,28431,1,1,350,360,370,380,17041)
 	self:addTradeFlags(RecipeDB,34541,1,2,3,37,41,51,66,68)
 	self:addTradeAcquire(RecipeDB,34541,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Black Planar Edge -- 34542
-	self:addTradeSkill(RecipeDB,34542,375,28432,1,2018,17041,1,375,385,395,405)
+	AddRecipe(34542,375,28432,1,1,375,385,395,405,17041)
 	self:addTradeFlags(RecipeDB,34542,1,2,3,37,41,51,66,68)
 	self:addTradeAcquire(RecipeDB,34542,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Lunar Crescent -- 34543
-	self:addTradeSkill(RecipeDB,34543,350,28434,1,2018,17041,1,350,360,370,380)
+	AddRecipe(34543,350,28434,1,1,350,360,370,380,17041)
 	self:addTradeFlags(RecipeDB,34543,1,2,3,37,41,51,67,68)
 	self:addTradeAcquire(RecipeDB,34543,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Mooncleaver -- 34544
-	self:addTradeSkill(RecipeDB,34544,375,28435,1,2018,17041,1,375,385,395,405)
+	AddRecipe(34544,375,28435,1,1,375,385,395,405,17041)
 	self:addTradeFlags(RecipeDB,34544,1,2,3,37,41,51,67,68)
 	self:addTradeAcquire(RecipeDB,34544,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Drakefist Hammer -- 34545
-	self:addTradeSkill(RecipeDB,34545,350,28437,1,2018,17040,1,350,360,370,380)
+	AddRecipe(34545,350,28437,1,1,350,360,370,380,17040)
 	self:addTradeFlags(RecipeDB,34545,1,2,3,37,41,66,70)
 	self:addTradeAcquire(RecipeDB,34545,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Dragonmaw -- 34546
-	self:addTradeSkill(RecipeDB,34546,375,28438,1,2018,17040,1,375,385,395,405)
+	AddRecipe(34546,375,28438,1,1,375,385,395,405,17040)
 	self:addTradeFlags(RecipeDB,34546,1,2,3,37,41,66,70)
 	self:addTradeAcquire(RecipeDB,34546,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Thunder -- 34547
-	self:addTradeSkill(RecipeDB,34547,350,28440,1,2018,17040,1,350,360,370,380)
+	AddRecipe(34547,350,28440,1,1,350,360,370,380,17040)
 	self:addTradeFlags(RecipeDB,34547,1,2,3,37,41,51,67,70)
 	self:addTradeAcquire(RecipeDB,34547,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Deep Thunder -- 34548
-	self:addTradeSkill(RecipeDB,34548,375,28441,1,2018,17040,1,375,385,395,405)
+	AddRecipe(34548,375,28441,1,1,375,385,395,405,17040)
 	self:addTradeFlags(RecipeDB,34548,1,2,3,37,41,51,67,70)
 	self:addTradeAcquire(RecipeDB,34548,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Fel Weightstone -- 34607
-	self:addTradeSkill(RecipeDB,34607,300,28420,1,2018,nil,1,300,300,305,310)
+	AddRecipe(34607,300,28420,1,1,300,300,305,310)
 	self:addTradeFlags(RecipeDB,34607,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,34607,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,1,26952,1,26904,1,29924)

 	-- Adamantite Weightstone -- 34608
-	self:addTradeSkill(RecipeDB,34608,350,28421,1,2018,nil,1,350,350,355,360)
+	AddRecipe(34608,350,28421,1,1,350,350,355,360)
 	self:addTradeFlags(RecipeDB,34608,1,2,4,36,41,51,103)
 	self:addTradeAcquire(RecipeDB,34608,6,942,2,17904)

 	-- Thick Bronze Darts -- 34979
-	self:addTradeSkill(RecipeDB,34979,100,29201,1,2018,nil,1,100,130,145,160)
+	AddRecipe(34979,100,29201,1,1,100,130,145,160)
 	self:addTradeFlags(RecipeDB,34979,1,2,3,36,41,51,75)
 	self:addTradeAcquire(RecipeDB,34979,1,2836,1,2998,1,3136,1,3355,1,3478,1,4258,1,4596,1,5511,1,16583,1,16669,1,16724,
 	1,16823,1,19341,1,28694,1,27034,1,514,1,1241,1,33591,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,
 	1,26952,1,3557,1,26904,1,29924)

 	-- Whirling Steel Axes -- 34981
-	self:addTradeSkill(RecipeDB,34981,200,29202,1,2018,nil,1,200,220,230,240)
+	AddRecipe(34981,200,29202,1,1,200,220,230,240)
 	self:addTradeFlags(RecipeDB,34981,1,2,3,36,41,51,75)
 	self:addTradeAcquire(RecipeDB,34981,1,2836,1,3355,1,4258,1,16583,1,16669,1,16823,1,19341,1,28694,1,27034,1,5511,1,514,1,1241,
 	1,16724,1,33591,1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,
 	1,26952,1,3557,1,26904,1,29924)

 	-- Enchanted Thorium Blades -- 34982
-	self:addTradeSkill(RecipeDB,34982,300,29203,1,2018,nil,1,300,320,330,340)
+	AddRecipe(34982,300,29203,1,1,300,320,330,340)
 	self:addTradeFlags(RecipeDB,34982,1,2,3,36,41,51,75)
 	self:addTradeAcquire(RecipeDB,34982,1,2836,1,16583,1,16823,1,19341,1,28694,1,27034,1,4258,1,5511,1,514,1,1241,1,16724,
 	1,3355,1,33591,1,2998,1,3478,1,3136,1,4596,1,3174,1,26988,1,33609,1,33631,1,15400,1,33675,1,26981,1,17245,1,6299,1,26564,
 	1,26952,1,3557,1,26904,1,29924)

 	-- Felsteel Whisper Knives -- 34983
-	self:addTradeSkill(RecipeDB,34983,350,29204,1,2018,nil,1,350,360,370,380)
+	AddRecipe(34983,350,29204,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,34983,1,2,3,36,41,51,75)
 	self:addTradeAcquire(RecipeDB,34983,1,16583,1,16823,1,19341,1,28694,1,27034,1,33591,1,26988,1,33609,1,33631,1,33675,1,26981,1,26564,
 	1,26952,1,26904,1,29924)

 	-- Earthforged Leggings -- 36122
-	self:addTradeSkill(RecipeDB,36122,260,30069,1,2018,9788,1,260,280,290,300)
+	AddRecipe(36122,260,30069,1,1,260,280,290,300,9788)
 	self:addTradeFlags(RecipeDB,36122,1,2,3,37,41,51,59)
 	self:addTradeAcquire(RecipeDB,36122,1,5164,1,7230,1,11177,1,20125,1,29506)

 	-- Windforged Leggings -- 36124
-	self:addTradeSkill(RecipeDB,36124,260,30070,1,2018,9788,1,260,280,290,300)
+	AddRecipe(36124,260,30070,1,1,260,280,290,300,9788)
 	self:addTradeFlags(RecipeDB,36124,1,2,3,37,41,51,58)
 	self:addTradeAcquire(RecipeDB,36124,1,5164,1,7230,1,11177,1,20125,1,29506)

 	-- Light Earthforged Blade -- 36125
-	self:addTradeSkill(RecipeDB,36125,260,30071,1,2018,9787,1,260,280,290,300)
+	AddRecipe(36125,260,30071,1,1,260,280,290,300,9787)
 	self:addTradeFlags(RecipeDB,36125,1,2,3,37,41,66,69)
 	self:addTradeAcquire(RecipeDB,36125,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Light Skyforged Axe -- 36126
-	self:addTradeSkill(RecipeDB,36126,260,30072,1,2018,9787,1,260,280,290,300)
+	AddRecipe(36126,260,30072,1,1,260,280,290,300,9787)
 	self:addTradeFlags(RecipeDB,36126,1,2,3,37,41,66,68)
 	self:addTradeAcquire(RecipeDB,36126,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Light Emberforged Hammer -- 36128
-	self:addTradeSkill(RecipeDB,36128,260,30073,1,2018,9787,1,260,280,290,300)
+	AddRecipe(36128,260,30073,1,1,260,280,290,300,9787)
 	self:addTradeFlags(RecipeDB,36128,1,2,3,37,41,51,66,70)
 	self:addTradeAcquire(RecipeDB,36128,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Heavy Earthforged Breastplate -- 36129
-	self:addTradeSkill(RecipeDB,36129,330,30074,1,2018,9788,1,330,340,350,360)
+	AddRecipe(36129,330,30074,1,1,330,340,350,360,9788)
 	self:addTradeFlags(RecipeDB,36129,1,2,3,37,41,52,59)
 	self:addTradeAcquire(RecipeDB,36129,1,5164,1,7230,1,11177,1,20125,1,29506)

 	-- Stormforged Hauberk -- 36130
-	self:addTradeSkill(RecipeDB,36130,330,30076,1,2018,9788,1,330,340,350,360)
+	AddRecipe(36130,330,30076,1,1,330,340,350,360,9788)
 	self:addTradeFlags(RecipeDB,36130,1,2,3,37,41,51,58)
 	self:addTradeAcquire(RecipeDB,36130,1,5164,1,7230,1,11177,1,20125,1,29506)

 	-- Windforged Rapier -- 36131
-	self:addTradeSkill(RecipeDB,36131,330,30077,1,2018,17039,1,330,340,350,360)
+	AddRecipe(36131,330,30077,1,1,330,340,350,360,17039)
 	self:addTradeFlags(RecipeDB,36131,1,2,3,37,41,66,69)
 	self:addTradeAcquire(RecipeDB,36131,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Stoneforged Claymore -- 36133
-	self:addTradeSkill(RecipeDB,36133,330,30086,1,2018,17039,1,330,340,350,360)
+	AddRecipe(36133,330,30086,1,1,330,340,350,360,17039)
 	self:addTradeFlags(RecipeDB,36133,1,2,3,37,41,51,67,69)
 	self:addTradeAcquire(RecipeDB,36133,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Stormforged Axe -- 36134
-	self:addTradeSkill(RecipeDB,36134,330,30087,1,2018,17041,1,330,340,350,360)
+	AddRecipe(36134,330,30087,1,1,330,340,350,360,17041)
 	self:addTradeFlags(RecipeDB,36134,1,2,3,37,41,51,66,68)
 	self:addTradeAcquire(RecipeDB,36134,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Skyforged Great Axe -- 36135
-	self:addTradeSkill(RecipeDB,36135,330,30088,1,2018,17041,1,330,340,350,360)
+	AddRecipe(36135,330,30088,1,1,330,340,350,360,17041)
 	self:addTradeFlags(RecipeDB,36135,1,2,3,37,41,51,67,68)
 	self:addTradeAcquire(RecipeDB,36135,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Lavaforged Warhammer -- 36136
-	self:addTradeSkill(RecipeDB,36136,330,30089,1,2018,17040,1,330,340,350,360)
+	AddRecipe(36136,330,30089,1,1,330,340,350,360,17040)
 	self:addTradeFlags(RecipeDB,36136,1,2,3,37,41,51,66,70)
 	self:addTradeAcquire(RecipeDB,36136,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Great Earthforged Hammer -- 36137
-	self:addTradeSkill(RecipeDB,36137,330,30093,1,2018,17040,1,330,340,350,360)
+	AddRecipe(36137,330,30093,1,1,330,340,350,360,17040)
 	self:addTradeFlags(RecipeDB,36137,1,2,3,37,41,51,67,70)
 	self:addTradeAcquire(RecipeDB,36137,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Embrace of the Twisting Nether -- 36256
-	self:addTradeSkill(RecipeDB,36256,375,23565,1,2018,9788,1,375,385,395,405)
+	AddRecipe(36256,375,23565,1,1,375,385,395,405,9788)
 	self:addTradeFlags(RecipeDB,36256,1,2,3,37,41,51,58)
 	self:addTradeAcquire(RecipeDB,36256,1,5164,1,7230,1,11177,1,20125,1,29506)

 	-- Bulwark of the Ancient Kings -- 36257
-	self:addTradeSkill(RecipeDB,36257,375,28485,1,2018,9788,1,375,385,395,405)
+	AddRecipe(36257,375,28485,1,1,375,385,395,405,9788)
 	self:addTradeFlags(RecipeDB,36257,1,2,3,37,41,51,59)
 	self:addTradeAcquire(RecipeDB,36257,1,5164,1,7230,1,11177,1,20125,1,29506)

 	-- Blazefury -- 36258
-	self:addTradeSkill(RecipeDB,36258,375,28427,1,2018,17039,1,375,385,395,405)
+	AddRecipe(36258,375,28427,1,1,375,385,395,405,17039)
 	self:addTradeFlags(RecipeDB,36258,1,2,3,37,41,51,66,69)
 	self:addTradeAcquire(RecipeDB,36258,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Lionheart Executioner -- 36259
-	self:addTradeSkill(RecipeDB,36259,375,28430,1,2018,17039,1,375,385,395,405)
+	AddRecipe(36259,375,28430,1,1,375,385,395,405,17039)
 	self:addTradeFlags(RecipeDB,36259,1,2,3,37,41,51,67,69)
 	self:addTradeAcquire(RecipeDB,36259,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Wicked Edge of the Planes -- 36260
-	self:addTradeSkill(RecipeDB,36260,375,28433,1,2018,17041,1,375,385,395,405)
+	AddRecipe(36260,375,28433,1,1,375,385,395,405,17041)
 	self:addTradeFlags(RecipeDB,36260,1,2,3,37,41,51,66,68)
 	self:addTradeAcquire(RecipeDB,36260,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Bloodmoon -- 36261
-	self:addTradeSkill(RecipeDB,36261,375,28436,1,2018,17041,1,375,385,395,405)
+	AddRecipe(36261,375,28436,1,1,375,385,395,405,17041)
 	self:addTradeFlags(RecipeDB,36261,1,2,3,37,41,51,67,68)
 	self:addTradeAcquire(RecipeDB,36261,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Dragonstrike -- 36262
-	self:addTradeSkill(RecipeDB,36262,375,28439,1,2018,17040,1,375,385,395,405)
+	AddRecipe(36262,375,28439,1,1,375,385,395,405,17040)
 	self:addTradeFlags(RecipeDB,36262,1,2,3,37,41,66,70)
 	self:addTradeAcquire(RecipeDB,36262,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Stormherald -- 36263
-	self:addTradeSkill(RecipeDB,36263,375,28442,1,2018,17040,1,375,385,395,405)
+	AddRecipe(36263,375,28442,1,1,375,385,395,405,17040)
 	self:addTradeFlags(RecipeDB,36263,1,2,3,37,41,51,67,70)
 	self:addTradeAcquire(RecipeDB,36263,1,7231,1,7232,1,11146,1,11178,1,20124,1,29505)

 	-- Belt of the Guardian -- 36389
-	self:addTradeSkill(RecipeDB,36389,375,30034,4,2018,nil,1,375,385,395,405)
+	AddRecipe(36389,375,30034,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,36389,1,2,6,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,36389,8,37,8,43)

 	-- Red Belt of Battle -- 36390
-	self:addTradeSkill(RecipeDB,36390,375,30032,4,2018,nil,1,375,385,395,405)
+	AddRecipe(36390,375,30032,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,36390,1,2,6,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,36390,8,37,8,43)

 	-- Boots of the Protector -- 36391
-	self:addTradeSkill(RecipeDB,36391,375,30033,4,2018,nil,1,375,385,395,405)
+	AddRecipe(36391,375,30033,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,36391,1,2,6,37,41,52,59)
 	self:addTradeAcquire(RecipeDB,36391,8,37,8,43)

 	-- Red Havoc Boots -- 36392
-	self:addTradeSkill(RecipeDB,36392,375,30031,4,2018,nil,1,375,385,395,405)
+	AddRecipe(36392,375,30031,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,36392,1,2,6,37,41,52,59)
 	self:addTradeAcquire(RecipeDB,36392,8,37,8,43)

 	-- Wildguard Breastplate -- 38473
-	self:addTradeSkill(RecipeDB,38473,375,31364,4,2018,nil,1,375,385,395,405)
+	AddRecipe(38473,375,31364,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,38473,1,2,4,36,41,52,59,103)
 	self:addTradeAcquire(RecipeDB,38473,6,942,4,17904)

 	-- Wildguard Leggings -- 38475
-	self:addTradeSkill(RecipeDB,38475,375,31367,4,2018,nil,1,375,385,395,405)
+	AddRecipe(38475,375,31367,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,38475,1,2,4,36,41,59,103)
 	self:addTradeAcquire(RecipeDB,38475,6,942,3,17904)

 	-- Wildguard Helm -- 38476
-	self:addTradeSkill(RecipeDB,38476,375,31368,4,2018,nil,1,375,385,395,405)
+	AddRecipe(38476,375,31368,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,38476,1,2,4,36,41,52,59,103)
 	self:addTradeAcquire(RecipeDB,38476,6,942,3,17904)

 	-- Iceguard Breastplate -- 38477
-	self:addTradeSkill(RecipeDB,38477,375,31369,4,2018,nil,1,375,385,395,405)
+	AddRecipe(38477,375,31369,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,38477,1,2,4,36,41,52,59,114)
 	self:addTradeAcquire(RecipeDB,38477,6,967,2,16388)

 	-- Iceguard Leggings -- 38478
-	self:addTradeSkill(RecipeDB,38478,375,31370,4,2018,nil,1,375,385,395,405)
+	AddRecipe(38478,375,31370,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,38478,1,2,4,36,41,59,114)
 	self:addTradeAcquire(RecipeDB,38478,6,967,3,16388)

 	-- Iceguard Helm -- 38479
-	self:addTradeSkill(RecipeDB,38479,375,31371,4,2018,nil,1,375,385,395,405)
+	AddRecipe(38479,375,31371,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,38479,1,2,4,36,41,52,59,114)
 	self:addTradeAcquire(RecipeDB,38479,6,967,2,16388)

 	-- Shadesteel Sabots -- 40033
-	self:addTradeSkill(RecipeDB,40033,375,32402,1,2018,nil,1,375,385,395,405)
+	AddRecipe(40033,375,32402,1,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,40033,1,2,4,36,41,59,102)
 	self:addTradeAcquire(RecipeDB,40033,6,1012,2,23159)

 	-- Shadesteel Bracers -- 40034
-	self:addTradeSkill(RecipeDB,40034,375,32403,1,2018,nil,1,375,385,395,405)
+	AddRecipe(40034,375,32403,1,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,40034,1,2,4,36,41,59,102)
 	self:addTradeAcquire(RecipeDB,40034,6,1012,1,23159)

 	-- Shadesteel Greaves -- 40035
-	self:addTradeSkill(RecipeDB,40035,375,32404,1,2018,nil,1,375,385,395,405)
+	AddRecipe(40035,375,32404,1,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,40035,1,2,4,36,41,59,102)
 	self:addTradeAcquire(RecipeDB,40035,6,1012,2,23159)

 	-- Shadesteel Girdle -- 40036
-	self:addTradeSkill(RecipeDB,40036,375,32401,1,2018,nil,1,375,385,395,405)
+	AddRecipe(40036,375,32401,1,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,40036,1,2,4,36,41,59,102)
 	self:addTradeAcquire(RecipeDB,40036,6,1012,1,23159)

 	-- Swiftsteel Bracers -- 41132
-	self:addTradeSkill(RecipeDB,41132,375,32568,4,2018,nil,1,375,385,395,405)
+	AddRecipe(41132,375,32568,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,41132,1,2,6,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,41132,8,27,8,34)

 	-- Swiftsteel Shoulders -- 41133
-	self:addTradeSkill(RecipeDB,41133,375,32570,4,2018,nil,1,375,385,395,405)
+	AddRecipe(41133,375,32570,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,41133,1,2,10,37,41,51,59)
 	self:addTradeAcquire(RecipeDB,41133,7,4)

 	-- Dawnsteel Bracers -- 41134
-	self:addTradeSkill(RecipeDB,41134,375,32571,4,2018,nil,1,375,385,395,405)
+	AddRecipe(41134,375,32571,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,41134,1,2,10,36,40,53,54,59)
 	self:addTradeAcquire(RecipeDB,41134,7,4)

 	-- Dawnsteel Shoulders -- 41135
-	self:addTradeSkill(RecipeDB,41135,375,32573,4,2018,nil,1,375,385,395,405)
+	AddRecipe(41135,375,32573,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,41135,1,2,6,37,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,41135,8,27,8,34)

 	-- Ragesteel Shoulders -- 42662
-	self:addTradeSkill(RecipeDB,42662,365,33173,3,2018,nil,1,365,375,385,395)
+	AddRecipe(42662,365,33173,3,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,42662,1,2,11,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,42662,3,21050,3,21059,3,21060,3,21061)

 	-- Adamantite Weapon Chain -- 42688
-	self:addTradeSkill(RecipeDB,42688,335,33185,2,2018,nil,1,335,345,350,355)
+	AddRecipe(42688,335,33185,2,1,335,345,350,355)
 	self:addTradeFlags(RecipeDB,42688,1,2,11,36,41,52)
 	self:addTradeAcquire(RecipeDB,42688,3,24664)

 	-- Heavy Copper Longsword -- 43549
-	self:addTradeSkill(RecipeDB,43549,35,33791,2,2018,nil,1,35,75,95,115)
+	AddRecipe(43549,35,33791,2,1,35,75,95,115)
 	self:addTradeFlags(RecipeDB,43549,1,8,36,40,51,66,69)
 	self:addTradeAcquire(RecipeDB,43549,4,1578)

 	-- Hammer of Righteous Might -- 43846
-	self:addTradeSkill(RecipeDB,43846,365,32854,4,2018,nil,1,365,375,385,395)
+	AddRecipe(43846,365,32854,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,43846,1,2,10,36,40,53,54,67,70)
 	self:addTradeAcquire(RecipeDB,43846,7,4)

 	-- Sunblessed Gauntlets -- 46140
-	self:addTradeSkill(RecipeDB,46140,365,34380,4,2018,nil,1,365,375,392,410)
+	AddRecipe(46140,365,34380,4,1,365,375,392,410)
 	self:addTradeFlags(RecipeDB,46140,1,2,6,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,46140,8,24)

 	-- Hard Khorium Battlefists -- 46141
-	self:addTradeSkill(RecipeDB,46141,365,34378,4,2018,nil,1,365,375,392,410)
+	AddRecipe(46141,365,34378,4,1,365,375,392,410)
 	self:addTradeFlags(RecipeDB,46141,1,2,6,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,46141,8,24)

 	-- Sunblessed Breastplate -- 46142
-	self:addTradeSkill(RecipeDB,46142,365,34379,4,2018,nil,1,365,375,392,410)
+	AddRecipe(46142,365,34379,4,1,365,375,392,410)
 	self:addTradeFlags(RecipeDB,46142,1,2,6,37,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,46142,8,24)

 	-- Hard Khorium Battleplate -- 46144
-	self:addTradeSkill(RecipeDB,46144,365,34377,4,2018,nil,1,365,375,392,410)
+	AddRecipe(46144,365,34377,4,1,365,375,392,410)
 	self:addTradeFlags(RecipeDB,46144,1,2,6,37,41,51,59)
 	self:addTradeAcquire(RecipeDB,46144,8,24)

 	-- Cobalt Legplates -- 52567
-	self:addTradeSkill(RecipeDB,52567,370,39086,2,2018,nil,2,370,375,380,3985)
+	AddRecipe(52567,370,39086,2,2,370,375,380,3985)
 	self:addTradeFlags(RecipeDB,52567,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,52567,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Cobalt Belt -- 52568
-	self:addTradeSkill(RecipeDB,52568,350,39087,2,2018,nil,2,350,360,370,380)
+	AddRecipe(52568,350,39087,2,2,350,360,370,380)
 	self:addTradeFlags(RecipeDB,52568,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,52568,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Cobalt Boots -- 52569
-	self:addTradeSkill(RecipeDB,52569,350,39088,2,2018,nil,2,350,360,370,380)
+	AddRecipe(52569,350,39088,2,2,350,360,370,380)
 	self:addTradeFlags(RecipeDB,52569,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,52569,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Cobalt Chestpiece -- 52570
-	self:addTradeSkill(RecipeDB,52570,375,39085,2,2018,nil,2,375,380,385,390)
+	AddRecipe(52570,375,39085,2,2,375,380,385,390)
 	self:addTradeFlags(RecipeDB,52570,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,52570,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Cobalt Helm -- 52571
-	self:addTradeSkill(RecipeDB,52571,370,39084,2,2018,nil,2,370,375,380,385)
+	AddRecipe(52571,370,39084,2,2,370,375,380,385)
 	self:addTradeFlags(RecipeDB,52571,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,52571,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Cobalt Shoulders -- 52572
-	self:addTradeSkill(RecipeDB,52572,360,39083,2,2018,nil,2,360,370,375,380)
+	AddRecipe(52572,360,39083,2,2,360,370,375,380)
 	self:addTradeFlags(RecipeDB,52572,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,52572,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Cobalt Triangle Shield -- 54550
-	self:addTradeSkill(RecipeDB,54550,360,40668,2,2018,nil,2,360,370,375,380)
+	AddRecipe(54550,360,40668,2,2,360,370,375,380)
 	self:addTradeFlags(RecipeDB,54550,1,2,3,36,41,52,64,66)
 	self:addTradeAcquire(RecipeDB,54550,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Tempered Saronite Belt -- 54551
-	self:addTradeSkill(RecipeDB,54551,395,40669,3,2018,nil,2,395,400,405,410)
+	AddRecipe(54551,395,40669,3,2,395,400,405,410)
 	self:addTradeFlags(RecipeDB,54551,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,54551,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Tempered Saronite Boots -- 54552
-	self:addTradeSkill(RecipeDB,54552,400,40671,3,2018,nil,2,400,405,410,415)
+	AddRecipe(54552,400,40671,3,2,400,405,410,415)
 	self:addTradeFlags(RecipeDB,54552,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,54552,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Tempered Saronite Breastplate -- 54553
-	self:addTradeSkill(RecipeDB,54553,400,40672,3,2018,nil,2,400,405,410,415)
+	AddRecipe(54553,400,40672,3,2,400,405,410,415)
 	self:addTradeFlags(RecipeDB,54553,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,54553,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Tempered Saronite Legplates -- 54554
-	self:addTradeSkill(RecipeDB,54554,395,40674,3,2018,nil,2,395,400,405,410)
+	AddRecipe(54554,395,40674,3,2,395,400,405,410)
 	self:addTradeFlags(RecipeDB,54554,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,54554,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Tempered Saronite Helm -- 54555
-	self:addTradeSkill(RecipeDB,54555,405,40673,3,2018,nil,2,405,410,415,420)
+	AddRecipe(54555,405,40673,3,2,405,410,415,420)
 	self:addTradeFlags(RecipeDB,54555,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,54555,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Tempered Saronite Shoulders -- 54556
-	self:addTradeSkill(RecipeDB,54556,405,40675,3,2018,nil,2,405,410,415,420)
+	AddRecipe(54556,405,40675,3,2,405,410,415,420)
 	self:addTradeFlags(RecipeDB,54556,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,54556,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Saronite Defender -- 54557
-	self:addTradeSkill(RecipeDB,54557,390,40670,3,2018,nil,2,390,395,400,405)
+	AddRecipe(54557,390,40670,3,2,390,395,400,405)
 	self:addTradeFlags(RecipeDB,54557,1,2,3,36,41,52,64,66)
 	self:addTradeAcquire(RecipeDB,54557,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Spiked Cobalt Helm -- 54917
-	self:addTradeSkill(RecipeDB,54917,375,40942,2,2018,nil,2,375,380,385,390)
+	AddRecipe(54917,375,40942,2,2,375,380,385,390)
 	self:addTradeFlags(RecipeDB,54917,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,54917,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Spiked Cobalt Boots -- 54918
-	self:addTradeSkill(RecipeDB,54918,380,40949,2,2018,nil,2,380,385,390,395)
+	AddRecipe(54918,380,40949,2,2,380,385,390,395)
 	self:addTradeFlags(RecipeDB,54918,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,54918,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Spiked Cobalt Shoulders -- 54941
-	self:addTradeSkill(RecipeDB,54941,385,40950,2,2018,nil,2,385,390,395,400)
+	AddRecipe(54941,385,40950,2,2,385,390,395,400)
 	self:addTradeFlags(RecipeDB,54941,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,54941,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Spiked Cobalt Chestpiece -- 54944
-	self:addTradeSkill(RecipeDB,54944,385,40951,2,2018,nil,2,385,390,395,400)
+	AddRecipe(54944,385,40951,2,2,385,390,395,400)
 	self:addTradeFlags(RecipeDB,54944,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,54944,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Spiked Cobalt Gauntlets -- 54945
-	self:addTradeSkill(RecipeDB,54945,390,40952,2,2018,nil,2,390,395,400,405)
+	AddRecipe(54945,390,40952,2,2,390,395,400,405)
 	self:addTradeFlags(RecipeDB,54945,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,54945,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Spiked Cobalt Belt -- 54946
-	self:addTradeSkill(RecipeDB,54946,395,40953,2,2018,nil,2,395,400,405,410)
+	AddRecipe(54946,395,40953,2,2,395,400,405,410)
 	self:addTradeFlags(RecipeDB,54946,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,54946,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Spiked Cobalt Legplates -- 54947
-	self:addTradeSkill(RecipeDB,54947,395,40943,2,2018,nil,2,395,400,405,410)
+	AddRecipe(54947,395,40943,2,2,395,400,405,410)
 	self:addTradeFlags(RecipeDB,54947,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,54947,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Spiked Cobalt Bracers -- 54948
-	self:addTradeSkill(RecipeDB,54948,400,40954,2,2018,nil,2,400,405,410,415)
+	AddRecipe(54948,400,40954,2,2,400,405,410,415)
 	self:addTradeFlags(RecipeDB,54948,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,54948,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Horned Cobalt Helm -- 54949
-	self:addTradeSkill(RecipeDB,54949,400,40955,2,2018,nil,2,400,405,410,415)
+	AddRecipe(54949,400,40955,2,2,400,405,410,415)
 	self:addTradeFlags(RecipeDB,54949,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,54949,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Reinforced Cobalt Shoulders -- 54978
-	self:addTradeSkill(RecipeDB,54978,375,40956,2,2018,nil,2,375,395,400,405)
+	AddRecipe(54978,375,40956,2,2,375,395,400,405)
 	self:addTradeFlags(RecipeDB,54978,1,2,11,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,54978,3,27333)

 	-- Reinforced Cobalt Helm -- 54979
-	self:addTradeSkill(RecipeDB,54979,375,40957,2,2018,nil,2,375,405,410,415)
+	AddRecipe(54979,375,40957,2,2,375,405,410,415)
 	self:addTradeFlags(RecipeDB,54979,1,2,11,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,54979,3,26270)

 	-- Reinforced Cobalt Legplates -- 54980
-	self:addTradeSkill(RecipeDB,54980,375,40958,2,2018,nil,2,375,410,415,420)
+	AddRecipe(54980,375,40958,2,2,375,410,415,420)
 	self:addTradeFlags(RecipeDB,54980,1,2,11,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,54980,3,29235)

 	-- Reinforced Cobalt Chestpiece -- 54981
-	self:addTradeSkill(RecipeDB,54981,375,40959,2,2018,nil,2,375,415,420,425)
+	AddRecipe(54981,375,40959,2,2,375,415,420,425)
 	self:addTradeFlags(RecipeDB,54981,1,2,11,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,54981,3,28123)

 	-- Saronite Protector -- 55013
-	self:addTradeSkill(RecipeDB,55013,390,41117,3,2018,nil,2,390,395,400,405)
+	AddRecipe(55013,390,41117,3,2,390,395,400,405)
 	self:addTradeFlags(RecipeDB,55013,1,2,3,36,41,53,54,64)
 	self:addTradeAcquire(RecipeDB,55013,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Saronite Bulwark -- 55014
-	self:addTradeSkill(RecipeDB,55014,410,41113,3,2018,nil,2,410,415,420,425)
+	AddRecipe(55014,410,41113,3,2,410,415,420,425)
 	self:addTradeFlags(RecipeDB,55014,1,2,3,36,41,52,64,66)
 	self:addTradeAcquire(RecipeDB,55014,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Tempered Saronite Gauntlets -- 55015
-	self:addTradeSkill(RecipeDB,55015,415,41114,3,2018,nil,2,415,420,425,430)
+	AddRecipe(55015,415,41114,3,2,415,420,425,430)
 	self:addTradeFlags(RecipeDB,55015,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,55015,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Tempered Saronite Bracers -- 55017
-	self:addTradeSkill(RecipeDB,55017,410,41116,3,2018,nil,2,410,415,420,425)
+	AddRecipe(55017,410,41116,3,2,410,415,420,425)
 	self:addTradeFlags(RecipeDB,55017,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,55017,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Brilliant Saronite Legplates -- 55055
-	self:addTradeSkill(RecipeDB,55055,395,41126,3,2018,nil,2,395,400,405,410)
+	AddRecipe(55055,395,41126,3,2,395,400,405,410)
 	self:addTradeFlags(RecipeDB,55055,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,55055,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Brilliant Saronite Gauntlets -- 55056
-	self:addTradeSkill(RecipeDB,55056,400,41127,3,2018,nil,2,400,405,410,415)
+	AddRecipe(55056,400,41127,3,2,400,405,410,415)
 	self:addTradeFlags(RecipeDB,55056,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,55056,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Brilliant Saronite Boots -- 55057
-	self:addTradeSkill(RecipeDB,55057,405,41128,3,2018,nil,2,405,410,415,420)
+	AddRecipe(55057,405,41128,3,2,405,410,415,420)
 	self:addTradeFlags(RecipeDB,55057,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,55057,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Brilliant Saronite Breastplate -- 55058
-	self:addTradeSkill(RecipeDB,55058,415,41129,3,2018,nil,2,415,420,425,430)
+	AddRecipe(55058,415,41129,3,2,415,420,425,430)
 	self:addTradeFlags(RecipeDB,55058,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,55058,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Honed Cobalt Cleaver -- 55174
-	self:addTradeSkill(RecipeDB,55174,390,41181,3,2018,nil,2,390,395,400,405)
+	AddRecipe(55174,390,41181,3,2,390,395,400,405)
 	self:addTradeFlags(RecipeDB,55174,1,2,3,36,41,51,67,68)
 	self:addTradeAcquire(RecipeDB,55174,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Savage Cobalt Slicer -- 55177
-	self:addTradeSkill(RecipeDB,55177,395,41182,3,2018,nil,2,395,400,405,410)
+	AddRecipe(55177,395,41182,3,2,395,400,405,410)
 	self:addTradeFlags(RecipeDB,55177,1,2,3,36,41,51,66,69)
 	self:addTradeAcquire(RecipeDB,55177,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Saronite Ambusher -- 55179
-	self:addTradeSkill(RecipeDB,55179,400,41183,3,2018,nil,2,400,405,410,415)
+	AddRecipe(55179,400,41183,3,2,400,405,410,415)
 	self:addTradeFlags(RecipeDB,55179,1,2,3,36,41,51,66,72)
 	self:addTradeAcquire(RecipeDB,55179,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Saronite Shiv -- 55181
-	self:addTradeSkill(RecipeDB,55181,405,41184,3,2018,nil,2,405,410,415,420)
+	AddRecipe(55181,405,41184,3,2,405,410,415,420)
 	self:addTradeFlags(RecipeDB,55181,1,2,3,36,41,51,66,72)
 	self:addTradeAcquire(RecipeDB,55181,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Furious Saronite Beatstick -- 55182
-	self:addTradeSkill(RecipeDB,55182,410,41185,3,2018,nil,2,410,415,420,425)
+	AddRecipe(55182,410,41185,3,2,410,415,420,425)
 	self:addTradeFlags(RecipeDB,55182,1,2,3,36,41,51,66,70)
 	self:addTradeAcquire(RecipeDB,55182,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Corroded Saronite Edge -- 55183
-	self:addTradeSkill(RecipeDB,55183,415,41186,3,2018,9787,2,415,420,425,430)
+	AddRecipe(55183,415,41186,3,2,415,420,425,430,9787)
 	self:addTradeFlags(RecipeDB,55183,1,2,3,37,41,51,66,69)
 	self:addTradeAcquire(RecipeDB,55183,1,11146,1,29505,1,11178)

 	-- Corroded Saronite Woundbringer -- 55184
-	self:addTradeSkill(RecipeDB,55184,415,41187,3,2018,9787,2,415,420,425,430)
+	AddRecipe(55184,415,41187,3,2,415,420,425,430,9787)
 	self:addTradeFlags(RecipeDB,55184,1,2,3,37,41,51,66,69)
 	self:addTradeAcquire(RecipeDB,55184,1,11146,1,29505,1,11178)

 	-- Saronite Mindcrusher -- 55185
-	self:addTradeSkill(RecipeDB,55185,415,41188,3,2018,9787,2,415,420,425,430)
+	AddRecipe(55185,415,41188,3,2,415,420,425,430,9787)
 	self:addTradeFlags(RecipeDB,55185,1,2,3,37,41,51,67,70)
 	self:addTradeAcquire(RecipeDB,55185,1,11146,1,29505,1,11178)

 	-- Chestplate of Conquest -- 55186
-	self:addTradeSkill(RecipeDB,55186,415,41189,3,2018,9788,2,415,420,425,430)
+	AddRecipe(55186,415,41189,3,2,415,420,425,430,9788)
 	self:addTradeFlags(RecipeDB,55186,1,2,3,37,41,51,59)
 	self:addTradeAcquire(RecipeDB,55186,1,29506,1,5164,1,11177)

 	-- Legplates of Conquest -- 55187
-	self:addTradeSkill(RecipeDB,55187,415,41190,3,2018,9788,2,415,420,425,430)
+	AddRecipe(55187,415,41190,3,2,415,420,425,430,9788)
 	self:addTradeFlags(RecipeDB,55187,1,2,3,37,41,51,59)
 	self:addTradeAcquire(RecipeDB,55187,1,29506,1,5164,1,11177)

 	-- Sturdy Cobalt Quickblade -- 55200
-	self:addTradeSkill(RecipeDB,55200,380,41239,2,2018,nil,2,380,385,390,395)
+	AddRecipe(55200,380,41239,2,2,380,385,390,395)
 	self:addTradeFlags(RecipeDB,55200,1,2,3,36,41,51,66,69)
 	self:addTradeAcquire(RecipeDB,55200,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Cobalt Tenderizer -- 55201
-	self:addTradeSkill(RecipeDB,55201,380,41240,2,2018,nil,2,380,385,390,395)
+	AddRecipe(55201,380,41240,2,2,380,385,390,395)
 	self:addTradeFlags(RecipeDB,55201,1,2,3,36,41,51,66,70)
 	self:addTradeAcquire(RecipeDB,55201,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Sure-fire Shuriken -- 55202
-	self:addTradeSkill(RecipeDB,55202,385,41241,2,2018,nil,2,385,390,395,400)
+	AddRecipe(55202,385,41241,2,2,385,390,395,400)
 	self:addTradeFlags(RecipeDB,55202,1,2,3,36,41,75)
 	self:addTradeAcquire(RecipeDB,55202,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Forged Cobalt Claymore -- 55203
-	self:addTradeSkill(RecipeDB,55203,385,41242,2,2018,nil,2,385,390,395,400)
+	AddRecipe(55203,385,41242,2,2,385,390,395,400)
 	self:addTradeFlags(RecipeDB,55203,1,2,3,36,41,51,67,69)
 	self:addTradeAcquire(RecipeDB,55203,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Notched Cobalt War Axe -- 55204
-	self:addTradeSkill(RecipeDB,55204,390,41243,2,2018,nil,2,390,395,400,405)
+	AddRecipe(55204,390,41243,2,2,390,395,400,405)
 	self:addTradeFlags(RecipeDB,55204,1,2,3,36,41,51,66,68)
 	self:addTradeAcquire(RecipeDB,55204,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Deadly Saronite Dirk -- 55206
-	self:addTradeSkill(RecipeDB,55206,405,41245,3,2018,nil,2,405,415,420,425)
+	AddRecipe(55206,405,41245,3,2,405,415,420,425)
 	self:addTradeFlags(RecipeDB,55206,1,2,3,36,41,51,75)
 	self:addTradeAcquire(RecipeDB,55206,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Vengeance Bindings -- 55298
-	self:addTradeSkill(RecipeDB,55298,420,41355,3,2018,nil,2,420,425,430,435)
+	AddRecipe(55298,420,41355,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,55298,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,55298,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Righteous Gauntlets -- 55300
-	self:addTradeSkill(RecipeDB,55300,420,41356,3,2018,nil,2,420,430,440,450)
+	AddRecipe(55300,420,41356,3,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,55300,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,55300,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Daunting Handguards -- 55301
-	self:addTradeSkill(RecipeDB,55301,420,41357,3,2018,nil,2,420,430,440,450)
+	AddRecipe(55301,420,41357,3,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,55301,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,55301,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Helm of Command -- 55302
-	self:addTradeSkill(RecipeDB,55302,425,41344,3,2018,nil,2,425,435,445,455)
+	AddRecipe(55302,425,41344,3,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,55302,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,55302,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Daunting Legplates -- 55303
-	self:addTradeSkill(RecipeDB,55303,425,41345,3,2018,nil,2,425,435,445,455)
+	AddRecipe(55303,425,41345,3,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,55303,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,55303,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Righteous Greaves -- 55304
-	self:addTradeSkill(RecipeDB,55304,425,41346,3,2018,nil,2,425,435,445,455)
+	AddRecipe(55304,425,41346,3,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,55304,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,55304,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Savage Saronite Bracers -- 55305
-	self:addTradeSkill(RecipeDB,55305,420,41354,3,2018,nil,2,420,425,430,435)
+	AddRecipe(55305,420,41354,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,55305,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,55305,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Savage Saronite Pauldrons -- 55306
-	self:addTradeSkill(RecipeDB,55306,420,41351,3,2018,nil,2,420,430,440,450)
+	AddRecipe(55306,420,41351,3,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,55306,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,55306,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Savage Saronite Waistguard -- 55307
-	self:addTradeSkill(RecipeDB,55307,420,41352,3,2018,nil,2,420,430,440,450)
+	AddRecipe(55307,420,41352,3,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,55307,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,55307,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Savage Saronite Walkers -- 55308
-	self:addTradeSkill(RecipeDB,55308,420,41348,3,2018,nil,2,420,430,440,450)
+	AddRecipe(55308,420,41348,3,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,55308,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,55308,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Savage Saronite Gauntlets -- 55309
-	self:addTradeSkill(RecipeDB,55309,420,41349,3,2018,nil,2,420,430,440,450)
+	AddRecipe(55309,420,41349,3,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,55309,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,55309,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Savage Saronite Legplates -- 55310
-	self:addTradeSkill(RecipeDB,55310,425,41347,3,2018,nil,2,425,435,445,455)
+	AddRecipe(55310,425,41347,3,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,55310,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,55310,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Savage Saronite Hauberk -- 55311
-	self:addTradeSkill(RecipeDB,55311,425,41353,3,2018,nil,2,425,435,445,455)
+	AddRecipe(55311,425,41353,3,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,55311,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,55311,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Savage Saronite Skullshield -- 55312
-	self:addTradeSkill(RecipeDB,55312,425,41350,3,2018,nil,2,425,435,445,455)
+	AddRecipe(55312,425,41350,3,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,55312,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,55312,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Titansteel Destroyer -- 55369
-	self:addTradeSkill(RecipeDB,55369,440,41257,4,2018,nil,2,440,450,460,470)
+	AddRecipe(55369,440,41257,4,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,55369,1,2,3,36,41,51,67,70)
 	self:addTradeAcquire(RecipeDB,55369,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Titansteel Bonecrusher -- 55370
-	self:addTradeSkill(RecipeDB,55370,440,41383,4,2018,nil,2,440,450,460,470)
+	AddRecipe(55370,440,41383,4,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,55370,1,2,3,36,41,51,66,70)
 	self:addTradeAcquire(RecipeDB,55370,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Titansteel Guardian -- 55371
-	self:addTradeSkill(RecipeDB,55371,440,41384,4,2018,nil,2,440,450,460,470)
+	AddRecipe(55371,440,41384,4,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,55371,1,2,3,36,41,53,54,66,70)
 	self:addTradeAcquire(RecipeDB,55371,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Spiked Titansteel Helm -- 55372
-	self:addTradeSkill(RecipeDB,55372,440,41386,4,2018,nil,2,440,450,460,470)
+	AddRecipe(55372,440,41386,4,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,55372,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,55372,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Tempered Titansteel Helm -- 55373
-	self:addTradeSkill(RecipeDB,55373,440,41387,4,2018,nil,2,440,450,460,470)
+	AddRecipe(55373,440,41387,4,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,55373,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,55373,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Brilliant Titansteel Helm -- 55374
-	self:addTradeSkill(RecipeDB,55374,440,41388,4,2018,nil,2,440,450,460,470)
+	AddRecipe(55374,440,41388,4,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,55374,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,55374,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Spiked Titansteel Treads -- 55375
-	self:addTradeSkill(RecipeDB,55375,440,41391,4,2018,nil,2,440,450,460,470)
+	AddRecipe(55375,440,41391,4,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,55375,1,2,3,36,41,51,59)
 	self:addTradeAcquire(RecipeDB,55375,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Tempered Titansteel Treads -- 55376
-	self:addTradeSkill(RecipeDB,55376,440,41392,4,2018,nil,2,450,450,460,470)
+	AddRecipe(55376,440,41392,4,2,450,450,460,470)
 	self:addTradeFlags(RecipeDB,55376,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,55376,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Brilliant Titansteel Treads -- 55377
-	self:addTradeSkill(RecipeDB,55377,440,41394,4,2018,nil,2,440,450,460,470)
+	AddRecipe(55377,440,41394,4,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,55377,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,55377,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Socket Bracer -- 55628
-	self:addTradeSkill(RecipeDB,55628,400,nil,1,2018,nil,2,400,400,400,400)
+	AddRecipe(55628,400,nil,1,2,400,400,400,400)
 	self:addTradeFlags(RecipeDB,55628,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,55628,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Socket Gloves -- 55641
-	self:addTradeSkill(RecipeDB,55641,400,nil,1,2018,nil,2,400,400,400,400)
+	AddRecipe(55641,400,nil,1,2,400,400,400,400)
 	self:addTradeFlags(RecipeDB,55641,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,55641,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Eternal Belt Buckle -- 55656
-	self:addTradeSkill(RecipeDB,55656,415,41611,3,2018,nil,2,415,420,425,430)
+	AddRecipe(55656,415,41611,3,2,415,420,425,430)
 	self:addTradeFlags(RecipeDB,55656,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,55656,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Titanium Rod -- 55732
-	self:addTradeSkill(RecipeDB,55732,420,41745,1,2018,nil,2,420,425,430,435)
+	AddRecipe(55732,420,41745,1,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,55732,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,55732,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Cobalt Bracers -- 55834
-	self:addTradeSkill(RecipeDB,55834,360,41974,2,2018,nil,2,360,370,375,380)
+	AddRecipe(55834,360,41974,2,2,360,370,375,380)
 	self:addTradeFlags(RecipeDB,55834,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,55834,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Cobalt Gauntlets -- 55835
-	self:addTradeSkill(RecipeDB,55835,370,41975,2,2018,nil,2,370,380,385,390)
+	AddRecipe(55835,370,41975,2,2,370,380,385,390)
 	self:addTradeFlags(RecipeDB,55835,1,2,3,36,41,52,59)
 	self:addTradeAcquire(RecipeDB,55835,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Titanium Weapon Chain -- 55839
-	self:addTradeSkill(RecipeDB,55839,420,41976,2,2018,nil,2,420,425,430,435)
+	AddRecipe(55839,420,41976,2,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,55839,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,55839,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Titansteel Shanker -- 56234
-	self:addTradeSkill(RecipeDB,56234,440,42435,4,2018,nil,2,440,450,460,470)
+	AddRecipe(56234,440,42435,4,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,56234,1,2,3,36,41,51,66,72)
 	self:addTradeAcquire(RecipeDB,56234,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Cudgel of Saronite Justice -- 56280
-	self:addTradeSkill(RecipeDB,56280,410,42443,3,2018,nil,2,410,415,420,425)
+	AddRecipe(56280,410,42443,3,2,410,415,420,425)
 	self:addTradeFlags(RecipeDB,56280,1,2,3,36,41,53,54,66,70)
 	self:addTradeAcquire(RecipeDB,56280,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Titanium Shield Spike -- 56357
-	self:addTradeSkill(RecipeDB,56357,420,42500,1,2018,nil,2,420,425,430,435)
+	AddRecipe(56357,420,42500,1,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,56357,1,2,3,36,41,52,64)
 	self:addTradeAcquire(RecipeDB,56357,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Titansteel Shield Wall -- 56400
-	self:addTradeSkill(RecipeDB,56400,440,42508,4,2018,nil,2,450,450,460,470)
+	AddRecipe(56400,440,42508,4,2,450,450,460,470)
 	self:addTradeFlags(RecipeDB,56400,1,2,3,36,41,52,64,66)
 	self:addTradeAcquire(RecipeDB,56400,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Ornate Saronite Bracers -- 56549
-	self:addTradeSkill(RecipeDB,56549,420,42723,1,2018,nil,2,420,425,430,435)
+	AddRecipe(56549,420,42723,1,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,56549,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,56549,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Ornate Saronite Pauldrons -- 56550
-	self:addTradeSkill(RecipeDB,56550,420,42727,1,2018,nil,2,420,430,440,450)
+	AddRecipe(56550,420,42727,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,56550,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,56550,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Ornate Saronite Waistguard -- 56551
-	self:addTradeSkill(RecipeDB,56551,420,42729,1,2018,nil,2,420,430,440,450)
+	AddRecipe(56551,420,42729,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,56551,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,56551,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Ornate Saronite Walkers -- 56552
-	self:addTradeSkill(RecipeDB,56552,420,42730,3,2018,nil,2,420,430,440,450)
+	AddRecipe(56552,420,42730,3,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,56552,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,56552,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Ornate Saronite Gauntlets -- 56553
-	self:addTradeSkill(RecipeDB,56553,420,42724,1,2018,nil,2,420,430,440,450)
+	AddRecipe(56553,420,42724,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,56553,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,56553,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Ornate Saronite Legplates -- 56554
-	self:addTradeSkill(RecipeDB,56554,425,42726,1,2018,nil,2,425,435,445,455)
+	AddRecipe(56554,425,42726,1,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,56554,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,56554,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Ornate Saronite Hauberk -- 56555
-	self:addTradeSkill(RecipeDB,56555,425,42725,1,2018,nil,2,425,435,445,455)
+	AddRecipe(56555,425,42725,1,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,56555,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,56555,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Ornate Saronite Skullshield -- 56556
-	self:addTradeSkill(RecipeDB,56556,425,42728,3,2018,nil,2,425,435,445,455)
+	AddRecipe(56556,425,42728,3,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,56556,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,56556,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Cobalt Skeleton Key -- 59405
-	self:addTradeSkill(RecipeDB,59405,350,43854,1,2018,nil,2,350,360,365,370)
+	AddRecipe(59405,350,43854,1,2,350,360,365,370)
 	self:addTradeFlags(RecipeDB,59405,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,59405,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Titanium Skeleton Key -- 59406
-	self:addTradeSkill(RecipeDB,59406,430,43853,1,2018,nil,2,430,435,440,445)
+	AddRecipe(59406,430,43853,1,2,430,435,440,445)
 	self:addTradeFlags(RecipeDB,59406,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,59406,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Brilliant Saronite Belt -- 59436
-	self:addTradeSkill(RecipeDB,59436,395,43860,1,2018,nil,2,395,400,405,410)
+	AddRecipe(59436,395,43860,1,2,395,400,405,410)
 	self:addTradeFlags(RecipeDB,59436,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,59436,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Brilliant Saronite Bracers -- 59438
-	self:addTradeSkill(RecipeDB,59438,400,43864,1,2018,nil,2,400,405,410,415)
+	AddRecipe(59438,400,43864,1,2,400,405,410,415)
 	self:addTradeFlags(RecipeDB,59438,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,59438,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Brilliant Saronite Pauldrons -- 59440
-	self:addTradeSkill(RecipeDB,59440,405,43865,1,2018,nil,2,405,410,415,420)
+	AddRecipe(59440,405,43865,1,2,405,410,415,420)
 	self:addTradeFlags(RecipeDB,59440,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,59440,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Brilliant Saronite Helm -- 59441
-	self:addTradeSkill(RecipeDB,59441,415,43870,1,2018,nil,2,405,410,415,420)
+	AddRecipe(59441,415,43870,1,2,405,410,415,420)
 	self:addTradeFlags(RecipeDB,59441,1,2,3,36,41,53,54,59)
 	self:addTradeAcquire(RecipeDB,59441,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Saronite Spellblade -- 59442
-	self:addTradeSkill(RecipeDB,59442,410,43871,1,2018,nil,2,410,415,420,425)
+	AddRecipe(59442,410,43871,1,2,410,415,420,425)
 	self:addTradeFlags(RecipeDB,59442,1,2,3,36,41,53,54,66,69)
 	self:addTradeAcquire(RecipeDB,59442,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Icebane Chestguard -- 61008
-	self:addTradeSkill(RecipeDB,61008,425,43586,1,2018,nil,2,425,435,445,455)
+	AddRecipe(61008,425,43586,1,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,61008,1,2,3,36,41,59)
 	self:addTradeAcquire(RecipeDB,61008,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Icebane Girdle -- 61009
-	self:addTradeSkill(RecipeDB,61009,420,43587,1,2018,nil,2,420,430,440,450)
+	AddRecipe(61009,420,43587,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,61009,1,2,3,36,41,59)
 	self:addTradeAcquire(RecipeDB,61009,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Icebane Treads -- 61010
-	self:addTradeSkill(RecipeDB,61010,420,43588,1,2018,nil,2,420,430,440,450)
+	AddRecipe(61010,420,43588,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,61010,1,2,3,36,41,59)
 	self:addTradeAcquire(RecipeDB,61010,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

 	-- Orcish War Leggings -- 9957
-	self:addTradeSkill(RecipeDB, 9957,250,7929,2,2018,nil,GAME_ORIG,250,250,260,270)
+	AddRecipe( 9957,250,7929,2,GAME_ORIG,250,250,260,270)
 	self:addTradeFlags(RecipeDB, 9957,2,8,36,41,51,58)
 	self:addTradeAcquire(RecipeDB, 9957,4,2756)

 	-- Dark Iron Mail -- 15293
-	self:addTradeSkill(RecipeDB,15293,270,11606,2,2018,nil,GAME_ORIG,270,290,300,310)
+	AddRecipe(15293,270,11606,2,GAME_ORIG,270,290,300,310)
 	self:addTradeFlags(RecipeDB,15293,1,2,5,36,41,58)
 	self:addTradeAcquire(RecipeDB,15293,8,25)

 	-- Dark Iron Shoulders -- 15295
-	self:addTradeSkill(RecipeDB,15295,280,11605,2,2018,nil,GAME_ORIG,280,300,310,320)
+	AddRecipe(15295,280,11605,2,GAME_ORIG,280,300,310,320)
 	self:addTradeFlags(RecipeDB,15295,1,2,5,36,41,59)
 	self:addTradeAcquire(RecipeDB,15295,8,25)

 	-- Titanium Plating -- 62202
-	self:addTradeSkill(RecipeDB,62202,450,44936,3,2018,nil,2,450,455,460,465)
+	AddRecipe(62202,450,44936,3,2,450,455,460,465)
 	self:addTradeFlags(RecipeDB,62202,1,2,4,36,41,52,64)
 	self:addTradeAcquire(RecipeDB,62202,6,1052,4,32565,6,1052,4,32774,6,1037,4,32564,6,1037,4,32773)

 	-- Battlelord's Plate Boots -- 63188
-	self:addTradeSkill(RecipeDB,63188,450,45089,4,2018,nil,2,450,455,465,475)
+	AddRecipe(63188,450,45089,4,2,450,455,465,475)
 	self:addTradeFlags(RecipeDB,63188,1,2,6,11,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,63188,8,39)

 	-- Belt of the Titans -- 63187
-	self:addTradeSkill(RecipeDB,63187,450,45088,4,2018,nil,2,450,455,465,475)
+	AddRecipe(63187,450,45088,4,2,450,455,465,475)
 	self:addTradeFlags(RecipeDB,63187,1,2,6,11,36,40,51,59)
 	self:addTradeAcquire(RecipeDB,63187,8,39)

 	-- Indestructible Plate Girdle -- 63191
-	self:addTradeSkill(RecipeDB,63191,450,45092,4,2018,nil,2,450,455,465,475)
+	AddRecipe(63191,450,45092,4,2,450,455,465,475)
 	self:addTradeFlags(RecipeDB,63191,1,2,6,11,36,40,52,59)
 	self:addTradeAcquire(RecipeDB,63191,8,39)

 	-- Plate Girdle of the Righteous -- 63189
-	self:addTradeSkill(RecipeDB,63189,450,45090,4,2018,nil,2,450,455,465,475)
+	AddRecipe(63189,450,45090,4,2,450,455,465,475)
 	self:addTradeFlags(RecipeDB,63189,1,2,6,11,36,40,53,54,59)
 	self:addTradeAcquire(RecipeDB,63189,8,39)

 	-- Spiked Deathdealers -- 63192
-	self:addTradeSkill(RecipeDB,63192,450,45093,4,2018,nil,2,450,455,465,475)
+	AddRecipe(63192,450,45093,4,2,450,455,465,475)
 	self:addTradeFlags(RecipeDB,63192,1,2,6,11,36,40,52,59)
 	self:addTradeAcquire(RecipeDB,63192,8,39)

 	-- Treads of Destiny -- 63190
-	self:addTradeSkill(RecipeDB,63190,450,45091,4,2018,nil,2,450,455,465,475)
+	AddRecipe(63190,450,45091,4,2,450,455,465,475)
 	self:addTradeFlags(RecipeDB,63190,1,2,6,11,36,40,53,54,59)
 	self:addTradeAcquire(RecipeDB,63190,8,39)

 	-- Titansteel Spellblade -- 63182
-	self:addTradeSkill(RecipeDB,63182,440,45085,4,2018,nil,2,440,450,460,470)
+	AddRecipe(63182,440,45085,4,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,63182,1,2,3,36,41,53,54,66,72)
 	self:addTradeAcquire(RecipeDB,63182,1,26564,1,26904,1,26952,1,26981,1,26988,1,27034,1,28694,1,29924,1,33591)

-		-- -- The number of items added with patches
-	-- local patchitems = 0
+	-- The number of items added with patches

 	-- -- 3.3.0 Items
 	-- local version = GetBuildInfo()
@@ -2601,32 +2621,30 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- if (version == "3.3.0") then

 	 -- Puresteel Legplates
-	 -- self:addTradeSkill(RecipeDB,)
+	 -- AddRecipe()
 	 -- self:addTradeFlags(RecipeDB,)
 	 -- self:addTradeAcquire(RecipeDB,)
 	 -- Protectors of Life
-	 -- self:addTradeSkill(RecipeDB,)
+	 -- AddRecipe()
 	 -- self:addTradeFlags(RecipeDB,)
 	 -- self:addTradeAcquire(RecipeDB,)
 	 -- Legplates of Painful Death
-	 -- self:addTradeSkill(RecipeDB,)
+	 -- AddRecipe()
 	 -- self:addTradeFlags(RecipeDB,)
 	 -- self:addTradeAcquire(RecipeDB,)
 	 -- Hellfrozen Bonegrinders
-	 -- self:addTradeSkill(RecipeDB,)
+	 -- AddRecipe()
 	 -- self:addTradeFlags(RecipeDB,)
 	 -- self:addTradeAcquire(RecipeDB,)
 	 -- Pillars of Might
-	  -- self:addTradeSkill(RecipeDB,)
+	  -- AddRecipe()
 	 -- self:addTradeFlags(RecipeDB,)
 	 -- self:addTradeAcquire(RecipeDB,)
 	 -- Boots of Kingly Upheaval
-	 -- self:addTradeSkill(RecipeDB,)
+	 -- AddRecipe()
 	 -- self:addTradeFlags(RecipeDB,)
 	 -- self:addTradeAcquire(RecipeDB,)

-		--patchitems = 6
-
 	 --end

 	-- Some recipes are only availible to specific factions.
@@ -2639,73 +2657,69 @@ function addon:InitBlacksmithing(RecipeDB)
 	if (faction == BFAC["Alliance"]) then

 		-- Breastplate of the White Knight (Ally) -- 67091
-		self:addTradeSkill(RecipeDB,67091,450,47591,4,2018,nil,2,450,455,465,475)
+		AddRecipe(67091,450,47591,4,2,450,455,465,475)
 		self:addTradeFlags(RecipeDB,67091,1,6,11,36,40,52,59)
 		self:addTradeAcquire(RecipeDB,67091,8,42)

 		-- Saronite Swordbreakers (Ally) -- 67092
-		self:addTradeSkill(RecipeDB,67092,450,47570,4,2018,nil,2,450,455,465,475)
+		AddRecipe(67092,450,47570,4,2,450,455,465,475)
 		self:addTradeFlags(RecipeDB,67092,1,6,11,36,40,52,59)
 		self:addTradeAcquire(RecipeDB,67092,8,42)

 		-- Sunforged Bracers (Ally) -- 67096
-		self:addTradeSkill(RecipeDB,67096,450,47574,4,2018,nil,2,450,455,465,475)
+		AddRecipe(67096,450,47574,4,2,450,455,465,475)
 		self:addTradeFlags(RecipeDB,67096,1,6,11,36,40,53,59)
 		self:addTradeAcquire(RecipeDB,67096,8,42)

 		-- Sunforged Breastplate (Ally) -- 67095
-		self:addTradeSkill(RecipeDB,67095,450,47593,4,2018,nil,2,450,460,467,475)
+		AddRecipe(67095,450,47593,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67095,1,6,11,36,40,53,59)
 		self:addTradeAcquire(RecipeDB,67095,8,42)

 		-- Titanium Razorplate (Ally) -- 67093
-		self:addTradeSkill(RecipeDB,67093,450,47589,4,2018,nil,2,450,455,465,475)
+		AddRecipe(67093,450,47589,4,2,450,455,465,475)
 		self:addTradeFlags(RecipeDB,67093,1,6,11,36,40,51,59)
 		self:addTradeAcquire(RecipeDB,67093,8,42)

 		-- Titanium Spikeguards (Ally) -- 67094
-		self:addTradeSkill(RecipeDB,67094,450,47572,4,2018,nil,2,450,455,465,475)
+		AddRecipe(67094,450,47572,4,2,450,455,465,475)
 		self:addTradeFlags(RecipeDB,67094,1,6,11,36,40,51,59)
 		self:addTradeAcquire(RecipeDB,67094,8,42)

-		factioncount = 6
-
 	elseif (faction == BFAC["Horde"]) then

 		-- Breastplate of the White Knight (Horde) -- 67130
-		self:addTradeSkill(RecipeDB,67130,450,47592,4,2018,nil,2,450,455,465,475)
+		AddRecipe(67130,450,47592,4,2,450,455,465,475)
 		self:addTradeFlags(RecipeDB,67130,2,6,11,36,40,52,59)
 		self:addTradeAcquire(RecipeDB,67130,8,42)

 		-- Saronite Swordbreakers (Horde) -- 67131
-		self:addTradeSkill(RecipeDB,67131,450,47571,4,2018,nil,2,450,455,465,475)
+		AddRecipe(67131,450,47571,4,2,450,455,465,475)
 		self:addTradeFlags(RecipeDB,67131,2,6,11,36,40,52,59)
 		self:addTradeAcquire(RecipeDB,67131,8,42)

 		-- Sunforged Bracers (Horde) -- 67135
-		self:addTradeSkill(RecipeDB,67135,450,47575,4,2018,nil,2,450,455,465,475)
+		AddRecipe(67135,450,47575,4,2,450,455,465,475)
 		self:addTradeFlags(RecipeDB,67135,2,6,11,36,40,53,54,59)
 		self:addTradeAcquire(RecipeDB,67135,8,42)

 		-- Sunforged Breastplate (Horde) -- 67134
-		self:addTradeSkill(RecipeDB,67134,450,47594,4,2018,nil,2,450,460,467,475)
+		AddRecipe(67134,450,47594,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67134,2,6,11,36,40,53,54,59)
 		self:addTradeAcquire(RecipeDB,67134,8,42)

 		-- Titanium Razorplate (Horde) -- 67132
-		self:addTradeSkill(RecipeDB,67132,450,47590,4,2018,nil,2,450,455,465,475)
+		AddRecipe(67132,450,47590,4,2,450,455,465,475)
 		self:addTradeFlags(RecipeDB,67132,2,6,11,36,40,51,59)
 		self:addTradeAcquire(RecipeDB,67132,8,42)

 		-- Titanium Spikeguards (Horde) -- 67133
-		self:addTradeSkill(RecipeDB,67133,450,47573,4,2018,nil,2,450,455,465,475)
+		AddRecipe(67133,450,47573,4,2,450,455,465,475)
 		self:addTradeFlags(RecipeDB,67133,2,6,11,36,40,51,59)
 		self:addTradeAcquire(RecipeDB,67133,8,42)

-		factioncount = 6
-
 	end

-	return 486 + factioncount --+ patchitems
+	return num_recipes

 end
diff --git a/RecipeDB/ARL-Enchant.lua b/RecipeDB/ARL-Enchant.lua
index 7069afd..e083f7f 100644
--- a/RecipeDB/ARL-Enchant.lua
+++ b/RecipeDB/ARL-Enchant.lua
@@ -1,1548 +1,1568 @@
---[[
-
-************************************************************************
-
-ARL-Enchant.lua
-
-Enchanting data for all of Ackis Recipe List
-
-************************************************************************
-
-File date: @file-date-iso@
-File revision: @file-revision@
-Project revision: @project-revision@
-Project version: @project-version@
-
-************************************************************************
-
-Please see http://www.wowace.com/projects/arl/for more information.
-
-License:
-	Please see LICENSE.txt
-
-This source code is released under All Rights Reserved.
-
-************************************************************************
-
-]]--
-
-local MODNAME		= "Ackis Recipe List"
-local addon		= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
-local L			= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
-
-local initialized	= false
+--------------------------------------------------------------------------------------------------------------------
+-- ARL-Enchant.lua
+-- Enchanting data for all of Ackis Recipe List
+--------------------------------------------------------------------------------------------------------------------
+-- File date: @file-date-iso@
+-- File revision: @file-revision@
+-- Project revision: @project-revision@
+-- Project version: @project-version@
+--------------------------------------------------------------------------------------------------------------------
+-- Please see http://www.wowace.com/projects/arl/for more information.
+--------------------------------------------------------------------------------------------------------------------
+-- License:
+-- Please see LICENSE.txt
+-- This source code is released under All Rights Reserved.
+--------------------------------------------------------------------------------------------------------------------
+
+local MODNAME = "Ackis Recipe List"
+local addon	= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
+local L	= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
+
+--------------------------------------------------------------------------------------------------------------------
+-- Item "rarity"
+--------------------------------------------------------------------------------------------------------------------
+local R_COMMON, R_UNCOMMON, R_RARE, R_EPIC, R_LEGENDARY, R_ARTIFACT = 1, 2, 3, 4, 5, 6
+
+--------------------------------------------------------------------------------------------------------------------
+-- Origin
+--------------------------------------------------------------------------------------------------------------------
+local GAME_ORIG, GAME_TBC, GAME_WOTLK = 0, 1, 2
+
+--------------------------------------------------------------------------------------------------------------------
+-- Filter flags
+--------------------------------------------------------------------------------------------------------------------
+local F_ALLIANCE, F_HORDE, F_TRAINER, F_VENDOR, F_INSTANCE, F_RAID = 1, 2, 3, 4, 5, 6
+local F_SEASONAL, F_QUEST, F_PVP, F_WORLD_DROP, F_MOB_DROP, F_DISC = 7, 8, 9, 10, 11, 12
+local F_DK, F_DRUID, F_HUNTER, F_MAGE, F_PALADIN, F_PRIEST, F_SHAMAN, F_ROGUE, F_WARLOCK, F_WARRIOR = 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
+local F_IBOE, F_IBOP, F_IBOA, F_RBOE, F_RBOP, F_RBOA = 36, 37, 38, 40, 41, 42
+local F_DPS, F_TANK, F_HEALER, F_CASTER = 51, 52, 53, 54
+local F_CLOTH, F_LEATHER, F_MAIL, F_PLATE, F_CLOAK, F_TRINKET, F_RING, F_NECK, F_SHIELD = 56, 57, 58, 59, 60, 61, 62, 63, 64
+local F_1H, F_2H, F_AXE, F_SWORD, F_MACE, F_POLEARM, F_DAGGER = 66, 67, 68, 69, 70, 71, 72
+local F_STAFF, F_WAND, F_THROWN, F_BOW, F_XBOW, F_AMMO, F_FIST, F_GUN = 73, 74, 75, 76, 77, 78, 79, 80
+
+--------------------------------------------------------------------------------------------------------------------
+-- Acquire types
+--------------------------------------------------------------------------------------------------------------------
+local A_TRAINER, A_VENDOR, A_MOB, A_QUEST, A_SEASONAL, A_REPUTATION, A_WORLD_DROP, A_CUSTOM = 1, 2, 3, 4, 5, 6, 7, 8
+
+
+local initialized = false
+local num_recipes = 0

 function addon:InitEnchanting(RecipeDB)

 	if initialized then
-		return
+		return num_recipes
 	end

 	initialized = true

+	--------------------------------------------------------------------------------------------------------------------
+	-- Counter and wrapper function
+	--------------------------------------------------------------------------------------------------------------------
+	local function AddRecipe(SpellID, Skill, ItemID, Rarity, Game, Orange, Yellow, Green, Gray)
+		num_recipes = num_recipes + 1
+		self:addTradeSkill(RecipeDB, SpellID, Skill, ItemID, Rarity, 7411, nil, Game, Orange, Yellow, Green, Gray)
+	end
+
 	-- Enchant Bracer - Minor Health -- 7418
-	self:addTradeSkill(RecipeDB,7418,1,nil,1,7411,nil,GAME_ORIG,1,70,90,110)
+	AddRecipe(7418,1,nil,1,GAME_ORIG,1,70,90,110)
 	self:addTradeFlags(RecipeDB,7418,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,7418,8,8)

 	-- Enchant Chest - Minor Health -- 7420
-	self:addTradeSkill(RecipeDB,7420,15,nil,1,7411,nil,GAME_ORIG,15,70,90,110)
+	AddRecipe(7420,15,nil,1,GAME_ORIG,15,70,90,110)
 	self:addTradeFlags(RecipeDB,7420,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,7420,1,1317,1,3011,1,3345,1,3606,1,4213,1,4616,1,5157,1,5695,
 	1,11072,1,11073,1,11074,1,16160,1,16633,1,16725,1,19251,1,19252,1,33610,1,33676,1,18773,1,7949,1,19540,1,18753)

 	-- Runed Copper Rod -- 7421
-	self:addTradeSkill(RecipeDB,7421,1,6218,1,7411,nil,GAME_ORIG,1,5,7,10)
+	AddRecipe(7421,1,6218,1,GAME_ORIG,1,5,7,10)
 	self:addTradeFlags(RecipeDB,7421,1,2,3,37,41)
 	self:addTradeAcquire(RecipeDB,7421,8,8)

 	-- Enchant Chest - Minor Absorption -- 7426
-	self:addTradeSkill(RecipeDB,7426,40,nil,1,7411,nil,GAME_ORIG,40,90,110,130)
+	AddRecipe(7426,40,nil,1,GAME_ORIG,40,90,110,130)
 	self:addTradeFlags(RecipeDB,7426,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,7426,1,1317,1,3011,1,3345,1,3606,1,4213,1,4616,1,5157,1,5695,
 	1,11072,1,11073,1,11074,1,16160,1,16633,1,16725,1,19251,1,19252,1,33610,1,33676,1,18773,1,7949,1,19540,1,18753)

 	-- Enchant Bracer - Minor Deflection -- 7428
-	self:addTradeSkill(RecipeDB,7428,1,nil,1,7411,nil,GAME_ORIG,1,80,100,120)
+	AddRecipe(7428,1,nil,1,GAME_ORIG,1,80,100,120)
 	self:addTradeFlags(RecipeDB,7428,1,2,3,36,41,52)
 	self:addTradeAcquire(RecipeDB,7428,8,8)

 	-- Enchant Chest - Minor Mana -- 7443
-	self:addTradeSkill(RecipeDB,7443,20,nil,1,7411,nil,GAME_ORIG,20,80,100,120)
+	AddRecipe(7443,20,nil,1,GAME_ORIG,20,80,100,120)
 	self:addTradeFlags(RecipeDB,7443,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,7443,7,1)

 	-- Enchant Cloak - Minor Resistance -- 7454
-	self:addTradeSkill(RecipeDB,7454,45,nil,1,7411,nil,GAME_ORIG,45,95,115,135)
+	AddRecipe(7454,45,nil,1,GAME_ORIG,45,95,115,135)
 	self:addTradeFlags(RecipeDB,7454,1,2,3,36,40,60)
 	self:addTradeAcquire(RecipeDB,7454,1,1317,1,3011,1,3345,1,3606,1,4213,1,4616,1,5157,1,5695,
 	1,11072,1,11073,1,11074,1,16160,1,16633,1,16725,1,19251,1,19252,1,33610,1,33676,1,18773,1,7949,1,19540,1,18753)

 	-- Enchant Bracer - Minor Stamina -- 7457
-	self:addTradeSkill(RecipeDB,7457,50,nil,1,7411,nil,GAME_ORIG,50,100,120,140)
+	AddRecipe(7457,50,nil,1,GAME_ORIG,50,100,120,140)
 	self:addTradeFlags(RecipeDB,7457,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,7457,1,1317,1,3011,1,3345,1,3606,1,4213,1,4616,1,5157,1,5695,
 	1,11072,1,11073,1,11074,1,16160,1,16633,1,16725,1,19251,1,19252,1,33610,1,33676,1,18773,1,7949,1,19540,1,18753)

 	-- Enchant 2H Weapon - Minor Impact -- 7745
-	self:addTradeSkill(RecipeDB,7745,100,nil,1,7411,nil,GAME_ORIG,100,130,150,170)
+	AddRecipe(7745,100,nil,1,GAME_ORIG,100,130,150,170)
 	self:addTradeFlags(RecipeDB,7745,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,7745,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,11072,1,11073,1,11074,1,16633,1,16725,
 	1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,7949,1,19540,1,18753,1,16160)

 	-- Enchant Chest - Lesser Health -- 7748
-	self:addTradeSkill(RecipeDB,7748,60,nil,1,7411,nil,GAME_ORIG,60,105,125,145)
+	AddRecipe(7748,60,nil,1,GAME_ORIG,60,105,125,145)
 	self:addTradeFlags(RecipeDB,7748,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,7748,1,1317,1,3011,1,3345,1,3606,1,4213,1,4616,1,5157,1,5695,
 	1,11072,1,11073,1,11074,1,16160,1,16633,1,16725,1,19251,1,19252,1,33610,1,33676,1,18773,1,7949,1,19540,1,18753)

 	-- Enchant Bracer - Minor Spirit -- 7766
-	self:addTradeSkill(RecipeDB,7766,60,nil,1,7411,nil,GAME_ORIG,60,105,125,145)
+	AddRecipe(7766,60,nil,1,GAME_ORIG,60,105,125,145)
 	self:addTradeFlags(RecipeDB,7766,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,7766,7,1)

 	-- Enchant Cloak - Minor Protection -- 7771
-	self:addTradeSkill(RecipeDB,7771,90,nil,1,7411,nil,GAME_ORIG,90,110,130,150)
+	AddRecipe(7771,90,nil,1,GAME_ORIG,90,110,130,150)
 	self:addTradeFlags(RecipeDB,7771,1,2,3,36,40,60)
 	self:addTradeAcquire(RecipeDB,7771,1,1317,1,3011,1,3345,1,3606,1,4213,1,4616,1,5157,1,5695,
 	1,11072,1,11073,1,11074,1,16160,1,16633,1,16725,1,19251,1,19252,1,33610,1,33676,1,18773,1,7949,1,19540,1,18753)

 	-- Enchant Chest - Lesser Mana -- 7776
-	self:addTradeSkill(RecipeDB,7776,80,nil,1,7411,nil,GAME_ORIG,80,115,135,155)
+	AddRecipe(7776,80,nil,1,GAME_ORIG,80,115,135,155)
 	self:addTradeFlags(RecipeDB,7776,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,7776,2,3346,2,5757)

 	-- Enchant Bracer - Minor Agility -- 7779
-	self:addTradeSkill(RecipeDB,7779,80,nil,1,7411,nil,GAME_ORIG,80,115,135,155)
+	AddRecipe(7779,80,nil,1,GAME_ORIG,80,115,135,155)
 	self:addTradeFlags(RecipeDB,7779,1,2,3,36,40,51)
 	self:addTradeAcquire(RecipeDB,7779,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,7949,1,19540,1,18753,1,16160)

 	-- Enchant Bracer - Minor Strength -- 7782
-	self:addTradeSkill(RecipeDB,7782,80,nil,1,7411,nil,GAME_ORIG,80,115,135,155)
+	AddRecipe(7782,80,nil,1,GAME_ORIG,80,115,135,155)
 	self:addTradeFlags(RecipeDB,7782,1,2,10,36,40,51)
 	self:addTradeAcquire(RecipeDB,7782,7,1)

 	-- Enchant Weapon - Minor Beastslayer -- 7786
-	self:addTradeSkill(RecipeDB,7786,90,nil,1,7411,nil,GAME_ORIG,90,120,140,160)
+	AddRecipe(7786,90,nil,1,GAME_ORIG,90,120,140,160)
 	self:addTradeFlags(RecipeDB,7786,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,7786,7,1)

 	-- Enchant Weapon - Minor Striking -- 7788
-	self:addTradeSkill(RecipeDB,7788,90,nil,1,7411,nil,GAME_ORIG,90,120,140,160)
+	AddRecipe(7788,90,nil,1,GAME_ORIG,90,120,140,160)
 	self:addTradeFlags(RecipeDB,7788,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,7788,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,7949,1,19540,1,18753,1,16160)

 	-- Enchant 2H Weapon - Lesser Intellect -- 7793
-	self:addTradeSkill(RecipeDB,7793,100,nil,1,7411,nil,GAME_ORIG,100,130,150,170)
+	AddRecipe(7793,100,nil,1,GAME_ORIG,100,130,150,170)
 	self:addTradeFlags(RecipeDB,7793,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,7793,2,3012,2,3346,2,5158,2,5758)

 	-- Runed Silver Rod -- 7795
-	self:addTradeSkill(RecipeDB,7795,100,6339,1,7411,nil,GAME_ORIG,100,130,150,170)
+	AddRecipe(7795,100,6339,1,GAME_ORIG,100,130,150,170)
 	self:addTradeFlags(RecipeDB,7795,1,2,3,37,41)
 	self:addTradeAcquire(RecipeDB,7795,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,7949,1,19540,1,18753,1,16160)

 	-- Enchant Chest - Health -- 7857
-	self:addTradeSkill(RecipeDB,7857,120,nil,1,7411,nil,GAME_ORIG,120,145,165,185)
+	AddRecipe(7857,120,nil,1,GAME_ORIG,120,145,165,185)
 	self:addTradeFlags(RecipeDB,7857,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,7857,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,7949,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,19540,1,18753,1,16160)

 	-- Enchant Bracer - Lesser Spirit -- 7859
-	self:addTradeSkill(RecipeDB,7859,120,nil,1,7411,nil,GAME_ORIG,120,145,165,185)
+	AddRecipe(7859,120,nil,1,GAME_ORIG,120,145,165,185)
 	self:addTradeFlags(RecipeDB,7859,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,7859,7,1)

 	-- Enchant Cloak - Lesser Fire Resistance -- 7861
-	self:addTradeSkill(RecipeDB,7861,125,nil,1,7411,nil,GAME_ORIG,125,150,170,190)
+	AddRecipe(7861,125,nil,1,GAME_ORIG,125,150,170,190)
 	self:addTradeFlags(RecipeDB,7861,1,2,3,36,40,60)
 	self:addTradeAcquire(RecipeDB,7861,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,7949,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,19540,1,18753,1,16160)

 	-- Enchant Boots - Minor Stamina -- 7863
-	self:addTradeSkill(RecipeDB,7863,125,nil,1,7411,nil,GAME_ORIG,125,150,170,190)
+	AddRecipe(7863,125,nil,1,GAME_ORIG,125,150,170,190)
 	self:addTradeFlags(RecipeDB,7863,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,7863,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,7949,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,19540,1,18753,1,16160)

 	-- Enchant Boots - Minor Agility -- 7867
-	self:addTradeSkill(RecipeDB,7867,125,nil,1,7411,nil,GAME_ORIG,125,150,170,190)
+	AddRecipe(7867,125,nil,1,GAME_ORIG,125,150,170,190)
 	self:addTradeFlags(RecipeDB,7867,1,2,4,36,40,51)
 	self:addTradeAcquire(RecipeDB,7867,2,3012,2,3537)

 	-- Enchant Shield - Minor Stamina -- 13378
-	self:addTradeSkill(RecipeDB,13378,105,nil,1,7411,nil,GAME_ORIG,105,130,150,170)
+	AddRecipe(13378,105,nil,1,GAME_ORIG,105,130,150,170)
 	self:addTradeFlags(RecipeDB,13378,1,2,3,36,40,64)
 	self:addTradeAcquire(RecipeDB,13378,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,7949,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,19540,1,18753,1,16160)

 	-- Enchant 2H Weapon - Lesser Spirit -- 13380
-	self:addTradeSkill(RecipeDB,13380,110,nil,1,7411,nil,GAME_ORIG,110,135,155,175)
+	AddRecipe(13380,110,nil,1,GAME_ORIG,110,135,155,175)
 	self:addTradeFlags(RecipeDB,13380,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,13380,7,1)

 	-- Enchant Cloak - Minor Agility -- 13419
-	self:addTradeSkill(RecipeDB,13419,110,nil,1,7411,nil,GAME_ORIG,110,135,155,175)
+	AddRecipe(13419,110,nil,1,GAME_ORIG,110,135,155,175)
 	self:addTradeFlags(RecipeDB,13419,1,2,4,10,36,40,51,60)
 	self:addTradeAcquire(RecipeDB,13419,7,1,2,3954,2,12043)

 	-- Enchant Cloak - Lesser Protection -- 13421
-	self:addTradeSkill(RecipeDB,13421,115,nil,1,7411,nil,GAME_ORIG,115,140,160,180)
+	AddRecipe(13421,115,nil,1,GAME_ORIG,115,140,160,180)
 	self:addTradeFlags(RecipeDB,13421,1,2,3,36,40,60)
 	self:addTradeAcquire(RecipeDB,13421,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,7949,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,19540,1,18753,1,16160)

 	-- Enchant Shield - Lesser Protection -- 13464
-	self:addTradeSkill(RecipeDB,13464,115,nil,1,7411,nil,GAME_ORIG,115,140,160,180)
+	AddRecipe(13464,115,nil,1,GAME_ORIG,115,140,160,180)
 	self:addTradeFlags(RecipeDB,13464,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,13464,7,1)

 	-- Enchant Shield - Lesser Spirit -- 13485
-	self:addTradeSkill(RecipeDB,13485,130,nil,1,7411,nil,GAME_ORIG,130,155,175,195)
+	AddRecipe(13485,130,nil,1,GAME_ORIG,130,155,175,195)
 	self:addTradeFlags(RecipeDB,13485,1,2,3,36,40,53,54,64)
 	self:addTradeAcquire(RecipeDB,13485,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,7949,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,19540,1,18753,1,16160)

 	-- Enchant Bracer - Lesser Stamina -- 13501
-	self:addTradeSkill(RecipeDB,13501,130,nil,1,7411,nil,GAME_ORIG,130,155,175,195)
+	AddRecipe(13501,130,nil,1,GAME_ORIG,130,155,175,195)
 	self:addTradeFlags(RecipeDB,13501,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13501,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,7949,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,19540,1,18753,1,16160)

 	-- Enchant Weapon - Lesser Striking -- 13503
-	self:addTradeSkill(RecipeDB,13503,140,nil,1,7411,nil,GAME_ORIG,140,165,185,205)
+	AddRecipe(13503,140,nil,1,GAME_ORIG,140,165,185,205)
 	self:addTradeFlags(RecipeDB,13503,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13503,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,7949,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,19540,1,18753,1,16160)

 	-- Enchant Cloak - Lesser Shadow Resistance -- 13522
-	self:addTradeSkill(RecipeDB,13522,135,nil,1,7411,nil,GAME_ORIG,135,160,180,200)
+	AddRecipe(13522,135,nil,1,GAME_ORIG,135,160,180,200)
 	self:addTradeFlags(RecipeDB,13522,1,2,10,36,40,60)
 	self:addTradeAcquire(RecipeDB,13522,7,1)

 	-- Enchant 2H Weapon - Lesser Impact -- 13529
-	self:addTradeSkill(RecipeDB,13529,145,nil,1,7411,nil,GAME_ORIG,145,170,190,210)
+	AddRecipe(13529,145,nil,1,GAME_ORIG,145,170,190,210)
 	self:addTradeFlags(RecipeDB,13529,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13529,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,7949,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,19540,1,18753,1,16160)

 	-- Enchant Bracer - Lesser Strength -- 13536
-	self:addTradeSkill(RecipeDB,13536,140,nil,1,7411,nil,GAME_ORIG,140,165,185,205)
+	AddRecipe(13536,140,nil,1,GAME_ORIG,140,165,185,205)
 	self:addTradeFlags(RecipeDB,13536,1,2,4,36,40,51)
 	self:addTradeAcquire(RecipeDB,13536,2,3954,2,12043)

 	-- Enchant Chest - Lesser Absorption -- 13538
-	self:addTradeSkill(RecipeDB,13538,140,nil,1,7411,nil,GAME_ORIG,140,165,185,205)
+	AddRecipe(13538,140,nil,1,GAME_ORIG,140,165,185,205)
 	self:addTradeFlags(RecipeDB,13538,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13538,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,7949,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,19540,1,18753,1,16160)

 	-- Enchant Chest - Mana -- 13607
-	self:addTradeSkill(RecipeDB,13607,145,nil,1,7411,nil,GAME_ORIG,145,170,190,210)
+	AddRecipe(13607,145,nil,1,GAME_ORIG,145,170,190,210)
 	self:addTradeFlags(RecipeDB,13607,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13607,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,7949,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,19540,1,18753,1,16160)

 	-- Enchant Gloves - Mining -- 13612
-	self:addTradeSkill(RecipeDB,13612,145,nil,1,7411,nil,GAME_ORIG,145,170,190,210)
+	AddRecipe(13612,145,nil,1,GAME_ORIG,145,170,190,210)
 	self:addTradeFlags(RecipeDB,13612,1,2,11,36,40)
 	self:addTradeAcquire(RecipeDB,13612,3,1054,3,1051,3,1052,3,1053,3,1364)

 	-- Enchant Gloves - Herbalism -- 13617
-	self:addTradeSkill(RecipeDB,13617,145,nil,1,7411,nil,GAME_ORIG,145,170,190,210)
+	AddRecipe(13617,145,nil,1,GAME_ORIG,145,170,190,210)
 	self:addTradeFlags(RecipeDB,13617,1,2,11,36,40)
 	self:addTradeAcquire(RecipeDB,13617,3,4030,3,4029,3,3834,3,3919,3,4028)

 	-- Enchant Gloves - Fishing -- 13620
-	self:addTradeSkill(RecipeDB,13620,145,nil,1,7411,nil,GAME_ORIG,145,170,190,210)
+	AddRecipe(13620,145,nil,1,GAME_ORIG,145,170,190,210)
 	self:addTradeFlags(RecipeDB,13620,1,2,11,36,40)
 	self:addTradeAcquire(RecipeDB,13620,3,2375,3,2377,3,2376,3,2374,3,14276)

 	-- Enchant Bracer - Lesser Intellect -- 13622
-	self:addTradeSkill(RecipeDB,13622,150,nil,1,7411,nil,GAME_ORIG,150,175,195,215)
+	AddRecipe(13622,150,nil,1,GAME_ORIG,150,175,195,215)
 	self:addTradeFlags(RecipeDB,13622,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13622,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,7949,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,19540,1,18753,1,16160)

 	-- Enchant Chest - Minor Stats -- 13626
-	self:addTradeSkill(RecipeDB,13626,150,nil,1,7411,nil,GAME_ORIG,150,175,195,215)
+	AddRecipe(13626,150,nil,1,GAME_ORIG,150,175,195,215)
 	self:addTradeFlags(RecipeDB,13626,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13626,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,7949,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,19540,1,18753,1,16160)

 	-- Runed Golden Rod -- 13628
-	self:addTradeSkill(RecipeDB,13628,150,11130,1,7411,nil,GAME_ORIG,150,175,195,215)
+	AddRecipe(13628,150,11130,1,GAME_ORIG,150,175,195,215)
 	self:addTradeFlags(RecipeDB,13628,1,2,3,37,41)
 	self:addTradeAcquire(RecipeDB,13628,1,1317,1,3011,1,3345,1,4213,1,4616,1,5157,1,7949,1,11072,1,11073,1,11074,1,16633,1,16725,1,19251,1,19252,1,33610,1,3606,1,33676,1,18773,1,5695,1,19540,1,18753,1,16160)

 	-- Enchant Shield - Lesser Stamina -- 13631
-	self:addTradeSkill(RecipeDB,13631,155,nil,1,7411,nil,GAME_ORIG,155,175,195,215)
+	AddRecipe(13631,155,nil,1,GAME_ORIG,155,175,195,215)
 	self:addTradeFlags(RecipeDB,13631,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13631,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Cloak - Defense -- 13635
-	self:addTradeSkill(RecipeDB,13635,155,nil,1,7411,nil,GAME_ORIG,155,175,195,215)
+	AddRecipe(13635,155,nil,1,GAME_ORIG,155,175,195,215)
 	self:addTradeFlags(RecipeDB,13635,1,2,3,36,40,52)
 	self:addTradeAcquire(RecipeDB,13635,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Boots - Lesser Agility -- 13637
-	self:addTradeSkill(RecipeDB,13637,160,nil,1,7411,nil,GAME_ORIG,160,180,200,220)
+	AddRecipe(13637,160,nil,1,GAME_ORIG,160,180,200,220)
 	self:addTradeFlags(RecipeDB,13637,1,2,3,36,40,51)
 	self:addTradeAcquire(RecipeDB,13637,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Chest - Greater Health -- 13640
-	self:addTradeSkill(RecipeDB,13640,160,nil,1,7411,nil,GAME_ORIG,160,180,200,220)
+	AddRecipe(13640,160,nil,1,GAME_ORIG,160,180,200,220)
 	self:addTradeFlags(RecipeDB,13640,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13640,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Bracer - Spirit -- 13642
-	self:addTradeSkill(RecipeDB,13642,165,nil,1,7411,nil,GAME_ORIG,165,185,205,225)
+	AddRecipe(13642,165,nil,1,GAME_ORIG,165,185,205,225)
 	self:addTradeFlags(RecipeDB,13642,1,2,3,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,13642,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Boots - Lesser Stamina -- 13644
-	self:addTradeSkill(RecipeDB,13644,170,nil,1,7411,nil,GAME_ORIG,170,190,210,230)
+	AddRecipe(13644,170,nil,1,GAME_ORIG,170,190,210,230)
 	self:addTradeFlags(RecipeDB,13644,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13644,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Bracer - Lesser Deflection -- 13646
-	self:addTradeSkill(RecipeDB,13646,170,nil,1,7411,nil,GAME_ORIG,170,190,210,230)
+	AddRecipe(13646,170,nil,1,GAME_ORIG,170,190,210,230)
 	self:addTradeFlags(RecipeDB,13646,1,2,4,36,40,52)
 	self:addTradeAcquire(RecipeDB,13646,2,2381,2,2821)

 	-- Enchant Bracer - Stamina -- 13648
-	self:addTradeSkill(RecipeDB,13648,170,nil,1,7411,nil,GAME_ORIG,170,190,210,230)
+	AddRecipe(13648,170,nil,1,GAME_ORIG,170,190,210,230)
 	self:addTradeFlags(RecipeDB,13648,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13648,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Weapon - Lesser Beastslayer -- 13653
-	self:addTradeSkill(RecipeDB,13653,175,nil,1,7411,nil,GAME_ORIG,175,195,215,235)
+	AddRecipe(13653,175,nil,1,GAME_ORIG,175,195,215,235)
 	self:addTradeFlags(RecipeDB,13653,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,13653,7,1)

 	-- Enchant Weapon - Lesser Elemental Slayer -- 13655
-	self:addTradeSkill(RecipeDB,13655,175,nil,1,7411,nil,GAME_ORIG,175,195,215,235)
+	AddRecipe(13655,175,nil,1,GAME_ORIG,175,195,215,235)
 	self:addTradeFlags(RecipeDB,13655,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,13655,7,1)

 	-- Enchant Cloak - Fire Resistance -- 13657
-	self:addTradeSkill(RecipeDB,13657,175,nil,1,7411,nil,GAME_ORIG,175,195,215,235)
+	AddRecipe(13657,175,nil,1,GAME_ORIG,175,195,215,235)
 	self:addTradeFlags(RecipeDB,13657,1,2,3,36,40,60)
 	self:addTradeAcquire(RecipeDB,13657,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Shield - Spirit -- 13659
-	self:addTradeSkill(RecipeDB,13659,180,nil,1,7411,nil,GAME_ORIG,180,200,220,240)
+	AddRecipe(13659,180,nil,1,GAME_ORIG,180,200,220,240)
 	self:addTradeFlags(RecipeDB,13659,1,2,3,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,13659,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Bracer - Strength -- 13661
-	self:addTradeSkill(RecipeDB,13661,180,nil,1,7411,nil,GAME_ORIG,180,200,220,240)
+	AddRecipe(13661,180,nil,1,GAME_ORIG,180,200,220,240)
 	self:addTradeFlags(RecipeDB,13661,1,2,3,36,40,51)
 	self:addTradeAcquire(RecipeDB,13661,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Chest - Greater Mana -- 13663
-	self:addTradeSkill(RecipeDB,13663,185,nil,1,7411,nil,GAME_ORIG,185,205,225,245)
+	AddRecipe(13663,185,nil,1,GAME_ORIG,185,205,225,245)
 	self:addTradeFlags(RecipeDB,13663,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13663,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Boots - Lesser Spirit -- 13687
-	self:addTradeSkill(RecipeDB,13687,190,nil,1,7411,nil,GAME_ORIG,190,210,230,250)
+	AddRecipe(13687,190,nil,1,GAME_ORIG,190,210,230,250)
 	self:addTradeFlags(RecipeDB,13687,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,13687,7,1)

 	-- Enchant Shield - Lesser Block -- 13689
-	self:addTradeSkill(RecipeDB,13689,195,nil,1,7411,nil,GAME_ORIG,195,215,235,255)
+	AddRecipe(13689,195,nil,1,GAME_ORIG,195,215,235,255)
 	self:addTradeFlags(RecipeDB,13689,1,2,5,10,36,40,52)
 	self:addTradeAcquire(RecipeDB,13689,7,2)

 	-- Enchant Weapon - Striking -- 13693
-	self:addTradeSkill(RecipeDB,13693,195,nil,1,7411,nil,GAME_ORIG,195,215,235,255)
+	AddRecipe(13693,195,nil,1,GAME_ORIG,195,215,235,255)
 	self:addTradeFlags(RecipeDB,13693,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13693,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant 2H Weapon - Impact -- 13695
-	self:addTradeSkill(RecipeDB,13695,200,nil,1,7411,nil,GAME_ORIG,200,220,240,260)
+	AddRecipe(13695,200,nil,1,GAME_ORIG,200,220,240,260)
 	self:addTradeFlags(RecipeDB,13695,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13695,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Gloves - Skinning -- 13698
-	self:addTradeSkill(RecipeDB,13698,200,nil,1,7411,nil,GAME_ORIG,195,215,235,255)
+	AddRecipe(13698,200,nil,1,GAME_ORIG,195,215,235,255)
 	self:addTradeFlags(RecipeDB,13698,1,2,11,36,40)
 	self:addTradeAcquire(RecipeDB,13698,3,2556,3,2557,3,2558,3,2606)

 	-- Enchant Chest - Lesser Stats -- 13700
-	self:addTradeSkill(RecipeDB,13700,200,nil,1,7411,nil,GAME_ORIG,200,220,240,260)
+	AddRecipe(13700,200,nil,1,GAME_ORIG,200,220,240,260)
 	self:addTradeFlags(RecipeDB,13700,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13700,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Runed Truesilver Rod -- 13702
-	self:addTradeSkill(RecipeDB,13702,200,11145,1,7411,nil,GAME_ORIG,200,220,240,260)
+	AddRecipe(13702,200,11145,1,GAME_ORIG,200,220,240,260)
 	self:addTradeFlags(RecipeDB,13702,1,2,3,37,41)
 	self:addTradeAcquire(RecipeDB,13702,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Cloak - Greater Defense -- 13746
-	self:addTradeSkill(RecipeDB,13746,205,nil,1,7411,nil,GAME_ORIG,205,225,245,265)
+	AddRecipe(13746,205,nil,1,GAME_ORIG,205,225,245,265)
 	self:addTradeFlags(RecipeDB,13746,1,2,3,36,40,52,60)
 	self:addTradeAcquire(RecipeDB,13746,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Cloak - Resistance -- 13794
-	self:addTradeSkill(RecipeDB,13794,205,nil,1,7411,nil,GAME_ORIG,205,225,245,265)
+	AddRecipe(13794,205,nil,1,GAME_ORIG,205,225,245,265)
 	self:addTradeFlags(RecipeDB,13794,1,2,3,36,40,60)
 	self:addTradeAcquire(RecipeDB,13794,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Gloves - Agility -- 13815
-	self:addTradeSkill(RecipeDB,13815,210,nil,1,7411,nil,GAME_ORIG,210,230,250,270)
+	AddRecipe(13815,210,nil,1,GAME_ORIG,210,230,250,270)
 	self:addTradeFlags(RecipeDB,13815,1,2,3,36,40,51)
 	self:addTradeAcquire(RecipeDB,13815,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Shield - Stamina -- 13817
-	self:addTradeSkill(RecipeDB,13817,210,nil,1,7411,nil,GAME_ORIG,210,230,250,270)
+	AddRecipe(13817,210,nil,1,GAME_ORIG,210,230,250,270)
 	self:addTradeFlags(RecipeDB,13817,1,2,10,36,40,64)
 	self:addTradeAcquire(RecipeDB,13817,7,1)

 	-- Enchant Bracer - Intellect -- 13822
-	self:addTradeSkill(RecipeDB,13822,210,nil,1,7411,nil,GAME_ORIG,210,230,250,270)
+	AddRecipe(13822,210,nil,1,GAME_ORIG,210,230,250,270)
 	self:addTradeFlags(RecipeDB,13822,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13822,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Boots - Stamina -- 13836
-	self:addTradeSkill(RecipeDB,13836,215,nil,1,7411,nil,GAME_ORIG,215,235,255,275)
+	AddRecipe(13836,215,nil,1,GAME_ORIG,215,235,255,275)
 	self:addTradeFlags(RecipeDB,13836,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13836,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Gloves - Advanced Mining -- 13841
-	self:addTradeSkill(RecipeDB,13841,215,nil,1,7411,nil,GAME_ORIG,215,235,255,275)
+	AddRecipe(13841,215,nil,1,GAME_ORIG,215,235,255,275)
 	self:addTradeFlags(RecipeDB,13841,1,2,11,36,40)
 	self:addTradeAcquire(RecipeDB,13841,3,674)

 	-- Enchant Bracer - Greater Spirit -- 13846
-	self:addTradeSkill(RecipeDB,13846,220,nil,1,7411,nil,GAME_ORIG,220,240,260,280)
+	AddRecipe(13846,220,nil,1,GAME_ORIG,220,240,260,280)
 	self:addTradeFlags(RecipeDB,13846,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,13846,7,1)

 	-- Enchant Chest - Superior Health -- 13858
-	self:addTradeSkill(RecipeDB,13858,220,nil,1,7411,nil,GAME_ORIG,220,240,260,280)
+	AddRecipe(13858,220,nil,1,GAME_ORIG,220,240,260,280)
 	self:addTradeFlags(RecipeDB,13858,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13858,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Gloves - Advanced Herbalism -- 13868
-	self:addTradeSkill(RecipeDB,13868,225,nil,1,7411,nil,GAME_ORIG,225,245,265,285)
+	AddRecipe(13868,225,nil,1,GAME_ORIG,225,245,265,285)
 	self:addTradeFlags(RecipeDB,13868,1,2,11,36,40)
 	self:addTradeAcquire(RecipeDB,13868,3,764,3,765,3,766,3,1081,3,14448)

 	-- Enchant Cloak - Lesser Agility -- 13882
-	self:addTradeSkill(RecipeDB,13882,225,nil,1,7411,nil,GAME_ORIG,225,245,265,285)
+	AddRecipe(13882,225,nil,1,GAME_ORIG,225,245,265,285)
 	self:addTradeFlags(RecipeDB,13882,1,2,11,36,40,51,60)
 	self:addTradeAcquire(RecipeDB,13882,3,2246,3,5623,3,7805)

 	-- Enchant Gloves - Strength -- 13887
-	self:addTradeSkill(RecipeDB,13887,225,nil,1,7411,nil,GAME_ORIG,225,245,265,285)
+	AddRecipe(13887,225,nil,1,GAME_ORIG,225,245,265,285)
 	self:addTradeFlags(RecipeDB,13887,1,2,3,36,40,51)
 	self:addTradeAcquire(RecipeDB,13887,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Boots - Minor Speed -- 13890
-	self:addTradeSkill(RecipeDB,13890,225,nil,1,7411,nil,GAME_ORIG,225,245,265,285)
+	AddRecipe(13890,225,nil,1,GAME_ORIG,225,245,265,285)
 	self:addTradeFlags(RecipeDB,13890,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13890,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Weapon - Fiery Weapon -- 13898
-	self:addTradeSkill(RecipeDB,13898,265,nil,1,7411,nil,GAME_ORIG,265,285,305,325)
+	AddRecipe(13898,265,nil,1,GAME_ORIG,265,285,305,325)
 	self:addTradeFlags(RecipeDB,13898,1,2,5,36,40)
 	self:addTradeAcquire(RecipeDB,13898,3,9024)

 	-- Enchant Shield - Greater Spirit -- 13905
-	self:addTradeSkill(RecipeDB,13905,230,nil,1,7411,nil,GAME_ORIG,230,250,270,290)
+	AddRecipe(13905,230,nil,1,GAME_ORIG,230,250,270,290)
 	self:addTradeFlags(RecipeDB,13905,1,2,3,36,40,53,54,64)
 	self:addTradeAcquire(RecipeDB,13905,1,11073,1,19251,1,19252,1,33610,1,16633,1,11072,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,11074,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Weapon - Demonslaying -- 13915
-	self:addTradeSkill(RecipeDB,13915,230,nil,1,7411,nil,GAME_ORIG,230,250,270,290)
+	AddRecipe(13915,230,nil,1,GAME_ORIG,230,250,270,290)
 	self:addTradeFlags(RecipeDB,13915,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,13915,7,1)

 	-- Enchant Chest - Superior Mana -- 13917
-	self:addTradeSkill(RecipeDB,13917,230,nil,1,7411,nil,GAME_ORIG,230,250,270,290)
+	AddRecipe(13917,230,nil,1,GAME_ORIG,230,250,270,290)
 	self:addTradeFlags(RecipeDB,13917,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13917,1,11073,1,19251,1,19252,1,33610,1,16633,1,11072,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,11074,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Bracer - Deflection -- 13931
-	self:addTradeSkill(RecipeDB,13931,235,nil,1,7411,nil,GAME_ORIG,235,255,275,295)
+	AddRecipe(13931,235,nil,1,GAME_ORIG,235,255,275,295)
 	self:addTradeFlags(RecipeDB,13931,1,2,4,36,40,52)
 	self:addTradeAcquire(RecipeDB,13931,2,989,2,4229)

 	-- Enchant Shield - Frost Resistance -- 13933
-	self:addTradeSkill(RecipeDB,13933,235,nil,1,7411,nil,GAME_ORIG,235,255,275,295)
+	AddRecipe(13933,235,nil,1,GAME_ORIG,235,255,275,295)
 	self:addTradeFlags(RecipeDB,13933,1,2,5,6,11,36,40,64)
 	self:addTradeAcquire(RecipeDB,13933,7,2,8,33)

 	-- Enchant Boots - Agility -- 13935
-	self:addTradeSkill(RecipeDB,13935,235,nil,1,7411,nil,GAME_ORIG,235,255,275,295)
+	AddRecipe(13935,235,nil,1,GAME_ORIG,235,255,275,295)
 	self:addTradeFlags(RecipeDB,13935,1,2,3,36,40,51)
 	self:addTradeAcquire(RecipeDB,13935,1,11073,1,19251,1,19252,1,33610,1,16633,1,11072,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,11074,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant 2H Weapon - Greater Impact -- 13937
-	self:addTradeSkill(RecipeDB,13937,240,nil,1,7411,nil,GAME_ORIG,240,260,280,300)
+	AddRecipe(13937,240,nil,1,GAME_ORIG,240,260,280,300)
 	self:addTradeFlags(RecipeDB,13937,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13937,1,1317,1,3011,1,3345,1,3606,1,4213,1,4616,1,5157,1,5695,
 	1,11072,1,11073,1,11074,1,16160,1,16633,1,16725,1,19251,1,19252,1,33610,1,33676,1,18773,1,7949,1,19540,1,18753)

 	-- Enchant Bracer - Greater Strength -- 13939
-	self:addTradeSkill(RecipeDB,13939,240,nil,1,7411,nil,GAME_ORIG,240,260,280,300)
+	AddRecipe(13939,240,nil,1,GAME_ORIG,240,260,280,300)
 	self:addTradeFlags(RecipeDB,13939,1,2,3,36,40,51)
 	self:addTradeAcquire(RecipeDB,13939,1,11073,1,19251,1,19252,1,33610,1,16633,1,11072,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,11074,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Chest - Stats -- 13941
-	self:addTradeSkill(RecipeDB,13941,245,nil,1,7411,nil,GAME_ORIG,245,265,285,305)
+	AddRecipe(13941,245,nil,1,GAME_ORIG,245,265,285,305)
 	self:addTradeFlags(RecipeDB,13941,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13941,1,11073,1,19251,1,19252,1,33610,1,16633,1,11072,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,11074,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Weapon - Greater Striking -- 13943
-	self:addTradeSkill(RecipeDB,13943,245,nil,1,7411,nil,GAME_ORIG,245,265,285,305)
+	AddRecipe(13943,245,nil,1,GAME_ORIG,245,265,285,305)
 	self:addTradeFlags(RecipeDB,13943,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13943,1,11073,1,19251,1,19252,1,33610,1,16633,1,11072,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,11074,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Bracer - Greater Stamina -- 13945
-	self:addTradeSkill(RecipeDB,13945,245,nil,1,7411,nil,GAME_ORIG,245,265,285,305)
+	AddRecipe(13945,245,nil,1,GAME_ORIG,245,265,285,305)
 	self:addTradeFlags(RecipeDB,13945,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,13945,7,1)

 	-- Enchant Gloves - Riding Skill -- 13947
-	self:addTradeSkill(RecipeDB,13947,250,nil,1,7411,nil,GAME_ORIG,250,270,290,310)
+	AddRecipe(13947,250,nil,1,GAME_ORIG,250,270,290,310)
 	self:addTradeFlags(RecipeDB,13947,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,13947,7,2)

 	-- Enchant Gloves - Minor Haste -- 13948
-	self:addTradeSkill(RecipeDB,13948,250,nil,1,7411,nil,GAME_ORIG,250,270,290,310)
+	AddRecipe(13948,250,nil,1,GAME_ORIG,250,270,290,310)
 	self:addTradeFlags(RecipeDB,13948,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,13948,1,11073,1,19251,1,19252,1,33610,1,16633,1,11072,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,11074,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Lesser Magic Wand -- 14293
-	self:addTradeSkill(RecipeDB,14293,10,11287,1,7411,nil,GAME_ORIG,10,75,95,115)
+	AddRecipe(14293,10,11287,1,GAME_ORIG,10,75,95,115)
 	self:addTradeFlags(RecipeDB,14293,1,2,3,36,41,74)
 	self:addTradeAcquire(RecipeDB,14293,1,1317,1,3011,1,3345,1,3606,1,4213,1,4616,1,5157,1,5695,
 	1,11072,1,11073,1,11074,1,16160,1,16633,1,16725,1,19251,1,19252,1,33610,1,33676,1,18773,1,7949,1,19540,1,18753)

 	-- Greater Magic Wand -- 14807
-	self:addTradeSkill(RecipeDB,14807,70,11288,1,7411,nil,GAME_ORIG,70,110,130,150)
+	AddRecipe(14807,70,11288,1,GAME_ORIG,70,110,130,150)
 	self:addTradeFlags(RecipeDB,14807,1,2,3,36,41,74)
 	self:addTradeAcquire(RecipeDB,14807,1,1317,1,3011,1,3345,1,3606,1,4213,1,4616,1,5157,1,5695,
 	1,11072,1,11073,1,11074,1,16160,1,16633,1,16725,1,19251,1,19252,1,33610,1,33676,1,18773,1,7949,1,19540,1,18753)

 	-- Lesser Mystic Wand -- 14809
-	self:addTradeSkill(RecipeDB,14809,155,11289,1,7411,nil,GAME_ORIG,155,175,195,215)
+	AddRecipe(14809,155,11289,1,GAME_ORIG,155,175,195,215)
 	self:addTradeFlags(RecipeDB,14809,1,2,3,36,41,74)
 	self:addTradeAcquire(RecipeDB,14809,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Greater Mystic Wand -- 14810
-	self:addTradeSkill(RecipeDB,14810,175,11290,1,7411,nil,GAME_ORIG,175,195,215,235)
+	AddRecipe(14810,175,11290,1,GAME_ORIG,175,195,215,235)
 	self:addTradeFlags(RecipeDB,14810,1,2,3,36,41,74)
 	self:addTradeAcquire(RecipeDB,14810,1,11072,1,11073,1,11074,1,19251,1,19252,1,33610,1,16633,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchanted Thorium -- 17180
-	self:addTradeSkill(RecipeDB,17180,250,12655,1,7411,nil,GAME_ORIG,250,250,255,260)
+	AddRecipe(17180,250,12655,1,GAME_ORIG,250,250,255,260)
 	self:addTradeFlags(RecipeDB,17180,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,17180,1,11073,1,19251,1,19252,1,33610,1,16633,1,11072,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,11074,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchanted Leather -- 17181
-	self:addTradeSkill(RecipeDB,17181,250,12810,1,7411,nil,GAME_ORIG,250,250,255,260)
+	AddRecipe(17181,250,12810,1,GAME_ORIG,250,250,255,260)
 	self:addTradeFlags(RecipeDB,17181,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,17181,1,11073,1,19251,1,19252,1,33610,1,16633,1,11072,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,11074,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Bracer - Greater Intellect -- 20008
-	self:addTradeSkill(RecipeDB,20008,255,nil,1,7411,nil,GAME_ORIG,255,275,295,315)
+	AddRecipe(20008,255,nil,1,GAME_ORIG,255,275,295,315)
 	self:addTradeFlags(RecipeDB,20008,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,20008,1,11073,1,19251,1,19252,1,33610,1,16633,1,11072,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,11074,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Bracer - Superior Spirit -- 20009
-	self:addTradeSkill(RecipeDB,20009,270,nil,1,7411,nil,GAME_ORIG,270,290,310,330)
+	AddRecipe(20009,270,nil,1,GAME_ORIG,270,290,310,330)
 	self:addTradeFlags(RecipeDB,20009,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,20009,7,1)

 	-- Enchant Bracer - Superior Strength -- 20010
-	self:addTradeSkill(RecipeDB,20010,295,nil,1,7411,nil,GAME_ORIG,295,310,325,340)
+	AddRecipe(20010,295,nil,1,GAME_ORIG,295,310,325,340)
 	self:addTradeFlags(RecipeDB,20010,1,2,11,36,40,51)
 	self:addTradeAcquire(RecipeDB,20010,3,7372)

 	-- Enchant Bracer - Superior Stamina -- 20011
-	self:addTradeSkill(RecipeDB,20011,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(20011,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,20011,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,20011,7,1)

 	-- Enchant Gloves - Greater Agility -- 20012
-	self:addTradeSkill(RecipeDB,20012,270,nil,1,7411,nil,GAME_ORIG,270,290,310,330)
+	AddRecipe(20012,270,nil,1,GAME_ORIG,270,290,310,330)
 	self:addTradeFlags(RecipeDB,20012,1,2,3,36,40,51)
 	self:addTradeAcquire(RecipeDB,20012,1,11073,1,19251,1,19252,1,33610,1,16633,1,11072,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,11074,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Gloves - Greater Strength -- 20013
-	self:addTradeSkill(RecipeDB,20013,295,nil,1,7411,nil,GAME_ORIG,295,310,325,340)
+	AddRecipe(20013,295,nil,1,GAME_ORIG,295,310,325,340)
 	self:addTradeFlags(RecipeDB,20013,1,2,3,36,40,51)
 	self:addTradeAcquire(RecipeDB,20013,1,11073,1,19251,1,19252,1,33610,1,16633,1,11072,1,1317,1,4213,1,16725,1,3345,1,3011,1,3606,1,11074,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Cloak - Greater Resistance -- 20014
-	self:addTradeSkill(RecipeDB,20014,265,nil,1,7411,nil,GAME_ORIG,265,285,305,325)
+	AddRecipe(20014,265,nil,1,GAME_ORIG,265,285,305,325)
 	self:addTradeFlags(RecipeDB,20014,1,2,3,36,40,60)
 	self:addTradeAcquire(RecipeDB,20014,1,11073,1,19251,1,19252,1,33610,1,16633,1,11072,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,11074,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Cloak - Superior Defense -- 20015
-	self:addTradeSkill(RecipeDB,20015,285,nil,1,7411,nil,GAME_ORIG,285,300,317,335)
+	AddRecipe(20015,285,nil,1,GAME_ORIG,285,300,317,335)
 	self:addTradeFlags(RecipeDB,20015,1,2,4,36,41,52,60)
 	self:addTradeAcquire(RecipeDB,20015,2,12022)

 	-- Enchant Shield - Vitality -- 20016
-	self:addTradeSkill(RecipeDB,20016,280,nil,1,7411,nil,GAME_ORIG,280,300,320,340)
+	AddRecipe(20016,280,nil,1,GAME_ORIG,280,300,320,340)
 	self:addTradeFlags(RecipeDB,20016,1,2,3,36,40,53,54,64)
 	self:addTradeAcquire(RecipeDB,20016,1,11073,1,19251,1,19252,1,33610,1,16633,1,11072,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,11074,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Shield - Greater Stamina -- 20017
-	self:addTradeSkill(RecipeDB,20017,265,nil,1,7411,nil,GAME_ORIG,265,285,305,325)
+	AddRecipe(20017,265,nil,1,GAME_ORIG,265,285,305,325)
 	self:addTradeFlags(RecipeDB,20017,1,2,4,36,41,64)
 	self:addTradeAcquire(RecipeDB,20017,2,4229,2,4561)

 	-- Enchant Boots - Greater Stamina -- 20020
-	self:addTradeSkill(RecipeDB,20020,260,nil,1,7411,nil,GAME_ORIG,260,280,300,320)
+	AddRecipe(20020,260,nil,1,GAME_ORIG,260,280,300,320)
 	self:addTradeFlags(RecipeDB,20020,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,20020,7,1)

 	-- Enchant Boots - Greater Agility -- 20023
-	self:addTradeSkill(RecipeDB,20023,295,nil,1,7411,nil,GAME_ORIG,295,310,325,340)
+	AddRecipe(20023,295,nil,1,GAME_ORIG,295,310,325,340)
 	self:addTradeFlags(RecipeDB,20023,1,2,3,11,36,40,51)
 	self:addTradeAcquire(RecipeDB,20023,1,11073,1,19251,1,19252,1,33610,1,16633,1,11072,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,11074,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Boots - Spirit -- 20024
-	self:addTradeSkill(RecipeDB,20024,275,nil,1,7411,nil,0)
+	AddRecipe(20024,275,nil,1,0)
 	self:addTradeFlags(RecipeDB,20024,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,20024,7,1,275,295,315,335)

 	-- Enchant Chest - Greater Stats -- 20025
-	self:addTradeSkill(RecipeDB,20025,300,nil,1,7411,nil,0)
+	AddRecipe(20025,300,nil,1,0)
 	self:addTradeFlags(RecipeDB,20025,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,20025,7,1,300,310,325,340)

 	-- Enchant Chest - Major Health -- 20026
-	self:addTradeSkill(RecipeDB,20026,275,nil,1,7411,nil,0)
+	AddRecipe(20026,275,nil,1,0)
 	self:addTradeFlags(RecipeDB,20026,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,20026,2,11189,275,295,315,335)

 	-- Enchant Chest - Major Mana -- 20028
-	self:addTradeSkill(RecipeDB,20028,290,nil,1,7411,nil,GAME_ORIG,290,305,322,340)
+	AddRecipe(20028,290,nil,1,GAME_ORIG,290,305,322,340)
 	self:addTradeFlags(RecipeDB,20028,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,20028,1,11073,1,19251,1,19252,1,33610,1,16633,1,11072,1,1317,1,3606,1,4213,1,16725,1,3345,1,3011,1,11074,1,33676,1,18773,1,5695,1,4616,1,7949,1,5157,1,19540,1,18753,1,16160)

 	-- Enchant Weapon - Icy Chill -- 20029
-	self:addTradeSkill(RecipeDB,20029,285,nil,1,7411,nil,GAME_ORIG,285,300,317,335)
+	AddRecipe(20029,285,nil,1,GAME_ORIG,285,300,317,335)
 	self:addTradeFlags(RecipeDB,20029,1,2,11,36,40)
 	self:addTradeAcquire(RecipeDB,20029,3,7524)

 	-- Enchant 2H Weapon - Superior Impact -- 20030
-	self:addTradeSkill(RecipeDB,20030,295,nil,1,7411,nil,GAME_ORIG,295,310,325,340)
+	AddRecipe(20030,295,nil,1,GAME_ORIG,295,310,325,340)
 	self:addTradeFlags(RecipeDB,20030,1,2,5,36,40)
 	self:addTradeAcquire(RecipeDB,20030,3,10317)

 	-- Enchant Weapon - Superior Striking -- 20031
-	self:addTradeSkill(RecipeDB,20031,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(20031,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,20031,1,2,5,36,40)
 	self:addTradeAcquire(RecipeDB,20031,3,9216)

 	-- Enchant Weapon - Lifestealing -- 20032
-	self:addTradeSkill(RecipeDB,20032,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(20032,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,20032,1,2,5,36,40)
 	self:addTradeAcquire(RecipeDB,20032,3,10499)

 	-- Enchant Weapon - Unholy Weapon -- 20033
-	self:addTradeSkill(RecipeDB,20033,295,nil,1,7411,nil,GAME_ORIG,295,310,325,340)
+	AddRecipe(20033,295,nil,1,GAME_ORIG,295,310,325,340)
 	self:addTradeFlags(RecipeDB,20033,1,2,5,11,36,40)
 	self:addTradeAcquire(RecipeDB,20033,3,10398,3,16810)

 	-- Enchant Weapon - Crusader -- 20034
-	self:addTradeSkill(RecipeDB,20034,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(20034,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,20034,1,2,11,36,40,51)
 	self:addTradeAcquire(RecipeDB,20034,3,4494,3,9451)

 	-- Enchant 2H Weapon - Major Spirit -- 20035
-	self:addTradeSkill(RecipeDB,20035,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(20035,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,20035,1,2,5,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,20035,3,10469)

 	-- Enchant 2H Weapon - Major Intellect -- 20036
-	self:addTradeSkill(RecipeDB,20036,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(20036,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,20036,1,2,5,36,40)
 	self:addTradeAcquire(RecipeDB,20036,3,10422)

 	-- Runed Arcanite Rod -- 20051
-	self:addTradeSkill(RecipeDB,20051,290,16207,1,7411,nil,GAME_ORIG,290,305,322,340)
+	AddRecipe(20051,290,16207,1,GAME_ORIG,290,305,322,340)
 	self:addTradeFlags(RecipeDB,20051,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,20051,2,12022)

 	-- Enchant Weapon - Winter's Might -- 21931
-	self:addTradeSkill(RecipeDB,21931,190,nil,1,7411,nil,GAME_ORIG,190,210,230,250)
+	AddRecipe(21931,190,nil,1,GAME_ORIG,190,210,230,250)
 	self:addTradeFlags(RecipeDB,21931,1,2,7,11,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,21931,5,1)

 	-- Enchant Weapon - Spellpower -- 22749
-	self:addTradeSkill(RecipeDB,22749,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(22749,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,22749,1,2,6,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,22749,8,26)

 	-- Enchant Weapon - Healing Power -- 22750
-	self:addTradeSkill(RecipeDB,22750,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(22750,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,22750,1,2,6,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,22750,8,26)

 	-- Enchant Weapon - Strength -- 23799
-	self:addTradeSkill(RecipeDB,23799,290,nil,1,7411,nil,GAME_ORIG,290,305,322,340)
+	AddRecipe(23799,290,nil,1,GAME_ORIG,290,305,322,340)
 	self:addTradeFlags(RecipeDB,23799,1,2,4,36,40,51,98)
 	self:addTradeAcquire(RecipeDB,23799,6,59,1,12944)

 	-- Enchant Weapon - Agility -- 23800
-	self:addTradeSkill(RecipeDB,23800,290,nil,1,7411,nil,GAME_ORIG,290,305,322,340)
+	AddRecipe(23800,290,nil,1,GAME_ORIG,290,305,322,340)
 	self:addTradeFlags(RecipeDB,23800,2,4,36,40,51,99)
 	self:addTradeAcquire(RecipeDB,23800,6,576,2,11557)

 	-- Enchant Bracer - Mana Regeneration -- 23801
-	self:addTradeSkill(RecipeDB,23801,290,nil,1,7411,nil,GAME_ORIG,290,305,322,340)
+	AddRecipe(23801,290,nil,1,GAME_ORIG,290,305,322,340)
 	self:addTradeFlags(RecipeDB,23801,1,2,4,36,40,53,54,96)
 	self:addTradeAcquire(RecipeDB,23801,6,529,2,10856,6,529,2,10857,6,529,2,11536)

 	-- Enchant Bracer - Healing Power -- 23802
-	self:addTradeSkill(RecipeDB,23802,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(23802,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,23802,1,2,4,36,40,53,54,96)
 	self:addTradeAcquire(RecipeDB,23802,6,529,3,10856,6,529,3,10857,6,529,3,11536)

 	-- Enchant Weapon - Mighty Spirit -- 23803
-	self:addTradeSkill(RecipeDB,23803,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(23803,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,23803,1,2,4,36,41,53,54,98)
 	self:addTradeAcquire(RecipeDB,23803,6,59,2,12944)

 	-- Enchant Weapon - Mighty Intellect -- 23804
-	self:addTradeSkill(RecipeDB,23804,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(23804,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,23804,1,2,4,36,41,98)
 	self:addTradeAcquire(RecipeDB,23804,6,59,3,12944)

 	-- Enchant Gloves - Threat -- 25072
-	self:addTradeSkill(RecipeDB,25072,300,nil,1,7411,nil,1,300,310,325,340)
+	AddRecipe(25072,300,nil,1,1,300,310,325,340)
 	self:addTradeFlags(RecipeDB,25072,1,2,4,6,11,36,40,111)
 	self:addTradeAcquire(RecipeDB,25072,3,15275,6,935,4,21432)

 	-- Enchant Gloves - Shadow Power -- 25073
-	self:addTradeSkill(RecipeDB,25073,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(25073,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,25073,1,2,6,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,25073,8,22)

 	-- Enchant Gloves - Frost Power -- 25074
-	self:addTradeSkill(RecipeDB,25074,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(25074,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,25074,1,2,6,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,25074,8,22)

 	-- Enchant Gloves - Fire Power -- 25078
-	self:addTradeSkill(RecipeDB,25078,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(25078,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,25078,1,2,6,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,25078,8,22)

 	-- Enchant Gloves - Healing Power -- 25079
-	self:addTradeSkill(RecipeDB,25079,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(25079,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,25079,1,2,6,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,25079,8,22)

 	-- Enchant Gloves - Superior Agility -- 25080
-	self:addTradeSkill(RecipeDB,25080,300,nil,1,7411,nil,1,300,310,325,340)
+	AddRecipe(25080,300,nil,1,1,300,310,325,340)
 	self:addTradeFlags(RecipeDB,25080,1,2,4,6,36,40,51,106)
 	self:addTradeAcquire(RecipeDB,25080,8,22,6,989,4,21643)

 	-- Enchant Cloak - Greater Fire Resistance -- 25081
-	self:addTradeSkill(RecipeDB,25081,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(25081,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,25081,1,2,4,36,40,60,97)
 	self:addTradeAcquire(RecipeDB,25081,6,609,1,15419)

 	-- Enchant Cloak - Greater Nature Resistance -- 25082
-	self:addTradeSkill(RecipeDB,25082,300,nil,1,7411,nil,GAME_ORIG,300,310,325,340)
+	AddRecipe(25082,300,nil,1,GAME_ORIG,300,310,325,340)
 	self:addTradeFlags(RecipeDB,25082,1,2,4,36,40,60,97)
 	self:addTradeAcquire(RecipeDB,25082,6,609,2,15419)

 	-- Enchant Cloak - Stealth -- 25083
-	self:addTradeSkill(RecipeDB,25083,300,nil,1,7411,nil,1,300,310,325,340)
+	AddRecipe(25083,300,nil,1,1,300,310,325,340)
 	self:addTradeFlags(RecipeDB,25083,1,2,4,6,10,36,40,60)
 	self:addTradeAcquire(RecipeDB,25083,8,22,6,942,4,17904)

 	-- Enchant Cloak - Subtlety -- 25084
-	self:addTradeSkill(RecipeDB,25084,300,nil,1,7411,nil,1,300,310,325,340)
+	AddRecipe(25084,300,nil,1,1,300,310,325,340)
 	self:addTradeFlags(RecipeDB,25084,1,2,4,6,36,40,60,104)
 	self:addTradeAcquire(RecipeDB,25084,3,15276,6,946,4,17657,6,947,4,17585)

 	-- Enchant Cloak - Dodge -- 25086
-	self:addTradeSkill(RecipeDB,25086,300,nil,1,7411,nil,1,300,310,325,340)
+	AddRecipe(25086,300,nil,1,1,300,310,325,340)
 	self:addTradeFlags(RecipeDB,25086,1,2,4,6,10,36,40,52,60,107)
 	self:addTradeAcquire(RecipeDB,25086,8,22,6,1011,4,21655)

 	-- Minor Wizard Oil -- 25124
-	self:addTradeSkill(RecipeDB,25124,45,20744,1,7411,nil,GAME_ORIG,45,55,65,75)
+	AddRecipe(25124,45,20744,1,GAME_ORIG,45,55,65,75)
 	self:addTradeFlags(RecipeDB,25124,1,2,4,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,25124,2,1318,2,3012,2,3346,2,4228,2,4617,2,5158,2,5757,2,5758,2,15419,2,16635,2,16722,2,18753,2,18773,2,18951,2,19234,2,19537,2,19540,2,19663,2,26569,2,27030,2,27054,2,27147,2,28714)

 	-- Minor Mana Oil -- 25125
-	self:addTradeSkill(RecipeDB,25125,150,20745,1,7411,nil,GAME_ORIG,150,160,170,180)
+	AddRecipe(25125,150,20745,1,GAME_ORIG,150,160,170,180)
 	self:addTradeFlags(RecipeDB,25125,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,25125,2,1318,2,3012,2,3346,2,4228,2,4617,2,5158,2,5757,2,5758,2,15419,2,16635,2,16722,2,18753,2,18773,2,18951,2,19234,2,19537,2,19540,2,19663,2,26569,2,27030,2,27054,2,27147,2,28714)

 	-- Lesser Wizard Oil -- 25126
-	self:addTradeSkill(RecipeDB,25126,200,20746,1,7411,nil,GAME_ORIG,200,210,220,230)
+	AddRecipe(25126,200,20746,1,GAME_ORIG,200,210,220,230)
 	self:addTradeFlags(RecipeDB,25126,1,2,4,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,25126,2,1318,2,3012,2,3346,2,4228,2,4617,2,5158,2,5757,2,5758,2,15419,2,16635,2,16722,2,18753,2,18773,2,18951,2,19234,2,19537,2,19540,2,19663,2,26569,2,27030,2,27054,2,27147,2,28714)

 	-- Lesser Mana Oil -- 25127
-	self:addTradeSkill(RecipeDB,25127,250,20747,1,7411,nil,GAME_ORIG,250,260,270,280)
+	AddRecipe(25127,250,20747,1,GAME_ORIG,250,260,270,280)
 	self:addTradeFlags(RecipeDB,25127,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,25127,2,15419)

 	-- Wizard Oil -- 25128
-	self:addTradeSkill(RecipeDB,25128,275,20750,1,7411,nil,GAME_ORIG,275,285,295,305)
+	AddRecipe(25128,275,20750,1,GAME_ORIG,275,285,295,305)
 	self:addTradeFlags(RecipeDB,25128,1,2,4,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,25128,2,15419)

 	-- Brilliant Wizard Oil -- 25129
-	self:addTradeSkill(RecipeDB,25129,300,20749,1,7411,nil,GAME_ORIG,300,310,320,330)
+	AddRecipe(25129,300,20749,1,GAME_ORIG,300,310,320,330)
 	self:addTradeFlags(RecipeDB,25129,1,2,4,36,41,53,54,100)
 	self:addTradeAcquire(RecipeDB,25129,6,270,2,14921)

 	-- Brilliant Mana Oil -- 25130
-	self:addTradeSkill(RecipeDB,25130,300,20748,1,7411,nil,GAME_ORIG,300,310,320,330)
+	AddRecipe(25130,300,20748,1,GAME_ORIG,300,310,320,330)
 	self:addTradeFlags(RecipeDB,25130,1,2,4,36,41,53,54,100)
 	self:addTradeAcquire(RecipeDB,25130,6,270,1,14921)

 	-- Enchant 2H Weapon - Agility -- 27837
-	self:addTradeSkill(RecipeDB,27837,290,nil,1,7411,nil,GAME_ORIG,290,305,322,340)
+	AddRecipe(27837,290,nil,1,GAME_ORIG,290,305,322,340)
 	self:addTradeFlags(RecipeDB,27837,1,2,4,36,40,51,99)
 	self:addTradeAcquire(RecipeDB,27837,6,576,1,11557)

 	-- Enchant Bracer - Brawn -- 27899
-	self:addTradeSkill(RecipeDB,27899,305,nil,1,7411,nil,1,305,315,330,345)
+	AddRecipe(27899,305,nil,1,1,305,315,330,345)
 	self:addTradeFlags(RecipeDB,27899,1,2,3,36,40,51)
 	self:addTradeAcquire(RecipeDB,27899,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Enchant Bracer - Stats -- 27905
-	self:addTradeSkill(RecipeDB,27905,315,nil,1,7411,nil,1,315,325,340,355)
+	AddRecipe(27905,315,nil,1,1,315,325,340,355)
 	self:addTradeFlags(RecipeDB,27905,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,27905,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Enchant Bracer - Major Defense -- 27906
-	self:addTradeSkill(RecipeDB,27906,320,nil,1,7411,nil,1,320,330,345,360)
+	AddRecipe(27906,320,nil,1,1,320,330,345,360)
 	self:addTradeFlags(RecipeDB,27906,1,2,11,36,40,52)
 	self:addTradeAcquire(RecipeDB,27906,3,22822,3,23008)

 	-- Enchant Bracer - Superior Healing -- 27911
-	self:addTradeSkill(RecipeDB,27911,325,nil,1,7411,nil,1,325,335,350,365)
+	AddRecipe(27911,325,nil,1,1,325,335,350,365)
 	self:addTradeFlags(RecipeDB,27911,2,4,36,40,53,54,104)
 	self:addTradeAcquire(RecipeDB,27911,6,946,1,17657,6,947,1,17585)

 	-- Enchant Bracer - Restore Mana Prime -- 27913
-	self:addTradeSkill(RecipeDB,27913,335,nil,1,7411,nil,1,335,345,360,375)
+	AddRecipe(27913,335,nil,1,1,335,345,360,375)
 	self:addTradeFlags(RecipeDB,27913,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,27913,7,1)

 	-- Enchant Bracer - Fortitude -- 27914
-	self:addTradeSkill(RecipeDB,27914,350,nil,1,7411,nil,1,320,330,345,360)
+	AddRecipe(27914,350,nil,1,1,320,330,345,360)
 	self:addTradeFlags(RecipeDB,27914,1,2,5,36,40)
 	self:addTradeAcquire(RecipeDB,27914,3,17803)

 	-- Enchant Bracer - Spellpower -- 27917
-	self:addTradeSkill(RecipeDB,27917,360,nil,1,7411,nil,1,360,370,385,400)
+	AddRecipe(27917,360,nil,1,1,360,370,385,400)
 	self:addTradeFlags(RecipeDB,27917,1,2,11,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,27917,3,19952)

 	-- Enchant Ring - Striking -- 27920
-	self:addTradeSkill(RecipeDB,27920,360,nil,1,7411,nil,1,360,370,377,385)
+	AddRecipe(27920,360,nil,1,1,360,370,377,385)
 	self:addTradeFlags(RecipeDB,27920,1,2,4,36,41,105)
 	self:addTradeAcquire(RecipeDB,27920,6,933,3,17518)

 	-- Enchant Ring - Spellpower -- 27924
-	self:addTradeSkill(RecipeDB,27924,360,nil,1,7411,nil,1,360,370,377,385)
+	AddRecipe(27924,360,nil,1,1,360,370,377,385)
 	self:addTradeFlags(RecipeDB,27924,1,2,4,36,41,53,54,106)
 	self:addTradeAcquire(RecipeDB,27924,6,989,2,21643)

 	-- Enchant Ring - Healing Power -- 27926
-	self:addTradeSkill(RecipeDB,27926,370,nil,1,7411,nil,1,370,380,385,390)
+	AddRecipe(27926,370,nil,1,1,370,380,385,390)
 	self:addTradeFlags(RecipeDB,27926,1,2,4,36,41,53,54,111)
 	self:addTradeAcquire(RecipeDB,27926,6,935,3,21432)

 	-- Enchant Ring - Stats -- 27927
-	self:addTradeSkill(RecipeDB,27927,375,nil,1,7411,nil,1,375,380,385,390)
+	AddRecipe(27927,375,nil,1,1,375,380,385,390)
 	self:addTradeFlags(RecipeDB,27927,1,2,4,36,41,62,107)
 	self:addTradeAcquire(RecipeDB,27927,6,1011,2,21655)

 	-- Enchant Shield - Tough Shield -- 27944
-	self:addTradeSkill(RecipeDB,27944,310,nil,1,7411,nil,1,310,320,335,350)
+	AddRecipe(27944,310,nil,1,1,310,320,335,350)
 	self:addTradeFlags(RecipeDB,27944,1,2,3,36,40,52,64)
 	self:addTradeAcquire(RecipeDB,27944,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Enchant Shield - Intellect -- 27945
-	self:addTradeSkill(RecipeDB,27945,325,nil,1,7411,nil,1,325,335,350,365)
+	AddRecipe(27945,325,nil,1,1,325,335,350,365)
 	self:addTradeFlags(RecipeDB,27945,1,2,4,36,40,64)
 	self:addTradeAcquire(RecipeDB,27945,2,18664)

 	-- Enchant Shield - Shield Block -- 27946
-	self:addTradeSkill(RecipeDB,27946,340,nil,1,7411,nil,1,340,350,365,380)
+	AddRecipe(27946,340,nil,1,1,340,350,365,380)
 	self:addTradeFlags(RecipeDB,27946,1,2,10,36,40,52,64)
 	self:addTradeAcquire(RecipeDB,27946,7,1)

 	-- Enchant Shield - Resistance -- 27947
-	self:addTradeSkill(RecipeDB,27947,360,nil,1,7411,nil,1)
+	AddRecipe(27947,360,nil,1,1)
 	self:addTradeFlags(RecipeDB,27947,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,27947,7,1)

 	-- Enchant Boots - Vitality -- 27948
-	self:addTradeSkill(RecipeDB,27948,305,nil,1,7411,nil,1,305,315,330,345)
+	AddRecipe(27948,305,nil,1,1,305,315,330,345)
 	self:addTradeFlags(RecipeDB,27948,1,2,11,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,27948,3,24664)

 	-- Enchant Boots - Fortitude -- 27950
-	self:addTradeSkill(RecipeDB,27950,320,nil,1,7411,nil,1,320,330,345,360)
+	AddRecipe(27950,320,nil,1,1,320,330,345,360)
 	self:addTradeFlags(RecipeDB,27950,1,2,5,11,36,40)
 	self:addTradeAcquire(RecipeDB,27950,3,18317)

 	-- Enchant Boots - Dexterity -- 27951
-	self:addTradeSkill(RecipeDB,27951,340,nil,1,7411,nil,1,340,350,365,380)
+	AddRecipe(27951,340,nil,1,1,340,350,365,380)
 	self:addTradeFlags(RecipeDB,27951,1,2,5,36,40,51)
 	self:addTradeAcquire(RecipeDB,27951,3,18521)

 	-- Enchant Boots - Surefooted -- 27954
-	self:addTradeSkill(RecipeDB,27954,370,nil,1,7411,nil,1,370,380,385,390)
+	AddRecipe(27954,370,nil,1,1,370,380,385,390)
 	self:addTradeFlags(RecipeDB,27954,1,2,6,36,41,51,54)
 	self:addTradeAcquire(RecipeDB,27954,3,16472)

 	-- Enchant Chest - Exceptional Health -- 27957
-	self:addTradeSkill(RecipeDB,27957,315,nil,1,7411,nil,1,315,325,340,355)
+	AddRecipe(27957,315,nil,1,1,315,325,340,355)
 	self:addTradeFlags(RecipeDB,27957,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,27957,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Enchant Chest - Exceptional Mana -- 27958
-	self:addTradeSkill(RecipeDB,27958,350,nil,1,7411,nil,2,350,360,370,380)
+	AddRecipe(27958,350,nil,1,2,350,360,370,380)
 	self:addTradeFlags(RecipeDB,27958,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,27958,1,28693,1,33583,1,26990,1,26980,1,26954,1,26906)

 	-- Enchant Chest - Exceptional Stats -- 27960
-	self:addTradeSkill(RecipeDB,27960,345,nil,1,7411,nil,1,345,355,367,380)
+	AddRecipe(27960,345,nil,1,1,345,355,367,380)
 	self:addTradeFlags(RecipeDB,27960,1,2,4,36,40,104)
 	self:addTradeAcquire(RecipeDB,27960,6,946,3,17657,6,947,3,17585)

 	-- Enchant Cloak - Major Armor -- 27961
-	self:addTradeSkill(RecipeDB,27961,310,nil,1,7411,nil,1,310,320,335,350)
+	AddRecipe(27961,310,nil,1,1,310,320,335,350)
 	self:addTradeFlags(RecipeDB,27961,1,2,3,36,40,60)
 	self:addTradeAcquire(RecipeDB,27961,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Enchant Cloak - Major Resistance -- 27962
-	self:addTradeSkill(RecipeDB,27962,330,nil,1,7411,nil,1,330,340,355,370)
+	AddRecipe(27962,330,nil,1,1,330,340,355,370)
 	self:addTradeFlags(RecipeDB,27962,1,2,10,36,40,60)
 	self:addTradeAcquire(RecipeDB,27962,7,1)

 	-- Enchant Weapon - Major Striking -- 27967
-	self:addTradeSkill(RecipeDB,27967,340,nil,1,7411,nil,1,340,350,365,380)
+	AddRecipe(27967,340,nil,1,1,340,350,365,380)
 	self:addTradeFlags(RecipeDB,27967,1,2,4,36,40,105)
 	self:addTradeAcquire(RecipeDB,27967,6,933,2,20242,6,933,2,23007)

 	-- Enchant Weapon - Major Intellect -- 27968
-	self:addTradeSkill(RecipeDB,27968,340,nil,1,7411,nil,1,340,350,365,380)
+	AddRecipe(27968,340,nil,1,1,340,350,365,380)
 	self:addTradeFlags(RecipeDB,27968,1,2,11,36,40)
 	self:addTradeAcquire(RecipeDB,27968,3,20136)

 	-- Enchant 2H Weapon - Savagery -- 27971
-	self:addTradeSkill(RecipeDB,27971,350,nil,1,7411,nil,1,350,370,375,380)
+	AddRecipe(27971,350,nil,1,1,350,370,375,380)
 	self:addTradeFlags(RecipeDB,27971,1,2,5,36,40,51)
 	self:addTradeAcquire(RecipeDB,27971,3,17465)

 	-- Enchant Weapon - Potency -- 27972
-	self:addTradeSkill(RecipeDB,27972,350,nil,1,7411,nil,1,350,370,375,380)
+	AddRecipe(27972,350,nil,1,1,350,370,375,380)
 	self:addTradeFlags(RecipeDB,27972,1,2,10,36,40,51)
 	self:addTradeAcquire(RecipeDB,27972,7,1)

 	-- Enchant Weapon - Major Spellpower -- 27975
-	self:addTradeSkill(RecipeDB,27975,350,nil,1,7411,nil,1,350,370,375,380)
+	AddRecipe(27975,350,nil,1,1,350,370,375,380)
 	self:addTradeFlags(RecipeDB,27975,1,2,11,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,27975,3,22242)

 	-- Enchant 2H Weapon - Major Agility -- 27977
-	self:addTradeSkill(RecipeDB,27977,360,nil,1,7411,nil,1,360,370,377,385)
+	AddRecipe(27977,360,nil,1,1,360,370,377,385)
 	self:addTradeFlags(RecipeDB,27977,1,2,5,36,40,51)
 	self:addTradeAcquire(RecipeDB,27977,3,20880)

 	-- Enchant Weapon - Sunfire -- 27981
-	self:addTradeSkill(RecipeDB,27981,375,nil,1,7411,nil,1,375,375,375,390)
+	AddRecipe(27981,375,nil,1,1,375,375,375,390)
 	self:addTradeFlags(RecipeDB,27981,1,2,6,11,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,27981,3,16524)

 	-- Enchant Weapon - Soulfrost -- 27982
-	self:addTradeSkill(RecipeDB,27982,375,nil,1,7411,nil,1,375,380,385,390)
+	AddRecipe(27982,375,nil,1,1,375,380,385,390)
 	self:addTradeFlags(RecipeDB,27982,1,2,6,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,27982,3,15688)

 	-- Enchant Weapon - Mongoose -- 27984
-	self:addTradeSkill(RecipeDB,27984,375,nil,3,7411,nil,1,375,380,385,390)
+	AddRecipe(27984,375,nil,3,1,375,380,385,390)
 	self:addTradeFlags(RecipeDB,27984,1,2,6,11,36,40,51)
 	self:addTradeAcquire(RecipeDB,27984,3,15687)

 	-- Enchant Weapon - Spellsurge -- 28003
-	self:addTradeSkill(RecipeDB,28003,360,nil,1,7411,nil,1,360,370,377,385)
+	AddRecipe(28003,360,nil,1,1,360,370,377,385)
 	self:addTradeFlags(RecipeDB,28003,1,2,5,6,11,36,40)
 	self:addTradeAcquire(RecipeDB,28003,7,2)

 	-- Enchant Weapon - Battlemaster -- 28004
-	self:addTradeSkill(RecipeDB,28004,360,nil,1,7411,nil,1,360,370,377,385)
+	AddRecipe(28004,360,nil,1,1,360,370,377,385)
 	self:addTradeFlags(RecipeDB,28004,1,2,5,6,11,36,40)
 	self:addTradeAcquire(RecipeDB,28004,7,2)

 	-- Superior Mana Oil -- 28016
-	self:addTradeSkill(RecipeDB,28016,310,22521,1,7411,nil,1,310,310,320,330)
+	AddRecipe(28016,310,22521,1,1,310,310,320,330)
 	self:addTradeFlags(RecipeDB,28016,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,28016,2,16635,2,16722,2,19663)

 	-- Superior Wizard Oil -- 28019
-	self:addTradeSkill(RecipeDB,28019,340,22522,1,7411,nil,1,340,340,350,360)
+	AddRecipe(28019,340,22522,1,1,340,340,350,360)
 	self:addTradeFlags(RecipeDB,28019,1,2,4,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,28019,2,16635,2,16722,2,19663)

 	-- Large Prismatic Shard -- 28022
-	self:addTradeSkill(RecipeDB,28022,335,22449,1,7411,nil,1,335,335,335,335)
+	AddRecipe(28022,335,22449,1,1,335,335,335,335)
 	self:addTradeFlags(RecipeDB,28022,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,28022,2,16635,2,16722,2,19663)

 	-- Prismatic Sphere -- 28027
-	self:addTradeSkill(RecipeDB,28027,325,22460,1,7411,nil,1,325,325,330,335)
+	AddRecipe(28027,325,22460,1,1,325,325,330,335)
 	self:addTradeFlags(RecipeDB,28027,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,28027,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Void Sphere -- 28028
-	self:addTradeSkill(RecipeDB,28028,350,22459,1,7411,nil,1,350,370,375,380)
+	AddRecipe(28028,350,22459,1,1,350,370,375,380)
 	self:addTradeFlags(RecipeDB,28028,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,28028,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Runed Fel Iron Rod -- 32664
-	self:addTradeSkill(RecipeDB,32664,300,22461,1,7411,nil,1,300,310,325,340)
+	AddRecipe(32664,300,22461,1,1,300,310,325,340)
 	self:addTradeFlags(RecipeDB,32664,1,2,3,37,41)
 	self:addTradeAcquire(RecipeDB,32664,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Runed Adamantite Rod -- 32665
-	self:addTradeSkill(RecipeDB,32665,350,22462,1,7411,nil,1,350,370,375,380)
+	AddRecipe(32665,350,22462,1,1,350,370,375,380)
 	self:addTradeFlags(RecipeDB,32665,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,32665,2,18960,2,19004)

 	-- Runed Eternium Rod -- 32667
-	self:addTradeSkill(RecipeDB,32667,375,22463,1,7411,nil,1,375,375,377,385)
+	AddRecipe(32667,375,22463,1,1,375,375,377,385)
 	self:addTradeFlags(RecipeDB,32667,1,2,3,4,37,41)
 	self:addTradeAcquire(RecipeDB,32667,2,19663,1,28693,1,33583,1,26990,1,26980,1,26954,1,26906)

 	-- Enchant Chest - Major Spirit -- 33990
-	self:addTradeSkill(RecipeDB,33990,320,nil,1,7411,nil,1,320,330,345,360)
+	AddRecipe(33990,320,nil,1,1,320,330,345,360)
 	self:addTradeFlags(RecipeDB,33990,1,2,3,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,33990,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Enchant Chest - Restore Mana Prime -- 33991
-	self:addTradeSkill(RecipeDB,33991,300,nil,1,7411,nil,1,300,310,325,340)
+	AddRecipe(33991,300,nil,1,1,300,310,325,340)
 	self:addTradeFlags(RecipeDB,33991,1,2,3,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,33991,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Enchant Chest - Major Resilience -- 33992
-	self:addTradeSkill(RecipeDB,33992,345,nil,1,7411,nil,1,345,355,367,380)
+	AddRecipe(33992,345,nil,1,1,345,355,367,380)
 	self:addTradeFlags(RecipeDB,33992,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,33992,7,1)

 	-- Enchant Gloves - Blasting -- 33993
-	self:addTradeSkill(RecipeDB,33993,305,nil,1,7411,nil,1,305,315,330,345)
+	AddRecipe(33993,305,nil,1,1,305,315,330,345)
 	self:addTradeFlags(RecipeDB,33993,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,33993,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Enchant Gloves - Precise Strikes -- 33994
-	self:addTradeSkill(RecipeDB,33994,360,nil,1,7411,nil,1,360,370,377,385)
+	AddRecipe(33994,360,nil,1,1,360,370,377,385)
 	self:addTradeFlags(RecipeDB,33994,1,2,4,36,40,103)
 	self:addTradeAcquire(RecipeDB,33994,6,942,3,17904)

 	-- Enchant Gloves - Major Strength -- 33995
-	self:addTradeSkill(RecipeDB,33995,340,nil,1,7411,nil,1,340,350,365,380)
+	AddRecipe(33995,340,nil,1,1,340,350,365,380)
 	self:addTradeFlags(RecipeDB,33995,1,2,3,36,40,51)
 	self:addTradeAcquire(RecipeDB,33995,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Enchant Gloves - Assault -- 33996
-	self:addTradeSkill(RecipeDB,33996,310,nil,1,7411,nil,1,310,320,335,350)
+	AddRecipe(33996,310,nil,1,1,310,320,335,350)
 	self:addTradeFlags(RecipeDB,33996,1,2,3,36,40,51)
 	self:addTradeAcquire(RecipeDB,33996,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Enchant Gloves - Major Spellpower -- 33997
-	self:addTradeSkill(RecipeDB,33997,360,nil,1,7411,nil,1,360,370,377,385)
+	AddRecipe(33997,360,nil,1,1,360,370,377,385)
 	self:addTradeFlags(RecipeDB,33997,1,2,4,36,40,53,54,106)
 	self:addTradeAcquire(RecipeDB,33997,6,989,2,21643)

 	-- Enchant Gloves - Major Healing -- 33999
-	self:addTradeSkill(RecipeDB,33999,350,nil,1,7411,nil,1,350,370,375,380)
+	AddRecipe(33999,350,nil,1,1,350,370,375,380)
 	self:addTradeFlags(RecipeDB,33999,1,2,4,36,40,53,54,111)
 	self:addTradeAcquire(RecipeDB,33999,6,935,2,21432)

 	-- Enchant Bracer - Major Intellect -- 34001
-	self:addTradeSkill(RecipeDB,34001,305,nil,1,7411,nil,1,305,315,330,345)
+	AddRecipe(34001,305,nil,1,1,305,315,330,345)
 	self:addTradeFlags(RecipeDB,34001,1,2,3,36,40)
 	self:addTradeAcquire(RecipeDB,34001,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Enchant Bracer - Assault -- 34002
-	self:addTradeSkill(RecipeDB,34002,300,nil,1,7411,nil,1,300,310,325,340)
+	AddRecipe(34002,300,nil,1,1,300,310,325,340)
 	self:addTradeFlags(RecipeDB,34002,1,2,3,36,40,51)
 	self:addTradeAcquire(RecipeDB,34002,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Enchant Cloak - Spell Penetration -- 34003
-	self:addTradeSkill(RecipeDB,34003,325,nil,1,7411,nil,1,325,335,350,365)
+	AddRecipe(34003,325,nil,1,1,325,335,350,365)
 	self:addTradeFlags(RecipeDB,34003,1,2,4,36,40,54,60,105)
 	self:addTradeAcquire(RecipeDB,34003,6,933,1,20242,6,933,1,23007)

 	-- Enchant Cloak - Greater Agility -- 34004
-	self:addTradeSkill(RecipeDB,34004,310,nil,1,7411,nil,1,310,320,335,350)
+	AddRecipe(34004,310,nil,1,1,310,320,335,350)
 	self:addTradeFlags(RecipeDB,34004,1,2,3,36,40,51,60)
 	self:addTradeAcquire(RecipeDB,34004,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Enchant Cloak - Greater Arcane Resistance -- 34005
-	self:addTradeSkill(RecipeDB,34005,350,nil,1,7411,nil,1,350,370,375,380)
+	AddRecipe(34005,350,nil,1,1,350,370,375,380)
 	self:addTradeFlags(RecipeDB,34005,1,2,11,36,40,60)
 	self:addTradeAcquire(RecipeDB,34005,3,19796)

 	-- Enchant Cloak - Greater Shadow Resistance -- 34006
-	self:addTradeSkill(RecipeDB,34006,350,nil,1,7411,nil,1,350,370,375,380)
+	AddRecipe(34006,350,nil,1,1,350,370,375,380)
 	self:addTradeFlags(RecipeDB,34006,1,2,11,36,40,60)
 	self:addTradeAcquire(RecipeDB,34006,3,18870)

 	-- Enchant Boots - Cat's Swiftness -- 34007
-	self:addTradeSkill(RecipeDB,34007,360,nil,1,7411,nil,1,360,370,377,385)
+	AddRecipe(34007,360,nil,1,1,360,370,377,385)
 	self:addTradeFlags(RecipeDB,34007,1,2,11,36,40,51)
 	self:addTradeAcquire(RecipeDB,34007,3,24664)

 	-- Enchant Boots - Boar's Speed -- 34008
-	self:addTradeSkill(RecipeDB,34008,360,nil,1,7411,nil,1,360,370,377,385)
+	AddRecipe(34008,360,nil,1,1,360,370,377,385)
 	self:addTradeFlags(RecipeDB,34008,1,2,11,36,40)
 	self:addTradeAcquire(RecipeDB,34008,3,24664)

 	-- Enchant Shield - Major Stamina -- 34009
-	self:addTradeSkill(RecipeDB,34009,325,nil,1,7411,nil,1,325,335,350,365)
+	AddRecipe(34009,325,nil,1,1,325,335,350,365)
 	self:addTradeFlags(RecipeDB,34009,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,34009,2,19663)

 	-- Enchant Weapon - Major Healing -- 34010
-	self:addTradeSkill(RecipeDB,34010,350,nil,1,7411,nil,1,350,370,375,380)
+	AddRecipe(34010,350,nil,1,1,350,370,375,380)
 	self:addTradeFlags(RecipeDB,34010,1,2,4,36,40,53,54,111)
 	self:addTradeAcquire(RecipeDB,34010,6,935,3,21432)

 	-- Nexus Transformation -- 42613
-	self:addTradeSkill(RecipeDB,42613,300,22448,1,7411,nil,1,300,300,300,305)
+	AddRecipe(42613,300,22448,1,1,300,300,300,305)
 	self:addTradeFlags(RecipeDB,42613,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,42613,1,18753,1,18773,1,19252,1,33610,1,33676,1,19540)

 	-- Small Prismatic Shard -- 42615
-	self:addTradeSkill(RecipeDB,42615,335,22448,1,7411,nil,1,335,335,335,335)
+	AddRecipe(42615,335,22448,1,1,335,335,335,335)
 	self:addTradeFlags(RecipeDB,42615,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,42615,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Enchant Weapon - Greater Agility -- 42620
-	self:addTradeSkill(RecipeDB,42620,350,nil,1,7411,nil,1,350,360,367,375)
+	AddRecipe(42620,350,nil,1,1,350,360,367,375)
 	self:addTradeFlags(RecipeDB,42620,1,2,4,36,40,51,114)
 	self:addTradeAcquire(RecipeDB,42620,6,967,4,18255)

 	-- Enchant Weapon - Executioner -- 42974
-	self:addTradeSkill(RecipeDB,42974,375,nil,1,7411,nil,1,375,380,385,390)
+	AddRecipe(42974,375,nil,1,1,375,380,385,390)
 	self:addTradeFlags(RecipeDB,42974,1,2,6,36,40,51)
 	self:addTradeAcquire(RecipeDB,42974,8,29)

 	-- Enchant Shield - Resilience -- 44383
-	self:addTradeSkill(RecipeDB,44383,330,nil,1,7411,nil,1,330,340,355,370)
+	AddRecipe(44383,330,nil,1,1,330,340,355,370)
 	self:addTradeFlags(RecipeDB,44383,1,2,3,36,41,64)
 	self:addTradeAcquire(RecipeDB,44383,1,18753,1,18773,1,19252,1,19540,1,33610,1,33676)

 	-- Enchant Cloak - Superior Frost Resistance -- 44483
-	self:addTradeSkill(RecipeDB,44483,400,nil,1,7411,nil,2,400,415,425,435)
+	AddRecipe(44483,400,nil,1,2,400,415,425,435)
 	self:addTradeFlags(RecipeDB,44483,1,2,11,36,40,60)
 	self:addTradeAcquire(RecipeDB,44483,3,32289)

 	-- Enchant Gloves - Expertise -- 44484
-	self:addTradeSkill(RecipeDB,44484,405,nil,1,7411,nil,2,405,415,425,435)
+	AddRecipe(44484,405,nil,1,2,405,415,425,435)
 	self:addTradeFlags(RecipeDB,44484,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,44484,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Gloves - Precision -- 44488
-	self:addTradeSkill(RecipeDB,44488,410,nil,1,7411,nil,2,410,420,430,440)
+	AddRecipe(44488,410,nil,1,2,410,420,430,440)
 	self:addTradeFlags(RecipeDB,44488,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,44488,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Shield - Defense -- 44489
-	self:addTradeSkill(RecipeDB,44489,420,nil,1,7411,nil,2,420,430,440,450)
+	AddRecipe(44489,420,nil,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,44489,1,2,3,36,41,52,64)
 	self:addTradeAcquire(RecipeDB,44489,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Chest - Mighty Health -- 44492
-	self:addTradeSkill(RecipeDB,44492,395,nil,1,7411,nil,2,395,405,415,425)
+	AddRecipe(44492,395,nil,1,2,395,405,415,425)
 	self:addTradeFlags(RecipeDB,44492,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,44492,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Cloak - Superior Nature Resistance -- 44494
-	self:addTradeSkill(RecipeDB,44494,400,nil,1,7411,nil,2,400,415,425,435)
+	AddRecipe(44494,400,nil,1,2,400,415,425,435)
 	self:addTradeFlags(RecipeDB,44494,1,2,11,36,40,60)
 	self:addTradeAcquire(RecipeDB,44494,3,32290)

 	-- Enchant Cloak - Superior Agility -- 44500
-	self:addTradeSkill(RecipeDB,44500,395,nil,1,7411,nil,2,395,405,415,425)
+	AddRecipe(44500,395,nil,1,2,395,405,415,425)
 	self:addTradeFlags(RecipeDB,44500,1,2,3,36,41,51,60)
 	self:addTradeAcquire(RecipeDB,44500,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Gloves - Gatherer -- 44506
-	self:addTradeSkill(RecipeDB,44506,375,nil,1,7411,nil,2,375,375,380,390)
+	AddRecipe(44506,375,nil,1,2,375,375,380,390)
 	self:addTradeFlags(RecipeDB,44506,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,44506,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Boots - Greater Spirit -- 44508
-	self:addTradeSkill(RecipeDB,44508,410,nil,1,7411,nil,2,410,420,430,440)
+	AddRecipe(44508,410,nil,1,2,410,420,430,440)
 	self:addTradeFlags(RecipeDB,44508,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,44508,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Chest - Greater Mana Restoration -- 44509
-	self:addTradeSkill(RecipeDB,44509,420,nil,1,7411,nil,2,420,430,440,450)
+	AddRecipe(44509,420,nil,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,44509,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,44509,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Weapon - Exceptional Spirit -- 44510
-	self:addTradeSkill(RecipeDB,44510,410,nil,1,7411,nil,2,410,420,430,440)
+	AddRecipe(44510,410,nil,1,2,410,420,430,440)
 	self:addTradeFlags(RecipeDB,44510,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,44510,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Gloves - Greater Assault -- 44513
-	self:addTradeSkill(RecipeDB,44513,395,nil,1,7411,nil,2,395,405,415,425)
+	AddRecipe(44513,395,nil,1,2,395,405,415,425)
 	self:addTradeFlags(RecipeDB,44513,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,44513,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Weapon - Icebreaker -- 44524
-	self:addTradeSkill(RecipeDB,44524,425,nil,1,7411,nil,2,425,435,445,455)
+	AddRecipe(44524,425,nil,1,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,44524,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,44524,2,32514)

 	-- Enchant Boots - Greater Fortitude -- 44528
-	self:addTradeSkill(RecipeDB,44528,385,nil,1,7411,nil,2,385,385,390,400)
+	AddRecipe(44528,385,nil,1,2,385,385,390,400)
 	self:addTradeFlags(RecipeDB,44528,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,44528,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Gloves - Major Agility -- 44529
-	self:addTradeSkill(RecipeDB,44529,415,nil,1,7411,nil,2,415,425,435,445)
+	AddRecipe(44529,415,nil,1,2,415,425,435,445)
 	self:addTradeFlags(RecipeDB,44529,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,44529,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Bracers - Exceptional Intellect -- 44555
-	self:addTradeSkill(RecipeDB,44555,375,nil,1,7411,nil,2,375,385,392,400)
+	AddRecipe(44555,375,nil,1,2,375,385,392,400)
 	self:addTradeFlags(RecipeDB,44555,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,44555,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Cloak - Superior Fire Resistance -- 44556
-	self:addTradeSkill(RecipeDB,44556,400,nil,1,7411,nil,2,400,415,425,435)
+	AddRecipe(44556,400,nil,1,2,400,415,425,435)
 	self:addTradeFlags(RecipeDB,44556,1,2,11,36,40,60)
 	self:addTradeAcquire(RecipeDB,44556,3,30921)

 	-- Enchant Bracers - Greater Assault -- 44575
-	self:addTradeSkill(RecipeDB,44575,430,nil,1,7411,nil,2,430,440,450,460)
+	AddRecipe(44575,430,nil,1,2,430,440,450,460)
 	self:addTradeFlags(RecipeDB,44575,1,2,4,36,40,51)
 	self:addTradeAcquire(RecipeDB,44575,2,32514)

 	-- Enchant Weapon - Lifeward -- 44576
-	self:addTradeSkill(RecipeDB,44576,440,nil,3,7411,nil,2,425,435,445,455)
+	AddRecipe(44576,440,nil,3,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,44576,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,44576,2,32514)

 	-- Enchant Cloak - Spell Piercing -- 44582
-	self:addTradeSkill(RecipeDB,44582,395,nil,1,7411,nil,2,395,395,402,410)
+	AddRecipe(44582,395,nil,1,2,395,395,402,410)
 	self:addTradeFlags(RecipeDB,44582,1,2,3,36,41,54,60)
 	self:addTradeAcquire(RecipeDB,44582,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Boots - Greater Vitality -- 44584
-	self:addTradeSkill(RecipeDB,44584,405,nil,1,7411,nil,2,405,415,425,435)
+	AddRecipe(44584,405,nil,1,2,405,415,425,435)
 	self:addTradeFlags(RecipeDB,44584,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,44584,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Boots - Superior Agility -- 44589
-	self:addTradeSkill(RecipeDB,44589,415,nil,1,7411,nil,2,415,425,435,445)
+	AddRecipe(44589,415,nil,1,2,415,425,435,445)
 	self:addTradeFlags(RecipeDB,44589,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,44589,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Cloak - Superior Shadow Resistance -- 44590
-	self:addTradeSkill(RecipeDB,44590,400,nil,1,7411,nil,2,400,415,425,435)
+	AddRecipe(44590,400,nil,1,2,400,415,425,435)
 	self:addTradeFlags(RecipeDB,44590,1,2,11,36,40,60)
 	self:addTradeAcquire(RecipeDB,44590,3,32349)

 	-- Enchant Cloak - Titanweave -- 44591
-	self:addTradeSkill(RecipeDB,44591,435,nil,1,7411,nil,2,435,445,455,465)
+	AddRecipe(44591,435,nil,1,2,435,445,455,465)
 	self:addTradeFlags(RecipeDB,44591,1,2,4,36,40,52,60)
 	self:addTradeAcquire(RecipeDB,44591,2,32514)

 	-- Enchant Gloves - Exceptional Spellpower -- 44592
-	self:addTradeSkill(RecipeDB,44592,360,nil,1,7411,nil,2,360,370,380,390)
+	AddRecipe(44592,360,nil,1,2,360,370,380,390)
 	self:addTradeFlags(RecipeDB,44592,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,44592,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Bracers - Major Spirit -- 44593
-	self:addTradeSkill(RecipeDB,44593,420,nil,1,7411,nil,2,420,430,440,450)
+	AddRecipe(44593,420,nil,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,44593,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,44593,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant 2H Weapon - Scourgebane -- 44595
-	self:addTradeSkill(RecipeDB,44595,430,nil,3,7411,nil,2,430,440,450,460)
+	AddRecipe(44595,430,nil,3,2,430,440,450,460)
 	self:addTradeFlags(RecipeDB,44595,1,2,4,36,41,51)
 	self:addTradeAcquire(RecipeDB,44595,2,32514)

 	-- Enchant Cloak - Superior Arcane Resistance -- 44596
-	self:addTradeSkill(RecipeDB,44596,400,nil,1,7411,nil,2,400,415,425,435)
+	AddRecipe(44596,400,nil,1,2,400,415,425,435)
 	self:addTradeFlags(RecipeDB,44596,1,2,11,36,40,60)
 	self:addTradeAcquire(RecipeDB,44596,3,31702,3,32297)

 	-- Enchant Bracers - Expertise -- 44598
-	self:addTradeSkill(RecipeDB,44598,415,nil,1,7411,nil,2,415,425,435,445)
+	AddRecipe(44598,415,nil,1,2,415,425,435,445)
 	self:addTradeFlags(RecipeDB,44598,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,44598,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Bracers - Greater Stats -- 44616
-	self:addTradeSkill(RecipeDB,44616,400,nil,1,7411,nil,2,400,410,420,430)
+	AddRecipe(44616,400,nil,1,2,400,410,420,430)
 	self:addTradeFlags(RecipeDB,44616,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,44616,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Weapon - Giant Slayer -- 44621
-	self:addTradeSkill(RecipeDB,44621,430,nil,1,7411,nil,2,430,440,450,460)
+	AddRecipe(44621,430,nil,1,2,430,440,450,460)
 	self:addTradeFlags(RecipeDB,44621,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,44621,2,32514)

 	-- Enchant Chest - Super Stats -- 44623
-	self:addTradeSkill(RecipeDB,44623,370,nil,1,7411,nil,2,370,380,390,400)
+	AddRecipe(44623,370,nil,1,2,370,380,390,400)
 	self:addTradeFlags(RecipeDB,44623,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,44623,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Gloves - Armsman -- 44625
-	self:addTradeSkill(RecipeDB,44625,435,nil,2,7411,nil,2,435,445,455,465)
+	AddRecipe(44625,435,nil,2,2,435,445,455,465)
 	self:addTradeFlags(RecipeDB,44625,1,2,4,36,41,52)
 	self:addTradeAcquire(RecipeDB,44625,2,32514)

 	-- Enchant Weapon - Exceptional Spellpower -- 44629
-	self:addTradeSkill(RecipeDB,44629,395,nil,1,7411,nil,2,395,405,415,425)
+	AddRecipe(44629,395,nil,1,2,395,405,415,425)
 	self:addTradeFlags(RecipeDB,44629,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,44629,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant 2H Weapon - Greater Savagery -- 44630
-	self:addTradeSkill(RecipeDB,44630,390,nil,1,7411,nil,2,390,400,410,420)
+	AddRecipe(44630,390,nil,1,2,390,400,410,420)
 	self:addTradeFlags(RecipeDB,44630,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,44630,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Cloak - Shadow Armor -- 44631
-	self:addTradeSkill(RecipeDB,44631,440,nil,1,7411,nil,2,440,450,460,470)
+	AddRecipe(44631,440,nil,1,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,44631,1,2,4,36,40,51,60)
 	self:addTradeAcquire(RecipeDB,44631,2,32514)

 	-- Enchant Weapon - Exceptional Agility -- 44633
-	self:addTradeSkill(RecipeDB,44633,410,nil,1,7411,nil,2,410,420,430,440)
+	AddRecipe(44633,410,nil,1,2,410,420,430,440)
 	self:addTradeFlags(RecipeDB,44633,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,44633,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Bracers - Greater Spellpower -- 44635
-	self:addTradeSkill(RecipeDB,44635,395,nil,1,7411,nil,2,395,405,415,425)
+	AddRecipe(44635,395,nil,1,2,395,405,415,425)
 	self:addTradeFlags(RecipeDB,44635,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,44635,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Ring - Greater Spellpower -- 44636
-	self:addTradeSkill(RecipeDB,44636,400,nil,1,7411,nil,2,400,400,407,415)
+	AddRecipe(44636,400,nil,1,2,400,400,407,415)
 	self:addTradeFlags(RecipeDB,44636,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,44636,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Ring - Assault -- 44645
-	self:addTradeSkill(RecipeDB,44645,400,nil,1,7411,nil,2,400,400,407,415)
+	AddRecipe(44645,400,nil,1,2,400,400,407,415)
 	self:addTradeFlags(RecipeDB,44645,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,44645,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Void Shatter -- 45765
-	self:addTradeSkill(RecipeDB,45765,375,22449,1,7411,nil,1,375,375,375,375)
+	AddRecipe(45765,375,22449,1,1,375,375,375,375)
 	self:addTradeFlags(RecipeDB,45765,1,2,4,36,41,112)
 	self:addTradeAcquire(RecipeDB,45765,6,1077,2,25032)

 	-- Enchant Weapon - Deathfrost -- 46578
-	self:addTradeSkill(RecipeDB,46578,350,nil,1,7411,nil,1,350,350,357,365)
+	AddRecipe(46578,350,nil,1,1,350,350,357,365)
 	self:addTradeFlags(RecipeDB,46578,1,2,7,36,40)
 	self:addTradeAcquire(RecipeDB,46578,5,4)

 	-- Enchant Chest - Defense -- 46594
-	self:addTradeSkill(RecipeDB,46594,360,nil,1,7411,nil,2,360,370,385,400)
+	AddRecipe(46594,360,nil,1,2,360,370,385,400)
 	self:addTradeFlags(RecipeDB,46594,1,2,4,36,40,52,112)
 	self:addTradeAcquire(RecipeDB,46594,6,1077,2,25032)

 	-- Enchant Cloak - Steelweave -- 47051
-	self:addTradeSkill(RecipeDB,47051,375,nil,1,7411,nil,2,375,380,385,390)
+	AddRecipe(47051,375,nil,1,2,375,380,385,390)
 	self:addTradeFlags(RecipeDB,47051,1,2,5,36,40,52,60)
 	self:addTradeAcquire(RecipeDB,47051,3,24560)

 	-- Enchant Cloak - Mighty Armor -- 47672
-	self:addTradeSkill(RecipeDB,47672,430,nil,2,7411,nil,2,430,440,450,460)
+	AddRecipe(47672,430,nil,2,2,430,440,450,460)
 	self:addTradeFlags(RecipeDB,47672,1,2,4,36,41,60)
 	self:addTradeAcquire(RecipeDB,47672,2,32514)

 	-- Enchant Chest - Greater Defense -- 47766
-	self:addTradeSkill(RecipeDB,47766,400,nil,1,7411,nil,2,400,410,420,430)
+	AddRecipe(47766,400,nil,1,2,400,410,420,430)
 	self:addTradeFlags(RecipeDB,47766,1,2,3,36,41,52)
 	self:addTradeAcquire(RecipeDB,47766,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Cloak - Greater Speed -- 47898
-	self:addTradeSkill(RecipeDB,47898,430,nil,2,7411,nil,2,430,440,450,460)
+	AddRecipe(47898,430,nil,2,2,430,440,450,460)
 	self:addTradeFlags(RecipeDB,47898,1,2,4,36,41,60)
 	self:addTradeAcquire(RecipeDB,47898,2,32514)

 	-- Enchant Cloak - Wisdom -- 47899
-	self:addTradeSkill(RecipeDB,47899,440,nil,2,7411,nil,2,440,450,460,470)
+	AddRecipe(47899,440,nil,2,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,47899,1,2,4,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,47899,2,32514)

 	-- Enchant Chest - Super Health -- 47900
-	self:addTradeSkill(RecipeDB,47900,425,nil,1,7411,nil,2,425,435,445,455)
+	AddRecipe(47900,425,nil,1,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,47900,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,47900,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Boots - Tuskarr's Vitality -- 47901
-	self:addTradeSkill(RecipeDB,47901,440,nil,2,7411,nil,2,440,450,460,470)
+	AddRecipe(47901,440,nil,2,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,47901,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,47901,2,32514)

 	-- Enchant Weapon - Accuracy -- 59619
-	self:addTradeSkill(RecipeDB,59619,440,nil,1,7411,nil,2,440,450,460,470)
+	AddRecipe(59619,440,nil,1,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,59619,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,59619,2,32514)

 	-- Enchant Weapon - Berserking -- 59621
-	self:addTradeSkill(RecipeDB,59621,440,nil,1,7411,nil,2,440,450,460,470)
+	AddRecipe(59621,440,nil,1,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,59621,1,2,4,36,40,51)
 	self:addTradeAcquire(RecipeDB,59621,2,32514)

 	-- Enchant Weapon - Black Magic -- 59625
-	self:addTradeSkill(RecipeDB,59625,440,nil,3,7411,nil,2,440,450,460,470)
+	AddRecipe(59625,440,nil,3,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,59625,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,59625,2,32514)

 	-- Enchant Ring - Stamina -- 59636
-	self:addTradeSkill(RecipeDB,59636,400,nil,1,7411,nil,2,400,400,407,415)
+	AddRecipe(59636,400,nil,1,2,400,400,407,415)
 	self:addTradeFlags(RecipeDB,59636,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,59636,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Boots - Assault -- 60606
-	self:addTradeSkill(RecipeDB,60606,375,nil,1,7411,nil,2,375,385,395,405)
+	AddRecipe(60606,375,nil,1,2,375,385,395,405)
 	self:addTradeFlags(RecipeDB,60606,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,60606,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Cloak - Speed -- 60609
-	self:addTradeSkill(RecipeDB,60609,350,nil,1,7411,nil,2,350,360,370,380)
+	AddRecipe(60609,350,nil,1,2,350,360,370,380)
 	self:addTradeFlags(RecipeDB,60609,1,2,3,36,41,60)
 	self:addTradeAcquire(RecipeDB,60609,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Bracers - Striking -- 60616
-	self:addTradeSkill(RecipeDB,60616,360,nil,1,7411,nil,2,360,370,380,390)
+	AddRecipe(60616,360,nil,1,2,360,370,380,390)
 	self:addTradeFlags(RecipeDB,60616,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,60616,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Runed Titanium Rod -- 60619
-	self:addTradeSkill(RecipeDB,60619,425,44452,3,7411,nil,2,425,435,445,455)
+	AddRecipe(60619,425,44452,3,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,60619,1,2,3,37,41)
 	self:addTradeAcquire(RecipeDB,60619,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Weapon - Greater Potency -- 60621
-	self:addTradeSkill(RecipeDB,60621,380,nil,1,7411,nil,2,380,390,400,410)
+	AddRecipe(60621,380,nil,1,2,380,390,400,410)
 	self:addTradeFlags(RecipeDB,60621,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,60621,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Boots - Icewalker -- 60623
-	self:addTradeSkill(RecipeDB,60623,385,nil,1,7411,nil,2,385,395,405,415)
+	AddRecipe(60623,385,nil,1,2,385,395,405,415)
 	self:addTradeFlags(RecipeDB,60623,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,60623,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Shield - Greater Intellect -- 60653
-	self:addTradeSkill(RecipeDB,60653,395,nil,1,7411,nil,2,395,405,415,425)
+	AddRecipe(60653,395,nil,1,2,395,405,415,425)
 	self:addTradeFlags(RecipeDB,60653,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,60653,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Cloak - Major Agility -- 60663
-	self:addTradeSkill(RecipeDB,60663,420,nil,1,7411,nil,2,420,430,440,450)
+	AddRecipe(60663,420,nil,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,60663,1,2,3,36,41,51,60)
 	self:addTradeAcquire(RecipeDB,60663,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Gloves - Crusher -- 60668
-	self:addTradeSkill(RecipeDB,60668,425,nil,1,7411,nil,2,425,435,445,455)
+	AddRecipe(60668,425,nil,1,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,60668,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,60668,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant 2H Weapon - Massacre -- 60691
-	self:addTradeSkill(RecipeDB,60691,430,nil,3,7411,nil,2,430,440,450,460)
+	AddRecipe(60691,430,nil,3,2,430,440,450,460)
 	self:addTradeFlags(RecipeDB,60691,1,2,4,36,41,51)
 	self:addTradeAcquire(RecipeDB,60691,2,32514)

 	-- Enchant Chest - Powerful Stats -- 60692
-	self:addTradeSkill(RecipeDB,60692,440,nil,2,7411,nil,2,440,450,460,470)
+	AddRecipe(60692,440,nil,2,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,60692,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,60692,2,32514)

 	-- Enchant Weapon - Superior Potency -- 60707
-	self:addTradeSkill(RecipeDB,60707,435,nil,3,7411,nil,2,435,445,455,465)
+	AddRecipe(60707,435,nil,3,2,435,445,455,465)
 	self:addTradeFlags(RecipeDB,60707,1,2,4,36,41,51)
 	self:addTradeAcquire(RecipeDB,60707,2,32514)

 	-- Enchant Weapon - Mighty Spellpower -- 60714
-	self:addTradeSkill(RecipeDB,60714,435,nil,3,7411,nil,2,435,445,455,465)
+	AddRecipe(60714,435,nil,3,2,435,445,455,465)
 	self:addTradeFlags(RecipeDB,60714,1,2,4,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,60714,2,32514)

 	-- Enchant Boots - Greater Assault -- 60763
-	self:addTradeSkill(RecipeDB,60763,440,nil,2,7411,nil,2,440,450,460,470)
+	AddRecipe(60763,440,nil,2,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,60763,1,2,4,36,41,51)
 	self:addTradeAcquire(RecipeDB,60763,2,32514)

 	-- Enchant Bracers - Superior Spellpower -- 60767
-	self:addTradeSkill(RecipeDB,60767,440,nil,2,7411,nil,2,440,450,460,470)
+	AddRecipe(60767,440,nil,2,2,440,450,460,470)
 	self:addTradeFlags(RecipeDB,60767,1,2,4,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,60767,2,32514)

 	-- Enchant Bracer - Major Stamina -- 62256
-	self:addTradeSkill(RecipeDB,62256,450,nil,2,7411,nil,2,450,460,470,480)
+	AddRecipe(62256,450,nil,2,2,450,460,470,480)
 	self:addTradeFlags(RecipeDB,62256,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,62256,2,32514)

 	-- Enchant Chest - Exceptional Resilience -- 44588
-	self:addTradeSkill(RecipeDB,44588,410,nil,2,7411,nil,2,410,435,445,455)
+	AddRecipe(44588,410,nil,2,2,410,435,445,455)
 	self:addTradeFlags(RecipeDB,44588,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,44588,2,32514)

 	-- Enchant Weapon - Titanguard -- 62257
-	--self:addTradeSkill(RecipeDB,62257,440,nil,2,7411,nil,2,450,460,470,480)
+	--AddRecipe(62257,440,nil,2,2,450,460,470,480)
 	--self:addTradeFlags(RecipeDB,62257,1,2,4,36,41)
 	--self:addTradeAcquire(RecipeDB,62257,2,32514)

 	-- Enchant Boots - Lesser Accuracy -- 63746
-	self:addTradeSkill(RecipeDB,63746,225,nil,2,7411,nil,2,225,245,265,285)
+	AddRecipe(63746,225,nil,2,2,225,245,265,285)
 	self:addTradeFlags(RecipeDB,63746,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,63746,1,1317,1,3011,1,3345,1,3606,1,4213,1,4616,1,5157,1,5695,
 	1,11072,1,11073,1,11074,1,16160,1,16633,1,16725,1,19251,1,19252,1,33610,1,33676,1,18773,1,7949,1,19540,1,18753)

 	-- Smoking Heart of the Mountain -- 15596
-	self:addTradeSkill(RecipeDB,15596,265,45050,2,7411,nil,GAME_ORIG,265,285,305,325)
+	AddRecipe(15596,265,45050,2,GAME_ORIG,265,285,305,325)
 	self:addTradeFlags(RecipeDB,15596,1,2,5,11,37,41,61)
 	self:addTradeAcquire(RecipeDB,15596,3,9025)

 	-- Enchant Staff - Spellpower -- 62959
-	self:addTradeSkill(RecipeDB,62959,385,nil,1,7411,nil,2,385,395,405,415)
+	AddRecipe(62959,385,nil,1,2,385,395,405,415)
 	self:addTradeFlags(RecipeDB,62959,1,2,3,36,41,53,54,73)
 	self:addTradeAcquire(RecipeDB,62959,1,26906,1,26954,1,26980,1,26990,1,28693,1,33583)

 	-- Enchant Staff - Greater Spellpower -- 62948
-	self:addTradeSkill(RecipeDB,62948,450,nil,3,7411,nil,2,450,455,460,465)
+	AddRecipe(62948,450,nil,3,2,450,455,460,465)
 	self:addTradeFlags(RecipeDB,62948,1,2,4,36,41,53,54,73)
 	self:addTradeAcquire(RecipeDB,62948,2,32514)

 	-- Enchant Weapon - Blade Ward -- 64441
-	self:addTradeSkill(RecipeDB,64441,450,nil,3,7411,nil,2,450,455,460,465)
+	AddRecipe(64441,450,nil,3,2,450,455,460,465)
 	self:addTradeFlags(RecipeDB,64441,1,2,6,11,36,41,52)
 	self:addTradeAcquire(RecipeDB,64441,8,39)

 	-- Enchant Weapon - Blood Draining -- 64579
-	self:addTradeSkill(RecipeDB,64579,450,nil,3,7411,nil,2,450,455,460,465)
+	AddRecipe(64579,450,nil,3,2,450,455,460,465)
 	self:addTradeFlags(RecipeDB,64579,1,2,6,11,36,41)
 	self:addTradeAcquire(RecipeDB,64579,8,39)

-	-- The number of items added with patches
-	local patchitems = 0
-
 	-- 3.2.2 Items (Leave this code in here because I think asian servers don't actually have 3.1 even)
 	local version = GetBuildInfo()

 	if (version == "3.2.2") then

 		-- Abyssal Shatter -- 69412
-		self:addTradeSkill(RecipeDB,69412,445,49640,1,7411,nil,2,445,445,447,450)
+		AddRecipe(69412,445,49640,1,2,445,445,447,450)
 		self:addTradeFlags(RecipeDB,69412,1,2,3,36,41)
 		self:addTradeAcquire(RecipeDB,69412,1,28693)

-		patchitems = 1
-
 	end

-	return 294 + patchitems
+	return num_recipes

 end
diff --git a/RecipeDB/ARL-Engineer.lua b/RecipeDB/ARL-Engineer.lua
index 434e8b3..5ee5cec 100644
--- a/RecipeDB/ARL-Engineer.lua
+++ b/RecipeDB/ARL-Engineer.lua
@@ -1,36 +1,18 @@
---[[
-
-************************************************************************
-
-ARL-Engineer.lua
-
-Engineering data for all of Ackis Recipe List
-
-************************************************************************
-
-File date: @file-date-iso@
-File revision: @file-revision@
-Project revision: @project-revision@
-Project version: @project-version@
-
-************************************************************************
-
-Format:
-
-	self:addTradeSkill(RecipeDB, SpellID, SkillLevel, ItemID, Rarity, Profession, Specialty, Game, Orange, Yellow, Green, Grey)
-
-************************************************************************
-
-Please see http://www.wowace.com/projects/arl/for more information.
-
-License:
-	Please see LICENSE.txt
-
-This source code is released under All Rights Reserved.
-
-************************************************************************
-
-]]--
+--------------------------------------------------------------------------------------------------------------------
+-- ARL-Engineer.lua
+-- Engineering data for all of Ackis Recipe List
+--------------------------------------------------------------------------------------------------------------------
+-- File date: @file-date-iso@
+-- File revision: @file-revision@
+-- Project revision: @project-revision@
+-- Project version: @project-version@
+--------------------------------------------------------------------------------------------------------------------
+-- Please see http://www.wowace.com/projects/arl/for more information.
+--------------------------------------------------------------------------------------------------------------------
+-- License:
+-- Please see LICENSE.txt
+-- This source code is released under All Rights Reserved.
+--------------------------------------------------------------------------------------------------------------------

 local MODNAME = "Ackis Recipe List"
 local addon = LibStub("AceAddon-3.0"):GetAddon(MODNAME)
diff --git a/RecipeDB/ARL-Inscription.lua b/RecipeDB/ARL-Inscription.lua
index 937b545..afbd9a1 100644
--- a/RecipeDB/ARL-Inscription.lua
+++ b/RecipeDB/ARL-Inscription.lua
@@ -1,40 +1,22 @@
---[[
-
-************************************************************************
-
-ARL-Inscription.lua
-
-Inscription data for all of Ackis Recipe List
-
-************************************************************************
-
-File date: @file-date-iso@
-File revision: @file-revision@
-Project revision: @project-revision@
-Project version: @project-version@
-
-************************************************************************
-
-Format:
-
-	self:addTradeSkill(RecipeDB,Spell ID,Skill Level,Item ID,Rarity,Specialty)
-
-************************************************************************
-
-Please see http://www.wowace.com/projects/arl/for more information.
-
-License:
-	Please see LICENSE.txt
-
-This source code is released under All Rights Reserved.
-
-************************************************************************
-
-]]--
+--------------------------------------------------------------------------------------------------------------------
+-- ARL-Inscription.lua
+-- Inscription data for all of Ackis Recipe List
+--------------------------------------------------------------------------------------------------------------------
+-- File date: @file-date-iso@
+-- File revision: @file-revision@
+-- Project revision: @project-revision@
+-- Project version: @project-version@
+--------------------------------------------------------------------------------------------------------------------
+-- Please see http://www.wowace.com/projects/arl/for more information.
+--------------------------------------------------------------------------------------------------------------------
+-- License:
+-- Please see LICENSE.txt
+-- This source code is released under All Rights Reserved.
+--------------------------------------------------------------------------------------------------------------------

-local MODNAME		= "Ackis Recipe List"
-local addon		= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
-local L			= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
+local MODNAME = "Ackis Recipe List"
+local addon	= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
+local L	= LibStub("AceLocale-3.0"):GetLocale(MODNAME)

 --------------------------------------------------------------------------------------------------------------------
 -- Item "rarity"
@@ -59,2405 +41,2385 @@ local F_1H, F_2H, F_AXE, F_SWORD, F_MACE, F_POLEARM, F_DAGGER = 66, 67, 68, 69,
 local F_STAFF, F_WAND, F_THROWN, F_BOW, F_XBOW, F_AMMO, F_FIST, F_GUN = 73, 74, 75, 76, 77, 78, 79, 80

 --------------------------------------------------------------------------------------------------------------------
--- Reputation Filter flags
---------------------------------------------------------------------------------------------------------------------
-local F_ARGENTDAWN, F_CENARION_CIRCLE, F_THORIUM_BROTHERHOOD, F_TIMBERMAW_HOLD, F_ZANDALAR = 96, 97, 98, 99, 100
-local F_ALDOR, F_ASHTONGUE, F_CENARION_EXPEDITION, F_HELLFIRE, F_CONSORTIUM = 101, 102, 103, 104, 105
-local F_KOT, F_LOWERCITY, F_NAGRAND, F_SCALE_SANDS, F_SCRYER, F_SHATAR = 106, 107, 108, 109, 110
-local F_SHATTEREDSUN, F_SPOREGGAR, F_VIOLETEYE = 111, 112, 113, 114
-local F_ARGENTCRUSADE, F_FRENZYHEART, F_EBONBLADE, F_KIRINTOR, F_HODIR = 115, 116, 117, 118, 119
-local F_KALUAK, F_ORACLES, F_WYRMREST, F_WRATHCOMMON1, F_WRATHCOMMON2 = 120, 121, 122, 123, 124
-local F_WRATHCOMMON3, F_WRATHCOMMON4, F_WRATHCOMMON5 = 125, 126, 127
-
---------------------------------------------------------------------------------------------------------------------
 -- Acquire types
 --------------------------------------------------------------------------------------------------------------------
 local A_TRAINER, A_VENDOR, A_MOB, A_QUEST, A_SEASONAL, A_REPUTATION, A_WORLD_DROP, A_CUSTOM = 1, 2, 3, 4, 5, 6, 7, 8

---------------------------------------------------------------------------------------------------------------------
--- Reputation Acquire Flags
---------------------------------------------------------------------------------------------------------------------
-local R_WINTERSPRING = 589
-
---------------------------------------------------------------------------------------------------------------------
--- Reputation Levels
---------------------------------------------------------------------------------------------------------------------
-local FRIENDLY = 1
-local HONORED = 2
-local REVERED = 3
-local EXALTED = 4
-

-local initialized	= false
+local initialized = false
+local num_recipes = 0

 function addon:InitInscription(RecipeDB)

 	if initialized then
-		return
+		return num_recipes
 	end

 	initialized = true

+	--------------------------------------------------------------------------------------------------------------------
+	-- Counter and wrapper function
+	--------------------------------------------------------------------------------------------------------------------
+	local function AddRecipe(SpellID, Skill, ItemID, Rarity, Game, Orange, Yellow, Green, Gray)
+		num_recipes = num_recipes + 1
+		self:addTradeSkill(RecipeDB, SpellID, Skill, ItemID, Rarity, 45357, nil, Game, Orange, Yellow, Green, Gray)
+	end
+
 	-- Scroll of Stamina -- 45382
-	self:addTradeSkill(RecipeDB,45382,25,1180,1,45357,nil,2,1,35,40,45)
+	AddRecipe(45382,25,1180,1,2,1,35,40,45)
 	self:addTradeFlags(RecipeDB,45382,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,45382,8,8)

 	-- Scroll of Intellect -- 48114
-	self:addTradeSkill(RecipeDB,48114,25,955,1,45357,nil,2,35,35,40,45)
+	AddRecipe(48114,25,955,1,2,35,35,40,45)
 	self:addTradeFlags(RecipeDB,48114,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,48114,8,8)

 	-- Scroll of Spirit -- 48116
-	self:addTradeSkill(RecipeDB,48116,25,1181,1,45357,nil,2,35,35,40,45)
+	AddRecipe(48116,25,1181,1,2,35,35,40,45)
 	self:addTradeFlags(RecipeDB,48116,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,48116,8,8)

 	-- Glyph of Entangling Roots -- 48121
-	self:addTradeSkill(RecipeDB,48121,100,40924,1,45357,nil,2,100,105,110,115)
+	AddRecipe(48121,100,40924,1,2,100,105,110,115)
 	self:addTradeFlags(RecipeDB,48121,1,2,3,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,48121,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Mysterious Tarot -- 48247
-	self:addTradeSkill(RecipeDB,48247,110,37168,1,45357,nil,2,110,125,137,150)
+	AddRecipe(48247,110,37168,1,2,110,125,137,150)
 	self:addTradeFlags(RecipeDB,48247,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,48247,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Recall -- 48248
-	self:addTradeSkill(RecipeDB,48248,35,37118,1,45357,nil,2,35,60,67,75)
+	AddRecipe(48248,35,37118,1,2,35,60,67,75)
 	self:addTradeFlags(RecipeDB,48248,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,48248,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Intellect II -- 50598
-	self:addTradeSkill(RecipeDB,50598,75,2290,1,45357,nil,2,75,75,80,85)
+	AddRecipe(50598,75,2290,1,2,75,75,80,85)
 	self:addTradeFlags(RecipeDB,50598,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,50598,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Intellect III -- 50599
-	self:addTradeSkill(RecipeDB,50599,165,4419,1,45357,nil,2,165,170,175,180)
+	AddRecipe(50599,165,4419,1,2,165,170,175,180)
 	self:addTradeFlags(RecipeDB,50599,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,50599,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Intellect IV -- 50600
-	self:addTradeSkill(RecipeDB,50600,215,10308,1,45357,nil,2,215,220,225,230)
+	AddRecipe(50600,215,10308,1,2,215,220,225,230)
 	self:addTradeFlags(RecipeDB,50600,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,50600,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Intellect V -- 50601
-	self:addTradeSkill(RecipeDB,50601,260,27499,1,45357,nil,2,260,265,270,275)
+	AddRecipe(50601,260,27499,1,2,260,265,270,275)
 	self:addTradeFlags(RecipeDB,50601,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,50601,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Intellect VI -- 50602
-	self:addTradeSkill(RecipeDB,50602,310,33458,1,45357,nil,2,310,310,315,320)
+	AddRecipe(50602,310,33458,1,2,310,310,315,320)
 	self:addTradeFlags(RecipeDB,50602,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,50602,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Intellect VII -- 50603
-	self:addTradeSkill(RecipeDB,50603,360,37091,1,45357,nil,2,360,365,370,375)
+	AddRecipe(50603,360,37091,1,2,360,365,370,375)
 	self:addTradeFlags(RecipeDB,50603,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,50603,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Scroll of Intellect VIII -- 50604
-	self:addTradeSkill(RecipeDB,50604,410,37092,1,45357,nil,2,410,415,420,425)
+	AddRecipe(50604,410,37092,1,2,410,415,420,425)
 	self:addTradeFlags(RecipeDB,50604,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,50604,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Scroll of Spirit II -- 50605
-	self:addTradeSkill(RecipeDB,50605,75,1712,1,45357,nil,2,75,75,80,85)
+	AddRecipe(50605,75,1712,1,2,75,75,80,85)
 	self:addTradeFlags(RecipeDB,50605,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,50605,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Spirit III -- 50606
-	self:addTradeSkill(RecipeDB,50606,160,4424,1,45357,nil,2,160,165,170,175)
+	AddRecipe(50606,160,4424,1,2,160,165,170,175)
 	self:addTradeFlags(RecipeDB,50606,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,50606,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Spirit IV -- 50607
-	self:addTradeSkill(RecipeDB,50607,210,10306,1,45357,nil,2,210,215,220,225)
+	AddRecipe(50607,210,10306,1,2,210,215,220,225)
 	self:addTradeFlags(RecipeDB,50607,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,50607,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Spirit V -- 50608
-	self:addTradeSkill(RecipeDB,50608,255,27501,1,45357,nil,2,255,260,265,270)
+	AddRecipe(50608,255,27501,1,2,255,260,265,270)
 	self:addTradeFlags(RecipeDB,50608,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,50608,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Spirit VI -- 50609
-	self:addTradeSkill(RecipeDB,50609,295,33460,1,45357,nil,2,295,305,310,315)
+	AddRecipe(50609,295,33460,1,2,295,305,310,315)
 	self:addTradeFlags(RecipeDB,50609,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,50609,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Spirit VII -- 50610
-	self:addTradeSkill(RecipeDB,50610,355,37097,1,45357,nil,2,355,360,365,370)
+	AddRecipe(50610,355,37097,1,2,355,360,365,370)
 	self:addTradeFlags(RecipeDB,50610,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,50610,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Scroll of Spirit VIII -- 50611
-	self:addTradeSkill(RecipeDB,50611,405,37098,1,45357,nil,2,405,410,415,420)
+	AddRecipe(50611,405,37098,1,2,405,410,415,420)
 	self:addTradeFlags(RecipeDB,50611,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,50611,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Scroll of Stamina II -- 50612
-	self:addTradeSkill(RecipeDB,50612,75,1711,1,45357,nil,2,75,75,80,85)
+	AddRecipe(50612,75,1711,1,2,75,75,80,85)
 	self:addTradeFlags(RecipeDB,50612,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,50612,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Stamina III -- 50614
-	self:addTradeSkill(RecipeDB,50614,155,4422,1,45357,nil,2,155,160,165,170)
+	AddRecipe(50614,155,4422,1,2,155,160,165,170)
 	self:addTradeFlags(RecipeDB,50614,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,50614,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Stamina IV -- 50616
-	self:addTradeSkill(RecipeDB,50616,205,10307,1,45357,nil,2,205,210,215,220)
+	AddRecipe(50616,205,10307,1,2,205,210,215,220)
 	self:addTradeFlags(RecipeDB,50616,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,50616,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Stamina V -- 50617
-	self:addTradeSkill(RecipeDB,50617,250,27502,1,45357,nil,2,250,255,260,265)
+	AddRecipe(50617,250,27502,1,2,250,255,260,265)
 	self:addTradeFlags(RecipeDB,50617,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,50617,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Stamina VI -- 50618
-	self:addTradeSkill(RecipeDB,50618,290,33461,1,45357,nil,2,290,300,305,310)
+	AddRecipe(50618,290,33461,1,2,290,300,305,310)
 	self:addTradeFlags(RecipeDB,50618,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,50618,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Stamina VII -- 50619
-	self:addTradeSkill(RecipeDB,50619,350,37093,1,45357,nil,2,350,355,360,365)
+	AddRecipe(50619,350,37093,1,2,350,355,360,365)
 	self:addTradeFlags(RecipeDB,50619,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,50619,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Scroll of Stamina VIII -- 50620
-	self:addTradeSkill(RecipeDB,50620,400,37094,1,45357,nil,2,400,405,410,415)
+	AddRecipe(50620,400,37094,1,2,400,405,410,415)
 	self:addTradeFlags(RecipeDB,50620,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,50620,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Ivory Ink -- 52738
-	self:addTradeSkill(RecipeDB,52738,1,37101,1,45357,nil,2,1,15,22,30)
+	AddRecipe(52738,1,37101,1,2,1,15,22,30)
 	self:addTradeFlags(RecipeDB,52738,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,52738,8,8)

 	-- Armor Vellum -- 52739
-	self:addTradeSkill(RecipeDB,52739,35,38682,1,45357,nil,2,35,75,87,100)
+	AddRecipe(52739,35,38682,1,2,35,75,87,100)
 	self:addTradeFlags(RecipeDB,52739,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,52739,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Weapon Vellum -- 52840
-	self:addTradeSkill(RecipeDB,52840,75,39349,1,45357,nil,2,75,100,112,125)
+	AddRecipe(52840,75,39349,1,2,75,100,112,125)
 	self:addTradeFlags(RecipeDB,52840,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,52840,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Moonglow Ink -- 52843
-	self:addTradeSkill(RecipeDB,52843,35,39469,1,45357,nil,2,35,45,60,75)
+	AddRecipe(52843,35,39469,1,2,35,45,60,75)
 	self:addTradeFlags(RecipeDB,52843,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,52843,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Midnight Ink -- 53462
-	self:addTradeSkill(RecipeDB,53462,75,39774,1,45357,nil,2,75,75,77,80)
+	AddRecipe(53462,75,39774,1,2,75,75,77,80)
 	self:addTradeFlags(RecipeDB,53462,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,53462,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Frenzied Regeneration -- 56943
-	self:addTradeSkill(RecipeDB,56943,350,40896,1,45357,nil,2,350,355,360,365)
+	AddRecipe(56943,350,40896,1,2,350,355,360,365)
 	self:addTradeFlags(RecipeDB,56943,1,2,3,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,56943,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Growl -- 56944
-	self:addTradeSkill(RecipeDB,56944,385,40899,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56944,385,40899,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56944,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,56944,8,15)

 	-- Glyph of Healing Touch -- 56945
-	self:addTradeSkill(RecipeDB,56945,115,40914,1,45357,nil,2,115,12,125,130)
+	AddRecipe(56945,115,40914,1,2,115,12,125,130)
 	self:addTradeFlags(RecipeDB,56945,1,2,3,F_DRUID,36,41,53)
 	self:addTradeAcquire(RecipeDB,56945,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Hurricane -- 56946
-	self:addTradeSkill(RecipeDB,56946,385,40920,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56946,385,40920,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56946,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,56946,8,15)

 	-- Glyph of Innervate -- 56947
-	self:addTradeSkill(RecipeDB,56947,385,40908,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56947,385,40908,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56947,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,56947,8,15)

 	-- Glyph of Insect Swarm -- 56948
-	self:addTradeSkill(RecipeDB,56948,150,40919,1,45357,nil,2,150,155,160,165)
+	AddRecipe(56948,150,40919,1,2,150,155,160,165)
 	self:addTradeFlags(RecipeDB,56948,1,2,3,F_DRUID,36,41,54)
 	self:addTradeAcquire(RecipeDB,56948,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Lifebloom -- 56949
-	self:addTradeSkill(RecipeDB,56949,385,40915,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56949,385,40915,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56949,1,2,12,F_DRUID,36,41,53)
 	self:addTradeAcquire(RecipeDB,56949,8,15)

 	-- Glyph of Mangle -- 56950
-	self:addTradeSkill(RecipeDB,56950,385,40900,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56950,385,40900,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56950,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,56950,8,15)

 	-- Glyph of Moonfire -- 56951
-	self:addTradeSkill(RecipeDB,56951,130,40923,1,45357,nil,2,130,135,140,145)
+	AddRecipe(56951,130,40923,1,2,130,135,140,145)
 	self:addTradeFlags(RecipeDB,56951,1,2,3,F_DRUID,36,41,54)
 	self:addTradeAcquire(RecipeDB,56951,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Rake -- 56952
-	self:addTradeSkill(RecipeDB,56952,310,40903,1,45357,nil,2,310,315,320,325)
+	AddRecipe(56952,310,40903,1,2,310,315,320,325)
 	self:addTradeFlags(RecipeDB,56952,1,2,3,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,56952,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Rebirth -- 56953
-	self:addTradeSkill(RecipeDB,56953,170,40909,1,45357,nil,2,170,175,180,185)
+	AddRecipe(56953,170,40909,1,2,170,175,180,185)
 	self:addTradeFlags(RecipeDB,56953,1,2,3,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,56953,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Regrowth -- 56954
-	self:addTradeSkill(RecipeDB,56954,385,40912,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56954,385,40912,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56954,1,2,12,F_DRUID,36,41,53)
 	self:addTradeAcquire(RecipeDB,56954,8,15)

 	-- Glyph of Rejuvenation -- 56955
-	self:addTradeSkill(RecipeDB,56955,80,40913,1,45357,nil,2,80,90,100,110)
+	AddRecipe(56955,80,40913,1,2,80,90,100,110)
 	self:addTradeFlags(RecipeDB,56955,1,2,3,F_DRUID,36,41,53)
 	self:addTradeAcquire(RecipeDB,56955,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Rip -- 56956
-	self:addTradeSkill(RecipeDB,56956,200,40902,1,45357,nil,2,200,205,210,215)
+	AddRecipe(56956,200,40902,1,2,200,205,210,215)
 	self:addTradeFlags(RecipeDB,56956,1,2,3,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,56956,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Shred -- 56957
-	self:addTradeSkill(RecipeDB,56957,260,40901,1,45357,nil,2,260,265,270,275)
+	AddRecipe(56957,260,40901,1,2,260,265,270,275)
 	self:addTradeFlags(RecipeDB,56957,1,2,3,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,56957,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Starfall -- 56958
-	self:addTradeSkill(RecipeDB,56958,385,40921,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56958,385,40921,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56958,1,2,12,F_DRUID,36,41,54)
 	self:addTradeAcquire(RecipeDB,56958,8,15)

 	-- Glyph of Starfire -- 56959
-	self:addTradeSkill(RecipeDB,56959,220,40916,1,45357,nil,2,220,225,230,235)
+	AddRecipe(56959,220,40916,1,2,220,225,230,235)
 	self:addTradeFlags(RecipeDB,56959,1,2,3,F_DRUID,36,41,54)
 	self:addTradeAcquire(RecipeDB,56959,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Swiftmend -- 56960
-	self:addTradeSkill(RecipeDB,56960,385,40906,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56960,385,40906,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56960,1,2,12,F_DRUID,36,41,53)
 	self:addTradeAcquire(RecipeDB,56960,8,15)

 	-- Glyph of Maul -- 56961
-	self:addTradeSkill(RecipeDB,56961,90,40897,1,45357,nil,2,90,100,110,120)
+	AddRecipe(56961,90,40897,1,2,90,100,110,120)
 	self:addTradeFlags(RecipeDB,56961,1,2,3,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,56961,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Wrath -- 56963
-	self:addTradeSkill(RecipeDB,56963,85,40922,1,45357,nil,2,85,95,105,115)
+	AddRecipe(56963,85,40922,1,2,85,95,105,115)
 	self:addTradeFlags(RecipeDB,56963,1,2,3,F_DRUID,36,41,54)
 	self:addTradeAcquire(RecipeDB,56963,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Arcane Explosion -- 56968
-	self:addTradeSkill(RecipeDB,56968,100,42734,1,45357,nil,2,100,105,110,115)
+	AddRecipe(56968,100,42734,1,2,100,105,110,115)
 	self:addTradeFlags(RecipeDB,56968,1,2,3,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56968,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Arcane Missiles -- 56971
-	self:addTradeSkill(RecipeDB,56971,115,42735,1,45357,nil,2,115,120,125,130)
+	AddRecipe(56971,115,42735,1,2,115,120,125,130)
 	self:addTradeFlags(RecipeDB,56971,1,2,3,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56971,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Arcane Power -- 56972
-	self:addTradeSkill(RecipeDB,56972,335,42736,1,45357,nil,2,335,340,345,350)
+	AddRecipe(56972,335,42736,1,2,335,340,345,350)
 	self:addTradeFlags(RecipeDB,56972,1,2,3,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56972,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Blink -- 56973
-	self:addTradeSkill(RecipeDB,56973,130,42737,1,45357,nil,2,130,135,140,145)
+	AddRecipe(56973,130,42737,1,2,130,135,140,145)
 	self:addTradeFlags(RecipeDB,56973,1,2,3,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56973,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,1,30710,1,30711,
 	1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Evocation -- 56974
-	self:addTradeSkill(RecipeDB,56974,155,42738,1,45357,nil,2,155,160,165,170)
+	AddRecipe(56974,155,42738,1,2,155,160,165,170)
 	self:addTradeFlags(RecipeDB,56974,1,2,3,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56974,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,1,30710,1,30711,
 	1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Fireball -- 56975
-	self:addTradeSkill(RecipeDB,56975,385,42739,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56975,385,42739,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56975,1,2,12,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56975,8,15)

 	-- Glyph of Frost Nova -- 56976
-	self:addTradeSkill(RecipeDB,56976,80,42741,1,45357,nil,2,80,90,100,110)
+	AddRecipe(56976,80,42741,1,2,80,90,100,110)
 	self:addTradeFlags(RecipeDB,56976,1,2,3,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56976,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Frostbolt -- 56977
-	self:addTradeSkill(RecipeDB,56977,385,42742,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56977,385,42742,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56977,1,2,12,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56977,8,15)

 	-- Glyph of Ice Armor -- 56978
-	self:addTradeSkill(RecipeDB,56978,90,42743,1,45357,nil,2,90,100,110,120)
+	AddRecipe(56978,90,42743,1,2,90,100,110,120)
 	self:addTradeFlags(RecipeDB,56978,1,2,3,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56978,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Ice Block -- 56979
-	self:addTradeSkill(RecipeDB,56979,225,42744,1,45357,nil,2,225,230,235,240)
+	AddRecipe(56979,225,42744,1,2,225,230,235,240)
 	self:addTradeFlags(RecipeDB,56979,1,2,3,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56979,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,30709,
 	1,30706,1,30713,1,30715,1,30716,1,33603,1,33615,1,30710,1,30717,1,30711,1,33679)

 	-- Glyph of Ice Lance -- 56980
-	self:addTradeSkill(RecipeDB,56980,375,42745,1,45357,nil,2,375,380,385,390)
+	AddRecipe(56980,375,42745,1,2,375,380,385,390)
 	self:addTradeFlags(RecipeDB,56980,1,2,3,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56980,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Glyph of Icy Veins -- 56981
-	self:addTradeSkill(RecipeDB,56981,175,42746,1,45357,nil,2,175,180,185,190)
+	AddRecipe(56981,175,42746,1,2,175,180,185,190)
 	self:addTradeFlags(RecipeDB,56981,1,2,3,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56981,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Improved Scorch -- 56982
-	self:addTradeSkill(RecipeDB,56982,205,42747,1,45357,nil,2,205,210,215,220)
+	AddRecipe(56982,205,42747,1,2,205,210,215,220)
 	self:addTradeFlags(RecipeDB,56982,1,2,3,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56982,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Invisibility -- 56983
-	self:addTradeSkill(RecipeDB,56983,385,42748,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56983,385,42748,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56983,1,2,12,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56983,8,15)

 	-- Glyph of Mage Armor -- 56984
-	self:addTradeSkill(RecipeDB,56984,325,42749,1,45357,nil,2,325,330,335,340)
+	AddRecipe(56984,325,42749,1,2,325,330,335,340)
 	self:addTradeFlags(RecipeDB,56984,1,2,3,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56984,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Mana Gem -- 56985
-	self:addTradeSkill(RecipeDB,56985,280,42750,1,45357,nil,2,280,285,290,295)
+	AddRecipe(56985,280,42750,1,2,280,285,290,295)
 	self:addTradeFlags(RecipeDB,56985,1,2,3,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56985,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Molten Armor -- 56986
-	self:addTradeSkill(RecipeDB,56986,385,42751,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56986,385,42751,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56986,1,2,12,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56986,8,15)

 	-- Glyph of Polymorph -- 56987
-	self:addTradeSkill(RecipeDB,56987,400,42752,1,45357,nil,2,400,400,400,405)
+	AddRecipe(56987,400,42752,1,2,400,400,400,405)
 	self:addTradeFlags(RecipeDB,56987,1,2,3,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56987,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Glyph of Remove Curse -- 56988
-	self:addTradeSkill(RecipeDB,56988,385,42753,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56988,385,42753,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56988,1,2,12,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56988,8,15)

 	-- Glyph of Water Elemental -- 56989
-	self:addTradeSkill(RecipeDB,56989,385,42754,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56989,385,42754,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56989,1,2,12,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,56989,8,15)

 	-- Glyph of Aimed Shot -- 56994
-	self:addTradeSkill(RecipeDB,56994,175,42897,1,45357,nil,2,175,180,185,190)
+	AddRecipe(56994,175,42897,1,2,175,180,185,190)
 	self:addTradeFlags(RecipeDB,56994,1,2,3,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,56994,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,1,30709,
 	1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Arcane Shot -- 56995
-	self:addTradeSkill(RecipeDB,56995,100,42898,1,45357,nil,2,100,105,110,115)
+	AddRecipe(56995,100,42898,1,2,100,105,110,115)
 	self:addTradeFlags(RecipeDB,56995,1,2,3,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,56995,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Aspect the Beast -- 56996
-	self:addTradeSkill(RecipeDB,56996,385,42899,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56996,385,42899,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56996,1,2,12,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,56996,8,15)

 	-- Glyph of Mending -- 56997
-	self:addTradeSkill(RecipeDB,56997,115,42900,1,45357,nil,2,115,120,125,130)
+	AddRecipe(56997,115,42900,1,2,115,120,125,130)
 	self:addTradeFlags(RecipeDB,56997,1,2,3,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,56997,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Aspect of the Viper -- 56998
-	self:addTradeSkill(RecipeDB,56998,385,42901,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56998,385,42901,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56998,1,2,12,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,56998,8,15)

 	-- Glyph of Bestial Wrath -- 56999
-	self:addTradeSkill(RecipeDB,56999,385,42902,1,45357,nil,2,385,390,397,405)
+	AddRecipe(56999,385,42902,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,56999,1,2,12,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,56999,8,15)

 	-- Glyph of Deterrence -- 57000
-	self:addTradeSkill(RecipeDB,57000,200,42903,1,45357,nil,2,200,205,210,215)
+	AddRecipe(57000,200,42903,1,2,200,205,210,215)
 	self:addTradeFlags(RecipeDB,57000,1,2,3,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,57000,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Disengage -- 57001
-	self:addTradeSkill(RecipeDB,57001,225,42904,1,45357,nil,2,225,230,235,240)
+	AddRecipe(57001,225,42904,1,2,225,230,235,240)
 	self:addTradeFlags(RecipeDB,57001,1,2,3,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,57001,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Freezing Trap -- 57002
-	self:addTradeSkill(RecipeDB,57002,260,42905,1,45357,nil,2,260,265,270,275)
+	AddRecipe(57002,260,42905,1,2,260,265,270,275)
 	self:addTradeFlags(RecipeDB,57002,1,2,3,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,57002,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Frost Trap -- 57003
-	self:addTradeSkill(RecipeDB,57003,350,42906,1,45357,nil,2,350,355,360,365)
+	AddRecipe(57003,350,42906,1,2,350,355,360,365)
 	self:addTradeFlags(RecipeDB,57003,1,2,3,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,57003,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Hunter's Mark -- 57004
-	self:addTradeSkill(RecipeDB,57004,80,42907,1,45357,nil,2,80,90,100,110)
+	AddRecipe(57004,80,42907,1,2,80,90,100,110)
 	self:addTradeFlags(RecipeDB,57004,1,2,3,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,57004,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Immolation Trap -- 57005
-	self:addTradeSkill(RecipeDB,57005,130,42908,1,45357,nil,2,130,135,140,145)
+	AddRecipe(57005,130,42908,1,2,130,135,140,145)
 	self:addTradeFlags(RecipeDB,57005,1,2,3,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,57005,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of the Hawk -- 57006
-	self:addTradeSkill(RecipeDB,57006,375,42909,1,45357,nil,2,375,380,385,390)
+	AddRecipe(57006,375,42909,1,2,375,380,385,390)
 	self:addTradeFlags(RecipeDB,57006,1,2,3,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,57006,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Glyph of Multi-Shot -- 57007
-	self:addTradeSkill(RecipeDB,57007,150,42910,1,45357,nil,2,150,155,160,165)
+	AddRecipe(57007,150,42910,1,2,150,155,160,165)
 	self:addTradeFlags(RecipeDB,57007,1,2,3,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,57007,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,
 	1,30709,1,30706,1,30713,1,30715,1,30716,1,33603,1,33615,1,30710,1,30717,1,30711,1,33679)

 	-- Glyph of Rapid Fire -- 57008
-	self:addTradeSkill(RecipeDB,57008,315,42911,1,45357,nil,2,315,320,325,330)
+	AddRecipe(57008,315,42911,1,2,315,320,325,330)
 	self:addTradeFlags(RecipeDB,57008,1,2,3,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,57008,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Serpent Sting -- 57009
-	self:addTradeSkill(RecipeDB,57009,90,42912,1,45357,nil,2,90,100,110,120)
+	AddRecipe(57009,90,42912,1,2,90,100,110,120)
 	self:addTradeFlags(RecipeDB,57009,1,2,3,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,57009,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Snake Trap -- 57010
-	self:addTradeSkill(RecipeDB,57010,385,42913,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57010,385,42913,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57010,1,2,12,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,57010,8,15)

 	-- Glyph of Steady Shot -- 57011
-	self:addTradeSkill(RecipeDB,57011,385,42914,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57011,385,42914,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57011,1,2,12,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,57011,8,15)

 	-- Glyph of Trueshot Aura -- 57012
-	self:addTradeSkill(RecipeDB,57012,385,42915,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57012,385,42915,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57012,1,2,12,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,57012,8,15)

 	-- Glyph of Volley -- 57013
-	self:addTradeSkill(RecipeDB,57013,385,42916,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57013,385,42916,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57013,1,2,12,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,57013,8,15)

 	-- Glyph of Wyvern Sting -- 57014
-	self:addTradeSkill(RecipeDB,57014,385,42917,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57014,385,42917,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57014,1,2,12,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,57014,8,15)

 	-- Glyph of Avenger's Shield -- 57019
-	self:addTradeSkill(RecipeDB,57019,385,41101,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57019,385,41101,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57019,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,57019,8,15)

 	-- Glyph of Cleansing -- 57020
-	self:addTradeSkill(RecipeDB,57020,180,41104,1,45357,nil,2,180,185,190,195)
+	AddRecipe(57020,180,41104,1,2,180,185,190,195)
 	self:addTradeFlags(RecipeDB,57020,1,2,3,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,57020,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Avenging Wrath -- 57021
-	self:addTradeSkill(RecipeDB,57021,385,41107,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57021,385,41107,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57021,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,57021,8,15)

 	-- Glyph of Spiritual Attunement -- 57022
-	self:addTradeSkill(RecipeDB,57022,80,41096,1,45357,nil,2,80,90,100,110)
+	AddRecipe(57022,80,41096,1,2,80,90,100,110)
 	self:addTradeFlags(RecipeDB,57022,1,2,3,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,57022,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Consecration -- 57023
-	self:addTradeSkill(RecipeDB,57023,205,41099,1,45357,nil,2,205,210,215,220)
+	AddRecipe(57023,205,41099,1,2,205,210,215,220)
 	self:addTradeFlags(RecipeDB,57023,1,2,3,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,57023,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Crusader Strike -- 57024
-	self:addTradeSkill(RecipeDB,57024,230,41098,1,45357,nil,2,230,235,240,245)
+	AddRecipe(57024,230,41098,1,2,230,235,240,245)
 	self:addTradeFlags(RecipeDB,57024,1,2,3,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,57024,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Exorcism -- 57025
-	self:addTradeSkill(RecipeDB,57025,265,41103,1,45357,nil,2,265,270,275,280)
+	AddRecipe(57025,265,41103,1,2,265,270,275,280)
 	self:addTradeFlags(RecipeDB,57025,1,2,3,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,57025,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Flash of Light -- 57026
-	self:addTradeSkill(RecipeDB,57026,300,41105,1,45357,nil,2,300,305,310,315)
+	AddRecipe(57026,300,41105,1,2,300,305,310,315)
 	self:addTradeFlags(RecipeDB,57026,1,2,3,F_PALADIN,36,41,53)
 	self:addTradeAcquire(RecipeDB,57026,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Hammer of Justice -- 57027
-	self:addTradeSkill(RecipeDB,57027,90,41095,1,45357,nil,2,90,100,110,120)
+	AddRecipe(57027,90,41095,1,2,90,100,110,120)
 	self:addTradeFlags(RecipeDB,57027,1,2,3,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,57027,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Hammer of Wrath -- 57028
-	self:addTradeSkill(RecipeDB,57028,385,41097,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57028,385,41097,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57028,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,57028,8,15)

 	-- Glyph of Holy Light -- 57029
-	self:addTradeSkill(RecipeDB,57029,105,41106,1,45357,nil,2,105,110,115,120)
+	AddRecipe(57029,105,41106,1,2,105,110,115,120)
 	self:addTradeFlags(RecipeDB,57029,1,2,3,F_PALADIN,36,41,53)
 	self:addTradeAcquire(RecipeDB,57029,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Judgement -- 57030
-	self:addTradeSkill(RecipeDB,57030,120,41092,1,45357,nil,2,120,125,130,135)
+	AddRecipe(57030,120,41092,1,2,120,125,130,135)
 	self:addTradeFlags(RecipeDB,57030,1,2,3,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,57030,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Divinity -- 57031
-	self:addTradeSkill(RecipeDB,57031,135,41108,1,45357,nil,2,135,140,145,150)
+	AddRecipe(57031,135,41108,1,2,135,140,145,150)
 	self:addTradeFlags(RecipeDB,57031,1,2,3,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,57031,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Righteous Defense -- 57032
-	self:addTradeSkill(RecipeDB,57032,155,41100,1,45357,nil,2,155,160,165,170)
+	AddRecipe(57032,155,41100,1,2,155,160,165,170)
 	self:addTradeFlags(RecipeDB,57032,1,2,3,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,57032,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Seal of Command -- 57033
-	self:addTradeSkill(RecipeDB,57033,335,41094,1,45357,nil,2,335,340,345,350)
+	AddRecipe(57033,335,41094,1,2,335,340,345,350)
 	self:addTradeFlags(RecipeDB,57033,1,2,3,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,57033,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Seal of Light -- 57034
-	self:addTradeSkill(RecipeDB,57034,385,41110,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57034,385,41110,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57034,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,57034,8,15)

 	-- Glyph of Seal of Wisdom -- 57035
-	self:addTradeSkill(RecipeDB,57035,385,41109,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57035,385,41109,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57035,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,57035,8,15)

 	-- Glyph of Turn Evil -- 57036
-	self:addTradeSkill(RecipeDB,57036,385,41102,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57036,385,41102,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57036,1,2,3,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,57036,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Glyph of Adrenaline Rush -- 57112
-	self:addTradeSkill(RecipeDB,57112,385,42954,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57112,385,42954,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57112,1,2,12,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57112,8,15)

 	-- Glyph of Ambush -- 57113
-	self:addTradeSkill(RecipeDB,57113,340,42955,1,45357,nil,2,340,345,350,355)
+	AddRecipe(57113,340,42955,1,2,340,345,350,355)
 	self:addTradeFlags(RecipeDB,57113,1,2,3,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57113,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Backstab -- 57114
-	self:addTradeSkill(RecipeDB,57114,80,42956,1,45357,nil,2,80,90,100,110)
+	AddRecipe(57114,80,42956,1,2,80,90,100,110)
 	self:addTradeFlags(RecipeDB,57114,1,2,3,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57114,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Blade Flurry -- 57115
-	self:addTradeSkill(RecipeDB,57115,385,42957,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57115,385,42957,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57115,1,2,12,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57115,8,15)

 	-- Glyph of Crippling Poison -- 57116
-	self:addTradeSkill(RecipeDB,57116,385,42958,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57116,385,42958,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57116,1,2,12,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57116,8,15)

 	-- Glyph of Deadly Throw -- 57117
-	self:addTradeSkill(RecipeDB,57117,385,42959,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57117,385,42959,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57117,1,2,12,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57117,8,15)

 	-- Glyph of Evasion -- 57119
-	self:addTradeSkill(RecipeDB,57119,95,42960,1,45357,nil,2,95,105,115,125)
+	AddRecipe(57119,95,42960,1,2,95,105,115,125)
 	self:addTradeFlags(RecipeDB,57119,1,2,3,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57119,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Eviscerate -- 57120
-	self:addTradeSkill(RecipeDB,57120,105,42961,1,45357,nil,2,105,110,115,120)
+	AddRecipe(57120,105,42961,1,2,105,110,115,120)
 	self:addTradeFlags(RecipeDB,57120,1,2,3,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57120,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Expose Armor -- 57121
-	self:addTradeSkill(RecipeDB,57121,120,42962,1,45357,nil,2,120,125,130,135)
+	AddRecipe(57121,120,42962,1,2,120,125,130,135)
 	self:addTradeFlags(RecipeDB,57121,1,2,3,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57121,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Feint -- 57122
-	self:addTradeSkill(RecipeDB,57122,305,42963,1,45357,nil,2,305,310,315,320)
+	AddRecipe(57122,305,42963,1,2,305,310,315,320)
 	self:addTradeFlags(RecipeDB,57122,1,2,3,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57122,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Garrote -- 57123
-	self:addTradeSkill(RecipeDB,57123,135,42964,1,45357,nil,2,135,140,145,150)
+	AddRecipe(57123,135,42964,1,2,135,140,145,150)
 	self:addTradeFlags(RecipeDB,57123,1,2,3,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57123,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Ghostly Strike -- 57124
-	self:addTradeSkill(RecipeDB,57124,385,42965,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57124,385,42965,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57124,1,2,12,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57124,8,15)

 	-- Glyph of Gouge -- 57125
-	self:addTradeSkill(RecipeDB,57125,160,42966,1,45357,nil,2,160,165,170,175)
+	AddRecipe(57125,160,42966,1,2,160,165,170,175)
 	self:addTradeFlags(RecipeDB,57125,1,2,3,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57125,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Hemorrhage -- 57126
-	self:addTradeSkill(RecipeDB,57126,385,42967,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57126,385,42967,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57126,1,2,12,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57126,8,15)

 	-- Glyph of Preparation -- 57127
-	self:addTradeSkill(RecipeDB,57127,385,42968,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57127,385,42968,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57127,1,2,12,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57127,8,15)

 	-- Glyph of Rupture -- 57128
-	self:addTradeSkill(RecipeDB,57128,385,42969,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57128,385,42969,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57128,1,2,12,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57128,8,15)

 	-- Glyph of Sap -- 57129
-	self:addTradeSkill(RecipeDB,57129,185,42970,1,45357,nil,2,185,190,195,200)
+	AddRecipe(57129,185,42970,1,2,185,190,195,200)
 	self:addTradeFlags(RecipeDB,57129,1,2,3,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57129,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Vigor -- 57130
-	self:addTradeSkill(RecipeDB,57130,385,42971,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57130,385,42971,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57130,1,2,12,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57130,8,15)

 	-- Glyph of Sinister Strike -- 57131
-	self:addTradeSkill(RecipeDB,57131,210,42972,1,45357,nil,2,210,215,220,225)
+	AddRecipe(57131,210,42972,1,2,210,215,220,225)
 	self:addTradeFlags(RecipeDB,57131,1,2,3,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57131,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Slice and Dice -- 57132
-	self:addTradeSkill(RecipeDB,57132,235,42973,1,45357,nil,2,235,240,245,250)
+	AddRecipe(57132,235,42973,1,2,235,240,245,250)
 	self:addTradeFlags(RecipeDB,57132,1,2,3,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57132,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Sprint -- 57133
-	self:addTradeSkill(RecipeDB,57133,285,42974,1,45357,nil,2,285,290,295,300)
+	AddRecipe(57133,285,42974,1,2,285,290,295,300)
 	self:addTradeFlags(RecipeDB,57133,1,2,3,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,57133,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Barbaric Insults -- 57151
-	self:addTradeSkill(RecipeDB,57151,220,43420,1,45357,nil,2,220,225,230,235)
+	AddRecipe(57151,220,43420,1,2,220,225,230,235)
 	self:addTradeFlags(RecipeDB,57151,1,2,3,F_WARRIOR,36,41,51)
 	self:addTradeAcquire(RecipeDB,57151,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Blocking -- 57152
-	self:addTradeSkill(RecipeDB,57152,385,43425,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57152,385,43425,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57152,1,2,12,F_WARRIOR,36,41,52)
 	self:addTradeAcquire(RecipeDB,57152,8,15)

 	-- Glyph of Bloodthirst -- 57153
-	self:addTradeSkill(RecipeDB,57153,385,43412,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57153,385,43412,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57153,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57153,8,15)

 	-- Glyph of Cleaving -- 57154
-	self:addTradeSkill(RecipeDB,57154,240,43414,1,45357,nil,2,240,245,250,255)
+	AddRecipe(57154,240,43414,1,2,240,245,250,255)
 	self:addTradeFlags(RecipeDB,57154,1,2,3,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57154,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Devastate -- 57155
-	self:addTradeSkill(RecipeDB,57155,385,43415,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57155,385,43415,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57155,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57155,8,15)

 	-- Glyph of Execution -- 57156
-	self:addTradeSkill(RecipeDB,57156,285,43416,1,45357,nil,2,285,290,295,300)
+	AddRecipe(57156,285,43416,1,2,285,290,295,300)
 	self:addTradeFlags(RecipeDB,57156,1,2,3,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57156,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Hamstring -- 57157
-	self:addTradeSkill(RecipeDB,57157,125,43417,1,45357,nil,2,125,130,135,140)
+	AddRecipe(57157,125,43417,1,2,125,130,135,140)
 	self:addTradeFlags(RecipeDB,57157,1,2,3,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57157,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Heroic Strike -- 57158
-	self:addTradeSkill(RecipeDB,57158,95,43418,1,45357,nil,2,95,105,115,125)
+	AddRecipe(57158,95,43418,1,2,95,105,115,125)
 	self:addTradeFlags(RecipeDB,57158,1,2,3,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57158,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Intervene -- 57159
-	self:addTradeSkill(RecipeDB,57159,385,43419,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57159,385,43419,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57159,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57159,8,15)

 	-- Glyph of Mortal Strike -- 57160
-	self:addTradeSkill(RecipeDB,57160,385,43421,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57160,385,43421,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57160,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57160,8,15)

 	-- Glyph of Overpower -- 57161
-	self:addTradeSkill(RecipeDB,57161,170,43422,1,45357,nil,2,170,175,180,185)
+	AddRecipe(57161,170,43422,1,2,170,175,180,185)
 	self:addTradeFlags(RecipeDB,57161,1,2,3,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57161,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Rapid Charge -- 57162
-	self:addTradeSkill(RecipeDB,57162,85,43413,1,45357,nil,2,85,95,105,115)
+	AddRecipe(57162,85,43413,1,2,85,95,105,115)
 	self:addTradeFlags(RecipeDB,57162,1,2,3,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57162,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Rending -- 57163
-	self:addTradeSkill(RecipeDB,57163,110,43423,1,45357,nil,2,110,115,120,125)
+	AddRecipe(57163,110,43423,1,2,110,115,120,125)
 	self:addTradeFlags(RecipeDB,57163,1,2,3,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57163,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Resonating Power -- 57164
-	self:addTradeSkill(RecipeDB,57164,385,43430,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57164,385,43430,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57164,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57164,8,15)

 	-- Glyph of Revenge -- 57165
-	self:addTradeSkill(RecipeDB,57165,190,43424,1,45357,nil,2,190,195,200,205)
+	AddRecipe(57165,190,43424,1,2,190,195,200,205)
 	self:addTradeFlags(RecipeDB,57165,1,2,3,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57165,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Last Stand -- 57166
-	self:addTradeSkill(RecipeDB,57166,385,43426,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57166,385,43426,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57166,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57166,8,15)

 	-- Glyph of Sunder Armor -- 57167
-	self:addTradeSkill(RecipeDB,57167,140,43427,1,45357,nil,2,140,145,150,155)
+	AddRecipe(57167,140,43427,1,2,140,145,150,155)
 	self:addTradeFlags(RecipeDB,57167,1,2,3,F_WARRIOR,36,41,52)
 	self:addTradeAcquire(RecipeDB,57167,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Sweeping Strikes -- 57168
-	self:addTradeSkill(RecipeDB,57168,320,43428,1,45357,nil,2,320,325,330,335)
+	AddRecipe(57168,320,43428,1,2,320,325,330,335)
 	self:addTradeFlags(RecipeDB,57168,1,2,3,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57168,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Taunt -- 57169
-	self:addTradeSkill(RecipeDB,57169,385,43429,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57169,385,43429,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57169,1,2,12,F_WARRIOR,36,41,52)
 	self:addTradeAcquire(RecipeDB,57169,8,15)

 	-- Glyph of Victory Rush -- 57170
-	self:addTradeSkill(RecipeDB,57170,385,43431,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57170,385,43431,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57170,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57170,8,15)

 	-- Glyph of Whirlwind -- 57172
-	self:addTradeSkill(RecipeDB,57172,345,43432,1,45357,nil,2,345,350,355,360)
+	AddRecipe(57172,345,43432,1,2,345,350,355,360)
 	self:addTradeFlags(RecipeDB,57172,1,2,3,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,57172,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Circle of Healing -- 57181
-	self:addTradeSkill(RecipeDB,57181,385,42396,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57181,385,42396,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57181,1,2,12,F_PRIEST,36,41,53)
 	self:addTradeAcquire(RecipeDB,57181,8,15)

 	-- Glyph of Dispel Magic -- 57183
-	self:addTradeSkill(RecipeDB,57183,230,42397,1,45357,nil,2,230,235,240,245)
+	AddRecipe(57183,230,42397,1,2,230,235,240,245)
 	self:addTradeFlags(RecipeDB,57183,1,2,3,F_PRIEST,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,57183,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Fade -- 57184
-	self:addTradeSkill(RecipeDB,57184,105,42398,1,45357,nil,2,75,80,85,90)
+	AddRecipe(57184,105,42398,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,57184,1,2,3,F_PRIEST,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,57184,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Fear Ward -- 57185
-	self:addTradeSkill(RecipeDB,57185,270,42399,1,45357,nil,2,270,275,280,285)
+	AddRecipe(57185,270,42399,1,2,270,275,280,285)
 	self:addTradeFlags(RecipeDB,57185,1,2,3,F_PRIEST,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,57185,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Flash Heal -- 57186
-	self:addTradeSkill(RecipeDB,57186,120,42400,1,45357,nil,2,120,125,130,135)
+	AddRecipe(57186,120,42400,1,2,120,125,130,135)
 	self:addTradeFlags(RecipeDB,57186,1,2,3,F_PRIEST,36,41,53)
 	self:addTradeAcquire(RecipeDB,57186,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Holy Nova -- 57187
-	self:addTradeSkill(RecipeDB,57187,315,42401,1,45357,nil,2,315,320,325,330)
+	AddRecipe(57187,315,42401,1,2,315,320,325,330)
 	self:addTradeFlags(RecipeDB,57187,1,2,3,F_PRIEST,36,41,53)
 	self:addTradeAcquire(RecipeDB,57187,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Inner Fire -- 57188
-	self:addTradeSkill(RecipeDB,57188,135,42402,1,45357,nil,2,135,140,145,150)
+	AddRecipe(57188,135,42402,1,2,135,140,145,150)
 	self:addTradeFlags(RecipeDB,57188,1,2,3,F_PRIEST,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,57188,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Lightwell -- 57189
-	self:addTradeSkill(RecipeDB,57189,385,42403,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57189,385,42403,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57189,1,2,12,F_PRIEST,36,41,53)
 	self:addTradeAcquire(RecipeDB,57189,8,15)

 	-- Glyph of Mass Dispel -- 57190
-	self:addTradeSkill(RecipeDB,57190,385,42404,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57190,385,42404,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57190,1,2,12,F_PRIEST,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,57190,8,15)

 	-- Glyph of Mind Control -- 57191
-	self:addTradeSkill(RecipeDB,57191,385,42405,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57191,385,42405,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57191,1,2,12,F_PRIEST,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,57191,8,15)

 	-- Glyph of Mind Flay -- 57192
-	self:addTradeSkill(RecipeDB,57192,350,42406,1,45357,nil,2,350,355,360,365)
+	AddRecipe(57192,350,42406,1,2,350,355,360,365)
 	self:addTradeFlags(RecipeDB,57192,1,2,3,F_PRIEST,36,41,54)
 	self:addTradeAcquire(RecipeDB,57192,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Mind Soothe -- 57193
-	self:addTradeSkill(RecipeDB,57193,385,42407,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57193,385,42407,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57193,1,2,12,F_PRIEST,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,57193,8,15)

 	-- Glyph of Power Word: Shield -- 57194
-	self:addTradeSkill(RecipeDB,57194,80,42408,1,45357,nil,2,80,90,100,110)
+	AddRecipe(57194,80,42408,1,2,80,90,100,110)
 	self:addTradeFlags(RecipeDB,57194,1,2,3,F_PRIEST,36,41,53)
 	self:addTradeAcquire(RecipeDB,57194,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Prayer of Healing -- 57195
-	self:addTradeSkill(RecipeDB,57195,385,42409,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57195,385,42409,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57195,1,2,12,F_PRIEST,36,41,53)
 	self:addTradeAcquire(RecipeDB,57195,8,15)

 	-- Glyph of Psychic Scream -- 57196
-	self:addTradeSkill(RecipeDB,57196,95,42410,1,45357,nil,2,95,105,115,125)
+	AddRecipe(57196,95,42410,1,2,95,105,115,125)
 	self:addTradeFlags(RecipeDB,57196,1,2,3,F_PRIEST,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,57196,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,
 	1,30709,1,30706,1,30713,1,30715,1,30716,1,33603,1,33615,1,30710,1,30717,1,30711,1,33679)

 	-- Glyph of Renew -- 57197
-	self:addTradeSkill(RecipeDB,57197,160,42411,1,45357,nil,2,160,165,170,175)
+	AddRecipe(57197,160,42411,1,2,160,165,170,175)
 	self:addTradeFlags(RecipeDB,57197,1,2,3,F_PRIEST,36,41,53)
 	self:addTradeAcquire(RecipeDB,57197,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Scourge Imprisonment -- 57198
-	self:addTradeSkill(RecipeDB,57198,385,42412,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57198,385,42412,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57198,1,2,3,F_PRIEST,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,57198,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Glyph of Shadow Word: Death -- 57199
-	self:addTradeSkill(RecipeDB,57199,385,42414,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57199,385,42414,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57199,1,2,12,F_PRIEST,36,41,54)
 	self:addTradeAcquire(RecipeDB,57199,8,15)

 	-- Glyph of Shadow Word: Pain -- 57200
-	self:addTradeSkill(RecipeDB,57200,180,42415,1,45357,nil,2,180,185,190,195)
+	AddRecipe(57200,180,42415,1,2,180,185,190,195)
 	self:addTradeFlags(RecipeDB,57200,1,2,3,F_PRIEST,36,41,54)
 	self:addTradeAcquire(RecipeDB,57200,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Smite -- 57201
-	self:addTradeSkill(RecipeDB,57201,210,42416,1,45357,nil,2,210,215,220,225)
+	AddRecipe(57201,210,42416,1,2,210,215,220,225)
 	self:addTradeFlags(RecipeDB,57201,1,2,3,F_PRIEST,36,41,54)
 	self:addTradeAcquire(RecipeDB,57201,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Spirit of Redemption -- 57202
-	self:addTradeSkill(RecipeDB,57202,385,42417,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57202,385,42417,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57202,1,2,12,F_PRIEST,36,41,53)
 	self:addTradeAcquire(RecipeDB,57202,8,15)

 	-- Glyph of Anti-Magic Shell -- 57207
-	self:addTradeSkill(RecipeDB,57207,385,43533,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57207,385,43533,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57207,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57207,8,15)

 	-- Glyph of Blood Boil -- 57208
-	self:addTradeSkill(RecipeDB,57208,385,43534,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57208,385,43534,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57208,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57208,8,15)

 	-- Glyph of Blood Tap -- 57209
-	self:addTradeSkill(RecipeDB,57209,320,43535,1,45357,nil,2,320,330,335,340)
+	AddRecipe(57209,320,43535,1,2,320,330,335,340)
 	self:addTradeFlags(RecipeDB,57209,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57209,8,14)

 	-- Glyph of Bone Shield -- 57210
-	self:addTradeSkill(RecipeDB,57210,265,43536,1,45357,nil,2,265,270,275,280)
+	AddRecipe(57210,265,43536,1,2,265,270,275,280)
 	self:addTradeFlags(RecipeDB,57210,1,2,3,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57210,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Chains of Ice -- 57211
-	self:addTradeSkill(RecipeDB,57211,385,43537,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57211,385,43537,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57211,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57211,8,15)

 	-- Glyph of Dark Command -- 57212
-	self:addTradeSkill(RecipeDB,57212,385,43538,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57212,385,43538,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57212,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57212,8,15)

 	-- Glyph of Death Grip -- 57213
-	self:addTradeSkill(RecipeDB,57213,285,43541,1,45357,nil,2,285,290,295,300)
+	AddRecipe(57213,285,43541,1,2,285,290,295,300)
 	self:addTradeFlags(RecipeDB,57213,1,2,3,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57213,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Death and Decay -- 57214
-	self:addTradeSkill(RecipeDB,57214,385,43542,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57214,385,43542,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57214,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57214,8,15)

 	-- Glyph of Death's Embrace -- 57215
-	self:addTradeSkill(RecipeDB,57215,295,43539,1,45357,nil,2,300,305,310,315)
+	AddRecipe(57215,295,43539,1,2,300,305,310,315)
 	self:addTradeFlags(RecipeDB,57215,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57215,8,14)

 	-- Glyph of Frost Strike -- 57216
-	self:addTradeSkill(RecipeDB,57216,270,43543,1,45357,nil,2,270,275,280,285)
+	AddRecipe(57216,270,43543,1,2,270,275,280,285)
 	self:addTradeFlags(RecipeDB,57216,1,2,3,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57216,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Horn of Winter -- 57217
-	self:addTradeSkill(RecipeDB,57217,320,43544,1,45357,nil,2,320,330,335,340)
+	AddRecipe(57217,320,43544,1,2,320,330,335,340)
 	self:addTradeFlags(RecipeDB,57217,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57217,8,14)

 	-- Glyph of Icebound Fortitude -- 57218
-	self:addTradeSkill(RecipeDB,57218,385,43545,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57218,385,43545,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57218,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57218,8,15)

 	-- Glyph of Icy Touch -- 57219
-	self:addTradeSkill(RecipeDB,57219,280,43546,1,45357,nil,2,280,285,290,295)
+	AddRecipe(57219,280,43546,1,2,280,285,290,295)
 	self:addTradeFlags(RecipeDB,57219,1,2,3,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57219,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,
 	1,30709,1,30706,1,30713,1,30715,1,30716,1,33603,1,33615,1,30710,1,30717,1,30711,1,33679)

 	-- Glyph of Obliterate -- 57220
-	self:addTradeSkill(RecipeDB,57220,385,43547,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57220,385,43547,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57220,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57220,8,15)

 	-- Glyph of Plague Strike -- 57221
-	self:addTradeSkill(RecipeDB,57221,300,43548,1,45357,nil,2,300,305,310,315)
+	AddRecipe(57221,300,43548,1,2,300,305,310,315)
 	self:addTradeFlags(RecipeDB,57221,1,2,3,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57221,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of the Ghoul -- 57222
-	self:addTradeSkill(RecipeDB,57222,350,43549,1,45357,nil,2,350,355,360,365)
+	AddRecipe(57222,350,43549,1,2,350,355,360,365)
 	self:addTradeFlags(RecipeDB,57222,1,2,3,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57222,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Rune Strike -- 57223
-	self:addTradeSkill(RecipeDB,57223,385,43550,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57223,385,43550,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57223,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57223,8,15)

 	-- Glyph of Scourge Strike -- 57224
-	self:addTradeSkill(RecipeDB,57224,330,43551,1,45357,nil,2,330,335,340,345)
+	AddRecipe(57224,330,43551,1,2,330,335,340,345)
 	self:addTradeFlags(RecipeDB,57224,1,2,3,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57224,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Strangulate -- 57225
-	self:addTradeSkill(RecipeDB,57225,375,43552,1,45357,nil,2,375,380,385,390)
+	AddRecipe(57225,375,43552,1,2,375,380,385,390)
 	self:addTradeFlags(RecipeDB,57225,1,2,3,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57225,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Glyph of Unbreakable Armor -- 57226
-	self:addTradeSkill(RecipeDB,57226,305,43553,1,45357,nil,2,305,310,315,320)
+	AddRecipe(57226,305,43553,1,2,305,310,315,320)
 	self:addTradeFlags(RecipeDB,57226,1,2,3,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57226,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Vampiric Blood -- 57227
-	self:addTradeSkill(RecipeDB,57227,345,43554,1,45357,nil,2,345,350,355,360)
+	AddRecipe(57227,345,43554,1,2,345,350,355,360)
 	self:addTradeFlags(RecipeDB,57227,1,2,3,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57227,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Raise Dead -- 57228
-	self:addTradeSkill(RecipeDB,57228,295,43673,1,45357,nil,2,295,305,310,315)
+	AddRecipe(57228,295,43673,1,2,295,305,310,315)
 	self:addTradeFlags(RecipeDB,57228,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57228,8,15)

 	-- Glyph of Corpse Explosion -- 57229
-	self:addTradeSkill(RecipeDB,57229,295,43671,1,45357,nil,2,295,305,310,315)
+	AddRecipe(57229,295,43671,1,2,295,305,310,315)
 	self:addTradeFlags(RecipeDB,57229,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57229,8,14)

 	-- Glyph of Pestilence -- 57230
-	self:addTradeSkill(RecipeDB,57230,295,43672,1,45357,nil,2,295,305,310,315)
+	AddRecipe(57230,295,43672,1,2,295,305,310,315)
 	self:addTradeFlags(RecipeDB,57230,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,57230,8,14)

 	-- Glyph of Chain Heal -- 57232
-	self:addTradeSkill(RecipeDB,57232,385,41517,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57232,385,41517,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57232,1,2,12,F_SHAMAN,36,41,53)
 	self:addTradeAcquire(RecipeDB,57232,8,15)

 	-- Glyph of Chain Lightning -- 57233
-	self:addTradeSkill(RecipeDB,57233,385,41518,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57233,385,41518,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57233,1,2,12,F_SHAMAN,36,41,54)
 	self:addTradeAcquire(RecipeDB,57233,8,15)

 	-- Glyph of Lava -- 57234
-	self:addTradeSkill(RecipeDB,57234,380,41524,1,45357,nil,2,385,390,395,400)
+	AddRecipe(57234,380,41524,1,2,385,390,395,400)
 	self:addTradeFlags(RecipeDB,57234,1,2,12,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,57234,8,15)

 	-- Glyph of Earth Shock -- 57235
-	self:addTradeSkill(RecipeDB,57235,385,41526,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57235,385,41526,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57235,1,2,12,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,57235,8,15)

 	-- Glyph of Earthliving Weapon -- 57236
-	self:addTradeSkill(RecipeDB,57236,300,41527,1,45357,nil,2,300,305,310,315)
+	AddRecipe(57236,300,41527,1,2,300,305,310,315)
 	self:addTradeFlags(RecipeDB,57236,1,2,3,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,57236,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Fire Elemental Totem -- 57237
-	self:addTradeSkill(RecipeDB,57237,385,41529,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57237,385,41529,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57237,1,2,12,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,57237,8,15)

 	-- Glyph of Fire Nova Totem -- 57238
-	self:addTradeSkill(RecipeDB,57238,110,41530,1,45357,nil,2,110,115,120,125)
+	AddRecipe(57238,110,41530,1,2,110,115,120,125)
 	self:addTradeFlags(RecipeDB,57238,1,2,3,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,57238,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Flame Shock -- 57239
-	self:addTradeSkill(RecipeDB,57239,85,41531,1,45357,nil,2,85,95,105,115)
+	AddRecipe(57239,85,41531,1,2,85,95,105,115)
 	self:addTradeFlags(RecipeDB,57239,1,2,3,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,57239,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Flametongue Weapon -- 57240
-	self:addTradeSkill(RecipeDB,57240,125,41532,1,45357,nil,2,125,130,135,140)
+	AddRecipe(57240,125,41532,1,2,125,130,135,140)
 	self:addTradeFlags(RecipeDB,57240,1,2,3,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,57240,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Frost Shock -- 57241
-	self:addTradeSkill(RecipeDB,57241,185,41547,1,45357,nil,2,185,190,195,200)
+	AddRecipe(57241,185,41547,1,2,185,190,195,200)
 	self:addTradeFlags(RecipeDB,57241,1,2,3,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,57241,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Healing Stream Totem -- 57242
-	self:addTradeSkill(RecipeDB,57242,215,41533,1,45357,nil,2,215,220,225,230)
+	AddRecipe(57242,215,41533,1,2,215,220,225,230)
 	self:addTradeFlags(RecipeDB,57242,1,2,3,F_SHAMAN,36,41,53)
 	self:addTradeAcquire(RecipeDB,57242,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Healing Wave -- 57243
-	self:addTradeSkill(RecipeDB,57243,385,41534,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57243,385,41534,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57243,1,2,12,F_SHAMAN,36,41,53)
 	self:addTradeAcquire(RecipeDB,57243,8,15)

 	-- Glyph of Lesser Healing Wave -- 57244
-	self:addTradeSkill(RecipeDB,57244,235,41535,1,45357,nil,2,235,240,245,250)
+	AddRecipe(57244,235,41535,1,2,235,240,245,250)
 	self:addTradeFlags(RecipeDB,57244,1,2,3,F_SHAMAN,36,41,53)
 	self:addTradeAcquire(RecipeDB,57244,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Lightning Bolt -- 57245
-	self:addTradeSkill(RecipeDB,57245,140,41536,1,45357,nil,2,140,145,150,155)
+	AddRecipe(57245,140,41536,1,2,140,145,150,155)
 	self:addTradeFlags(RecipeDB,57245,1,2,3,F_SHAMAN,36,41,54)
 	self:addTradeAcquire(RecipeDB,57245,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Lightning Shield -- 57246
-	self:addTradeSkill(RecipeDB,57246,95,41537,1,45357,nil,2,95,105,115,125)
+	AddRecipe(57246,95,41537,1,2,95,105,115,125)
 	self:addTradeFlags(RecipeDB,57246,1,2,3,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,57246,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Mana Tide Totem -- 57247
-	self:addTradeSkill(RecipeDB,57247,385,41538,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57247,385,41538,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57247,1,2,12,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,57247,8,15)

 	-- Glyph of Stormstrike -- 57248
-	self:addTradeSkill(RecipeDB,57248,385,41539,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57248,385,41539,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57248,1,2,3,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,57248,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Glyph of Lava Lash -- 57249
-	self:addTradeSkill(RecipeDB,57249,165,41540,1,45357,nil,2,165,170,175,180)
+	AddRecipe(57249,165,41540,1,2,165,170,175,180)
 	self:addTradeFlags(RecipeDB,57249,1,2,3,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,57249,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Elemental Mastery -- 57250
-	self:addTradeSkill(RecipeDB,57250,385,41552,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57250,385,41552,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57250,1,2,12,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,57250,8,15)

 	-- Glyph of Water Mastery -- 57251
-	self:addTradeSkill(RecipeDB,57251,275,41541,1,45357,nil,2,275,280,285,290)
+	AddRecipe(57251,275,41541,1,2,275,280,285,290)
 	self:addTradeFlags(RecipeDB,57251,1,2,3,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,57251,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Windfury Weapon -- 57252
-	self:addTradeSkill(RecipeDB,57252,330,41542,1,45357,nil,2,330,335,340,345)
+	AddRecipe(57252,330,41542,1,2,330,335,340,345)
 	self:addTradeFlags(RecipeDB,57252,1,2,3,F_SHAMAN,36,41,51)
 	self:addTradeAcquire(RecipeDB,57252,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Incinerate -- 57257
-	self:addTradeSkill(RecipeDB,57257,350,42453,1,45357,nil,2,350,355,360,365)
+	AddRecipe(57257,350,42453,1,2,350,355,360,365)
 	self:addTradeFlags(RecipeDB,57257,1,2,3,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57257,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Conflagrate -- 57258
-	self:addTradeSkill(RecipeDB,57258,385,42454,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57258,385,42454,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57258,1,2,12,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57258,8,15)

 	-- Glyph of Corruption -- 57259
-	self:addTradeSkill(RecipeDB,57259,85,42455,1,45357,nil,2,85,95,105,115)
+	AddRecipe(57259,85,42455,1,2,85,95,105,115)
 	self:addTradeFlags(RecipeDB,57259,1,2,3,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57259,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Curse of Agony -- 57260
-	self:addTradeSkill(RecipeDB,57260,385,42456,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57260,385,42456,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57260,1,2,12,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57260,8,15)

 	-- Glyph of Death Coil -- 57261
-	self:addTradeSkill(RecipeDB,57261,385,42457,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57261,385,42457,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57261,1,2,12,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57261,8,15)

 	-- Glyph of Fear -- 57262
-	self:addTradeSkill(RecipeDB,57262,125,42458,1,45357,nil,2,125,130,135,140)
+	AddRecipe(57262,125,42458,1,2,125,130,135,140)
 	self:addTradeFlags(RecipeDB,57262,1,2,3,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57262,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Felguard -- 57263
-	self:addTradeSkill(RecipeDB,57263,385,42459,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57263,385,42459,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57263,1,2,12,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57263,8,15)

 	-- Glyph of Felhunter -- 57264
-	self:addTradeSkill(RecipeDB,57264,385,42460,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57264,385,42460,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57264,1,2,12,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57264,8,15)

 	-- Glyph of Health Funnel -- 57265
-	self:addTradeSkill(RecipeDB,57265,110,42461,1,45357,nil,2,110,115,120,125)
+	AddRecipe(57265,110,42461,1,2,110,115,120,125)
 	self:addTradeFlags(RecipeDB,57265,1,2,3,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57265,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Healthstone -- 57266
-	self:addTradeSkill(RecipeDB,57266,95,42462,1,45357,nil,2,95,105,115,125)
+	AddRecipe(57266,95,42462,1,2,95,105,115,125)
 	self:addTradeFlags(RecipeDB,57266,1,2,3,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57266,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Howl of Terror -- 57267
-	self:addTradeSkill(RecipeDB,57267,385,42463,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57267,385,42463,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57267,1,2,12,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57267,8,15)

 	-- Glyph of Immolate -- 57268
-	self:addTradeSkill(RecipeDB,57268,385,42464,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57268,385,42464,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57268,1,2,12,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57268,8,15)

 	-- Glyph of Imp -- 57269
-	self:addTradeSkill(RecipeDB,57269,140,42465,1,45357,nil,2,140,145,150,155)
+	AddRecipe(57269,140,42465,1,2,140,145,150,155)
 	self:addTradeFlags(RecipeDB,57269,1,2,3,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57269,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,
 	1,30709,1,30706,1,30713,1,30715,1,30716,1,33603,1,33615,1,30710,1,30717,1,30711,1,33679)

 	-- Glyph of Searing Pain -- 57270
-	self:addTradeSkill(RecipeDB,57270,215,42466,1,45357,nil,2,215,220,225,230)
+	AddRecipe(57270,215,42466,1,2,215,220,225,230)
 	self:addTradeFlags(RecipeDB,57270,1,2,3,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57270,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,
 	1,30709,1,30706,1,30713,1,30715,1,30716,1,33603,1,33615,1,30710,1,30717,1,30711,1,33679)

 	-- Glyph of Shadow Bolt -- 57271
-	self:addTradeSkill(RecipeDB,57271,165,42467,1,45357,nil,2,165,170,175,180)
+	AddRecipe(57271,165,42467,1,2,165,170,175,180)
 	self:addTradeFlags(RecipeDB,57271,1,2,3,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57271,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Shadowburn -- 57272
-	self:addTradeSkill(RecipeDB,57272,275,42468,1,45357,nil,2,275,280,285,290)
+	AddRecipe(57272,275,42468,1,2,275,280,285,290)
 	self:addTradeFlags(RecipeDB,57272,1,2,3,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57272,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Siphon Life -- 57273
-	self:addTradeSkill(RecipeDB,57273,385,42469,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57273,385,42469,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57273,1,2,12,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57273,8,15)

 	-- Glyph of Soulstone -- 57274
-	self:addTradeSkill(RecipeDB,57274,240,42470,1,45357,nil,2,240,245,250,255)
+	AddRecipe(57274,240,42470,1,2,240,245,250,255)
 	self:addTradeFlags(RecipeDB,57274,1,2,3,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57274,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Succubus -- 57275
-	self:addTradeSkill(RecipeDB,57275,325,42471,1,45357,nil,2,325,330,335,340)
+	AddRecipe(57275,325,42471,1,2,325,330,335,340)
 	self:addTradeFlags(RecipeDB,57275,1,2,3,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57275,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Unstable Affliction -- 57276
-	self:addTradeSkill(RecipeDB,57276,385,42472,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57276,385,42472,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57276,1,2,12,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57276,8,15)

 	-- Glyph of Voidwalker -- 57277
-	self:addTradeSkill(RecipeDB,57277,190,42473,1,45357,nil,2,190,195,200,205)
+	AddRecipe(57277,190,42473,1,2,190,195,200,205)
 	self:addTradeFlags(RecipeDB,57277,1,2,3,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,57277,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Hunter's Ink -- 57703
-	self:addTradeSkill(RecipeDB,57703,85,43115,2,45357,nil,2,85,85,90,95)
+	AddRecipe(57703,85,43115,2,2,85,85,90,95)
 	self:addTradeFlags(RecipeDB,57703,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,57703,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Lion's Ink -- 57704
-	self:addTradeSkill(RecipeDB,57704,100,43116,1,45357,nil,2,100,100,100,105)
+	AddRecipe(57704,100,43116,1,2,100,100,100,105)
 	self:addTradeFlags(RecipeDB,57704,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,57704,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Dawnstar Ink -- 57706
-	self:addTradeSkill(RecipeDB,57706,125,43117,2,45357,nil,2,125,125,130,135)
+	AddRecipe(57706,125,43117,2,2,125,125,130,135)
 	self:addTradeFlags(RecipeDB,57706,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,57706,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Jadefire Ink -- 57707
-	self:addTradeSkill(RecipeDB,57707,150,43118,1,45357,nil,2,150,150,150,155)
+	AddRecipe(57707,150,43118,1,2,150,150,150,155)
 	self:addTradeFlags(RecipeDB,57707,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,57707,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Royal Ink -- 57708
-	self:addTradeSkill(RecipeDB,57708,175,43119,2,45357,nil,2,175,175,175,180)
+	AddRecipe(57708,175,43119,2,2,175,175,175,180)
 	self:addTradeFlags(RecipeDB,57708,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,57708,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Celestial Ink -- 57709
-	self:addTradeSkill(RecipeDB,57709,200,43120,1,45357,nil,2,200,200,200,205)
+	AddRecipe(57709,200,43120,1,2,200,200,200,205)
 	self:addTradeFlags(RecipeDB,57709,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,57709,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,
 	1,30709,1,30706,1,30713,1,30715,1,30716,1,33603,1,33615,1,30710,1,30717,1,30711,1,33679)

 	-- Fiery Ink -- 57710
-	self:addTradeSkill(RecipeDB,57710,225,43121,2,45357,nil,2,225,225,225,230)
+	AddRecipe(57710,225,43121,2,2,225,225,225,230)
 	self:addTradeFlags(RecipeDB,57710,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,57710,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Shimmering Ink -- 57711
-	self:addTradeSkill(RecipeDB,57711,250,43122,1,45357,nil,2,250,250,250,255)
+	AddRecipe(57711,250,43122,1,2,250,250,250,255)
 	self:addTradeFlags(RecipeDB,57711,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,57711,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Ink of the Sky -- 57712
-	self:addTradeSkill(RecipeDB,57712,275,43123,2,45357,nil,2,275,290,295,300)
+	AddRecipe(57712,275,43123,2,2,275,290,295,300)
 	self:addTradeFlags(RecipeDB,57712,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,57712,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Ethereal Ink -- 57713
-	self:addTradeSkill(RecipeDB,57713,290,43124,1,45357,nil,2,290,295,300,305)
+	AddRecipe(57713,290,43124,1,2,290,295,300,305)
 	self:addTradeFlags(RecipeDB,57713,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,57713,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Darkflame Ink -- 57714
-	self:addTradeSkill(RecipeDB,57714,325,43125,2,45357,nil,2,325,325,325,330)
+	AddRecipe(57714,325,43125,2,2,325,325,325,330)
 	self:addTradeFlags(RecipeDB,57714,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,57714,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603,1,33615,1,30722,1,30721,1,33679)

 	-- Ink of the Sea -- 57715
-	self:addTradeSkill(RecipeDB,57715,350,43126,1,45357,nil,2,350,350,350,355)
+	AddRecipe(57715,350,43126,1,2,350,350,350,355)
 	self:addTradeFlags(RecipeDB,57715,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,57715,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Snowfall Ink -- 57716
-	self:addTradeSkill(RecipeDB,57716,375,43127,2,45357,nil,2,375,375,375,380)
+	AddRecipe(57716,375,43127,2,2,375,375,375,380)
 	self:addTradeFlags(RecipeDB,57716,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,57716,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Glyph of Fire Blast -- 57719
-	self:addTradeSkill(RecipeDB,57719,385,42740,1,45357,nil,2,385,390,397,405)
+	AddRecipe(57719,385,42740,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,57719,1,2,12,F_MAGE,36,41)
 	self:addTradeAcquire(RecipeDB,57719,8,15)

 	-- Glyph of Aquatic Form -- 58286
-	self:addTradeSkill(RecipeDB,58286,95,43316,1,45357,nil,2,85,105,110,115)
+	AddRecipe(58286,95,43316,1,2,85,105,110,115)
 	self:addTradeFlags(RecipeDB,58286,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,58286,8,14)

 	-- Glyph of Challenging Roar -- 58287
-	self:addTradeSkill(RecipeDB,58287,150,43334,1,45357,nil,2,150,155,160,165)
+	AddRecipe(58287,150,43334,1,2,150,155,160,165)
 	self:addTradeFlags(RecipeDB,58287,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,58287,8,14)

 	-- Glyph of Unburdened Rebirth -- 58288
-	self:addTradeSkill(RecipeDB,58288,95,43331,1,45357,nil,2,95,105,110,115)
+	AddRecipe(58288,95,43331,1,2,95,105,110,115)
 	self:addTradeFlags(RecipeDB,58288,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,58288,8,14)

 	-- Glyph of Thorns -- 58289
-	self:addTradeSkill(RecipeDB,58289,75,43332,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58289,75,43332,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58289,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,58289,8,14)

 	-- Glyph of the Wild -- 58296
-	self:addTradeSkill(RecipeDB,58296,75,43335,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58296,75,43335,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58296,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,58296,8,14)

 	-- Glyph of the Pack -- 58297
-	self:addTradeSkill(RecipeDB,58297,195,43355,1,45357,nil,2,195,205,210,215)
+	AddRecipe(58297,195,43355,1,2,195,205,210,215)
 	self:addTradeFlags(RecipeDB,58297,1,2,12,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,58297,8,14)

 	-- Glyph of Scare Beast -- 58298
-	self:addTradeSkill(RecipeDB,58298,75,43356,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58298,75,43356,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58298,1,2,12,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,58298,8,14)

 	-- Glyph of Revive Pet -- 58299
-	self:addTradeSkill(RecipeDB,58299,75,43338,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58299,75,43338,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58299,1,2,12,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,58299,8,14)

 	-- Glyph of Possessed Strength -- 58300
-	self:addTradeSkill(RecipeDB,58300,75,43354,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58300,75,43354,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58300,1,2,12,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,58300,8,14)

 	-- Glyph of Mend Pet -- 58301
-	self:addTradeSkill(RecipeDB,58301,75,43350,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58301,75,43350,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58301,1,2,12,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,58301,8,14)

 	-- Glyph of Feign Death -- 58302
-	self:addTradeSkill(RecipeDB,58302,150,43351,1,45357,nil,2,150,155,160,165)
+	AddRecipe(58302,150,43351,1,2,150,155,160,165)
 	self:addTradeFlags(RecipeDB,58302,1,2,12,F_HUNTER,36,41,51)
 	self:addTradeAcquire(RecipeDB,58302,8,14)

 	-- Glyph of Arcane Intellect -- 58303
-	self:addTradeSkill(RecipeDB,58303,75,43339,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58303,75,43339,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58303,1,2,12,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,58303,8,14)

 	-- Glyph of Fire Ward -- 58305
-	self:addTradeSkill(RecipeDB,58305,95,43357,1,45357,nil,2,95,105,110,115)
+	AddRecipe(58305,95,43357,1,2,95,105,110,115)
 	self:addTradeFlags(RecipeDB,58305,1,2,12,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,58305,8,14)

 	-- Glyph of Frost Armor -- 58306
-	self:addTradeSkill(RecipeDB,58306,75,43359,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58306,75,43359,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58306,1,2,12,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,58306,8,14)

 	-- Glyph of Frost Ward -- 58307
-	self:addTradeSkill(RecipeDB,58307,120,43360,1,45357,nil,2,120,130,135,140)
+	AddRecipe(58307,120,43360,1,2,120,130,135,140)
 	self:addTradeFlags(RecipeDB,58307,1,2,12,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,58307,8,14)

 	-- Glyph of Slow Fall -- 58308
-	self:addTradeSkill(RecipeDB,58308,75,43364,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58308,75,43364,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58308,1,2,12,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,58308,8,14)

 	-- Glyph of the Penguin -- 58310
-	self:addTradeSkill(RecipeDB,58310,75,43361,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58310,75,43361,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58310,1,2,12,F_MAGE,36,41,54)
 	self:addTradeAcquire(RecipeDB,58310,8,14)

 	-- Glyph of Blessing of Kings -- 58311
-	self:addTradeSkill(RecipeDB,58311,95,43365,1,45357,nil,2,95,105,110,115)
+	AddRecipe(58311,95,43365,1,2,95,105,110,115)
 	self:addTradeFlags(RecipeDB,58311,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,58311,8,14)

 	-- Glyph of Blessing of Wisdom -- 58312
-	self:addTradeSkill(RecipeDB,58312,75,43366,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58312,75,43366,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58312,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,58312,8,14)

 	-- Glyph of Lay on Hands -- 58313
-	self:addTradeSkill(RecipeDB,58313,75,43367,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58313,75,43367,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58313,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,58313,8,14)

 	-- Glyph of Blessing of Might -- 58314
-	self:addTradeSkill(RecipeDB,58314,75,43340,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58314,75,43340,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58314,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,58314,8,14)

 	-- Glyph of Sense Undead -- 58315
-	self:addTradeSkill(RecipeDB,58315,95,43368,1,45357,nil,2,95,105,110,115)
+	AddRecipe(58315,95,43368,1,2,95,105,110,115)
 	self:addTradeFlags(RecipeDB,58315,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,58315,8,14)

 	-- Glyph of the Wise -- 58316
-	self:addTradeSkill(RecipeDB,58316,150,43369,1,45357,nil,2,150,155,160,165)
+	AddRecipe(58316,150,43369,1,2,150,155,160,165)
 	self:addTradeFlags(RecipeDB,58316,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,58316,8,14)

 	-- Glyph of Fading -- 58317
-	self:addTradeSkill(RecipeDB,58317,75,43342,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58317,75,43342,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58317,1,2,12,F_PRIEST,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,58317,8,14)

 	-- Glyph of Fortitude -- 58318
-	self:addTradeSkill(RecipeDB,58318,75,43371,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58318,75,43371,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58318,1,2,12,F_PRIEST,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,58318,8,14)

 	-- Glyph of Levitate -- 58319
-	self:addTradeSkill(RecipeDB,58319,170,43370,1,45357,nil,2,170,180,185,190)
+	AddRecipe(58319,170,43370,1,2,170,180,185,190)
 	self:addTradeFlags(RecipeDB,58319,1,2,12,F_PRIEST,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,58319,8,14)

 	-- Glyph of Shackle Undead -- 58320
-	self:addTradeSkill(RecipeDB,58320,95,43373,1,45357,nil,2,95,105,110,115)
+	AddRecipe(58320,95,43373,1,2,95,105,110,115)
 	self:addTradeFlags(RecipeDB,58320,1,2,12,F_PRIEST,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,58320,8,14)

 	-- Glyph of Shadow Protection -- 58321
-	self:addTradeSkill(RecipeDB,58321,150,43372,1,45357,nil,2,150,155,160,165)
+	AddRecipe(58321,150,43372,1,2,150,155,160,165)
 	self:addTradeFlags(RecipeDB,58321,1,2,12,F_PRIEST,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,58321,8,14)

 	-- Glyph of Shadowfiend -- 58322
-	self:addTradeSkill(RecipeDB,58322,345,43374,1,45357,nil,2,345,355,360,365)
+	AddRecipe(58322,345,43374,1,2,345,355,360,365)
 	self:addTradeFlags(RecipeDB,58322,1,2,12,F_PRIEST,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,58322,8,14)

 	-- Glyph of Blurred Speed -- 58323
-	self:addTradeSkill(RecipeDB,58323,75,43379,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58323,75,43379,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58323,1,2,12,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,58323,8,14)

 	-- Glyph of Distract -- 58324
-	self:addTradeSkill(RecipeDB,58324,120,43376,1,45357,nil,2,120,130,135,140)
+	AddRecipe(58324,120,43376,1,2,120,130,135,140)
 	self:addTradeFlags(RecipeDB,58324,1,2,12,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,58324,8,14)

 	-- Glyph of Pick Lock -- 58325
-	self:addTradeSkill(RecipeDB,58325,95,43377,1,45357,nil,2,95,105,110,115)
+	AddRecipe(58325,95,43377,1,2,95,105,110,115)
 	self:addTradeFlags(RecipeDB,58325,1,2,12,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,58325,8,14)

 	-- Glyph of Pick Pocket -- 58326
-	self:addTradeSkill(RecipeDB,58326,75,43343,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58326,75,43343,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58326,1,2,12,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,58326,8,14)

 	-- Glyph of Safe Fall -- 58327
-	self:addTradeSkill(RecipeDB,58327,195,43378,1,45357,nil,2,195,205,210,215)
+	AddRecipe(58327,195,43378,1,2,195,205,210,215)
 	self:addTradeFlags(RecipeDB,58327,1,2,12,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,58327,8,14)

 	-- Glyph of Vanish -- 58328
-	self:addTradeSkill(RecipeDB,58328,120,43380,1,45357,nil,2,120,130,135,140)
+	AddRecipe(58328,120,43380,1,2,120,130,135,140)
 	self:addTradeFlags(RecipeDB,58328,1,2,12,F_ROGUE,36,41,51)
 	self:addTradeAcquire(RecipeDB,58328,8,14)

 	-- Glyph of Astral Recall -- 58329
-	self:addTradeSkill(RecipeDB,58329,150,43381,1,45357,nil,2,150,155,160,165)
+	AddRecipe(58329,150,43381,1,2,150,155,160,165)
 	self:addTradeFlags(RecipeDB,58329,1,2,12,F_SHAMAN,36,41,51,53,54)
 	self:addTradeAcquire(RecipeDB,58329,8,14)

 	-- Glyph of Renewed Life -- 58330
-	self:addTradeSkill(RecipeDB,58330,150,43385,1,45357,nil,2,150,155,160,165)
+	AddRecipe(58330,150,43385,1,2,150,155,160,165)
 	self:addTradeFlags(RecipeDB,58330,1,2,12,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,58330,8,14)

 	-- Glyph of Water Breathing -- 58331
-	self:addTradeSkill(RecipeDB,58331,120,43344,1,45357,nil,2,120,130,135,140)
+	AddRecipe(58331,120,43344,1,2,120,130,135,140)
 	self:addTradeFlags(RecipeDB,58331,1,2,12,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,58331,8,14)

 	-- Glyph of Water Shield -- 58332
-	self:addTradeSkill(RecipeDB,58332,95,43386,1,45357,nil,2,95,105,110,115)
+	AddRecipe(58332,95,43386,1,2,95,105,110,115)
 	self:addTradeFlags(RecipeDB,58332,1,2,12,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,58332,8,14)

 	-- Glyph of Water Walking -- 58333
-	self:addTradeSkill(RecipeDB,58333,150,43388,1,45357,nil,2,150,155,160,165)
+	AddRecipe(58333,150,43388,1,2,150,155,160,165)
 	self:addTradeFlags(RecipeDB,58333,1,2,12,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,58333,8,14)

 	-- Glyph of Unending Breath -- 58336
-	self:addTradeSkill(RecipeDB,58336,95,43389,1,45357,nil,2,95,105,110,115)
+	AddRecipe(58336,95,43389,1,2,95,105,110,115)
 	self:addTradeFlags(RecipeDB,58336,1,2,12,F_WARLOCK,36,41)
 	self:addTradeAcquire(RecipeDB,58336,8,14)

 	-- Glyph of Drain Soul -- 58337
-	self:addTradeSkill(RecipeDB,58337,75,43390,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58337,75,43390,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58337,1,2,12,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,58337,8,14)

 	-- Glyph of Curse of Exhaustion -- 58338
-	self:addTradeSkill(RecipeDB,58338,150,43392,1,45357,nil,2,150,155,160,165)
+	AddRecipe(58338,150,43392,1,2,150,155,160,165)
 	self:addTradeFlags(RecipeDB,58338,1,2,12,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,58338,8,14)

 	-- Glyph of Enslave Demon -- 58339
-	self:addTradeSkill(RecipeDB,58339,150,43393,1,45357,nil,2,150,155,160,165)
+	AddRecipe(58339,150,43393,1,2,150,155,160,165)
 	self:addTradeFlags(RecipeDB,58339,1,2,12,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,58339,8,14)

 	-- Glyph of Kilrogg -- 58340
-	self:addTradeSkill(RecipeDB,58340,120,43391,1,45357,nil,2,120,130,135,140)
+	AddRecipe(58340,120,43391,1,2,120,130,135,140)
 	self:addTradeFlags(RecipeDB,58340,1,2,12,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,58340,8,14)

 	-- Glyph of Souls -- 58341
-	self:addTradeSkill(RecipeDB,58341,345,43394,1,45357,nil,2,345,355,360,365)
+	AddRecipe(58341,345,43394,1,2,345,355,360,365)
 	self:addTradeFlags(RecipeDB,58341,1,2,12,F_WARLOCK,36,41,54)
 	self:addTradeAcquire(RecipeDB,58341,8,14)

 	-- Glyph of Battle -- 58342
-	self:addTradeSkill(RecipeDB,58342,75,43395,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58342,75,43395,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58342,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,58342,8,14)

 	-- Glyph of Bloodrage -- 58343
-	self:addTradeSkill(RecipeDB,58343,75,43396,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58343,75,43396,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58343,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,58343,8,14)

 	-- Glyph of Charge -- 58344
-	self:addTradeSkill(RecipeDB,58344,75,43397,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58344,75,43397,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58344,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,58344,8,14)

 	-- Glyph of Mocking Blow -- 58345
-	self:addTradeSkill(RecipeDB,58345,95,43398,1,45357,nil,2,95,105,110,115)
+	AddRecipe(58345,95,43398,1,2,95,105,110,115)
 	self:addTradeFlags(RecipeDB,58345,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,58345,8,14)

 	-- Glyph of Thunder Clap -- 58346
-	self:addTradeSkill(RecipeDB,58346,75,43399,1,45357,nil,2,75,80,85,90)
+	AddRecipe(58346,75,43399,1,2,75,80,85,90)
 	self:addTradeFlags(RecipeDB,58346,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,58346,8,14)

 	-- Glyph of Enduring Victory -- 58347
-	self:addTradeSkill(RecipeDB,58347,320,43400,1,45357,nil,2,320,330,335,340)
+	AddRecipe(58347,320,43400,1,2,320,330,335,340)
 	self:addTradeFlags(RecipeDB,58347,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,58347,8,14)

 	-- Scroll of Agility -- 58472
-	self:addTradeSkill(RecipeDB,58472,15,3012,1,45357,nil,2,15,35,40,45)
+	AddRecipe(58472,15,3012,1,2,15,35,40,45)
 	self:addTradeFlags(RecipeDB,58472,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,58472,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Agility II -- 58473
-	self:addTradeSkill(RecipeDB,58473,85,1477,1,45357,nil,2,85,85,90,95)
+	AddRecipe(58473,85,1477,1,2,85,85,90,95)
 	self:addTradeFlags(RecipeDB,58473,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,58473,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Agility III -- 58476
-	self:addTradeSkill(RecipeDB,58476,175,4425,1,45357,nil,2,175,180,185,190)
+	AddRecipe(58476,175,4425,1,2,175,180,185,190)
 	self:addTradeFlags(RecipeDB,58476,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,58476,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Agility IV -- 58478
-	self:addTradeSkill(RecipeDB,58478,225,10309,1,45357,nil,2,225,230,325,240)
+	AddRecipe(58478,225,10309,1,2,225,230,325,240)
 	self:addTradeFlags(RecipeDB,58478,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,58478,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Agility V -- 58480
-	self:addTradeSkill(RecipeDB,58480,270,27498,1,45357,nil,2,270,275,280,285)
+	AddRecipe(58480,270,27498,1,2,270,275,280,285)
 	self:addTradeFlags(RecipeDB,58480,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,58480,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Agility VI -- 58481
-	self:addTradeSkill(RecipeDB,58481,310,33457,1,45357,nil,2,310,320,325,330)
+	AddRecipe(58481,310,33457,1,2,310,320,325,330)
 	self:addTradeFlags(RecipeDB,58481,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,58481,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Agility VII -- 58482
-	self:addTradeSkill(RecipeDB,58482,370,43463,1,45357,nil,2,370,375,380,385)
+	AddRecipe(58482,370,43463,1,2,370,375,380,385)
 	self:addTradeFlags(RecipeDB,58482,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,58482,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Scroll of Agility VIII -- 58483
-	self:addTradeSkill(RecipeDB,58483,420,43464,1,45357,nil,2,420,425,430,435)
+	AddRecipe(58483,420,43464,1,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,58483,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,58483,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Scroll of Strength -- 58484
-	self:addTradeSkill(RecipeDB,58484,15,954,1,45357,nil,2,15,35,40,45)
+	AddRecipe(58484,15,954,1,2,15,35,40,45)
 	self:addTradeFlags(RecipeDB,58484,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,58484,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Strength II -- 58485
-	self:addTradeSkill(RecipeDB,58485,80,2289,1,45357,nil,2,80,80,85,90)
+	AddRecipe(58485,80,2289,1,2,80,80,85,90)
 	self:addTradeFlags(RecipeDB,58485,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,58485,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Strength III -- 58486
-	self:addTradeSkill(RecipeDB,58486,170,4426,1,45357,nil,2,170,175,180,185)
+	AddRecipe(58486,170,4426,1,2,170,175,180,185)
 	self:addTradeFlags(RecipeDB,58486,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,58486,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Strength IV -- 58487
-	self:addTradeSkill(RecipeDB,58487,220,10310,1,45357,nil,2,220,225,230,235)
+	AddRecipe(58487,220,10310,1,2,220,225,230,235)
 	self:addTradeFlags(RecipeDB,58487,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,58487,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Strength V -- 58488
-	self:addTradeSkill(RecipeDB,58488,265,27503,1,45357,nil,2,265,270,275,280)
+	AddRecipe(58488,265,27503,1,2,265,270,275,280)
 	self:addTradeFlags(RecipeDB,58488,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,58488,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Strength VI -- 58489
-	self:addTradeSkill(RecipeDB,58489,305,33462,1,45357,nil,2,305,315,320,325)
+	AddRecipe(58489,305,33462,1,2,305,315,320,325)
 	self:addTradeFlags(RecipeDB,58489,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,58489,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Strength VII -- 58490
-	self:addTradeSkill(RecipeDB,58490,365,43465,1,45357,nil,2,365,370,375,380)
+	AddRecipe(58490,365,43465,1,2,365,370,375,380)
 	self:addTradeFlags(RecipeDB,58490,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,58490,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Scroll of Strength VIII -- 58491
-	self:addTradeSkill(RecipeDB,58491,415,43466,1,45357,nil,2,415,420,425,430)
+	AddRecipe(58491,415,43466,1,2,415,420,425,430)
 	self:addTradeFlags(RecipeDB,58491,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,58491,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Mystic Tome -- 58565
-	self:addTradeSkill(RecipeDB,58565,110,43515,3,45357,nil,2,110,125,137,150)
+	AddRecipe(58565,110,43515,3,2,110,125,137,150)
 	self:addTradeFlags(RecipeDB,58565,1,2,3,36,41,66)
 	self:addTradeAcquire(RecipeDB,58565,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Dash -- 59315
-	self:addTradeSkill(RecipeDB,59315,150,43674,1,45357,nil,2,150,155,160,165)
+	AddRecipe(59315,150,43674,1,2,150,155,160,165)
 	self:addTradeFlags(RecipeDB,59315,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,59315,8,14)

 	-- Glyph of Ghost Wolf -- 59326
-	self:addTradeSkill(RecipeDB,59326,95,43725,1,45357,nil,2,95,105,110,115)
+	AddRecipe(59326,95,43725,1,2,95,105,110,115)
 	self:addTradeFlags(RecipeDB,59326,1,2,12,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,59326,8,14)

 	-- Glyph of Rune Tap -- 59338
-	self:addTradeSkill(RecipeDB,59338,310,43825,1,45357,nil,2,310,315,320,325)
+	AddRecipe(59338,310,43825,1,2,310,315,320,325)
 	self:addTradeFlags(RecipeDB,59338,1,2,3,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,59338,1,28702,1,33603,1,26977,1,33615,1,30722,1,26959,1,26995,1,30721,1,26916,1,33679)

 	-- Glyph of Blood Strike -- 59339
-	self:addTradeSkill(RecipeDB,59339,320,43826,1,45357,nil,2,320,325,330,335)
+	AddRecipe(59339,320,43826,1,2,320,325,330,335)
 	self:addTradeFlags(RecipeDB,59339,1,2,3,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,59339,1,28702,1,33603,1,26977,1,33615,1,30722,1,26959,1,26995,1,30721,1,26916,1,33679)

 	-- Glyph of Death Strike -- 59340
-	self:addTradeSkill(RecipeDB,59340,340,43827,1,45357,nil,2,340,345,350,355)
+	AddRecipe(59340,340,43827,1,2,340,345,350,355)
 	self:addTradeFlags(RecipeDB,59340,1,2,3,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,59340,1,28702,1,33603,1,26977,1,33615,1,30722,1,26959,1,26995,1,30721,1,26916,1,33679)

 	-- Certificate of Ownership -- 59387
-	self:addTradeSkill(RecipeDB,59387,200,43850,1,45357,nil,2,200,205,210,215)
+	AddRecipe(59387,200,43850,1,2,200,205,210,215)
 	self:addTradeFlags(RecipeDB,59387,1,2,3,F_HUNTER,36,41)
 	self:addTradeAcquire(RecipeDB,59387,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,
 	1,30709,1,30706,1,30713,1,30715,1,30716,1,33603,1,33615,1,30710,1,30717,1,30711,1,33679)

 	-- Tome of the Dawn -- 59475
-	self:addTradeSkill(RecipeDB,59475,125,43654,3,45357,nil,2,125,150,162,175)
+	AddRecipe(59475,125,43654,3,2,125,150,162,175)
 	self:addTradeFlags(RecipeDB,59475,1,2,3,36,41,66)
 	self:addTradeAcquire(RecipeDB,59475,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Book of Survival -- 59478
-	self:addTradeSkill(RecipeDB,59478,125,43655,3,45357,nil,2,125,150,162,175)
+	AddRecipe(59478,125,43655,3,2,125,150,162,175)
 	self:addTradeFlags(RecipeDB,59478,1,2,3,36,41,66)
 	self:addTradeAcquire(RecipeDB,59478,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Strange Tarot -- 59480
-	self:addTradeSkill(RecipeDB,59480,125,nil,1,45357,nil,2,125,150,162,175)
+	AddRecipe(59480,125,nil,1,2,125,150,162,175)
 	self:addTradeFlags(RecipeDB,59480,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,59480,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Tome of Kings -- 59484
-	self:addTradeSkill(RecipeDB,59484,175,43656,3,45357,nil,2,175,200,205,210)
+	AddRecipe(59484,175,43656,3,2,175,200,205,210)
 	self:addTradeFlags(RecipeDB,59484,1,2,3,36,41,66)
 	self:addTradeAcquire(RecipeDB,59484,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Royal Guide of Escape Routes -- 59486
-	self:addTradeSkill(RecipeDB,59486,175,43657,3,45357,nil,2,175,200,205,210)
+	AddRecipe(59486,175,43657,3,2,175,200,205,210)
 	self:addTradeFlags(RecipeDB,59486,1,2,3,36,41,66)
 	self:addTradeAcquire(RecipeDB,59486,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Arcane Tarot -- 59487
-	self:addTradeSkill(RecipeDB,59487,175,nil,1,45357,nil,2,175,200,205,210)
+	AddRecipe(59487,175,nil,1,2,175,200,205,210)
 	self:addTradeFlags(RecipeDB,59487,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,59487,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Weapon Vellum II -- 59488
-	self:addTradeSkill(RecipeDB,59488,235,39350,1,45357,nil,2,235,250,255,260)
+	AddRecipe(59488,235,39350,1,2,235,250,255,260)
 	self:addTradeFlags(RecipeDB,59488,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,59488,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Fire Eater's Guide -- 59489
-	self:addTradeSkill(RecipeDB,59489,225,43660,3,45357,nil,2,225,240,245,250)
+	AddRecipe(59489,225,43660,3,2,225,240,245,250)
 	self:addTradeFlags(RecipeDB,59489,1,2,3,36,41,66)
 	self:addTradeAcquire(RecipeDB,59489,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Book of Stars -- 59490
-	self:addTradeSkill(RecipeDB,59490,225,43661,3,45357,nil,2,225,240,245,250)
+	AddRecipe(59490,225,43661,3,2,225,240,245,250)
 	self:addTradeFlags(RecipeDB,59490,1,2,3,36,41,66)
 	self:addTradeAcquire(RecipeDB,59490,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Shadowy Tarot -- 59491
-	self:addTradeSkill(RecipeDB,59491,225,nil,1,45357,nil,2,225,240,245,250)
+	AddRecipe(59491,225,nil,1,2,225,240,245,250)
 	self:addTradeFlags(RecipeDB,59491,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,59491,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Stormbound Tome -- 59493
-	self:addTradeSkill(RecipeDB,59493,275,43663,3,45357,nil,2,275,290,295,300)
+	AddRecipe(59493,275,43663,3,2,275,290,295,300)
 	self:addTradeFlags(RecipeDB,59493,1,2,3,36,41,53,54,66)
 	self:addTradeAcquire(RecipeDB,59493,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Manual of Clouds -- 59494
-	self:addTradeSkill(RecipeDB,59494,275,43664,3,45357,nil,2,275,290,295,300)
+	AddRecipe(59494,275,43664,3,2,275,290,295,300)
 	self:addTradeFlags(RecipeDB,59494,1,2,3,36,41,66)
 	self:addTradeAcquire(RecipeDB,59494,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Hellfire Tome -- 59495
-	self:addTradeSkill(RecipeDB,59495,325,43666,3,45357,nil,2,325,340,345,350)
+	AddRecipe(59495,325,43666,3,2,325,340,345,350)
 	self:addTradeFlags(RecipeDB,59495,1,2,3,36,41,66)
 	self:addTradeAcquire(RecipeDB,59495,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Book of Clever Tricks -- 59496
-	self:addTradeSkill(RecipeDB,59496,325,43667,3,45357,nil,2,325,340,345,350)
+	AddRecipe(59496,325,43667,3,2,325,340,345,350)
 	self:addTradeFlags(RecipeDB,59496,1,2,3,36,41,66)
 	self:addTradeAcquire(RecipeDB,59496,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603,1,33615,1,30722,1,30721,1,33679)

 	-- Iron-bound Tome -- 59497
-	self:addTradeSkill(RecipeDB,59497,400,38322,4,45357,nil,2,400,425,437,450)
+	AddRecipe(59497,400,38322,4,2,400,425,437,450)
 	self:addTradeFlags(RecipeDB,59497,1,2,3,36,41,66)
 	self:addTradeAcquire(RecipeDB,59497,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Faces of Doom -- 59498
-	self:addTradeSkill(RecipeDB,59498,400,44210,4,45357,nil,2,400,425,437,450)
+	AddRecipe(59498,400,44210,4,2,400,425,437,450)
 	self:addTradeFlags(RecipeDB,59498,1,2,3,36,41,66)
 	self:addTradeAcquire(RecipeDB,59498,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Armor Vellum II -- 59499
-	self:addTradeSkill(RecipeDB,59499,200,37602,1,45357,nil,2,200,210,215,220)
+	AddRecipe(59499,200,37602,1,2,200,210,215,220)
 	self:addTradeFlags(RecipeDB,59499,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,59499,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Armor Vellum III -- 59500
-	self:addTradeSkill(RecipeDB,59500,350,43145,1,45357,nil,2,350,355,370,385)
+	AddRecipe(59500,350,43145,1,2,350,355,370,385)
 	self:addTradeFlags(RecipeDB,59500,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,59500,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Weapon Vellum III -- 59501
-	self:addTradeSkill(RecipeDB,59501,400,43146,1,45357,nil,2,400,405,410,415)
+	AddRecipe(59501,400,43146,1,2,400,405,410,415)
 	self:addTradeFlags(RecipeDB,59501,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,59501,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Darkmoon Card -- 59502
-	self:addTradeSkill(RecipeDB,59502,275,nil,1,45357,nil,2,275,290,295,300)
+	AddRecipe(59502,275,nil,1,2,275,290,295,300)
 	self:addTradeFlags(RecipeDB,59502,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,59502,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Greater Darkmoon Card -- 59503
-	self:addTradeSkill(RecipeDB,59503,325,nil,1,45357,nil,2,325,340,345,350)
+	AddRecipe(59503,325,nil,1,2,325,340,345,350)
 	self:addTradeFlags(RecipeDB,59503,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,59503,1,26916,1,26959,1,26977,1,26995,1,28702,1,30721,1,30722,1,33615,1,33603,1,33679)

 	-- Darkmoon Card of the North -- 59504
-	self:addTradeSkill(RecipeDB,59504,400,nil,1,45357,nil,2,400,425,450,475)
+	AddRecipe(59504,400,nil,1,2,400,425,450,475)
 	self:addTradeFlags(RecipeDB,59504,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,59504,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Glyph of Seal of Blood -- 59559
-	self:addTradeSkill(RecipeDB,59559,385,43867,1,45357,nil,2,385,390,397,405)
+	AddRecipe(59559,385,43867,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,59559,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,59559,8,15)

 	-- Glyph of Seal of Righteousness -- 59560
-	self:addTradeSkill(RecipeDB,59560,385,43868,1,45357,nil,2,385,390,397,405)
+	AddRecipe(59560,385,43868,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,59560,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,59560,8,15)

 	-- Glyph of Seal of Vengeance -- 59561
-	self:addTradeSkill(RecipeDB,59561,385,43869,1,45357,nil,2,385,390,397,405)
+	AddRecipe(59561,385,43869,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,59561,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,59561,8,15)

 	-- Scroll of Recall II -- 60336
-	self:addTradeSkill(RecipeDB,60336,200,44314,1,45357,nil,2,200,215,220,225)
+	AddRecipe(60336,200,44314,1,2,200,215,220,225)
 	self:addTradeFlags(RecipeDB,60336,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,60336,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Scroll of Recall III -- 60337
-	self:addTradeSkill(RecipeDB,60337,350,44315,1,45357,nil,2,350,350,350,355)
+	AddRecipe(60337,350,44315,1,2,350,350,350,355)
 	self:addTradeFlags(RecipeDB,60337,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,60337,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Master's Inscription of the Axe -- 61117
-	self:addTradeSkill(RecipeDB,61117,400,nil,1,45357,nil,2,400,400,400,405)
+	AddRecipe(61117,400,nil,1,2,400,400,400,405)
 	self:addTradeFlags(RecipeDB,61117,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,61117,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Master's Inscription of the Crag -- 61118
-	self:addTradeSkill(RecipeDB,61118,400,nil,1,45357,nil,2,400,400,400,405)
+	AddRecipe(61118,400,nil,1,2,400,400,400,405)
 	self:addTradeFlags(RecipeDB,61118,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,61118,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Master's Inscription of the Pinnacle -- 61119
-	self:addTradeSkill(RecipeDB,61119,400,nil,1,45357,nil,2,400,400,400,405)
+	AddRecipe(61119,400,nil,1,2,400,400,400,405)
 	self:addTradeFlags(RecipeDB,61119,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,61119,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Master's Inscription of the Storm -- 61120
-	self:addTradeSkill(RecipeDB,61120,400,nil,1,45357,nil,2,400,400,400,405)
+	AddRecipe(61120,400,nil,1,2,400,400,400,405)
 	self:addTradeFlags(RecipeDB,61120,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,61120,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Northrend Inscription Research -- 61177
-	self:addTradeSkill(RecipeDB,61177,385,nil,1,45357,nil,2,385,425,437,450)
+	AddRecipe(61177,385,nil,1,2,385,425,437,450)
 	self:addTradeFlags(RecipeDB,61177,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,61177,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603,1,33679)

 	-- Minor Inscription Research -- 61288
-	self:addTradeSkill(RecipeDB,61288,75,nil,1,45357,nil,2,75,125,137,150)
+	AddRecipe(61288,75,nil,1,2,75,125,137,150)
 	self:addTradeFlags(RecipeDB,61288,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,61288,1,26916,1,26959,1,26977,1,26995,1,28702,1,30706,
 	1,30709,1,30710,1,30711,1,30713,1,30715,1,30716,1,30717,1,30721,1,30722,1,33603,1,33615,1,33679)

 	-- Glyph of Frostfire -- 61677
-	self:addTradeSkill(RecipeDB,61677,385,44684,1,45357,nil,2,385,390,397,405)
+	AddRecipe(61677,385,44684,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,61677,1,2,12,F_MAGE,36,41)
 	self:addTradeAcquire(RecipeDB,61677,8,15)

 	-- Glyph of Blast Wave -- 56990
-	self:addTradeSkill(RecipeDB,56990,310,44920,1,45357,nil,2,310,355,360,365)
+	AddRecipe(56990,310,44920,1,2,310,355,360,365)
 	self:addTradeFlags(RecipeDB,56990,1,2,12,F_MAGE,36,41)
 	self:addTradeAcquire(RecipeDB,56990,8,14)

 	-- Glyph of Arcane Blast -- 56991
-	self:addTradeSkill(RecipeDB,56991,315,44955,1,45357,nil,2,310,320,325,330)
+	AddRecipe(56991,315,44955,1,2,310,320,325,330)
 	self:addTradeFlags(RecipeDB,56991,1,2,3,F_MAGE,36,41)
 	self:addTradeAcquire(RecipeDB,56991,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603,1,33615,1,30722,1,30721,1,33679)

 	-- Glyph of Typhoon -- 56965
-	self:addTradeSkill(RecipeDB,56965,310,44955,1,45357,nil,2)
+	AddRecipe(56965,310,44955,1,2)
 	self:addTradeFlags(RecipeDB,56965,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,56965,8,14)

 	-- Glyph of Focus -- 62162
-	self:addTradeSkill(RecipeDB,62162,385,44928,1,45357,nil,2,385,390,397,405)
+	AddRecipe(62162,385,44928,1,2,385,390,397,405)
 	self:addTradeFlags(RecipeDB,62162,1,2,3,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,62162,1,26916,1,26959,1,26977,1,26995,1,28702,1,33603)

 	-- Glyph of Thunderstorm -- 57253
-	self:addTradeSkill(RecipeDB,57253,355,44923,1,45357,nil,2,355,355,360,365)
+	AddRecipe(57253,355,44923,1,2,355,355,360,365)
 	self:addTradeFlags(RecipeDB,57253,1,2,12,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,57253,8,14)

 	-- Rituals of the New Moon -- 64051
-	self:addTradeSkill(RecipeDB,64051,350,46108,2,45357,nil,2,350,375,387,400)
+	AddRecipe(64051,350,46108,2,2,350,375,387,400)
 	self:addTradeFlags(RecipeDB,64051,1,2,11,36,41,54,66)
 	self:addTradeAcquire(RecipeDB,64051,3,26679,3,26708,3,27546,3,27676)

 	-- Glyph of Dancing Rune Weapon -- 64297
-	self:addTradeSkill(RecipeDB,64297,425,45799,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64297,425,45799,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64297,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,64297,8,40)

 	-- Glyph of Dark Death -- 64266
-	self:addTradeSkill(RecipeDB,64266,275,45804,1,45357,nil,2,275,280,287,295)
+	AddRecipe(64266,275,45804,1,2,275,280,287,295)
 	self:addTradeFlags(RecipeDB,64266,1,2,3,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,64266,1,30709,1,30706,1,28702,1,30713,1,30715,1,30716,
 	1,33603,1,26977,1,33615,1,30710,1,30722,1,30717,1,26959,1,26995,1,30721,1,26916,1,30711,1,33679)

 	-- Glyph of Disease -- 64267
-	self:addTradeSkill(RecipeDB,64267,280,45805,1,45357,nil,2,280,285,290,295)
+	AddRecipe(64267,280,45805,1,2,280,285,290,295)
 	self:addTradeFlags(RecipeDB,64267,1,2,3,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,64267,1,30709,1,30706,1,28702,1,30713,1,30715,1,30716,
 	1,33603,1,26977,1,33615,1,30710,1,30722,1,30717,1,26959,1,26995,1,30721,1,26916,1,30711,1,33679)

 	-- Glyph of Howling Blast -- 64300
-	self:addTradeSkill(RecipeDB,64300,425,45806,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64300,425,45806,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64300,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,64300,8,40)

 	-- Glyph of Hungering Cold -- 64298
-	self:addTradeSkill(RecipeDB,64298,425,45800,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64298,425,45800,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64298,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,64298,8,40)

 	-- Glyph of Unholy Blight -- 64299
-	self:addTradeSkill(RecipeDB,64299,425,45803,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64299,425,45803,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64299,1,2,12,F_DK,36,41)
 	self:addTradeAcquire(RecipeDB,64299,8,40)

 	--Glyph of Arcane Barrage -- 64276
-	self:addTradeSkill(RecipeDB,64276,425,45738,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64276,425,45738,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64276,1,2,12,F_MAGE,36,41)
 	self:addTradeAcquire(RecipeDB,64276,8,40)

 	--Glyph of Barkskin  -- 64256
-	self:addTradeSkill(RecipeDB,64256,425,45623,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64256,425,45623,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64256,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,64256,8,40)

 	--Glyph of Beacon of Light -- 64277
-	self:addTradeSkill(RecipeDB,64277,425,45741,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64277,425,45741,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64277,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,64277,8,40)

 	--Glyph of Berserk  -- 64268
-	self:addTradeSkill(RecipeDB,64268,425,45601,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64268,425,45601,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64268,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,64268,8,40)

 	--Glyph of Bladestorm  -- 64295
-	self:addTradeSkill(RecipeDB,64295,425,45790,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64295,425,45790,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64295,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,64295,8,40)

 	--Glyph of Chaos Bolt  -- 64294
-	self:addTradeSkill(RecipeDB,64294,425,45781,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64294,425,45781,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64294,1,2,12,F_WARLOCK,36,41)
 	self:addTradeAcquire(RecipeDB,64294,8,40)

 	--Glyph of Chimera Shot -- 64271
-	self:addTradeSkill(RecipeDB,64271,425,45625,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64271,425,45625,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64271,1,2,12,F_HUNTER,36,41)
 	self:addTradeAcquire(RecipeDB,64271,8,40)

 	--Glyph of Cloak of Shadows -- 64303
-	self:addTradeSkill(RecipeDB,64303,425,45769,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64303,425,45769,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64303,1,2,12,F_ROGUE,36,41)
 	self:addTradeAcquire(RecipeDB,64303,8,40)

 	--Glyph of Deep Freeze  - 64274
-	self:addTradeSkill(RecipeDB,64274,425,45736,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64274,425,45736,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64274,1,2,12,F_MAGE,36,41)
 	self:addTradeAcquire(RecipeDB,64274,8,40)

 	--Glyph of Demonic Circle  -- 64317
-	self:addTradeSkill(RecipeDB,64317,425,45782,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64317,425,45782,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64317,1,2,12,F_WARLOCK,36,41)
 	self:addTradeAcquire(RecipeDB,64317,8,40)

 	--Glyph of Dispersion  -- 64280
-	self:addTradeSkill(RecipeDB,64280,425,45753,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64280,425,45753,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64280,1,2,12,F_PRIEST,36,41)
 	self:addTradeAcquire(RecipeDB,64280,8,40)

 	--Glyph of Divine Plea -- 64305
-	self:addTradeSkill(RecipeDB,64305,425,45745,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64305,425,45745,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64305,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,64305,8,40)

 	--Glyph of Divine Storm  -- 64279
-	self:addTradeSkill(RecipeDB,64279,425,45743,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64279,425,45743,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64279,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,64279,8,40)

 	--Glyph of Earth Shield -- 64261
-	self:addTradeSkill(RecipeDB,64261,250,45775,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64261,250,45775,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64261,1,2,3,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,64261,1,30709,1,30706,1,28702,1,30713,1,30715,
 	1,30716,1,33603,1,26977,1,33615,1,30710,1,30722,1,30717,1,26959,1,26995,1,30721,1,26916,1,30711,1,33679)

 	--Glyph of Enraged Regeneration  -- 64312
-	self:addTradeSkill(RecipeDB,64312,425,45794,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64312,425,45794,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64312,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,64312,8,40)

 	--Glyph of Explosive Shot  -- 64273
-	self:addTradeSkill(RecipeDB,64273,425,45731,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64273,425,45731,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64273,1,2,12,F_HUNTER,36,41)
 	self:addTradeAcquire(RecipeDB,64273,8,40)

 	--Glyph of Explosive Trap -- 64253
-	self:addTradeSkill(RecipeDB,64253,425,45733,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64253,425,45733,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64253,1,2,12,F_HUNTER,36,41)
 	self:addTradeAcquire(RecipeDB,64253,8,40)

 	--Glyph of Fan of Knives -- 64315
-	self:addTradeSkill(RecipeDB,64315,425,45766,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64315,425,45766,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64315,1,2,12,F_ROGUE,36,41)
 	self:addTradeAcquire(RecipeDB,64315,8,40)

 	--Glyph of Feral Spirit  -- 64288
-	self:addTradeSkill(RecipeDB,64288,425,45771,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64288,425,45771,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64288,1,2,12,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,64288,8,40)

 	--Glyph of Guardian Spirit  -- 64281
-	self:addTradeSkill(RecipeDB,64281,425,45755,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64281,425,45755,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64281,1,2,12,F_PRIEST,36,41)
 	self:addTradeAcquire(RecipeDB,64281,8,40)

 	--Glyph of Hammer of the Righteous  -- 64278
-	self:addTradeSkill(RecipeDB,64278,425,45742,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64278,425,45742,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64278,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,64278,8,40)

 	--Glyph of Haunt  -- 64291
-	self:addTradeSkill(RecipeDB,64291,425,45779,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64291,425,45779,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64291,1,2,12,F_WARLOCK,36,41)
 	self:addTradeAcquire(RecipeDB,64291,8,40)

 	--Glyph of Hex -- 64316
-	self:addTradeSkill(RecipeDB,64316,425,45777,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64316,425,45777,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64316,1,2,12,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,64316,8,40)

 	--Glyph of Holy Shock  -- 64254
-	self:addTradeSkill(RecipeDB,64254,425,45746,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64254,425,45746,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64254,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,64254,8,40)

 	--Glyph of Hunger for Blood  -- 64284
-	self:addTradeSkill(RecipeDB,64284,425,45761,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64284,425,45761,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64284,1,2,12,F_ROGUE,36,41)
 	self:addTradeAcquire(RecipeDB,64284,8,40)

 	--Glyph of Hymn of Hope -- 64283
-	self:addTradeSkill(RecipeDB,64283,425,45758,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64283,425,45758,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64283,1,2,12,F_PRIEST,36,41)
 	self:addTradeAcquire(RecipeDB,64283,8,40)

 	--Glyph of Ice Barrier -- 64257
-	self:addTradeSkill(RecipeDB,64257,425,45740,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64257,425,45740,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64257,1,2,12,F_MAGE,36,41)
 	self:addTradeAcquire(RecipeDB,64257,8,40)

 	--Glyph of Kill Shot -- 64304
-	self:addTradeSkill(RecipeDB,64304,425,45732,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64304,425,45732,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64304,1,2,12,F_HUNTER,36,41)
 	self:addTradeAcquire(RecipeDB,64304,8,40)

 	--Glyph of Killing Spree -- 64285
-	self:addTradeSkill(RecipeDB,64285,425,45762,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64285,425,45762,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64285,1,2,12,F_ROGUE,36,41)
 	self:addTradeAcquire(RecipeDB,64285,8,40)

 	--Glyph of Life Tap -- 64248
-	self:addTradeSkill(RecipeDB,64248,425,45785,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64248,425,45785,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64248,1,2,12,F_WARLOCK,36,41)
 	self:addTradeAcquire(RecipeDB,64248,8,40)

 	--Glyph of Living Bomb -- 64275
-	self:addTradeSkill(RecipeDB,64275,425,45737,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64275,425,45737,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64275,1,2,12,F_MAGE,36,41)
 	self:addTradeAcquire(RecipeDB,64275,8,40)

 	--Glyph of Metamorphosis  -- 64318
-	self:addTradeSkill(RecipeDB,64318,425,45780,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64318,425,45780,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64318,1,2,12,F_WARLOCK,36,41)
 	self:addTradeAcquire(RecipeDB,64318,8,40)

 	--Glyph of Mind Sear -- 64309
-	self:addTradeSkill(RecipeDB,64309,425,45757,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64309,425,45757,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64309,1,2,12,F_PRIEST,36,41)
 	self:addTradeAcquire(RecipeDB,64309,8,40)

 	--Glyph of Mirror Image -- 64314
-	self:addTradeSkill(RecipeDB,64314,425,45739,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64314,425,45739,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64314,1,2,12,F_MAGE,36,41)
 	self:addTradeAcquire(RecipeDB,64314,8,40)

 	--Glyph of Monsoon -- 64258
-	self:addTradeSkill(RecipeDB,64258,250,45622,1,45357,nil,2,250,255,262,270)
+	AddRecipe(64258,250,45622,1,2,250,255,262,270)
 	self:addTradeFlags(RecipeDB,64258,1,2,3,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,64258,1,30709,1,30706,1,28702,1,30713,1,30715,1,30716,
 	1,33603,1,26977,1,33615,1,30710,1,30722,1,30717,1,26959,1,26995,1,30721,1,26916,1,30711,1,33679)

 	--Glyph of Mutilate -- 64260
-	self:addTradeSkill(RecipeDB,64260,255,45768,1,45357,nil,2,255,255,262,270)
+	AddRecipe(64260,255,45768,1,2,255,255,262,270)
 	self:addTradeFlags(RecipeDB,64260,1,2,3,F_ROGUE,36,41)
 	self:addTradeAcquire(RecipeDB,64260,1,30709,1,30706,1,28702,1,30713,1,30715,1,30716,
 	1,33603,1,26977,1,33615,1,30710,1,30722,1,30717,1,26959,1,26995,1,30721,1,26916,1,30711,1,33679)

 	--Glyph of Nourish -- 64313
-	self:addTradeSkill(RecipeDB,64313,425,45603,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64313,425,45603,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64313,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,64313,8,40)

 	--Glyph of Pain Suppression -- 64259
-	self:addTradeSkill(RecipeDB,64259,255,45760,1,45357,nil,2,255,255,262,270)
+	AddRecipe(64259,255,45760,1,2,255,255,262,270)
 	self:addTradeFlags(RecipeDB,64259,1,2,3,F_PRIEST,36,41)
 	self:addTradeAcquire(RecipeDB,64259,1,30709,1,30706,1,28702,1,30713,1,30715,1,30716,
 	1,33603,1,26977,1,33615,1,30710,1,30722,1,30717,1,26959,1,30721,1,26916,1,30711,1,33679)

 	--Glyph of Penance -- 64282
-	self:addTradeSkill(RecipeDB,64282,425,45756,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64282,425,45756,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64282,1,2,12,F_PRIEST,36,41)
 	self:addTradeAcquire(RecipeDB,64282,8,40)

 	--Glyph of Raptor Strike -- 64246
-	self:addTradeSkill(RecipeDB,64246,425,45735,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64246,425,45735,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64246,1,2,12,F_HUNTER,36,41)
 	self:addTradeAcquire(RecipeDB,64246,8,40)

 	--Glyph of Riptide -- 64289
-	self:addTradeSkill(RecipeDB,64289,425,45772,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64289,425,45772,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64289,1,2,12,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,64289,8,40)

 	--Glyph of Salvation -- 64251
-	self:addTradeSkill(RecipeDB,64251,425,45747,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64251,425,45747,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64251,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,64251,8,40)

 	--Glyph of Savage Roar -- 64307
-	self:addTradeSkill(RecipeDB,64307,425,45604,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64307,425,45604,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64307,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,64307,8,40)

 	--Glyph of Scatter Shot -- 64249
-	self:addTradeSkill(RecipeDB,64249,425,45734,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64249,425,45734,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64249,1,2,12,F_HUNTER,36,41)
 	self:addTradeAcquire(RecipeDB,64249,8,40)

 	--Glyph of Shadow Dance -- 64286
-	self:addTradeSkill(RecipeDB,64286,425,45764,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64286,425,45764,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64286,1,2,12,F_ROGUE,36,41)
 	self:addTradeAcquire(RecipeDB,64286,8,40)

 	--Glyph of Shadowflame -- 64311
-	self:addTradeSkill(RecipeDB,64311,425,45783,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64311,425,45783,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64311,1,2,12,F_WARLOCK,36,41)
 	self:addTradeAcquire(RecipeDB,64311,8,40)

 	--Glyph of Shield of Righteousness -- 64308
-	self:addTradeSkill(RecipeDB,64308,425,45744,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64308,425,45744,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64308,1,2,12,F_PALADIN,36,41)
 	self:addTradeAcquire(RecipeDB,64308,8,40)

 	--Glyph of Shield Wall -- 64252
-	self:addTradeSkill(RecipeDB,64252,425,45797,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64252,425,45797,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64252,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,64252,8,40)

 	--Glyph of Shockwave -- 64296
-	self:addTradeSkill(RecipeDB,64296,425,45792,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64296,425,45792,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64296,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,64296,8,40)

 	--Glyph of Soul Link -- 64250
-	self:addTradeSkill(RecipeDB,64250,425,45789,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64250,425,45789,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64250,1,2,12,F_WARLOCK,36,41)
 	self:addTradeAcquire(RecipeDB,64250,8,40)

 	--Glyph of Spell Reflection -- 64302
-	self:addTradeSkill(RecipeDB,64302,425,45795,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64302,425,45795,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64302,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,64302,8,40)

 	--Glyph of Stoneclaw Totem -- 64247
-	self:addTradeSkill(RecipeDB,64247,425,45778,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64247,425,45778,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64247,1,2,12,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,64247,8,40)

 	--Glyph of Survival Instincts  -- 65245
-	self:addTradeSkill(RecipeDB,65245,425,46372,1,45357,nil,2,425,430,435,440)
+	AddRecipe(65245,425,46372,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,65245,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,65245,8,40)

 	--Glyph of Thunder -- 64287
-	self:addTradeSkill(RecipeDB,64287,425,45770,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64287,425,45770,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64287,1,2,12,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,64287,8,40)

 	--Glyph of Totem of Wrath -- 64262
-	self:addTradeSkill(RecipeDB,64262,255,45776,1,45357,nil,2,255,255,262,270)
+	AddRecipe(64262,255,45776,1,2,255,255,262,270)
 	self:addTradeFlags(RecipeDB,64262,1,2,3,F_SHAMAN,36,41)
 	self:addTradeAcquire(RecipeDB,64262,1,30709,1,30706,1,28702,1,30713,1,30715,1,30716,
 	1,33603,1,26977,1,33615,1,30710,1,30722,1,30717,1,26959,1,26995,1,30721,1,26916,1,30711,1,33679)

 	--Glyph of Tricks of the Trade -- 64310
-	self:addTradeSkill(RecipeDB,64310,425,45767,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64310,425,45767,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64310,1,2,12,F_ROGUE,36,41)
 	self:addTradeAcquire(RecipeDB,64310,8,40)

 	--Glyph of Vigilance -- 64255
-	self:addTradeSkill(RecipeDB,64255,425,45793,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64255,425,45793,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64255,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,64255,8,40)

 	--Glyph of Wild Growth -- 64270
-	self:addTradeSkill(RecipeDB,64270,425,45602,1,45357,nil,2,425,430,435,440)
+	AddRecipe(64270,425,45602,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,64270,1,2,12,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,64270,8,40)

 	--Twilight Tome -- 64053
-	self:addTradeSkill(RecipeDB,64053,350,45849,1,45357,nil,2,350,375,387,400)
+	AddRecipe(64053,350,45849,1,2,350,375,387,400)
 	self:addTradeFlags(RecipeDB,64053,1,2,3,36,41,53,54,66)
 	self:addTradeAcquire(RecipeDB,64053,1,33603,1,28702,1,26977,1,26959,1,26995,1,26916)

 	--Glyph of Claw -- 67600
-	self:addTradeSkill(RecipeDB,67600,105,48720,1,45357,nil,2,105,105,110,115)
+	AddRecipe(67600,105,48720,1,2,105,105,110,115)
 	self:addTradeFlags(RecipeDB,67600,1,2,3,F_DRUID,36,41)
 	self:addTradeAcquire(RecipeDB,67600,1,33603,1,33679)

 	--Glyph of Command -- 68166
-	self:addTradeSkill(RecipeDB,68166,355,49084,1,45357,nil,2,355,355,360,365)
+	AddRecipe(68166,355,49084,1,2,355,355,360,365)
 	self:addTradeFlags(RecipeDB,68166,1,2,12,F_WARRIOR,36,41)
 	self:addTradeAcquire(RecipeDB,68166,8,14)

-	-- The number of items added with patches
-	local patchitems = 0
-
 	-- 3.2.2 Items (Leave this code in here because I think asian servers don't actually have 3.1 even)
 	local version = GetBuildInfo()

 	if (version == "3.2.2") then

 		-- Runescroll of Fortitude -- 69385
-		self:addTradeSkill(RecipeDB,69385,440,49632,1,45357,nil,2,440,440,442,460)
+		AddRecipe(69385,440,49632,1,2,440,440,442,460)
 		self:addTradeFlags(RecipeDB,69385,1,2,3,36,41)
 		self:addTradeAcquire(RecipeDB,69385,1,28702)

-		patchitems = 1
-
 	end

-	return 436 + patchitems
+	return num_recipes

 end
diff --git a/RecipeDB/ARL-Jewelcraft.lua b/RecipeDB/ARL-Jewelcraft.lua
index 8a7f226..176287a 100644
--- a/RecipeDB/ARL-Jewelcraft.lua
+++ b/RecipeDB/ARL-Jewelcraft.lua
@@ -1,2821 +1,2840 @@
---[[
-
-************************************************************************
-
-ARL-Jewelcraft.lua
-
-Jewelcrafting data for all of Ackis Recipe List
-
-************************************************************************
-
-File date: @file-date-iso@
-File revision: @file-revision@
-Project revision: @project-revision@
-Project version: @project-version@
-
-************************************************************************
-
-Format:
-
-	self:addTradeSkill(RecipeDB, Spell ID, Skill Level, Item ID, Rarity, Specialty)
-
-************************************************************************
-
-Please see http://www.wowace.com/projects/arl/for more information.
-
-License:
-	Please see LICENSE.txt
-
-This source code is released under All Rights Reserved.
-
-************************************************************************
-
-]]--
-
-local MODNAME	= "Ackis Recipe List"
-local addon		= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
-local L			= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
-
-local initialized	= false
+--------------------------------------------------------------------------------------------------------------------
+-- ARL-Jewelcraft.lua
+-- Jewelcrafting data for all of Ackis Recipe List
+--------------------------------------------------------------------------------------------------------------------
+-- File date: @file-date-iso@
+-- File revision: @file-revision@
+-- Project revision: @project-revision@
+-- Project version: @project-version@
+--------------------------------------------------------------------------------------------------------------------
+-- Please see http://www.wowace.com/projects/arl/for more information.
+--------------------------------------------------------------------------------------------------------------------
+-- License:
+-- Please see LICENSE.txt
+-- This source code is released under All Rights Reserved.
+--------------------------------------------------------------------------------------------------------------------
+
+local MODNAME = "Ackis Recipe List"
+local addon	= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
+local L	= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
+
+--------------------------------------------------------------------------------------------------------------------
+-- Item "rarity"
+--------------------------------------------------------------------------------------------------------------------
+local R_COMMON, R_UNCOMMON, R_RARE, R_EPIC, R_LEGENDARY, R_ARTIFACT = 1, 2, 3, 4, 5, 6
+
+--------------------------------------------------------------------------------------------------------------------
+-- Origin
+--------------------------------------------------------------------------------------------------------------------
+local GAME_ORIG, GAME_TBC, GAME_WOTLK = 0, 1, 2
+
+--------------------------------------------------------------------------------------------------------------------
+-- Filter flags
+--------------------------------------------------------------------------------------------------------------------
+local F_ALLIANCE, F_HORDE, F_TRAINER, F_VENDOR, F_INSTANCE, F_RAID = 1, 2, 3, 4, 5, 6
+local F_SEASONAL, F_QUEST, F_PVP, F_WORLD_DROP, F_MOB_DROP, F_DISC = 7, 8, 9, 10, 11, 12
+local F_DK, F_DRUID, F_HUNTER, F_MAGE, F_PALADIN, F_PRIEST, F_SHAMAN, F_ROGUE, F_WARLOCK, F_WARRIOR = 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
+local F_IBOE, F_IBOP, F_IBOA, F_RBOE, F_RBOP, F_RBOA = 36, 37, 38, 40, 41, 42
+local F_DPS, F_TANK, F_HEALER, F_CASTER = 51, 52, 53, 54
+local F_CLOTH, F_LEATHER, F_MAIL, F_PLATE, F_CLOAK, F_TRINKET, F_RING, F_NECK, F_SHIELD = 56, 57, 58, 59, 60, 61, 62, 63, 64
+local F_1H, F_2H, F_AXE, F_SWORD, F_MACE, F_POLEARM, F_DAGGER = 66, 67, 68, 69, 70, 71, 72
+local F_STAFF, F_WAND, F_THROWN, F_BOW, F_XBOW, F_AMMO, F_FIST, F_GUN = 73, 74, 75, 76, 77, 78, 79, 80
+
+--------------------------------------------------------------------------------------------------------------------
+-- Acquire types
+--------------------------------------------------------------------------------------------------------------------
+local A_TRAINER, A_VENDOR, A_MOB, A_QUEST, A_SEASONAL, A_REPUTATION, A_WORLD_DROP, A_CUSTOM = 1, 2, 3, 4, 5, 6, 7, 8
+
+
+local initialized = false
+local num_recipes = 0

 function addon:InitJewelcrafting(RecipeDB)

 	if initialized then
-		return
+		return num_recipes
 	end

 	initialized = true

+	--------------------------------------------------------------------------------------------------------------------
+	-- Counter and wrapper function
+	--------------------------------------------------------------------------------------------------------------------
+	local function AddRecipe(SpellID, Skill, ItemID, Rarity, Game, Orange, Yellow, Green, Gray)
+		num_recipes = num_recipes + 1
+		self:addTradeSkill(RecipeDB, SpellID, Skill, ItemID, Rarity, 25229, nil, Game, Orange, Yellow, Green, Gray)
+	end
+
 	-- Delicate Copper Wire -- 25255
-	self:addTradeSkill(RecipeDB,25255,1,20816,1,25229,nil,1)
+	AddRecipe(25255,1,20816,1,1)
 	self:addTradeFlags(RecipeDB,25255,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,25255,8,8)

 	-- Bronze Setting -- 25278
-	self:addTradeSkill(RecipeDB,25278,50,20817,1,25229,nil,1)
+	AddRecipe(25278,50,20817,1,1)
 	self:addTradeFlags(RecipeDB,25278,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,25278,1,15501,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Elegant Silver Ring -- 25280
-	self:addTradeSkill(RecipeDB,25280,50,20818,1,25229,nil,1)
+	AddRecipe(25280,50,20818,1,1)
 	self:addTradeFlags(RecipeDB,25280,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,25280,1,15501,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Inlaid Malachite Ring -- 25283
-	self:addTradeSkill(RecipeDB,25283,30,20821,1,25229,nil,1)
+	AddRecipe(25283,30,20821,1,1)
 	self:addTradeFlags(RecipeDB,25283,1,2,3,36,41,51,62)
 	self:addTradeAcquire(RecipeDB,25283,1,15501,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Simple Pearl Ring -- 25284
-	self:addTradeSkill(RecipeDB,25284,60,20820,1,25229,nil,1)
+	AddRecipe(25284,60,20820,1,1)
 	self:addTradeFlags(RecipeDB,25284,1,2,3,36,41,62)
 	self:addTradeAcquire(RecipeDB,25284,1,15501,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Gloom Band -- 25287
-	self:addTradeSkill(RecipeDB,25287,70,20823,1,25229,nil,1)
+	AddRecipe(25287,70,20823,1,1)
 	self:addTradeFlags(RecipeDB,25287,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,25287,1,15501,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Heavy Silver Ring -- 25305
-	self:addTradeSkill(RecipeDB,25305,90,20826,1,25229,nil,1)
+	AddRecipe(25305,90,20826,1,1)
 	self:addTradeFlags(RecipeDB,25305,1,2,3,36,41,62)
 	self:addTradeAcquire(RecipeDB,25305,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Ring of Silver Might -- 25317
-	self:addTradeSkill(RecipeDB,25317,80,20827,1,25229,nil,1)
+	AddRecipe(25317,80,20827,1,1)
 	self:addTradeFlags(RecipeDB,25317,1,2,3,36,41,51,62)
 	self:addTradeAcquire(RecipeDB,25317,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Ring of Twilight Shadows -- 25318
-	self:addTradeSkill(RecipeDB,25318,100,20828,1,25229,nil,1)
+	AddRecipe(25318,100,20828,1,1)
 	self:addTradeFlags(RecipeDB,25318,1,2,3,36,41,62)
 	self:addTradeAcquire(RecipeDB,25318,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26960,1,33680)

 	-- Heavy Golden Necklace of Battle -- 25320
-	self:addTradeSkill(RecipeDB,25320,150,20831,1,25229,nil,1)
+	AddRecipe(25320,150,20831,1,1)
 	self:addTradeFlags(RecipeDB,25320,1,2,4,36,40,51,63)
 	self:addTradeAcquire(RecipeDB,25320,2,1286,2,3367,2,16624,2,17512)

 	-- Moonsoul Crown -- 25321
-	self:addTradeSkill(RecipeDB,25321,120,20832,1,25229,nil,1)
+	AddRecipe(25321,120,20832,1,1)
 	self:addTradeFlags(RecipeDB,25321,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,25321,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Wicked Moonstone Ring -- 25323
-	self:addTradeSkill(RecipeDB,25323,125,20833,1,25229,nil,1)
+	AddRecipe(25323,125,20833,1,1)
 	self:addTradeFlags(RecipeDB,25323,1,2,4,36,40,53,54,62)
 	self:addTradeAcquire(RecipeDB,25323,2,3499,2,3954)

 	-- Amulet of the Moon -- 25339
-	self:addTradeSkill(RecipeDB,25339,110,20830,1,25229,nil,1)
+	AddRecipe(25339,110,20830,1,1)
 	self:addTradeFlags(RecipeDB,25339,1,2,4,36,40,53,54,63)
 	self:addTradeAcquire(RecipeDB,25339,2,4229,2,4561,2,16624,2,17512)

 	-- Solid Bronze Ring -- 25490
-	self:addTradeSkill(RecipeDB,25490,50,20907,1,25229,nil,1)
+	AddRecipe(25490,50,20907,1,1)
 	self:addTradeFlags(RecipeDB,25490,1,2,3,36,41,62)
 	self:addTradeAcquire(RecipeDB,25490,1,15501,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Braided Copper Ring -- 25493
-	self:addTradeSkill(RecipeDB,25493,1,20906,2,25229,nil,1)
+	AddRecipe(25493,1,20906,2,1)
 	self:addTradeFlags(RecipeDB,25493,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,25493,8,8)

 	-- Barbaric Iron Collar -- 25498
-	self:addTradeSkill(RecipeDB,25498,110,20909,1,25229,nil,1)
+	AddRecipe(25498,110,20909,1,1)
 	self:addTradeFlags(RecipeDB,25498,1,2,3,36,41,51,63)
 	self:addTradeAcquire(RecipeDB,25498,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Pendant of the Agate Shield -- 25610
-	self:addTradeSkill(RecipeDB,25610,120,20950,1,25229,nil,1)
+	AddRecipe(25610,120,20950,1,1)
 	self:addTradeFlags(RecipeDB,25610,1,2,4,36,40,52,63)
 	self:addTradeAcquire(RecipeDB,25610,2,1448,2,4877)

 	-- Heavy Iron Knuckles -- 25612
-	self:addTradeSkill(RecipeDB,25612,125,20954,1,25229,nil,1)
+	AddRecipe(25612,125,20954,1,1)
 	self:addTradeFlags(RecipeDB,25612,1,2,4,36,40,51,79)
 	self:addTradeAcquire(RecipeDB,25612,2,2381,2,2393)

 	-- Golden Dragon Ring -- 25613
-	self:addTradeSkill(RecipeDB,25613,135,20955,1,25229,nil,1)
+	AddRecipe(25613,135,20955,1,1)
 	self:addTradeFlags(RecipeDB,25613,1,2,3,36,41,52,62)
 	self:addTradeAcquire(RecipeDB,25613,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Mithril Filigree -- 25615
-	self:addTradeSkill(RecipeDB,25615,150,20963,1,25229,nil,1)
+	AddRecipe(25615,150,20963,1,1)
 	self:addTradeFlags(RecipeDB,25615,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,25615,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Blazing Citrine Ring -- 25617
-	self:addTradeSkill(RecipeDB,25617,150,20958,1,25229,nil,1)
+	AddRecipe(25617,150,20958,1,1)
 	self:addTradeFlags(RecipeDB,25617,1,2,4,36,40,53,54,62)
 	self:addTradeAcquire(RecipeDB,25617,2,2381,2,9636)

 	-- Jade Pendant of Blasting -- 25618
-	self:addTradeSkill(RecipeDB,25618,160,20966,2,25229,nil,1)
+	AddRecipe(25618,160,20966,2,1)
 	self:addTradeFlags(RecipeDB,25618,1,2,10,36,40,53,54,63)
 	self:addTradeAcquire(RecipeDB,25618,7,2)

 	-- The Jade Eye -- 25619
-	self:addTradeSkill(RecipeDB,25619,170,20959,1,25229,nil,1)
+	AddRecipe(25619,170,20959,1,1)
 	self:addTradeFlags(RecipeDB,25619,1,2,4,36,40,52,62)
 	self:addTradeAcquire(RecipeDB,25619,2,4775,2,5163,2,16624,2,17512)

 	-- Engraved Truesilver Ring -- 25620
-	self:addTradeSkill(RecipeDB,25620,170,20960,1,25229,nil,1)
+	AddRecipe(25620,170,20960,1,1)
 	self:addTradeFlags(RecipeDB,25620,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,25620,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Citrine Ring of Rapid Healing -- 25621
-	self:addTradeSkill(RecipeDB,25621,180,20961,1,25229,nil,1)
+	AddRecipe(25621,180,20961,1,1)
 	self:addTradeFlags(RecipeDB,25621,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,25621,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Citrine Pendant of Golden Healing -- 25622
-	self:addTradeSkill(RecipeDB,25622,190,20967,2,25229,nil,1)
+	AddRecipe(25622,190,20967,2,1)
 	self:addTradeFlags(RecipeDB,25622,1,2,10,36,41,53,54,63)
 	self:addTradeAcquire(RecipeDB,25622,7,2)

 	-- Figurine - Jade Owl -- 26872
-	self:addTradeSkill(RecipeDB,26872,200,21748,1,25229,nil,1)
+	AddRecipe(26872,200,21748,1,1)
 	self:addTradeFlags(RecipeDB,26872,1,2,3,37,41,53,54,61)
 	self:addTradeAcquire(RecipeDB,26872,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Figurine - Golden Hare -- 26873
-	self:addTradeSkill(RecipeDB,26873,200,21756,2,25229,nil,1)
+	AddRecipe(26873,200,21756,2,1)
 	self:addTradeFlags(RecipeDB,26873,1,2,10,37,41,61)
 	self:addTradeAcquire(RecipeDB,26873,7,2)

 	-- Aquamarine Signet -- 26874
-	self:addTradeSkill(RecipeDB,26874,210,20964,1,25229,nil,1)
+	AddRecipe(26874,210,20964,1,1)
 	self:addTradeFlags(RecipeDB,26874,1,2,3,36,41,51,62)
 	self:addTradeAcquire(RecipeDB,26874,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Figurine - Black Pearl Panther -- 26875
-	self:addTradeSkill(RecipeDB,26875,215,21758,1,25229,nil,1)
+	AddRecipe(26875,215,21758,1,1)
 	self:addTradeFlags(RecipeDB,26875,1,2,4,37,41,51,61)
 	self:addTradeAcquire(RecipeDB,26875,2,989,2,4897)

 	-- Aquamarine Pendant of the Warrior -- 26876
-	self:addTradeSkill(RecipeDB,26876,220,21755,1,25229,nil,1)
+	AddRecipe(26876,220,21755,1,1)
 	self:addTradeFlags(RecipeDB,26876,1,2,3,36,41,51,63)
 	self:addTradeAcquire(RecipeDB,26876,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Ruby Crown of Restoration -- 26878
-	self:addTradeSkill(RecipeDB,26878,225,20969,1,25229,nil,1)
+	AddRecipe(26878,225,20969,1,1)
 	self:addTradeFlags(RecipeDB,26878,1,2,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,26878,2,2810,2,2821)

 	-- Thorium Setting -- 26880
-	self:addTradeSkill(RecipeDB,26880,225,21752,1,25229,nil,1)
+	AddRecipe(26880,225,21752,1,1)
 	self:addTradeFlags(RecipeDB,26880,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,26880,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Figurine - Truesilver Crab -- 26881
-	self:addTradeSkill(RecipeDB,26881,225,21760,1,25229,nil,1)
+	AddRecipe(26881,225,21760,1,1)
 	self:addTradeFlags(RecipeDB,26881,1,2,4,37,41,52,61)
 	self:addTradeAcquire(RecipeDB,26881,2,1148,2,4897)

 	-- Figurine - Truesilver Boar -- 26882
-	self:addTradeSkill(RecipeDB,26882,235,21763,2,25229,nil,1)
+	AddRecipe(26882,235,21763,2,1)
 	self:addTradeFlags(RecipeDB,26882,1,2,10,37,41,51,61)
 	self:addTradeAcquire(RecipeDB,26882,7,2)

 	-- Ruby Pendant of Fire -- 26883
-	self:addTradeSkill(RecipeDB,26883,235,21764,1,25229,nil,1)
+	AddRecipe(26883,235,21764,1,1)
 	self:addTradeFlags(RecipeDB,26883,1,2,3,36,41,53,54,63)
 	self:addTradeAcquire(RecipeDB,26883,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Truesilver Healing Ring -- 26885
-	self:addTradeSkill(RecipeDB,26885,240,21765,1,25229,nil,1)
+	AddRecipe(26885,240,21765,1,1)
 	self:addTradeFlags(RecipeDB,26885,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,26885,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- The Aquamarine Ward -- 26887
-	self:addTradeSkill(RecipeDB,26887,245,21754,2,25229,nil,1)
+	AddRecipe(26887,245,21754,2,1)
 	self:addTradeFlags(RecipeDB,26887,1,2,10,36,40,52,62)
 	self:addTradeAcquire(RecipeDB,26887,7,2)

 	-- Gem Studded Band -- 26896
-	self:addTradeSkill(RecipeDB,26896,250,21753,2,25229,nil,1)
+	AddRecipe(26896,250,21753,2,1)
 	self:addTradeFlags(RecipeDB,26896,1,2,10,36,40,53,54,62)
 	self:addTradeAcquire(RecipeDB,26896,7,2)

 	-- Opal Necklace of Impact -- 26897
-	self:addTradeSkill(RecipeDB,26897,250,21766,1,25229,nil,1)
+	AddRecipe(26897,250,21766,1,1)
 	self:addTradeFlags(RecipeDB,26897,1,2,4,36,40,51,63)
 	self:addTradeAcquire(RecipeDB,26897,2,5163,2,8363,2,16624,2,17512)

 	-- Figurine - Ruby Serpent -- 26900
-	self:addTradeSkill(RecipeDB,26900,260,21769,2,25229,nil,1)
+	AddRecipe(26900,260,21769,2,1)
 	self:addTradeFlags(RecipeDB,26900,1,2,10,37,41,53,54,61)
 	self:addTradeAcquire(RecipeDB,26900,7,2)

 	-- Simple Opal Ring -- 26902
-	self:addTradeSkill(RecipeDB,26902,260,21767,1,25229,nil,1)
+	AddRecipe(26902,260,21767,1,1)
 	self:addTradeFlags(RecipeDB,26902,1,2,3,36,41,51,62)
 	self:addTradeAcquire(RecipeDB,26902,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Sapphire Signet -- 26903
-	self:addTradeSkill(RecipeDB,26903,275,21768,1,25229,nil,1)
+	AddRecipe(26903,275,21768,1,1)
 	self:addTradeFlags(RecipeDB,26903,1,2,3,36,41,62)
 	self:addTradeAcquire(RecipeDB,26903,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Emerald Crown of Destruction -- 26906
-	self:addTradeSkill(RecipeDB,26906,275,21774,1,25229,nil,1)
+	AddRecipe(26906,275,21774,1,1)
 	self:addTradeFlags(RecipeDB,26906,1,2,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,26906,2,15179)

 	-- Onslaught Ring -- 26907
-	self:addTradeSkill(RecipeDB,26907,280,21775,1,25229,nil,1)
+	AddRecipe(26907,280,21775,1,1)
 	self:addTradeFlags(RecipeDB,26907,1,2,3,36,41,51,62)
 	self:addTradeAcquire(RecipeDB,26907,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Sapphire Pendant of Winter Night -- 26908
-	self:addTradeSkill(RecipeDB,26908,280,21790,1,25229,nil,1)
+	AddRecipe(26908,280,21790,1,1)
 	self:addTradeFlags(RecipeDB,26908,1,2,3,36,41,53,54,63)
 	self:addTradeAcquire(RecipeDB,26908,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Figurine - Emerald Owl -- 26909
-	self:addTradeSkill(RecipeDB,26909,285,21777,2,25229,nil,1)
+	AddRecipe(26909,285,21777,2,1)
 	self:addTradeFlags(RecipeDB,26909,1,2,10,37,41,61)
 	self:addTradeAcquire(RecipeDB,26909,7,2)

 	-- Ring of Bitter Shadows -- 26910
-	self:addTradeSkill(RecipeDB,26910,285,21778,1,25229,nil,1)
+	AddRecipe(26910,285,21778,1,1)
 	self:addTradeFlags(RecipeDB,26910,1,2,4,36,40,53,54,62)
 	self:addTradeAcquire(RecipeDB,26910,2,12941)

 	-- Living Emerald Pendant -- 26911
-	self:addTradeSkill(RecipeDB,26911,290,21791,1,25229,nil,1)
+	AddRecipe(26911,290,21791,1,1)
 	self:addTradeFlags(RecipeDB,26911,1,2,3,37,41,53,54,63)
 	self:addTradeAcquire(RecipeDB,26911,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Figurine - Black Diamond Crab -- 26912
-	self:addTradeSkill(RecipeDB,26912,300,21784,2,25229,nil,1)
+	AddRecipe(26912,300,21784,2,1)
 	self:addTradeFlags(RecipeDB,26912,1,2,5,11,37,41,52,61)
 	self:addTradeAcquire(RecipeDB,26912,3,9736)

 	-- Figurine - Dark Iron Scorpid -- 26914
-	self:addTradeSkill(RecipeDB,26914,300,21789,2,25229,nil,1)
+	AddRecipe(26914,300,21789,2,1)
 	self:addTradeFlags(RecipeDB,26914,1,2,5,37,41,51,61)
 	self:addTradeAcquire(RecipeDB,26914,3,8983)

 	-- Necklace of the Diamond Tower -- 26915
-	self:addTradeSkill(RecipeDB,26915,305,21792,1,25229,nil,1)
+	AddRecipe(26915,305,21792,1,1)
 	self:addTradeFlags(RecipeDB,26915,1,2,4,36,40,52,63)
 	self:addTradeAcquire(RecipeDB,26915,2,11189)

 	-- Band of Natural Fire -- 26916
-	self:addTradeSkill(RecipeDB,26916,310,21779,1,25229,nil,1)
+	AddRecipe(26916,310,21779,1,1)
 	self:addTradeFlags(RecipeDB,26916,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,26916,1,18751,1,18774,1,19063,1,19539,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Woven Copper Ring -- 26925
-	self:addTradeSkill(RecipeDB,26925,1,21931,2,25229,nil,1)
+	AddRecipe(26925,1,21931,2,1)
 	self:addTradeFlags(RecipeDB,26925,1,2,3,36,41,62)
 	self:addTradeAcquire(RecipeDB,26925,8,8)

 	-- Heavy Copper Ring -- 26926
-	self:addTradeSkill(RecipeDB,26926,5,21932,1,25229,nil,1)
+	AddRecipe(26926,5,21932,1,1)
 	self:addTradeFlags(RecipeDB,26926,1,2,3,36,41,62)
 	self:addTradeAcquire(RecipeDB,26926,1,15501,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Thick Bronze Necklace -- 26927
-	self:addTradeSkill(RecipeDB,26927,50,21933,1,25229,nil,1)
+	AddRecipe(26927,50,21933,1,1)
 	self:addTradeFlags(RecipeDB,26927,1,2,3,36,41,63)
 	self:addTradeAcquire(RecipeDB,26927,1,15501,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Ornate Tigerseye Necklace -- 26928
-	self:addTradeSkill(RecipeDB,26928,30,21934,1,25229,nil,1)
+	AddRecipe(26928,30,21934,1,1)
 	self:addTradeFlags(RecipeDB,26928,1,2,3,36,41,53,54,63)
 	self:addTradeAcquire(RecipeDB,26928,1,15501,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Teardrop Blood Garnet -- 28903
-	self:addTradeSkill(RecipeDB,28903,300,23094,1,25229,nil,1)
+	AddRecipe(28903,300,23094,1,1)
 	self:addTradeFlags(RecipeDB,28903,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,28903,1,26997,1,26960,1,26982,1,19063,1,19539,1,18751,1,26915,1,18774,1,28701,1,33590,1,33614,1,33680)

 	-- Bold Blood Garnet -- 28905
-	self:addTradeSkill(RecipeDB,28905,305,23095,1,25229,nil,1)
+	AddRecipe(28905,305,23095,1,1)
 	self:addTradeFlags(RecipeDB,28905,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,28905,1,26997,1,26960,1,26982,1,19063,1,19539,1,18751,1,26915,1,18774,1,28701,1,33590,1,33614,1,33680)

 	-- Runed Blood Garnet -- 28906
-	self:addTradeSkill(RecipeDB,28906,315,23096,2,25229,nil,1)
+	AddRecipe(28906,315,23096,2,1)
 	self:addTradeFlags(RecipeDB,28906,1,2,4,36,41,53,54,110)
 	self:addTradeAcquire(RecipeDB,28906,6,934,1,19331)

 	-- Delicate Blood Garnet -- 28907
-	self:addTradeSkill(RecipeDB,28907,325,23097,2,25229,nil,1)
+	AddRecipe(28907,325,23097,2,1)
 	self:addTradeFlags(RecipeDB,28907,1,2,4,36,41,51,105)
 	self:addTradeAcquire(RecipeDB,28907,6,933,2,20242,6,933,2,23007)

 	-- Inscribed Flame Spessarite -- 28910
-	self:addTradeSkill(RecipeDB,28910,300,23098,1,25229,nil,1)
+	AddRecipe(28910,300,23098,1,1)
 	self:addTradeFlags(RecipeDB,28910,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,28910,1,26997,1,26960,1,26982,1,19063,1,19539,1,18751,1,26915,1,18774,1,28701,1,33590,1,33614,1,33680)

 	-- Luminous Flame Spessarite -- 28912
-	self:addTradeSkill(RecipeDB,28912,305,23099,2,25229,nil,1)
+	AddRecipe(28912,305,23099,2,1)
 	self:addTradeFlags(RecipeDB,28912,1,2,4,36,41,53,54,105)
 	self:addTradeAcquire(RecipeDB,28912,6,933,1,20242,6,933,1,23007)

 	-- Glinting Flame Spessarite -- 28914
-	self:addTradeSkill(RecipeDB,28914,315,23100,1,25229,nil,1)
+	AddRecipe(28914,315,23100,1,1)
 	self:addTradeFlags(RecipeDB,28914,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,28914,1,26997,1,26960,1,26982,1,19063,1,19539,1,18751,1,26915,1,18774,1,28701,1,33590,1,33614,1,33680)

 	-- Potent Flame Spessarite -- 28915
-	self:addTradeSkill(RecipeDB,28915,325,23101,2,25229,nil,1)
+	AddRecipe(28915,325,23101,2,1)
 	self:addTradeFlags(RecipeDB,28915,1,2,4,36,41,53,54,107)
 	self:addTradeAcquire(RecipeDB,28915,6,1011,1,21655)

 	-- Radiant Deep Peridot -- 28916
-	self:addTradeSkill(RecipeDB,28916,300,23103,1,25229,nil,1)
+	AddRecipe(28916,300,23103,1,1)
 	self:addTradeFlags(RecipeDB,28916,1,2,3,36,41,54)
 	self:addTradeAcquire(RecipeDB,28916,1,26997,1,26960,1,26982,1,19063,1,19539,1,18751,1,26915,1,18774,1,28701,1,33590,1,33614,1,33680)

 	-- Jagged Deep Peridot -- 28917
-	self:addTradeSkill(RecipeDB,28917,305,23104,1,25229,nil,1)
+	AddRecipe(28917,305,23104,1,1)
 	self:addTradeFlags(RecipeDB,28917,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,28917,1,26997,1,26960,1,26982,1,19063,1,19539,1,18751,1,26915,1,18774,1,28701,1,33590,1,33614,1,33680)

 	-- Enduring Deep Peridot -- 28918
-	self:addTradeSkill(RecipeDB,28918,315,23105,2,25229,nil,1)
+	AddRecipe(28918,315,23105,2,1)
 	self:addTradeFlags(RecipeDB,28918,1,2,4,36,41,52,104)
 	self:addTradeAcquire(RecipeDB,28918,6,946,1,17657,6,947,1,17585)

 	-- Dazzling Deep Peridot -- 28924
-	self:addTradeSkill(RecipeDB,28924,325,23106,2,25229,nil,1)
+	AddRecipe(28924,325,23106,2,1)
 	self:addTradeFlags(RecipeDB,28924,1,2,4,36,41,110)
 	self:addTradeAcquire(RecipeDB,28924,6,934,2,19331)

 	-- Glowing Shadow Draenite -- 28925
-	self:addTradeSkill(RecipeDB,28925,300,23108,1,25229,nil,1)
+	AddRecipe(28925,300,23108,1,1)
 	self:addTradeFlags(RecipeDB,28925,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,28925,1,26997,1,26960,1,26982,1,19063,1,19539,1,18751,1,26915,1,18774,1,28701,1,33590,1,33614,1,33680)

 	-- Royal Shadow Draenite -- 28927
-	self:addTradeSkill(RecipeDB,28927,305,23109,2,25229,nil,1)
+	AddRecipe(28927,305,23109,2,1)
 	self:addTradeFlags(RecipeDB,28927,1,4,36,41,53,54,101)
 	self:addTradeAcquire(RecipeDB,28927,6,932,2,19321)

 	-- Shifting Shadow Draenite -- 28933
-	self:addTradeSkill(RecipeDB,28933,315,23110,2,25229,nil,1)
+	AddRecipe(28933,315,23110,2,1)
 	self:addTradeFlags(RecipeDB,28933,1,2,4,36,41,51,105)
 	self:addTradeAcquire(RecipeDB,28933,6,933,1,20242,6,933,1,23007)

 	-- Sovereign Shadow Draenite -- 28936
-	self:addTradeSkill(RecipeDB,28936,325,23111,2,25229,nil,1)
+	AddRecipe(28936,325,23111,2,1)
 	self:addTradeFlags(RecipeDB,28936,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,28936,1,26997,1,26960,1,26982,1,19063,1,19539,1,18751,1,26915,1,18774,1,28701,1,33590,1,33614,1,33680)

 	-- Brilliant Golden Draenite -- 28938
-	self:addTradeSkill(RecipeDB,28938,300,23113,1,25229,nil,1)
+	AddRecipe(28938,300,23113,1,1)
 	self:addTradeFlags(RecipeDB,28938,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,28938,1,26997,1,26960,1,26982,1,19063,1,19539,1,18751,1,26915,1,18774,1,28701,1,33590,1,33614,1,33680)

 	-- Gleaming Golden Draenite -- 28944
-	self:addTradeSkill(RecipeDB,28944,305,23114,2,25229,nil,1)
+	AddRecipe(28944,305,23114,2,1)
 	self:addTradeFlags(RecipeDB,28944,1,4,36,41,101)
 	self:addTradeAcquire(RecipeDB,28944,6,932,1,19321)

 	-- Thick Golden Draenite -- 28947
-	self:addTradeSkill(RecipeDB,28947,315,23115,2,25229,nil,1)
+	AddRecipe(28947,315,23115,2,1)
 	self:addTradeFlags(RecipeDB,28947,1,2,4,36,41,52,105)
 	self:addTradeAcquire(RecipeDB,28947,6,933,2,20242,6,933,2,23007)

 	-- Rigid Golden Draenite -- 28948
-	self:addTradeSkill(RecipeDB,28948,325,23116,2,25229,nil,1)
+	AddRecipe(28948,325,23116,2,1)
 	self:addTradeFlags(RecipeDB,28948,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,28948,1,26997,1,26960,1,26982,1,19063,1,19539,1,18751,1,26915,1,18774,1,28701,1,33590,1,33614,1,33680)

 	-- Solid Azure Moonstone -- 28950
-	self:addTradeSkill(RecipeDB,28950,300,23118,1,25229,nil,1)
+	AddRecipe(28950,300,23118,1,1)
 	self:addTradeFlags(RecipeDB,28950,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,28950,1,26997,1,26960,1,26982,1,19063,1,19539,1,18751,1,26915,1,18774,1,28701,1,33590,1,33614,1,33680)

 	-- Sparkling Azure Moonstone -- 28953
-	self:addTradeSkill(RecipeDB,28953,305,23119,2,25229,nil,1)
+	AddRecipe(28953,305,23119,2,1)
 	self:addTradeFlags(RecipeDB,28953,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,28953,1,26997,1,26960,1,26982,1,19063,1,19539,1,18751,1,26915,1,18774,1,28701,1,33590,1,33614,1,33680)

 	-- Stormy Azure Moonstone -- 28955
-	self:addTradeSkill(RecipeDB,28955,315,23120,2,25229,nil,1)
+	AddRecipe(28955,315,23120,2,1)
 	self:addTradeFlags(RecipeDB,28955,1,2,10,36,40,54)
 	self:addTradeAcquire(RecipeDB,28955,7,2)

 	-- Lustrous Azure Moonstone -- 28957
-	self:addTradeSkill(RecipeDB,28957,325,23121,2,25229,nil,1)
+	AddRecipe(28957,325,23121,2,1)
 	self:addTradeFlags(RecipeDB,28957,1,2,4,36,41,53,54,105)
 	self:addTradeAcquire(RecipeDB,28957,6,933,2,20242,6,933,2,23007)

 	-- Fel Iron Blood Ring -- 31048
-	self:addTradeSkill(RecipeDB,31048,310,24074,1,25229,nil,1)
+	AddRecipe(31048,310,24074,1,1)
 	self:addTradeFlags(RecipeDB,31048,1,2,3,36,41,51,62)
 	self:addTradeAcquire(RecipeDB,31048,1,18751,1,18774,1,19063,1,19539,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Golden Draenite Ring -- 31049
-	self:addTradeSkill(RecipeDB,31049,310,24075,1,25229,nil,1)
+	AddRecipe(31049,310,24075,1,1)
 	self:addTradeFlags(RecipeDB,31049,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,31049,1,18751,1,18774,1,19063,1,19539,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Azure Moonstone Ring -- 31050
-	self:addTradeSkill(RecipeDB,31050,320,24076,1,25229,nil,1)
+	AddRecipe(31050,320,24076,1,1)
 	self:addTradeFlags(RecipeDB,31050,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,31050,1,18751,1,18774,1,19063,1,19539,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Thick Adamantite Necklace -- 31051
-	self:addTradeSkill(RecipeDB,31051,335,24077,1,25229,nil,1)
+	AddRecipe(31051,335,24077,1,1)
 	self:addTradeFlags(RecipeDB,31051,1,2,3,36,41,63)
 	self:addTradeAcquire(RecipeDB,31051,1,18751,1,18774,1,19063,1,19539,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Heavy Adamantite Ring -- 31052
-	self:addTradeSkill(RecipeDB,31052,335,24078,1,25229,nil,1)
+	AddRecipe(31052,335,24078,1,1)
 	self:addTradeFlags(RecipeDB,31052,1,2,3,36,41,62)
 	self:addTradeAcquire(RecipeDB,31052,1,18751,1,18774,1,19063,1,19539,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Khorium Band of Shadows -- 31053
-	self:addTradeSkill(RecipeDB,31053,350,24079,3,25229,nil,1)
+	AddRecipe(31053,350,24079,3,1)
 	self:addTradeFlags(RecipeDB,31053,1,2,11,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,31053,3,19826)

 	-- Khorium Band of Frost -- 31054
-	self:addTradeSkill(RecipeDB,31054,355,24080,3,25229,nil,1)
+	AddRecipe(31054,355,24080,3,1)
 	self:addTradeFlags(RecipeDB,31054,1,2,5,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,31054,3,17722)

 	-- Khorium Inferno Band -- 31055
-	self:addTradeSkill(RecipeDB,31055,355,24082,3,25229,nil,1)
+	AddRecipe(31055,355,24082,3,1)
 	self:addTradeFlags(RecipeDB,31055,1,2,5,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,31055,3,18472)

 	-- Khorium Band of Leaves -- 31056
-	self:addTradeSkill(RecipeDB,31056,360,24085,3,25229,nil,1)
+	AddRecipe(31056,360,24085,3,1)
 	self:addTradeFlags(RecipeDB,31056,1,2,11,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,31056,3,19984)

 	-- Arcane Khorium Band -- 31057
-	self:addTradeSkill(RecipeDB,31057,365,24086,3,25229,nil,1)
+	AddRecipe(31057,365,24086,3,1)
 	self:addTradeFlags(RecipeDB,31057,1,2,11,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,31057,3,18866)

 	-- Heavy Felsteel Ring -- 31058
-	self:addTradeSkill(RecipeDB,31058,345,24087,3,25229,nil,1)
+	AddRecipe(31058,345,24087,3,1)
 	self:addTradeFlags(RecipeDB,31058,1,2,10,36,40,51,62)
 	self:addTradeAcquire(RecipeDB,31058,7,3)

 	-- Delicate Eternium Ring -- 31060
-	self:addTradeSkill(RecipeDB,31060,355,24088,3,25229,nil,1)
+	AddRecipe(31060,355,24088,3,1)
 	self:addTradeFlags(RecipeDB,31060,1,2,10,36,40,52,62)
 	self:addTradeAcquire(RecipeDB,31060,7,3)

 	-- Blazing Eternium Band -- 31061
-	self:addTradeSkill(RecipeDB,31061,365,24089,3,25229,nil,1)
+	AddRecipe(31061,365,24089,3,1)
 	self:addTradeFlags(RecipeDB,31061,1,2,10,36,40,62)
 	self:addTradeAcquire(RecipeDB,31061,7,3)

 	-- Pendant of Frozen Flame -- 31062
-	self:addTradeSkill(RecipeDB,31062,360,24092,3,25229,nil,1)
+	AddRecipe(31062,360,24092,3,1)
 	self:addTradeFlags(RecipeDB,31062,1,2,4,36,41,63,106)
 	self:addTradeAcquire(RecipeDB,31062,6,989,3,21643)

 	-- Pendant of Thawing -- 31063
-	self:addTradeSkill(RecipeDB,31063,360,24093,3,25229,nil,1)
+	AddRecipe(31063,360,24093,3,1)
 	self:addTradeFlags(RecipeDB,31063,1,2,4,36,41,63,107)
 	self:addTradeAcquire(RecipeDB,31063,6,1011,3,21655)

 	-- Pendant of Withering -- 31064
-	self:addTradeSkill(RecipeDB,31064,360,24095,3,25229,nil,1)
+	AddRecipe(31064,360,24095,3,1)
 	self:addTradeFlags(RecipeDB,31064,1,2,4,36,41,63,110)
 	self:addTradeAcquire(RecipeDB,31064,6,934,3,19331)

 	-- Pendant of Shadow's End -- 31065
-	self:addTradeSkill(RecipeDB,31065,360,24097,3,25229,nil,1)
+	AddRecipe(31065,360,24097,3,1)
 	self:addTradeFlags(RecipeDB,31065,1,4,36,41,63,101)
 	self:addTradeAcquire(RecipeDB,31065,6,932,3,19321)

 	-- Pendant of the Null Rune -- 31066
-	self:addTradeSkill(RecipeDB,31066,360,24098,3,25229,nil,1)
+	AddRecipe(31066,360,24098,3,1)
 	self:addTradeFlags(RecipeDB,31066,1,2,4,36,41,63,105)
 	self:addTradeAcquire(RecipeDB,31066,6,933,3,20242,6,933,3,23007)

 	-- Thick Felsteel Necklace -- 31067
-	self:addTradeSkill(RecipeDB,31067,355,24106,3,25229,nil,1)
+	AddRecipe(31067,355,24106,3,1)
 	self:addTradeFlags(RecipeDB,31067,1,2,10,36,40,63)
 	self:addTradeAcquire(RecipeDB,31067,7,3)

 	-- Living Ruby Pendant -- 31068
-	self:addTradeSkill(RecipeDB,31068,355,24110,3,25229,nil,1)
+	AddRecipe(31068,355,24110,3,1)
 	self:addTradeFlags(RecipeDB,31068,1,2,10,36,40,53,54,63)
 	self:addTradeAcquire(RecipeDB,31068,7,3)

 	-- Braided Eternium Chain -- 31070
-	self:addTradeSkill(RecipeDB,31070,360,24114,3,25229,nil,1)
+	AddRecipe(31070,360,24114,3,1)
 	self:addTradeFlags(RecipeDB,31070,1,2,10,36,40,51,63)
 	self:addTradeAcquire(RecipeDB,31070,7,3)

 	-- Eye of the Night -- 31071
-	self:addTradeSkill(RecipeDB,31071,360,24116,3,25229,nil,1)
+	AddRecipe(31071,360,24116,3,1)
 	self:addTradeFlags(RecipeDB,31071,1,2,10,36,40,53,54,63)
 	self:addTradeAcquire(RecipeDB,31071,7,3)

 	-- Embrace of the Dawn -- 31072
-	self:addTradeSkill(RecipeDB,31072,365,24117,3,25229,nil,1)
+	AddRecipe(31072,365,24117,3,1)
 	self:addTradeFlags(RecipeDB,31072,1,2,10,36,40,63)
 	self:addTradeAcquire(RecipeDB,31072,7,3)

 	-- Chain of the Twilight Owl -- 31076
-	self:addTradeSkill(RecipeDB,31076,365,24121,3,25229,nil,1)
+	AddRecipe(31076,365,24121,3,1)
 	self:addTradeFlags(RecipeDB,31076,1,2,10,36,40,52,53,54,63)
 	self:addTradeAcquire(RecipeDB,31076,7,3)

 	-- Coronet of Verdant Flame -- 31077
-	self:addTradeSkill(RecipeDB,31077,370,24122,4,25229,nil,1)
+	AddRecipe(31077,370,24122,4,1)
 	self:addTradeFlags(RecipeDB,31077,1,2,5,11,36,41,56)
 	self:addTradeAcquire(RecipeDB,31077,3,18422)

 	-- Circlet of Arcane Might -- 31078
-	self:addTradeSkill(RecipeDB,31078,370,24123,4,25229,nil,1)
+	AddRecipe(31078,370,24123,4,1)
 	self:addTradeFlags(RecipeDB,31078,1,2,5,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,31078,3,18096)

 	-- Figurine - Felsteel Boar -- 31079
-	self:addTradeSkill(RecipeDB,31079,370,24124,3,25229,nil,1)
+	AddRecipe(31079,370,24124,3,1)
 	self:addTradeFlags(RecipeDB,31079,1,2,4,37,41,51,61,107)
 	self:addTradeAcquire(RecipeDB,31079,6,1011,3,21655)

 	-- Figurine - Dawnstone Crab -- 31080
-	self:addTradeSkill(RecipeDB,31080,370,24125,3,25229,nil,1)
+	AddRecipe(31080,370,24125,3,1)
 	self:addTradeFlags(RecipeDB,31080,1,2,4,37,41,52,61,104)
 	self:addTradeAcquire(RecipeDB,31080,6,946,3,17657,6,947,3,17585)

 	-- Figurine - Living Ruby Serpent -- 31081
-	self:addTradeSkill(RecipeDB,31081,370,24126,3,25229,nil,1)
+	AddRecipe(31081,370,24126,3,1)
 	self:addTradeFlags(RecipeDB,31081,1,2,4,37,41,53,54,61,106)
 	self:addTradeAcquire(RecipeDB,31081,6,989,3,21643)

 	-- Figurine - Talasite Owl -- 31082
-	self:addTradeSkill(RecipeDB,31082,370,24127,3,25229,nil,1)
+	AddRecipe(31082,370,24127,3,1)
 	self:addTradeFlags(RecipeDB,31082,1,2,4,37,41,53,54,61,111)
 	self:addTradeAcquire(RecipeDB,31082,6,935,3,21432)

 	-- Figurine - Nightseye Panther -- 31083
-	self:addTradeSkill(RecipeDB,31083,370,24128,3,25229,nil,1)
+	AddRecipe(31083,370,24128,3,1)
 	self:addTradeFlags(RecipeDB,31083,1,2,4,37,41,51,61,103)
 	self:addTradeAcquire(RecipeDB,31083,6,942,3,17904)

 	-- Bold Living Ruby -- 31084
-	self:addTradeSkill(RecipeDB,31084,350,24027,3,25229,nil,1)
+	AddRecipe(31084,350,24027,3,1)
 	self:addTradeFlags(RecipeDB,31084,1,2,10,36,40,51)
 	self:addTradeAcquire(RecipeDB,31084,7,3)

 	-- Delicate Living Ruby -- 31085
-	self:addTradeSkill(RecipeDB,31085,350,24028,3,25229,nil,1)
+	AddRecipe(31085,350,24028,3,1)
 	self:addTradeFlags(RecipeDB,31085,1,2,10,36,40,51)
 	self:addTradeAcquire(RecipeDB,31085,7,3)

 	-- Teardrop Living Ruby -- 31087
-	self:addTradeSkill(RecipeDB,31087,350,24029,3,25229,nil,1)
+	AddRecipe(31087,350,24029,3,1)
 	self:addTradeFlags(RecipeDB,31087,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,31087,7,3)

 	-- Runed Living Ruby -- 31088
-	self:addTradeSkill(RecipeDB,31088,350,24030,3,25229,nil,1)
+	AddRecipe(31088,350,24030,3,1)
 	self:addTradeFlags(RecipeDB,31088,1,2,10,11,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,31088,3,24664)

 	-- Bright Living Ruby -- 31089
-	self:addTradeSkill(RecipeDB,31089,350,24031,3,25229,nil,1)
+	AddRecipe(31089,350,24031,3,1)
 	self:addTradeFlags(RecipeDB,31089,1,2,10,11,36,41,51)
 	self:addTradeAcquire(RecipeDB,31089,3,24664)

 	-- Subtle Living Ruby -- 31090
-	self:addTradeSkill(RecipeDB,31090,350,24032,3,25229,nil,1)
+	AddRecipe(31090,350,24032,3,1)
 	self:addTradeFlags(RecipeDB,31090,1,2,10,36,40,52)
 	self:addTradeAcquire(RecipeDB,31090,7,3)

 	-- Flashing Living Ruby -- 31091
-	self:addTradeSkill(RecipeDB,31091,350,24036,3,25229,nil,1)
+	AddRecipe(31091,350,24036,3,1)
 	self:addTradeFlags(RecipeDB,31091,1,2,10,36,40,52)
 	self:addTradeAcquire(RecipeDB,31091,7,3)

 	-- Solid Star of Elune -- 31092
-	self:addTradeSkill(RecipeDB,31092,350,24033,3,25229,nil,1)
+	AddRecipe(31092,350,24033,3,1)
 	self:addTradeFlags(RecipeDB,31092,1,2,10,11,36,41)
 	self:addTradeAcquire(RecipeDB,31092,3,24664)

 	-- Lustrous Star of Elune -- 31094
-	self:addTradeSkill(RecipeDB,31094,350,24037,3,25229,nil,1)
+	AddRecipe(31094,350,24037,3,1)
 	self:addTradeFlags(RecipeDB,31094,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,31094,7,3)

 	-- Stormy Star of Elune -- 31095
-	self:addTradeSkill(RecipeDB,31095,350,24039,3,25229,nil,1)
+	AddRecipe(31095,350,24039,3,1)
 	self:addTradeFlags(RecipeDB,31095,1,2,10,36,40,54)
 	self:addTradeAcquire(RecipeDB,31095,7,3)

 	-- Brilliant Dawnstone -- 31096
-	self:addTradeSkill(RecipeDB,31096,350,24047,3,25229,nil,1)
+	AddRecipe(31096,350,24047,3,1)
 	self:addTradeFlags(RecipeDB,31096,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,31096,7,3)

 	-- Smooth Dawnstone -- 31097
-	self:addTradeSkill(RecipeDB,31097,350,24048,3,25229,nil,1)
+	AddRecipe(31097,350,24048,3,1)
 	self:addTradeFlags(RecipeDB,31097,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,31097,7,3)

 	-- Rigid Dawnstone -- 31098
-	self:addTradeSkill(RecipeDB,31098,350,24051,3,25229,nil,1)
+	AddRecipe(31098,350,24051,3,1)
 	self:addTradeFlags(RecipeDB,31098,1,2,10,11,36,41)
 	self:addTradeAcquire(RecipeDB,31098,3,24664)

 	-- Gleaming Dawnstone -- 31099
-	self:addTradeSkill(RecipeDB,31099,350,24050,3,25229,nil,1)
+	AddRecipe(31099,350,24050,3,1)
 	self:addTradeFlags(RecipeDB,31099,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,31099,7,3)

 	-- Thick Dawnstone -- 31100
-	self:addTradeSkill(RecipeDB,31100,350,24052,3,25229,nil,1)
+	AddRecipe(31100,350,24052,3,1)
 	self:addTradeFlags(RecipeDB,31100,1,2,10,36,40,52)
 	self:addTradeAcquire(RecipeDB,31100,7,3)

 	-- Mystic Dawnstone -- 31101
-	self:addTradeSkill(RecipeDB,31101,350,24053,3,25229,nil,1)
+	AddRecipe(31101,350,24053,3,1)
 	self:addTradeFlags(RecipeDB,31101,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,31101,2,21474,2,21485)

 	-- Sovereign Nightseye -- 31102
-	self:addTradeSkill(RecipeDB,31102,350,24054,3,25229,nil,1)
+	AddRecipe(31102,350,24054,3,1)
 	self:addTradeFlags(RecipeDB,31102,1,2,10,36,40,51)
 	self:addTradeAcquire(RecipeDB,31102,7,3)

 	-- Shifting Nightseye -- 31103
-	self:addTradeSkill(RecipeDB,31103,350,24055,3,25229,nil,1)
+	AddRecipe(31103,350,24055,3,1)
 	self:addTradeFlags(RecipeDB,31103,1,2,10,36,40,51)
 	self:addTradeAcquire(RecipeDB,31103,7,3)

 	-- Glowing Nightseye -- 31104
-	self:addTradeSkill(RecipeDB,31104,350,24056,3,25229,nil,1)
+	AddRecipe(31104,350,24056,3,1)
 	self:addTradeFlags(RecipeDB,31104,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,31104,7,3)

 	-- Royal Nightseye -- 31105
-	self:addTradeSkill(RecipeDB,31105,350,24057,3,25229,nil,1)
+	AddRecipe(31105,350,24057,3,1)
 	self:addTradeFlags(RecipeDB,31105,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,31105,7,3)

 	-- Inscribed Noble Topaz -- 31106
-	self:addTradeSkill(RecipeDB,31106,350,24058,3,25229,nil,1)
+	AddRecipe(31106,350,24058,3,1)
 	self:addTradeFlags(RecipeDB,31106,1,2,10,36,40,51)
 	self:addTradeAcquire(RecipeDB,31106,7,3)

 	-- Potent Noble Topaz -- 31107
-	self:addTradeSkill(RecipeDB,31107,350,24059,3,25229,nil,1)
+	AddRecipe(31107,350,24059,3,1)
 	self:addTradeFlags(RecipeDB,31107,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,31107,7,3)

 	-- Luminous Noble Topaz -- 31108
-	self:addTradeSkill(RecipeDB,31108,350,24060,3,25229,nil,1)
+	AddRecipe(31108,350,24060,3,1)
 	self:addTradeFlags(RecipeDB,31108,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,31108,7,3)

 	-- Glinting Noble Topaz -- 31109
-	self:addTradeSkill(RecipeDB,31109,350,24061,3,25229,nil,1)
+	AddRecipe(31109,350,24061,3,1)
 	self:addTradeFlags(RecipeDB,31109,1,2,10,36,40,51)
 	self:addTradeAcquire(RecipeDB,31109,7,3)

 	-- Enduring Talasite -- 31110
-	self:addTradeSkill(RecipeDB,31110,350,24062,3,25229,nil,1)
+	AddRecipe(31110,350,24062,3,1)
 	self:addTradeFlags(RecipeDB,31110,1,2,10,36,40,52)
 	self:addTradeAcquire(RecipeDB,31110,7,3)

 	-- Radiant Talasite -- 31111
-	self:addTradeSkill(RecipeDB,31111,350,24066,3,25229,nil,1)
+	AddRecipe(31111,350,24066,3,1)
 	self:addTradeFlags(RecipeDB,31111,1,2,10,36,40,54)
 	self:addTradeAcquire(RecipeDB,31111,7,3)

 	-- Dazzling Talasite -- 31112
-	self:addTradeSkill(RecipeDB,31112,350,24065,3,25229,nil,1)
+	AddRecipe(31112,350,24065,3,1)
 	self:addTradeFlags(RecipeDB,31112,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,31112,7,3)

 	-- Jagged Talasite -- 31113
-	self:addTradeSkill(RecipeDB,31113,350,24067,3,25229,nil,1)
+	AddRecipe(31113,350,24067,3,1)
 	self:addTradeFlags(RecipeDB,31113,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,31113,7,3)

 	-- Sparkling Star of Elune -- 31149
-	self:addTradeSkill(RecipeDB,31149,350,24035,3,25229,nil,1)
+	AddRecipe(31149,350,24035,3,1)
 	self:addTradeFlags(RecipeDB,31149,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,31149,7,3)

 	-- Malachite Pendant -- 32178
-	self:addTradeSkill(RecipeDB,32178,20,25438,1,25229,nil,1)
+	AddRecipe(32178,20,25438,1,1)
 	self:addTradeFlags(RecipeDB,32178,1,2,3,36,41,51,63)
 	self:addTradeAcquire(RecipeDB,32178,1,15501,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Tigerseye Band -- 32179
-	self:addTradeSkill(RecipeDB,32179,20,25439,1,25229,nil,1)
+	AddRecipe(32179,20,25439,1,1)
 	self:addTradeFlags(RecipeDB,32179,1,2,3,36,41,51,62)
 	self:addTradeAcquire(RecipeDB,32179,1,15501,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Rough Stone Statue -- 32259
-	self:addTradeSkill(RecipeDB,32259,1,25498,1,25229,nil,1)
+	AddRecipe(32259,1,25498,1,1)
 	self:addTradeFlags(RecipeDB,32259,1,2,3,37,41)
 	self:addTradeAcquire(RecipeDB,32259,8,8)

 	-- Coarse Stone Statue -- 32801
-	self:addTradeSkill(RecipeDB,32801,50,25880,1,25229,nil,1)
+	AddRecipe(32801,50,25880,1,1)
 	self:addTradeFlags(RecipeDB,32801,1,2,3,37,41)
 	self:addTradeAcquire(RecipeDB,32801,1,15501,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Heavy Stone Statue -- 32807
-	self:addTradeSkill(RecipeDB,32807,110,25881,1,25229,nil,1)
+	AddRecipe(32807,110,25881,1,1)
 	self:addTradeFlags(RecipeDB,32807,1,2,3,37,41)
 	self:addTradeAcquire(RecipeDB,32807,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Solid Stone Statue -- 32808
-	self:addTradeSkill(RecipeDB,32808,175,25882,1,25229,nil,1)
+	AddRecipe(32808,175,25882,1,1)
 	self:addTradeFlags(RecipeDB,32808,1,2,3,37,41)
 	self:addTradeAcquire(RecipeDB,32808,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Dense Stone Statue -- 32809
-	self:addTradeSkill(RecipeDB,32809,225,25883,1,25229,nil,1)
+	AddRecipe(32809,225,25883,1,1)
 	self:addTradeFlags(RecipeDB,32809,1,2,3,37,41)
 	self:addTradeAcquire(RecipeDB,32809,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Powerful Earthstorm Diamond -- 32866
-	self:addTradeSkill(RecipeDB,32866,365,25896,1,25229,nil,1)
+	AddRecipe(32866,365,25896,1,1)
 	self:addTradeFlags(RecipeDB,32866,1,2,4,36,41,105)
 	self:addTradeAcquire(RecipeDB,32866,6,933,2,17518)

 	-- Bracing Earthstorm Diamond -- 32867
-	self:addTradeSkill(RecipeDB,32867,365,25897,1,25229,nil,1)
+	AddRecipe(32867,365,25897,1,1)
 	self:addTradeFlags(RecipeDB,32867,1,2,4,36,41,53,54,105)
 	self:addTradeAcquire(RecipeDB,32867,6,933,3,17518)

 	-- Tenacious Earthstorm Diamond -- 32868
-	self:addTradeSkill(RecipeDB,32868,365,25898,3,25229,nil,1)
+	AddRecipe(32868,365,25898,3,1)
 	self:addTradeFlags(RecipeDB,32868,1,2,10,36,40,52)
 	self:addTradeAcquire(RecipeDB,32868,7,3)

 	-- Brutal Earthstorm Diamond -- 32869
-	self:addTradeSkill(RecipeDB,32869,365,25899,3,25229,nil,1)
+	AddRecipe(32869,365,25899,3,1)
 	self:addTradeFlags(RecipeDB,32869,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,32869,7,3)

 	-- Insightful Earthstorm Diamond -- 32870
-	self:addTradeSkill(RecipeDB,32870,365,25901,1,25229,nil,1)
+	AddRecipe(32870,365,25901,1,1)
 	self:addTradeFlags(RecipeDB,32870,1,2,4,36,41,111)
 	self:addTradeAcquire(RecipeDB,32870,6,935,1,21432)

 	-- Destructive Skyfire Diamond -- 32871
-	self:addTradeSkill(RecipeDB,32871,365,25890,3,25229,nil,1)
+	AddRecipe(32871,365,25890,3,1)
 	self:addTradeFlags(RecipeDB,32871,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,32871,7,3)

 	-- Mystical Skyfire Diamond -- 32872
-	self:addTradeSkill(RecipeDB,32872,365,25893,3,25229,nil,1)
+	AddRecipe(32872,365,25893,3,1)
 	self:addTradeFlags(RecipeDB,32872,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,32872,7,3)

 	-- Swift Skyfire Diamond -- 32873
-	self:addTradeSkill(RecipeDB,32873,365,25894,1,25229,nil,1)
+	AddRecipe(32873,365,25894,1,1)
 	self:addTradeFlags(RecipeDB,32873,1,2,4,36,41,51,105)
 	self:addTradeAcquire(RecipeDB,32873,6,933,2,20242,6,933,2,23007)

 	-- Enigmatic Skyfire Diamond -- 32874
-	self:addTradeSkill(RecipeDB,32874,365,25895,1,25229,nil,1)
+	AddRecipe(32874,365,25895,1,1)
 	self:addTradeFlags(RecipeDB,32874,1,2,4,36,41,106)
 	self:addTradeAcquire(RecipeDB,32874,6,989,2,21643)

 	-- Smooth Golden Draenite -- 34069
-	self:addTradeSkill(RecipeDB,34069,325,28290,2,25229,nil,1)
+	AddRecipe(34069,325,28290,2,1)
 	self:addTradeFlags(RecipeDB,34069,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,34069,1,26997,1,26960,1,26982,1,19063,1,19539,1,18751,1,26915,1,18774,1,28701,1,33590,1,33614,1,33680)

 	-- Bright Blood Garnet -- 34590
-	self:addTradeSkill(RecipeDB,34590,305,28595,1,25229,nil,1)
+	AddRecipe(34590,305,28595,1,1)
 	self:addTradeFlags(RecipeDB,34590,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,34590,1,26997,1,26960,1,26982,1,19063,1,19539,1,18751,1,26915,1,18774,1,28701,1,33590,1,33614,1,33680)

 	-- Golden Ring of Power -- 34955
-	self:addTradeSkill(RecipeDB,34955,180,29157,1,25229,nil,1)
+	AddRecipe(34955,180,29157,1,1)
 	self:addTradeFlags(RecipeDB,34955,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,34955,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Truesilver Commander's Ring -- 34959
-	self:addTradeSkill(RecipeDB,34959,200,29158,1,25229,nil,1)
+	AddRecipe(34959,200,29158,1,1)
 	self:addTradeFlags(RecipeDB,34959,1,2,3,36,41,51,62)
 	self:addTradeAcquire(RecipeDB,34959,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Glowing Thorium Band -- 34960
-	self:addTradeSkill(RecipeDB,34960,280,29159,1,25229,nil,1)
+	AddRecipe(34960,280,29159,1,1)
 	self:addTradeFlags(RecipeDB,34960,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,34960,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Emerald Lion Ring -- 34961
-	self:addTradeSkill(RecipeDB,34961,290,29160,1,25229,nil,1)
+	AddRecipe(34961,290,29160,1,1)
 	self:addTradeFlags(RecipeDB,34961,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,34961,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Brilliant Necklace -- 36523
-	self:addTradeSkill(RecipeDB,36523,75,30419,1,25229,nil,1)
+	AddRecipe(36523,75,30419,1,1)
 	self:addTradeFlags(RecipeDB,36523,1,2,3,36,41,53,54,63)
 	self:addTradeAcquire(RecipeDB,36523,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Heavy Jade Ring -- 36524
-	self:addTradeSkill(RecipeDB,36524,105,30420,1,25229,nil,1)
+	AddRecipe(36524,105,30420,1,1)
 	self:addTradeFlags(RecipeDB,36524,1,2,3,36,41,62)
 	self:addTradeAcquire(RecipeDB,36524,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Red Ring of Destruction -- 36525
-	self:addTradeSkill(RecipeDB,36525,230,30421,1,25229,nil,1)
+	AddRecipe(36525,230,30421,1,1)
 	self:addTradeFlags(RecipeDB,36525,1,2,3,36,41,62)
 	self:addTradeAcquire(RecipeDB,36525,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Diamond Focus Ring -- 36526
-	self:addTradeSkill(RecipeDB,36526,265,30422,1,25229,nil,1)
+	AddRecipe(36526,265,30422,1,1)
 	self:addTradeFlags(RecipeDB,36526,1,2,3,36,41,62)
 	self:addTradeAcquire(RecipeDB,36526,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Bronze Band of Force -- 37818
-	self:addTradeSkill(RecipeDB,37818,65,30804,1,25229,nil,1)
+	AddRecipe(37818,65,30804,1,1)
 	self:addTradeFlags(RecipeDB,37818,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,37818,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Ring of Arcane Shielding -- 37855
-	self:addTradeSkill(RecipeDB,37855,360,30825,3,25229,nil,1)
+	AddRecipe(37855,360,30825,3,1)
 	self:addTradeFlags(RecipeDB,37855,1,2,4,36,41,62,111)
 	self:addTradeAcquire(RecipeDB,37855,6,935,2,21432)

 	-- Mercurial Adamantite -- 38068
-	self:addTradeSkill(RecipeDB,38068,325,31079,1,25229,nil,1)
+	AddRecipe(38068,325,31079,1,1)
 	self:addTradeFlags(RecipeDB,38068,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,38068,1,18751,1,18774,1,19063,1,19539,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Bronze Torc -- 38175
-	self:addTradeSkill(RecipeDB,38175,80,31154,1,25229,nil,1)
+	AddRecipe(38175,80,31154,1,1)
 	self:addTradeFlags(RecipeDB,38175,1,2,3,36,41,63)
 	self:addTradeAcquire(RecipeDB,38175,1,18751,1,18774,1,19063,1,19539,1,19775,1,19778,1,28701,1,15501,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- The Frozen Eye -- 38503
-	self:addTradeSkill(RecipeDB,38503,375,31398,4,25229,nil,1)
+	AddRecipe(38503,375,31398,4,1)
 	self:addTradeFlags(RecipeDB,38503,1,2,4,36,41,62,114)
 	self:addTradeAcquire(RecipeDB,38503,6,967,2,18255)

 	-- The Natural Ward -- 38504
-	self:addTradeSkill(RecipeDB,38504,375,31399,4,25229,nil,1)
+	AddRecipe(38504,375,31399,4,1)
 	self:addTradeFlags(RecipeDB,38504,1,2,4,36,41,62,103)
 	self:addTradeAcquire(RecipeDB,38504,6,942,4,17904)

 	-- Great Golden Draenite -- 39451
-	self:addTradeSkill(RecipeDB,39451,325,31860,2,25229,nil,1)
+	AddRecipe(39451,325,31860,2,1)
 	self:addTradeFlags(RecipeDB,39451,1,2,11,36,40)
 	self:addTradeAcquire(RecipeDB,39451,8,35)

 	-- Great Dawnstone -- 39452
-	self:addTradeSkill(RecipeDB,39452,350,31861,3,25229,nil,1)
+	AddRecipe(39452,350,31861,3,1)
 	self:addTradeFlags(RecipeDB,39452,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,39452,7,3)

 	-- Balanced Shadow Draenite -- 39455
-	self:addTradeSkill(RecipeDB,39455,325,31862,2,25229,nil,1)
+	AddRecipe(39455,325,31862,2,1)
 	self:addTradeFlags(RecipeDB,39455,1,2,11,36,40,51)
 	self:addTradeAcquire(RecipeDB,39455,8,35)

 	-- Infused Shadow Draenite -- 39458
-	self:addTradeSkill(RecipeDB,39458,325,31864,2,25229,nil,1)
+	AddRecipe(39458,325,31864,2,1)
 	self:addTradeFlags(RecipeDB,39458,1,2,11,36,40,51)
 	self:addTradeAcquire(RecipeDB,39458,8,35)

 	-- Infused Nightseye -- 39462
-	self:addTradeSkill(RecipeDB,39462,350,31865,3,25229,nil,1)
+	AddRecipe(39462,350,31865,3,1)
 	self:addTradeFlags(RecipeDB,39462,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,39462,7,3)

 	-- Balanced Nightseye -- 39463
-	self:addTradeSkill(RecipeDB,39463,350,31863,3,25229,nil,1)
+	AddRecipe(39463,350,31863,3,1)
 	self:addTradeFlags(RecipeDB,39463,1,2,10,36,40,51)
 	self:addTradeAcquire(RecipeDB,39463,7,3)

 	-- Veiled Flame Spessarite -- 39466
-	self:addTradeSkill(RecipeDB,39466,325,31866,2,25229,nil,1)
+	AddRecipe(39466,325,31866,2,1)
 	self:addTradeFlags(RecipeDB,39466,1,2,11,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,39466,8,35)

 	-- Wicked Flame Spessarite -- 39467
-	self:addTradeSkill(RecipeDB,39467,325,31869,2,25229,nil,1)
+	AddRecipe(39467,325,31869,2,1)
 	self:addTradeFlags(RecipeDB,39467,1,2,11,36,40,51)
 	self:addTradeAcquire(RecipeDB,39467,8,35)

 	-- Veiled Noble Topaz -- 39470
-	self:addTradeSkill(RecipeDB,39470,350,31867,3,25229,nil,1)
+	AddRecipe(39470,350,31867,3,1)
 	self:addTradeFlags(RecipeDB,39470,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,39470,7,3)

 	-- Wicked Noble Topaz -- 39471
-	self:addTradeSkill(RecipeDB,39471,350,31868,3,25229,nil,1)
+	AddRecipe(39471,350,31868,3,1)
 	self:addTradeFlags(RecipeDB,39471,1,2,10,36,40,51)
 	self:addTradeAcquire(RecipeDB,39471,7,3)

 	-- Bold Crimson Spinel -- 39705
-	self:addTradeSkill(RecipeDB,39705,375,32193,1,25229,nil,1)
+	AddRecipe(39705,375,32193,1,1)
 	self:addTradeFlags(RecipeDB,39705,1,2,4,36,41,51,112)
 	self:addTradeAcquire(RecipeDB,39705,6,1077,1,25950,6,1077,1,27666)

 	-- Delicate Crimson Spinel -- 39706
-	self:addTradeSkill(RecipeDB,39706,375,32194,1,25229,nil,1)
+	AddRecipe(39706,375,32194,1,1)
 	self:addTradeFlags(RecipeDB,39706,1,2,4,36,41,51,112)
 	self:addTradeAcquire(RecipeDB,39706,6,1077,1,25950)

 	-- Teardrop Crimson Spinel -- 39710
-	self:addTradeSkill(RecipeDB,39710,375,32195,1,25229,nil,1)
+	AddRecipe(39710,375,32195,1,1)
 	self:addTradeFlags(RecipeDB,39710,1,2,4,36,41,53,54,112)
 	self:addTradeAcquire(RecipeDB,39710,6,1077,1,25950,6,1077,1,27666)

 	-- Runed Crimson Spinel -- 39711
-	self:addTradeSkill(RecipeDB,39711,375,32196,1,25229,nil,1)
+	AddRecipe(39711,375,32196,1,1)
 	self:addTradeFlags(RecipeDB,39711,1,2,4,36,41,53,54,112)
 	self:addTradeAcquire(RecipeDB,39711,6,1077,1,25950,6,1077,1,27666)

 	-- Bright Crimson Spinel -- 39712
-	self:addTradeSkill(RecipeDB,39712,375,32197,1,25229,nil,1)
+	AddRecipe(39712,375,32197,1,1)
 	self:addTradeFlags(RecipeDB,39712,1,2,4,36,41,51,112)
 	self:addTradeAcquire(RecipeDB,39712,6,1077,1,25950,6,1077,1,27666)

 	-- Subtle Crimson Spinel -- 39713
-	self:addTradeSkill(RecipeDB,39713,375,32198,1,25229,nil,1)
+	AddRecipe(39713,375,32198,1,1)
 	self:addTradeFlags(RecipeDB,39713,1,2,4,36,41,52,112)
 	self:addTradeAcquire(RecipeDB,39713,6,1077,1,25950,6,1077,1,27666)

 	-- Flashing Crimson Spinel -- 39714
-	self:addTradeSkill(RecipeDB,39714,375,32199,1,25229,nil,1)
+	AddRecipe(39714,375,32199,1,1)
 	self:addTradeFlags(RecipeDB,39714,1,2,4,6,36,41,52,112)
 	self:addTradeAcquire(RecipeDB,39714,8,27,8,34,6,1077,4,27666,6,1077,4,25950)

 	-- Solid Empyrean Sapphire -- 39715
-	self:addTradeSkill(RecipeDB,39715,375,32200,1,25229,nil,1)
+	AddRecipe(39715,375,32200,1,1)
 	self:addTradeFlags(RecipeDB,39715,1,2,4,36,41,112)
 	self:addTradeAcquire(RecipeDB,39715,6,1077,1,25950,6,1077,1,27666)

 	-- Sparkling Empyrean Sapphire -- 39716
-	self:addTradeSkill(RecipeDB,39716,375,32201,1,25229,nil,1)
+	AddRecipe(39716,375,32201,1,1)
 	self:addTradeFlags(RecipeDB,39716,1,2,4,36,41,53,54,112)
 	self:addTradeAcquire(RecipeDB,39716,6,1077,1,25950,6,1077,1,27666)

 	-- Lustrous Empyrean Sapphire -- 39717
-	self:addTradeSkill(RecipeDB,39717,375,32202,1,25229,nil,1)
+	AddRecipe(39717,375,32202,1,1)
 	self:addTradeFlags(RecipeDB,39717,1,2,4,36,41,53,54,112)
 	self:addTradeAcquire(RecipeDB,39717,6,1077,1,25950,6,1077,1,27666)

 	-- Stormy Empyrean Sapphire -- 39718
-	self:addTradeSkill(RecipeDB,39718,375,32203,1,25229,nil,1)
+	AddRecipe(39718,375,32203,1,1)
 	self:addTradeFlags(RecipeDB,39718,1,2,4,6,36,41,54,112)
 	self:addTradeAcquire(RecipeDB,39718,8,27,8,34,6,1077,4,27666,6,1077,4,25950)

 	-- Brilliant Lionseye -- 39719
-	self:addTradeSkill(RecipeDB,39719,375,32204,1,25229,nil,1)
+	AddRecipe(39719,375,32204,1,1)
 	self:addTradeFlags(RecipeDB,39719,1,2,4,36,41,112)
 	self:addTradeAcquire(RecipeDB,39719,6,1077,1,25950)

 	-- Smooth Lionseye -- 39720
-	self:addTradeSkill(RecipeDB,39720,375,32205,1,25229,nil,1)
+	AddRecipe(39720,375,32205,1,1)
 	self:addTradeFlags(RecipeDB,39720,1,2,4,36,41,112)
 	self:addTradeAcquire(RecipeDB,39720,6,1077,1,25950,6,1077,1,27666)

 	-- Rigid Lionseye -- 39721
-	self:addTradeSkill(RecipeDB,39721,375,32206,1,25229,nil,1)
+	AddRecipe(39721,375,32206,1,1)
 	self:addTradeFlags(RecipeDB,39721,1,2,4,36,41,112)
 	self:addTradeAcquire(RecipeDB,39721,6,1077,3,25950)

 	-- Gleaming Lionseye -- 39722
-	self:addTradeSkill(RecipeDB,39722,375,32207,1,25229,nil,1)
+	AddRecipe(39722,375,32207,1,1)
 	self:addTradeFlags(RecipeDB,39722,1,2,4,36,41,112)
 	self:addTradeAcquire(RecipeDB,39722,6,1077,1,25950,6,1077,1,27666)

 	-- Thick Lionseye -- 39723
-	self:addTradeSkill(RecipeDB,39723,375,32208,1,25229,nil,1)
+	AddRecipe(39723,375,32208,1,1)
 	self:addTradeFlags(RecipeDB,39723,1,2,4,36,41,52,112)
 	self:addTradeAcquire(RecipeDB,39723,6,1077,1,25950,6,1077,1,27666)

 	-- Mystic Lionseye -- 39724
-	self:addTradeSkill(RecipeDB,39724,375,32209,1,25229,nil,1)
+	AddRecipe(39724,375,32209,1,1)
 	self:addTradeFlags(RecipeDB,39724,1,2,4,6,36,41,112)
 	self:addTradeAcquire(RecipeDB,39724,8,27,8,34,6,1077,4,27666,6,1077,4,25950)

 	-- Great Lionseye -- 39725
-	self:addTradeSkill(RecipeDB,39725,375,32210,1,25229,nil,1)
+	AddRecipe(39725,375,32210,1,1)
 	self:addTradeFlags(RecipeDB,39725,1,2,4,6,36,41,112)
 	self:addTradeAcquire(RecipeDB,39725,8,27,8,34,6,1077,4,27666,6,1077,4,25950)

 	-- Sovereign Shadowsong Amethyst -- 39727
-	self:addTradeSkill(RecipeDB,39727,375,32211,1,25229,nil,1)
+	AddRecipe(39727,375,32211,1,1)
 	self:addTradeFlags(RecipeDB,39727,1,2,4,6,36,41,51,112)
 	self:addTradeAcquire(RecipeDB,39727,8,27,8,34,6,1077,4,27666,6,1077,4,25950)

 	-- Shifting Shadowsong Amethyst -- 39728
-	self:addTradeSkill(RecipeDB,39728,375,32212,1,25229,nil,1)
+	AddRecipe(39728,375,32212,1,1)
 	self:addTradeFlags(RecipeDB,39728,1,2,4,6,36,41,51,112)
 	self:addTradeAcquire(RecipeDB,39728,8,27,8,34,6,1077,4,27666,6,1077,4,25950)

 	-- Balanced Shadowsong Amethyst -- 39729
-	self:addTradeSkill(RecipeDB,39729,375,32213,1,25229,nil,1)
+	AddRecipe(39729,375,32213,1,1)
 	self:addTradeFlags(RecipeDB,39729,1,2,4,36,41,51,112)
 	self:addTradeAcquire(RecipeDB,39729,6,1077,2,25950)

 	-- Infused Shadowsong Amethyst -- 39730
-	self:addTradeSkill(RecipeDB,39730,375,32214,1,25229,nil,1)
+	AddRecipe(39730,375,32214,1,1)
 	self:addTradeFlags(RecipeDB,39730,1,2,4,36,41,53,54,112)
 	self:addTradeAcquire(RecipeDB,39730,6,1077,2,25950)

 	-- Glowing Shadowsong Amethyst -- 39731
-	self:addTradeSkill(RecipeDB,39731,375,32215,1,25229,nil,1)
+	AddRecipe(39731,375,32215,1,1)
 	self:addTradeFlags(RecipeDB,39731,1,2,4,36,41,53,54,112)
 	self:addTradeAcquire(RecipeDB,39731,6,1077,2,25950)

 	-- Royal Shadowsong Amethyst -- 39732
-	self:addTradeSkill(RecipeDB,39732,375,32216,1,25229,nil,1)
+	AddRecipe(39732,375,32216,1,1)
 	self:addTradeFlags(RecipeDB,39732,1,2,4,36,41,53,54,112)
 	self:addTradeAcquire(RecipeDB,39732,6,1077,3,25950)

 	-- Inscribed Pyrestone -- 39733
-	self:addTradeSkill(RecipeDB,39733,375,32217,1,25229,nil,1)
+	AddRecipe(39733,375,32217,1,1)
 	self:addTradeFlags(RecipeDB,39733,1,2,4,6,36,41,51,112)
 	self:addTradeAcquire(RecipeDB,39733,8,27,8,34,6,1077,4,27666,6,1077,4,25950)

 	-- Potent Pyrestone -- 39734
-	self:addTradeSkill(RecipeDB,39734,375,32218,1,25229,nil,1)
+	AddRecipe(39734,375,32218,1,1)
 	self:addTradeFlags(RecipeDB,39734,1,2,4,36,41,53,54,112)
 	self:addTradeAcquire(RecipeDB,39734,6,1077,2,25950)

 	-- Luminous Pyrestone -- 39735
-	self:addTradeSkill(RecipeDB,39735,375,32219,1,25229,nil,1)
+	AddRecipe(39735,375,32219,1,1)
 	self:addTradeFlags(RecipeDB,39735,1,2,4,36,41,53,54,112)
 	self:addTradeAcquire(RecipeDB,39735,6,1077,2,25950)

 	-- Glinting Pyrestone -- 39736
-	self:addTradeSkill(RecipeDB,39736,375,32220,1,25229,nil,1)
+	AddRecipe(39736,375,32220,1,1)
 	self:addTradeFlags(RecipeDB,39736,1,2,4,36,41,51,112)
 	self:addTradeAcquire(RecipeDB,39736,6,1077,2,25950)

 	-- Veiled Pyrestone -- 39737
-	self:addTradeSkill(RecipeDB,39737,375,32221,1,25229,nil,1)
+	AddRecipe(39737,375,32221,1,1)
 	self:addTradeFlags(RecipeDB,39737,1,2,4,6,36,41,53,54,112)
 	self:addTradeAcquire(RecipeDB,39737,8,27,8,34,6,1077,4,27666,6,1077,4,25950)

 	-- Wicked Pyrestone -- 39738
-	self:addTradeSkill(RecipeDB,39738,375,32222,1,25229,nil,1)
+	AddRecipe(39738,375,32222,1,1)
 	self:addTradeFlags(RecipeDB,39738,1,2,4,36,41,51,112)
 	self:addTradeAcquire(RecipeDB,39738,6,1077,3,25950)

 	-- Enduring Seaspray Emerald -- 39739
-	self:addTradeSkill(RecipeDB,39739,375,32223,1,25229,nil,1)
+	AddRecipe(39739,375,32223,1,1)
 	self:addTradeFlags(RecipeDB,39739,1,2,4,36,41,52,112)
 	self:addTradeAcquire(RecipeDB,39739,6,1077,3,25950)

 	-- Radiant Seaspray Emerald -- 39740
-	self:addTradeSkill(RecipeDB,39740,375,32224,1,25229,nil,1)
+	AddRecipe(39740,375,32224,1,1)
 	self:addTradeFlags(RecipeDB,39740,1,2,4,36,41,54,112)
 	self:addTradeAcquire(RecipeDB,39740,6,1077,2,25950)

 	-- Dazzling Seaspray Emerald -- 39741
-	self:addTradeSkill(RecipeDB,39741,375,32225,1,25229,nil,1)
+	AddRecipe(39741,375,32225,1,1)
 	self:addTradeFlags(RecipeDB,39741,1,2,4,36,41,53,54,112)
 	self:addTradeAcquire(RecipeDB,39741,6,1077,2,25950)

 	-- Jagged Seaspray Emerald -- 39742
-	self:addTradeSkill(RecipeDB,39742,375,32226,1,25229,nil,1)
+	AddRecipe(39742,375,32226,1,1)
 	self:addTradeFlags(RecipeDB,39742,1,2,4,36,41,112)
 	self:addTradeAcquire(RecipeDB,39742,6,1077,2,25950)

 	-- Relentless Earthstorm Diamond -- 39961
-	self:addTradeSkill(RecipeDB,39961,365,32409,3,25229,nil,1)
+	AddRecipe(39961,365,32409,3,1)
 	self:addTradeFlags(RecipeDB,39961,1,2,4,36,41,51,105)
 	self:addTradeAcquire(RecipeDB,39961,6,933,4,20242,6,933,4,23007)

 	-- Thundering Skyfire Diamond -- 39963
-	self:addTradeSkill(RecipeDB,39963,365,32410,3,25229,nil,1)
+	AddRecipe(39963,365,32410,3,1)
 	self:addTradeFlags(RecipeDB,39963,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,39963,7,3)

 	-- Necklace of the Deep -- 40514
-	self:addTradeSkill(RecipeDB,40514,340,32508,1,25229,nil,1)
+	AddRecipe(40514,340,32508,1,1)
 	self:addTradeFlags(RecipeDB,40514,1,2,3,36,41,51,63)
 	self:addTradeAcquire(RecipeDB,40514,1,18751,1,18774,1,19063,1,19539,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Brilliant Pearl Band -- 41414
-	self:addTradeSkill(RecipeDB,41414,325,32772,1,25229,nil,1)
+	AddRecipe(41414,325,32772,1,1)
 	self:addTradeFlags(RecipeDB,41414,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,41414,1,18751,1,18774,1,19063,1,19539,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- The Black Pearl -- 41415
-	self:addTradeSkill(RecipeDB,41415,330,32774,1,25229,nil,1)
+	AddRecipe(41415,330,32774,1,1)
 	self:addTradeFlags(RecipeDB,41415,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,41415,1,18751,1,18774,1,19063,1,19539,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Crown of the Sea Witch -- 41418
-	self:addTradeSkill(RecipeDB,41418,365,32776,1,25229,nil,1)
+	AddRecipe(41418,365,32776,1,1)
 	self:addTradeFlags(RecipeDB,41418,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,41418,1,18751,1,18774,1,19063,1,19539,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Purified Jaggal Pearl -- 41420
-	self:addTradeSkill(RecipeDB,41420,325,32833,1,25229,nil,1)
+	AddRecipe(41420,325,32833,1,1)
 	self:addTradeFlags(RecipeDB,41420,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,41420,1,18751,1,18774,1,19063,1,19539,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Purified Shadow Pearl -- 41429
-	self:addTradeSkill(RecipeDB,41429,350,32836,1,25229,nil,1)
+	AddRecipe(41429,350,32836,1,1)
 	self:addTradeFlags(RecipeDB,41429,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,41429,1,18751,1,18774,1,19063,1,19539,1,28701,1,33590,1,26997,1,26982,1,33614,1,26915,1,26960,1,33680)

 	-- Don Julio's Heart -- 42558
-	self:addTradeSkill(RecipeDB,42558,360,33133,1,25229,nil,1)
+	AddRecipe(42558,360,33133,1,1)
 	self:addTradeFlags(RecipeDB,42558,1,2,4,37,41,53,54,105)
 	self:addTradeAcquire(RecipeDB,42558,6,933,3,20242,6,933,3,23007)

 	-- Kailee's Rose -- 42588
-	self:addTradeSkill(RecipeDB,42588,360,33134,1,25229,nil,1)
+	AddRecipe(42588,360,33134,1,1)
 	self:addTradeFlags(RecipeDB,42588,1,2,4,37,41,53,54,111)
 	self:addTradeAcquire(RecipeDB,42588,6,935,2,21432)

 	-- Crimson Sun -- 42589
-	self:addTradeSkill(RecipeDB,42589,360,33131,1,25229,nil,1)
+	AddRecipe(42589,360,33131,1,1)
 	self:addTradeFlags(RecipeDB,42589,1,2,4,37,41,51,105)
 	self:addTradeAcquire(RecipeDB,42589,6,933,3,20242,6,933,3,23007)

 	-- Falling Star -- 42590
-	self:addTradeSkill(RecipeDB,42590,360,33135,1,25229,nil,1)
+	AddRecipe(42590,360,33135,1,1)
 	self:addTradeFlags(RecipeDB,42590,1,2,4,37,41,107)
 	self:addTradeAcquire(RecipeDB,42590,6,1011,3,21655)

 	-- Stone of Blades -- 42591
-	self:addTradeSkill(RecipeDB,42591,360,33143,1,25229,nil,1)
+	AddRecipe(42591,360,33143,1,1)
 	self:addTradeFlags(RecipeDB,42591,1,2,4,37,41,106)
 	self:addTradeAcquire(RecipeDB,42591,6,989,3,21643)

 	-- Blood of Amber -- 42592
-	self:addTradeSkill(RecipeDB,42592,360,33140,1,25229,nil,1)
+	AddRecipe(42592,360,33140,1,1)
 	self:addTradeFlags(RecipeDB,42592,1,2,4,37,41,111)
 	self:addTradeAcquire(RecipeDB,42592,6,935,3,21432)

 	-- Facet of Eternity -- 42593
-	self:addTradeSkill(RecipeDB,42593,360,33144,1,25229,nil,1)
+	AddRecipe(42593,360,33144,1,1)
 	self:addTradeFlags(RecipeDB,42593,1,2,4,37,41,52,106)
 	self:addTradeAcquire(RecipeDB,42593,6,989,2,21643)

 	-- Steady Talasite -- 43493
-	self:addTradeSkill(RecipeDB,43493,350,33782,3,25229,nil,1)
+	AddRecipe(43493,350,33782,3,1)
 	self:addTradeFlags(RecipeDB,43493,1,2,4,9,36,41)
 	self:addTradeAcquire(RecipeDB,43493,2,18821,2,18822)

 	-- Chaotic Skyfire Diamond -- 44794
-	self:addTradeSkill(RecipeDB,44794,365,34220,3,25229,nil,1)
+	AddRecipe(44794,365,34220,3,1)
 	self:addTradeFlags(RecipeDB,44794,1,2,11,36,41)
 	self:addTradeAcquire(RecipeDB,44794,3,19768)

 	-- Loop of Forged Power -- 46122
-	self:addTradeSkill(RecipeDB,46122,365,34362,4,25229,nil,1)
+	AddRecipe(46122,365,34362,4,1)
 	self:addTradeFlags(RecipeDB,46122,1,2,6,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,46122,8,24)

 	-- Ring of Flowing Life -- 46123
-	self:addTradeSkill(RecipeDB,46123,365,34363,4,25229,nil,1)
+	AddRecipe(46123,365,34363,4,1)
 	self:addTradeFlags(RecipeDB,46123,1,2,6,36,40,53,54,62)
 	self:addTradeAcquire(RecipeDB,46123,8,24)

 	-- Hard Khorium Band -- 46124
-	self:addTradeSkill(RecipeDB,46124,365,34361,4,25229,nil,1)
+	AddRecipe(46124,365,34361,4,1)
 	self:addTradeFlags(RecipeDB,46124,1,2,6,36,41,51,62)
 	self:addTradeAcquire(RecipeDB,46124,8,24)

 	-- Pendant of Sunfire -- 46125
-	self:addTradeSkill(RecipeDB,46125,365,34359,4,25229,nil,1)
+	AddRecipe(46125,365,34359,4,1)
 	self:addTradeFlags(RecipeDB,46125,1,2,6,37,41,53,54,63)
 	self:addTradeAcquire(RecipeDB,46125,8,24)

 	-- Amulet of Flowing Life -- 46126
-	self:addTradeSkill(RecipeDB,46126,365,34360,4,25229,nil,1)
+	AddRecipe(46126,365,34360,4,1)
 	self:addTradeFlags(RecipeDB,46126,1,2,6,37,41,53,54,63)
 	self:addTradeAcquire(RecipeDB,46126,8,24)

 	-- Hard Khorium Choker -- 46127
-	self:addTradeSkill(RecipeDB,46127,365,34358,4,25229,nil,1)
+	AddRecipe(46127,365,34358,4,1)
 	self:addTradeFlags(RecipeDB,46127,1,2,6,11,37,41,51,63)
 	self:addTradeAcquire(RecipeDB,46127,8,24)

 	-- Quick Dawnstone -- 46403
-	self:addTradeSkill(RecipeDB,46403,350,35315,3,25229,nil,1)
+	AddRecipe(46403,350,35315,3,1)
 	self:addTradeFlags(RecipeDB,46403,1,2,4,36,41,112)
 	self:addTradeAcquire(RecipeDB,46403,6,1077,4,25950)

 	-- Reckless Noble Topaz -- 46404
-	self:addTradeSkill(RecipeDB,46404,350,35316,3,25229,nil,1)
+	AddRecipe(46404,350,35316,3,1)
 	self:addTradeFlags(RecipeDB,46404,1,2,4,36,41,53,54,112)
 	self:addTradeAcquire(RecipeDB,46404,6,1077,4,25950)

 	-- Forceful Talasite -- 46405
-	self:addTradeSkill(RecipeDB,46405,350,35318,3,25229,nil,1)
+	AddRecipe(46405,350,35318,3,1)
 	self:addTradeFlags(RecipeDB,46405,1,2,4,36,41,112)
 	self:addTradeAcquire(RecipeDB,46405,6,1077,4,25950)

 	-- Eternal Earthstorm Diamond -- 46597
-	self:addTradeSkill(RecipeDB,46597,370,35501,1,25229,nil,1)
+	AddRecipe(46597,370,35501,1,1)
 	self:addTradeFlags(RecipeDB,46597,1,2,4,36,41,52,112)
 	self:addTradeAcquire(RecipeDB,46597,6,1077,3,25032)

 	-- Ember Skyfire Diamond -- 46601
-	self:addTradeSkill(RecipeDB,46601,370,35503,1,25229,nil,1)
+	AddRecipe(46601,370,35503,1,1)
 	self:addTradeFlags(RecipeDB,46601,1,2,4,36,41,53,54,112)
 	self:addTradeAcquire(RecipeDB,46601,6,1077,3,25032)

 	-- Figurine - Empyrean Tortoise -- 46775
-	self:addTradeSkill(RecipeDB,46775,375,35693,1,25229,nil,1)
+	AddRecipe(46775,375,35693,1,1)
 	self:addTradeFlags(RecipeDB,46775,1,2,4,37,41,52,61,112)
 	self:addTradeAcquire(RecipeDB,46775,6,1077,3,25032)

 	-- Figurine - Khorium Boar -- 46776
-	self:addTradeSkill(RecipeDB,46776,375,35694,1,25229,nil,1)
+	AddRecipe(46776,375,35694,1,1)
 	self:addTradeFlags(RecipeDB,46776,1,2,4,37,41,51,61,112)
 	self:addTradeAcquire(RecipeDB,46776,6,1077,3,25032)

 	-- Figurine - Crimson Serpent -- 46777
-	self:addTradeSkill(RecipeDB,46777,375,35700,1,25229,nil,1)
+	AddRecipe(46777,375,35700,1,1)
 	self:addTradeFlags(RecipeDB,46777,1,2,4,37,41,53,54,61,112)
 	self:addTradeAcquire(RecipeDB,46777,6,1077,3,25032)

 	-- Figurine - Shadowsong Panther -- 46778
-	self:addTradeSkill(RecipeDB,46778,375,35702,1,25229,nil,1)
+	AddRecipe(46778,375,35702,1,1)
 	self:addTradeFlags(RecipeDB,46778,1,2,4,37,41,51,61,112)
 	self:addTradeAcquire(RecipeDB,46778,6,1077,3,25032)

 	-- Figurine - Seaspray Albatross -- 46779
-	self:addTradeSkill(RecipeDB,46779,375,35703,1,25229,nil,1)
+	AddRecipe(46779,375,35703,1,1)
 	self:addTradeFlags(RecipeDB,46779,1,2,4,37,41,61,112)
 	self:addTradeAcquire(RecipeDB,46779,6,1077,3,25032)

 	-- Regal Nightseye -- 46803
-	self:addTradeSkill(RecipeDB,46803,350,35707,1,25229,nil,1)
+	AddRecipe(46803,350,35707,1,1)
 	self:addTradeFlags(RecipeDB,46803,1,2,4,36,41,52,112)
 	self:addTradeAcquire(RecipeDB,46803,6,1077,3,25032)

 	-- Forceful Seaspray Emerald -- 47053
-	self:addTradeSkill(RecipeDB,47053,375,35759,4,25229,nil,1)
+	AddRecipe(47053,375,35759,4,1)
 	self:addTradeFlags(RecipeDB,47053,1,2,4,36,41,112)
 	self:addTradeAcquire(RecipeDB,47053,6,1077,3,25032,6,1077,3,25950)

 	-- Steady Seaspray Emerald -- 47054
-	self:addTradeSkill(RecipeDB,47054,375,35758,4,25229,nil,1)
+	AddRecipe(47054,375,35758,4,1)
 	self:addTradeFlags(RecipeDB,47054,1,2,4,36,41,109)
 	self:addTradeAcquire(RecipeDB,47054,6,990,2,23437)

 	-- Reckless Pyrestone -- 47055
-	self:addTradeSkill(RecipeDB,47055,375,35760,4,25229,nil,1)
+	AddRecipe(47055,375,35760,4,1)
 	self:addTradeFlags(RecipeDB,47055,1,2,4,36,41,53,54,112)
 	self:addTradeAcquire(RecipeDB,47055,6,1077,3,25032,6,1077,3,25950)

 	-- Quick Lionseye -- 47056
-	self:addTradeSkill(RecipeDB,47056,375,35761,4,25229,nil,1)
+	AddRecipe(47056,375,35761,4,1)
 	self:addTradeFlags(RecipeDB,47056,1,2,4,36,41,112)
 	self:addTradeAcquire(RecipeDB,47056,6,1077,3,25032,6,1077,3,25950)

 	-- Brilliant Glass -- 47280
-	self:addTradeSkill(RecipeDB,47280,350,35945,3,25229,nil,1)
+	AddRecipe(47280,350,35945,3,1)
 	self:addTradeFlags(RecipeDB,47280,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,47280,1,26997,1,26960,1,26982,1,19063,1,19539,1,18751,1,26915,1,18774,1,28701,1,33590,1,33614,1,33680)

 	-- Purified Shadowsong Amethyst -- 48789
-	self:addTradeSkill(RecipeDB,48789,375,37503,1,25229,nil,1)
+	AddRecipe(48789,375,37503,1,1)
 	self:addTradeFlags(RecipeDB,48789,1,2,4,36,41,53,54,112)
 	self:addTradeAcquire(RecipeDB,48789,6,1077,4,25950)

 	-- Bold Scarlet Ruby -- 53830
-	self:addTradeSkill(RecipeDB,53830,390,39996,3,25229,nil,2)
+	AddRecipe(53830,390,39996,3,2)
 	self:addTradeFlags(RecipeDB,53830,1,2,4,36,41,51)
 	self:addTradeAcquire(RecipeDB,53830,2,28721,2,33602)

 	-- Bold Bloodstone -- 53831
-	self:addTradeSkill(RecipeDB,53831,350,39900,2,25229,nil,2)
+	AddRecipe(53831,350,39900,2,2)
 	self:addTradeFlags(RecipeDB,53831,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53831,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Delicate Bloodstone -- 53832
-	self:addTradeSkill(RecipeDB,53832,350,39905,2,25229,nil,2)
+	AddRecipe(53832,350,39905,2,2)
 	self:addTradeFlags(RecipeDB,53832,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53832,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Runed Bloodstone -- 53834
-	self:addTradeSkill(RecipeDB,53834,350,39911,2,25229,nil,2)
+	AddRecipe(53834,350,39911,2,2)
 	self:addTradeFlags(RecipeDB,53834,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53834,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Bright Bloodstone -- 53835
-	self:addTradeSkill(RecipeDB,53835,350,39906,2,25229,nil,2)
+	AddRecipe(53835,350,39906,2,2)
 	self:addTradeFlags(RecipeDB,53835,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53835,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Subtle Bloodstone -- 53843
-	self:addTradeSkill(RecipeDB,53843,360,39907,2,25229,nil,2)
+	AddRecipe(53843,360,39907,2,2)
 	self:addTradeFlags(RecipeDB,53843,1,2,3,36,41,52)
 	self:addTradeAcquire(RecipeDB,53843,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Flashing Bloodstone -- 53844
-	self:addTradeSkill(RecipeDB,53844,350,39908,2,25229,nil,2)
+	AddRecipe(53844,350,39908,2,2)
 	self:addTradeFlags(RecipeDB,53844,1,2,3,36,41,52)
 	self:addTradeAcquire(RecipeDB,53844,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Fractured Bloodstone -- 53845
-	self:addTradeSkill(RecipeDB,53845,350,39909,2,25229,nil,2)
+	AddRecipe(53845,350,39909,2,2)
 	self:addTradeFlags(RecipeDB,53845,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53845,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Brilliant Sun Crystal -- 53852
-	self:addTradeSkill(RecipeDB,53852,350,39912,2,25229,nil,2)
+	AddRecipe(53852,350,39912,2,2)
 	self:addTradeFlags(RecipeDB,53852,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,53852,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Smooth Sun Crystal -- 53853
-	self:addTradeSkill(RecipeDB,53853,350,39914,2,25229,nil,2)
+	AddRecipe(53853,350,39914,2,2)
 	self:addTradeFlags(RecipeDB,53853,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,53853,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Rigid Sun Crystal -- 53854
-	self:addTradeSkill(RecipeDB,53854,350,39915,2,25229,nil,2)
+	AddRecipe(53854,350,39915,2,2)
 	self:addTradeFlags(RecipeDB,53854,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,53854,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Thick Sun Crystal -- 53855
-	self:addTradeSkill(RecipeDB,53855,350,39916,2,25229,nil,2)
+	AddRecipe(53855,350,39916,2,2)
 	self:addTradeFlags(RecipeDB,53855,1,2,3,36,41,52)
 	self:addTradeAcquire(RecipeDB,53855,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Quick Sun Crystal -- 53856
-	self:addTradeSkill(RecipeDB,53856,350,39918,2,25229,nil,2)
+	AddRecipe(53856,350,39918,2,2)
 	self:addTradeFlags(RecipeDB,53856,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,53856,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Mystic Sun Crystal -- 53857
-	self:addTradeSkill(RecipeDB,53857,350,39917,2,25229,nil,2)
+	AddRecipe(53857,350,39917,2,2)
 	self:addTradeFlags(RecipeDB,53857,1,2,4,9,36,41)
 	self:addTradeAcquire(RecipeDB,53857,2,34079,2,34039)

 	-- Sovereign Shadow Crystal -- 53859
-	self:addTradeSkill(RecipeDB,53859,350,39934,2,25229,nil,2)
+	AddRecipe(53859,350,39934,2,2)
 	self:addTradeFlags(RecipeDB,53859,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53859,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Shifting Shadow Crystal -- 53860
-	self:addTradeSkill(RecipeDB,53860,350,39935,2,25229,nil,2)
+	AddRecipe(53860,350,39935,2,2)
 	self:addTradeFlags(RecipeDB,53860,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53860,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Tenuous Shadow Crystal -- 53861
-	self:addTradeSkill(RecipeDB,53861,350,39942,2,25229,nil,2)
+	AddRecipe(53861,350,39942,2,2)
 	self:addTradeFlags(RecipeDB,53861,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53861,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Glowing Shadow Crystal -- 53862
-	self:addTradeSkill(RecipeDB,53862,350,39936,2,25229,nil,2)
+	AddRecipe(53862,350,39936,2,2)
 	self:addTradeFlags(RecipeDB,53862,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53862,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Purified Shadow Crystal -- 53863
-	self:addTradeSkill(RecipeDB,53863,350,39941,2,25229,nil,2)
+	AddRecipe(53863,350,39941,2,2)
 	self:addTradeFlags(RecipeDB,53863,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53863,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Royal Shadow Crystal -- 53864
-	self:addTradeSkill(RecipeDB,53864,350,39943,2,25229,nil,2)
+	AddRecipe(53864,350,39943,2,2)
 	self:addTradeFlags(RecipeDB,53864,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53864,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Mysterious Shadow Crystal -- 53865
-	self:addTradeSkill(RecipeDB,53865,350,39945,2,25229,nil,2)
+	AddRecipe(53865,350,39945,2,2)
 	self:addTradeFlags(RecipeDB,53865,1,2,4,9,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53865,2,34079,2,34039)

 	-- Balanced Shadow Crystal -- 53866
-	self:addTradeSkill(RecipeDB,53866,350,39937,2,25229,nil,2)
+	AddRecipe(53866,350,39937,2,2)
 	self:addTradeFlags(RecipeDB,53866,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53866,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Infused Shadow Crystal -- 53867
-	self:addTradeSkill(RecipeDB,53867,350,39944,2,25229,nil,2)
+	AddRecipe(53867,350,39944,2,2)
 	self:addTradeFlags(RecipeDB,53867,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53867,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Regal Shadow Crystal -- 53868
-	self:addTradeSkill(RecipeDB,53868,360,39938,2,25229,nil,2)
+	AddRecipe(53868,360,39938,2,2)
 	self:addTradeFlags(RecipeDB,53868,1,2,3,36,41,52)
 	self:addTradeAcquire(RecipeDB,53868,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Defender's Shadow Crystal -- 53869
-	self:addTradeSkill(RecipeDB,53869,350,39939,2,25229,nil,2)
+	AddRecipe(53869,350,39939,2,2)
 	self:addTradeFlags(RecipeDB,53869,1,2,4,36,41,52,120)
 	self:addTradeAcquire(RecipeDB,53869,6,1073,2,31916,6,1073,2,32763)

 	-- Puissant Shadow Crystal -- 53870
-	self:addTradeSkill(RecipeDB,53870,350,39933,2,25229,nil,2)
+	AddRecipe(53870,350,39933,2,2)
 	self:addTradeFlags(RecipeDB,53870,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53870,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Guardian's Shadow Crystal -- 53871
-	self:addTradeSkill(RecipeDB,53871,350,39940,2,25229,nil,2)
+	AddRecipe(53871,350,39940,2,2)
 	self:addTradeFlags(RecipeDB,53871,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53871,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Inscribed Huge Citrine -- 53872
-	self:addTradeSkill(RecipeDB,53872,350,39947,2,25229,nil,2)
+	AddRecipe(53872,350,39947,2,2)
 	self:addTradeFlags(RecipeDB,53872,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53872,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Etched Huge Citrine -- 53873
-	self:addTradeSkill(RecipeDB,53873,350,39948,2,25229,nil,2)
+	AddRecipe(53873,350,39948,2,2)
 	self:addTradeFlags(RecipeDB,53873,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53873,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Champion's Huge Citrine -- 53874
-	self:addTradeSkill(RecipeDB,53874,350,39949,2,25229,nil,2)
+	AddRecipe(53874,350,39949,2,2)
 	self:addTradeFlags(RecipeDB,53874,1,2,3,36,41,51,52)
 	self:addTradeAcquire(RecipeDB,53874,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Resplendent Huge Citrine -- 53875
-	self:addTradeSkill(RecipeDB,53875,350,39950,2,25229,nil,2)
+	AddRecipe(53875,350,39950,2,2)
 	self:addTradeFlags(RecipeDB,53875,1,2,4,9,36,41,51)
 	self:addTradeAcquire(RecipeDB,53875,2,34079,2,34039)

 	-- Fierce Huge Citrine -- 53876
-	self:addTradeSkill(RecipeDB,53876,350,39951,2,25229,nil,2)
+	AddRecipe(53876,350,39951,2,2)
 	self:addTradeFlags(RecipeDB,53876,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53876,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Deadly Huge Citrine -- 53877
-	self:addTradeSkill(RecipeDB,53877,350,39952,2,25229,nil,2)
+	AddRecipe(53877,350,39952,2,2)
 	self:addTradeFlags(RecipeDB,53877,1,2,4,36,41,51,117)
 	self:addTradeAcquire(RecipeDB,53877,6,1098,1,32538)

 	-- Glinting Huge Citrine -- 53878
-	self:addTradeSkill(RecipeDB,53878,350,39953,2,25229,nil,2)
+	AddRecipe(53878,350,39953,2,2)
 	self:addTradeFlags(RecipeDB,53878,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53878,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Lucent Huge Citrine -- 53879
-	self:addTradeSkill(RecipeDB,53879,350,39954,2,25229,nil,2)
+	AddRecipe(53879,350,39954,2,2)
 	self:addTradeFlags(RecipeDB,53879,1,2,4,9,36,41,51)
 	self:addTradeAcquire(RecipeDB,53879,2,34079,2,34039)

 	-- Deft Huge Citrine -- 53880
-	self:addTradeSkill(RecipeDB,53880,350,39955,2,25229,nil,2)
+	AddRecipe(53880,350,39955,2,2)
 	self:addTradeFlags(RecipeDB,53880,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53880,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Luminous Huge Citrine -- 53881
-	self:addTradeSkill(RecipeDB,53881,350,39946,2,25229,nil,2)
+	AddRecipe(53881,350,39946,2,2)
 	self:addTradeFlags(RecipeDB,53881,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53881,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Potent Huge Citrine -- 53882
-	self:addTradeSkill(RecipeDB,53882,350,39956,2,25229,nil,2)
+	AddRecipe(53882,350,39956,2,2)
 	self:addTradeFlags(RecipeDB,53882,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53882,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Veiled Huge Citrine -- 53883
-	self:addTradeSkill(RecipeDB,53883,350,39957,2,25229,nil,2)
+	AddRecipe(53883,350,39957,2,2)
 	self:addTradeFlags(RecipeDB,53883,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53883,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Durable Huge Citrine -- 53884
-	self:addTradeSkill(RecipeDB,53884,350,39958,2,25229,nil,2)
+	AddRecipe(53884,350,39958,2,2)
 	self:addTradeFlags(RecipeDB,53884,1,2,4,9,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53884,2,34079,2,34039)

 	-- Reckless Huge Citrine -- 53885
-	self:addTradeSkill(RecipeDB,53885,350,39959,2,25229,nil,2)
+	AddRecipe(53885,350,39959,2,2)
 	self:addTradeFlags(RecipeDB,53885,1,2,4,36,41,53,54,116)
 	self:addTradeAcquire(RecipeDB,53885,6,1104,1,31911)

 	-- Wicked Huge Citrine -- 53886
-	self:addTradeSkill(RecipeDB,53886,350,39960,2,25229,nil,2)
+	AddRecipe(53886,350,39960,2,2)
 	self:addTradeFlags(RecipeDB,53886,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53886,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Pristine Huge Citrine -- 53887
-	self:addTradeSkill(RecipeDB,53887,350,39961,2,25229,nil,2)
+	AddRecipe(53887,350,39961,2,2)
 	self:addTradeFlags(RecipeDB,53887,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53887,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Empowered Huge Citrine -- 53888
-	self:addTradeSkill(RecipeDB,53888,350,39962,2,25229,nil,2)
+	AddRecipe(53888,350,39962,2,2)
 	self:addTradeFlags(RecipeDB,53888,1,2,4,9,36,41,51)
 	self:addTradeAcquire(RecipeDB,53888,2,34079,2,34039)

 	-- Stark Huge Citrine -- 53889
-	self:addTradeSkill(RecipeDB,53889,350,39963,2,25229,nil,2)
+	AddRecipe(53889,350,39963,2,2)
 	self:addTradeFlags(RecipeDB,53889,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53889,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Stalwart Huge Citrine -- 53890
-	self:addTradeSkill(RecipeDB,53890,350,39964,2,25229,nil,2)
+	AddRecipe(53890,350,39964,2,2)
 	self:addTradeFlags(RecipeDB,53890,1,2,3,36,41,52)
 	self:addTradeAcquire(RecipeDB,53890,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Glimmering Huge Citrine -- 53891
-	self:addTradeSkill(RecipeDB,53891,360,39965,2,25229,nil,2)
+	AddRecipe(53891,360,39965,2,2)
 	self:addTradeFlags(RecipeDB,53891,1,2,3,36,41,52)
 	self:addTradeAcquire(RecipeDB,53891,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Accurate Huge Citrine -- 53892
-	self:addTradeSkill(RecipeDB,53892,350,39966,2,25229,nil,2)
+	AddRecipe(53892,350,39966,2,2)
 	self:addTradeFlags(RecipeDB,53892,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53892,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Resolute Huge Citrine -- 53893
-	self:addTradeSkill(RecipeDB,53893,350,39967,2,25229,nil,2)
+	AddRecipe(53893,350,39967,2,2)
 	self:addTradeFlags(RecipeDB,53893,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53893,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Timeless Dark Jade -- 53894
-	self:addTradeSkill(RecipeDB,53894,350,39968,2,25229,nil,2)
+	AddRecipe(53894,350,39968,2,2)
 	self:addTradeFlags(RecipeDB,53894,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,53894,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Jagged Dark Jade -- 53916
-	self:addTradeSkill(RecipeDB,53916,350,39974,2,25229,nil,2)
+	AddRecipe(53916,350,39974,2,2)
 	self:addTradeFlags(RecipeDB,53916,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,53916,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Vivid Dark Jade -- 53917
-	self:addTradeSkill(RecipeDB,53917,350,39975,2,25229,nil,2)
+	AddRecipe(53917,350,39975,2,2)
 	self:addTradeFlags(RecipeDB,53917,1,2,4,36,41,121)
 	self:addTradeAcquire(RecipeDB,53917,6,1105,1,31910)

 	-- Enduring Dark Jade -- 53918
-	self:addTradeSkill(RecipeDB,53918,350,39976,2,25229,nil,2)
+	AddRecipe(53918,350,39976,2,2)
 	self:addTradeFlags(RecipeDB,53918,1,2,3,36,41,52)
 	self:addTradeAcquire(RecipeDB,53918,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Steady Dark Jade -- 53919
-	self:addTradeSkill(RecipeDB,53919,350,39977,2,25229,nil,2)
+	AddRecipe(53919,350,39977,2,2)
 	self:addTradeFlags(RecipeDB,53919,1,2,4,9,36,41)
 	self:addTradeAcquire(RecipeDB,53919,2,34079,2,34039)

 	-- Forceful Dark Jade -- 53920
-	self:addTradeSkill(RecipeDB,53920,350,39978,2,25229,nil,2)
+	AddRecipe(53920,350,39978,2,2)
 	self:addTradeFlags(RecipeDB,53920,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,53920,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Seer's Dark Jade -- 53921
-	self:addTradeSkill(RecipeDB,53921,350,39979,2,25229,nil,2)
+	AddRecipe(53921,350,39979,2,2)
 	self:addTradeFlags(RecipeDB,53921,1,2,4,36,41,53,54,120)
 	self:addTradeAcquire(RecipeDB,53921,6,1073,1,31916,6,1073,1,32763)

 	-- Misty Dark Jade -- 53922
-	self:addTradeSkill(RecipeDB,53922,350,39980,2,25229,nil,2)
+	AddRecipe(53922,350,39980,2,2)
 	self:addTradeFlags(RecipeDB,53922,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53922,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Shining Dark Jade -- 53923
-	self:addTradeSkill(RecipeDB,53923,350,39981,2,25229,nil,2)
+	AddRecipe(53923,350,39981,2,2)
 	self:addTradeFlags(RecipeDB,53923,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53923,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Turbid Dark Jade -- 53924
-	self:addTradeSkill(RecipeDB,53924,350,39982,2,25229,nil,2)
+	AddRecipe(53924,350,39982,2,2)
 	self:addTradeFlags(RecipeDB,53924,1,2,4,9,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53924,2,34079,2,34039)

 	-- Intricate Dark Jade -- 53925
-	self:addTradeSkill(RecipeDB,53925,350,39983,2,25229,nil,2)
+	AddRecipe(53925,350,39983,2,2)
 	self:addTradeFlags(RecipeDB,53925,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53925,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Dazzling Dark Jade -- 53926
-	self:addTradeSkill(RecipeDB,53926,350,39984,2,25229,nil,2)
+	AddRecipe(53926,350,39984,2,2)
 	self:addTradeFlags(RecipeDB,53926,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53926,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Sundered Dark Jade -- 53927
-	self:addTradeSkill(RecipeDB,53927,350,39985,2,25229,nil,2)
+	AddRecipe(53927,350,39985,2,2)
 	self:addTradeFlags(RecipeDB,53927,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53927,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Lambent Dark Jade -- 53928
-	self:addTradeSkill(RecipeDB,53928,350,39986,2,25229,nil,2)
+	AddRecipe(53928,350,39986,2,2)
 	self:addTradeFlags(RecipeDB,53928,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53928,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Opaque Dark Jade -- 53929
-	self:addTradeSkill(RecipeDB,53929,350,39988,2,25229,nil,2)
+	AddRecipe(53929,350,39988,2,2)
 	self:addTradeFlags(RecipeDB,53929,1,2,4,9,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53929,2,34079,2,34039)

 	-- Energized Dark Jade -- 53930
-	self:addTradeSkill(RecipeDB,53930,350,39989,2,25229,nil,2)
+	AddRecipe(53930,350,39989,2,2)
 	self:addTradeFlags(RecipeDB,53930,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53930,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Radiant Dark Jade -- 53931
-	self:addTradeSkill(RecipeDB,53931,350,39990,2,25229,nil,2)
+	AddRecipe(53931,350,39990,2,2)
 	self:addTradeFlags(RecipeDB,53931,1,2,3,36,41,54)
 	self:addTradeAcquire(RecipeDB,53931,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Tense Dark Jade -- 53932
-	self:addTradeSkill(RecipeDB,53932,350,39991,2,25229,nil,2)
+	AddRecipe(53932,350,39991,2,2)
 	self:addTradeFlags(RecipeDB,53932,1,2,4,9,36,41,54)
 	self:addTradeAcquire(RecipeDB,53932,2,34079,2,34039)

 	-- Shattered Dark Jade -- 53933
-	self:addTradeSkill(RecipeDB,53933,350,39992,2,25229,nil,2)
+	AddRecipe(53933,350,39992,2,2)
 	self:addTradeFlags(RecipeDB,53933,1,2,4,9,36,41,54)
 	self:addTradeAcquire(RecipeDB,53933,2,34079,2,34039)

 	-- Solid Chalcedony -- 53934
-	self:addTradeSkill(RecipeDB,53934,350,39919,2,25229,nil,2)
+	AddRecipe(53934,350,39919,2,2)
 	self:addTradeFlags(RecipeDB,53934,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,53934,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Sparkling Chalcedony -- 53940
-	self:addTradeSkill(RecipeDB,53940,350,39920,2,25229,nil,2)
+	AddRecipe(53940,350,39920,2,2)
 	self:addTradeFlags(RecipeDB,53940,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53940,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Lustrous Chalcedony -- 53941
-	self:addTradeSkill(RecipeDB,53941,350,39927,2,25229,nil,2)
+	AddRecipe(53941,350,39927,2,2)
 	self:addTradeFlags(RecipeDB,53941,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53941,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Stormy Chalcedony -- 53943
-	self:addTradeSkill(RecipeDB,53943,350,39927,2,25229,nil,2)
+	AddRecipe(53943,350,39927,2,2)
 	self:addTradeFlags(RecipeDB,53943,1,2,4,9,36,41,54)
 	self:addTradeAcquire(RecipeDB,53943,2,34079,2,34039)

 	-- Delicate Scarlet Ruby -- 53945
-	self:addTradeSkill(RecipeDB,53945,390,39997,3,25229,nil,2)
+	AddRecipe(53945,390,39997,3,2)
 	self:addTradeFlags(RecipeDB,53945,1,2,4,36,41,51)
 	self:addTradeAcquire(RecipeDB,53945,2,28721,2,33602)

 	-- Runed Scarlet Ruby -- 53946
-	self:addTradeSkill(RecipeDB,53946,390,39998,3,25229,nil,2)
+	AddRecipe(53946,390,39998,3,2)
 	self:addTradeFlags(RecipeDB,53946,1,2,4,36,41,53,54,118)
 	self:addTradeAcquire(RecipeDB,53946,6,1090,4,32287)

 	-- Bright Scarlet Ruby -- 53947
-	self:addTradeSkill(RecipeDB,53947,390,39999,3,25229,nil,2)
+	AddRecipe(53947,390,39999,3,2)
 	self:addTradeFlags(RecipeDB,53947,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53947,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Flashing Scarlet Ruby -- 53949
-	self:addTradeSkill(RecipeDB,53949,390,40001,3,25229,nil,2)
+	AddRecipe(53949,390,40001,3,2)
 	self:addTradeFlags(RecipeDB,53949,1,2,4,36,41,52)
 	self:addTradeAcquire(RecipeDB,53949,2,28721,2,33602)

 	-- Fractured Scarlet Ruby -- 53950
-	self:addTradeSkill(RecipeDB,53950,390,40002,3,25229,nil,2)
+	AddRecipe(53950,390,40002,3,2)
 	self:addTradeFlags(RecipeDB,53950,1,2,11,36,41,51)
 	self:addTradeAcquire(RecipeDB,53950,3,29570)

 	-- Precise Scarlet Ruby -- 53951
-	self:addTradeSkill(RecipeDB,53951,390,40003,3,25229,nil,2)
+	AddRecipe(53951,390,40003,3,2)
 	self:addTradeFlags(RecipeDB,53951,1,2,5,11,36,41,51)
 	self:addTradeAcquire(RecipeDB,53951,3,29311)

 	-- Solid Sky Sapphire -- 53952
-	self:addTradeSkill(RecipeDB,53952,390,40008,3,25229,nil,2)
+	AddRecipe(53952,390,40008,3,2)
 	self:addTradeFlags(RecipeDB,53952,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,53952,2,28721,2,33602)

 	-- Sparkling Sky Sapphire -- 53953
-	self:addTradeSkill(RecipeDB,53953,390,40009,3,25229,nil,2)
+	AddRecipe(53953,390,40009,3,2)
 	self:addTradeFlags(RecipeDB,53953,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53953,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Lustrous Sky Sapphire -- 53954
-	self:addTradeSkill(RecipeDB,53954,390,40010,3,25229,nil,2)
+	AddRecipe(53954,390,40010,3,2)
 	self:addTradeFlags(RecipeDB,53954,1,2,4,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53954,2,28721,2,33602)

 	-- Stormy Sky Sapphire -- 53955
-	self:addTradeSkill(RecipeDB,53955,390,40011,3,25229,nil,2)
+	AddRecipe(53955,390,40011,3,2)
 	self:addTradeFlags(RecipeDB,53955,1,2,4,9,36,41,54)
 	self:addTradeAcquire(RecipeDB,53955,2,30489,2,32294,2,32296)

 	-- Brilliant Autumn's Glow -- 53956
-	self:addTradeSkill(RecipeDB,53956,390,40012,3,25229,nil,2)
+	AddRecipe(53956,390,40012,3,2)
 	self:addTradeFlags(RecipeDB,53956,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,53956,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Smooth Autumn's Glow -- 53957
-	self:addTradeSkill(RecipeDB,53957,390,40013,3,25229,nil,2)
+	AddRecipe(53957,390,40013,3,2)
 	self:addTradeFlags(RecipeDB,53957,1,2,4,36,41,119)
 	self:addTradeAcquire(RecipeDB,53957,6,1119,4,32540)

 	-- Rigid Autumn's Glow -- 53958
-	self:addTradeSkill(RecipeDB,53958,390,40014,3,25229,nil,2)
+	AddRecipe(53958,390,40014,3,2)
 	self:addTradeFlags(RecipeDB,53958,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,53958,2,28721,2,33602)

 	-- Thick Autumn's Glow -- 53959
-	self:addTradeSkill(RecipeDB,53959,390,40015,3,25229,nil,2)
+	AddRecipe(53959,390,40015,3,2)
 	self:addTradeFlags(RecipeDB,53959,1,2,5,11,36,41,52)
 	self:addTradeAcquire(RecipeDB,53959,3,31134)

 	-- Mystic Autumn's Glow -- 53960
-	self:addTradeSkill(RecipeDB,53960,390,40016,3,25229,nil,2)
+	AddRecipe(53960,390,40016,3,2)
 	self:addTradeFlags(RecipeDB,53960,1,2,4,9,36,41)
 	self:addTradeAcquire(RecipeDB,53960,2,30489,2,32294,2,32296)

 	-- Quick Autumn's Glow -- 53961
-	self:addTradeSkill(RecipeDB,53961,390,40017,3,25229,nil,2)
+	AddRecipe(53961,390,40017,3,2)
 	self:addTradeFlags(RecipeDB,53961,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,53961,2,28721,2,33602)

 	-- Sovereign Twilight Opal -- 53962
-	self:addTradeSkill(RecipeDB,53962,380,40022,3,25229,nil,2)
+	AddRecipe(53962,380,40022,3,2)
 	self:addTradeFlags(RecipeDB,53962,1,2,10,36,40,51)
 	self:addTradeAcquire(RecipeDB,53962,7,3)

 	-- Tenuous Twilight Opal -- 53964
-	self:addTradeSkill(RecipeDB,53964,380,40024,3,25229,nil,2)
+	AddRecipe(53964,380,40024,3,2)
 	self:addTradeFlags(RecipeDB,53964,1,2,10,36,40,51)
 	self:addTradeAcquire(RecipeDB,53964,7,3)

 	-- Glowing Twilight Opal -- 53965
-	self:addTradeSkill(RecipeDB,53965,390,40025,3,25229,nil,2)
+	AddRecipe(53965,390,40025,3,2)
 	self:addTradeFlags(RecipeDB,53965,1,2,4,36,41,53,54,117)
 	self:addTradeAcquire(RecipeDB,53965,6,1098,4,32538)

 	-- Purified Twilight Opal -- 53966
-	self:addTradeSkill(RecipeDB,53966,380,40026,3,25229,nil,2)
+	AddRecipe(53966,380,40026,3,2)
 	self:addTradeFlags(RecipeDB,53966,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,53966,7,3)

 	-- Royal Twilight Opal -- 53967
-	self:addTradeSkill(RecipeDB,53967,390,40027,3,25229,nil,2)
+	AddRecipe(53967,390,40027,3,2)
 	self:addTradeFlags(RecipeDB,53967,1,2,4,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53967,2,28721,2,33602)

 	-- Mysterious Twilight Opal
-	self:addTradeSkill(RecipeDB,53968,390,40028,3,25229,nil,2)
+	AddRecipe(53968,390,40028,3,2)
 	self:addTradeFlags(RecipeDB,53968,1,2,4,9,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53968,2,30489,2,32294,2,32296)

 	-- Balanced Twilight Opal -- 53969
-	self:addTradeSkill(RecipeDB,53969,390,40029,3,25229,nil,2)
+	AddRecipe(53969,390,40029,3,2)
 	self:addTradeFlags(RecipeDB,53969,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53969,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Infused Twilight Opal -- 53970
-	self:addTradeSkill(RecipeDB,53970,390,40030,3,25229,nil,2)
+	AddRecipe(53970,390,40030,3,2)
 	self:addTradeFlags(RecipeDB,53970,1,2,5,11,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53970,3,29120)

 	-- Regal Twilight Opal -- 53971
-	self:addTradeSkill(RecipeDB,53971,390,40031,3,25229,nil,2)
+	AddRecipe(53971,390,40031,3,2)
 	self:addTradeFlags(RecipeDB,53971,1,2,4,36,41,52)
 	self:addTradeAcquire(RecipeDB,53971,2,28721,2,33602)

 	-- Defender's Twilight Opal -- 53972
-	self:addTradeSkill(RecipeDB,53972,390,40032,3,25229,nil,2)
+	AddRecipe(53972,390,40032,3,2)
 	self:addTradeFlags(RecipeDB,53972,1,2,11,36,41,52)
 	self:addTradeAcquire(RecipeDB,53972,3,29370,3,29376,3,30208,3,30222)

 	-- Puissant Twilight Opal -- 53973
-	self:addTradeSkill(RecipeDB,53973,390,40033,3,25229,nil,2)
+	AddRecipe(53973,390,40033,3,2)
 	self:addTradeFlags(RecipeDB,53973,1,2,4,36,41,51)
 	self:addTradeAcquire(RecipeDB,53973,2,28721,2,33602)

 	-- Guardian's Twilight Opal -- 53974
-	self:addTradeSkill(RecipeDB,53974,390,40034,3,25229,nil,2)
+	AddRecipe(53974,390,40034,3,2)
 	self:addTradeFlags(RecipeDB,53974,1,2,4,36,41,51,115)
 	self:addTradeAcquire(RecipeDB,53974,6,1106,3,30431)

 	-- Inscribed Monarch Topaz -- 53975
-	self:addTradeSkill(RecipeDB,53975,390,40037,3,25229,nil,2)
+	AddRecipe(53975,390,40037,3,2)
 	self:addTradeFlags(RecipeDB,53975,1,2,10,36,40,51)
 	self:addTradeAcquire(RecipeDB,53975,7,3)

 	-- Etched Monarch Topaz -- 53976
-	self:addTradeSkill(RecipeDB,53976,380,40038,3,25229,nil,2)
+	AddRecipe(53976,380,40038,3,2)
 	self:addTradeFlags(RecipeDB,53976,1,2,10,36,40,51)
 	self:addTradeAcquire(RecipeDB,53976,7,3)

 	-- Champion's Monarch Topaz -- 53977
-	self:addTradeSkill(RecipeDB,53977,380,40039,3,25229,nil,2)
+	AddRecipe(53977,380,40039,3,2)
 	self:addTradeFlags(RecipeDB,53977,1,2,10,36,40,51,52)
 	self:addTradeAcquire(RecipeDB,53977,7,3)

 	-- Resplendent Monarch Topaz -- 53978
-	self:addTradeSkill(RecipeDB,53978,390,40040,3,25229,nil,2)
+	AddRecipe(53978,390,40040,3,2)
 	self:addTradeFlags(RecipeDB,53978,1,2,4,9,36,41,51)
 	self:addTradeAcquire(RecipeDB,53978,2,30489,2,32294,2,32296)

 	-- Deadly Monarch Topaz -- 53979
-	self:addTradeSkill(RecipeDB,53979,390,40043,3,25229,nil,2)
+	AddRecipe(53979,390,40043,3,2)
 	self:addTradeFlags(RecipeDB,53979,1,2,5,11,36,41,51)
 	self:addTradeAcquire(RecipeDB,53979,3,26723)

 	-- Glinting Monarch Topaz -- 53980
-	self:addTradeSkill(RecipeDB,53980,390,40044,3,25229,nil,2)
+	AddRecipe(53980,390,40044,3,2)
 	self:addTradeFlags(RecipeDB,53980,1,2,4,36,41,51)
 	self:addTradeAcquire(RecipeDB,53980,2,28721,2,33602)

 	-- Lucent Monarch Topaz -- 53981
-	self:addTradeSkill(RecipeDB,53981,390,40045,3,25229,nil,2)
+	AddRecipe(53981,390,40045,3,2)
 	self:addTradeFlags(RecipeDB,53981,1,2,4,9,36,41,51)
 	self:addTradeAcquire(RecipeDB,53981,2,30489,2,32294,2,32296)

 	-- Deft Monarch Topaz -- 53982
-	self:addTradeSkill(RecipeDB,53982,390,40046,3,25229,nil,2)
+	AddRecipe(53982,390,40046,3,2)
 	self:addTradeFlags(RecipeDB,53982,1,2,5,11,36,41,51)
 	self:addTradeAcquire(RecipeDB,53982,3,27978)

 	-- Luminous Monarch Topaz -- 53983
-	self:addTradeSkill(RecipeDB,53983,390,40047,3,25229,nil,2)
+	AddRecipe(53983,390,40047,3,2)
 	self:addTradeFlags(RecipeDB,53983,1,2,4,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53983,2,28721,2,33602)

 	-- Potent Monarch Topaz -- 53984
-	self:addTradeSkill(RecipeDB,53984,390,40048,3,25229,nil,2)
+	AddRecipe(53984,390,40048,3,2)
 	self:addTradeFlags(RecipeDB,53984,1,2,4,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53984,2,28721,2,33602)

 	-- Veiled Monarch Topaz -- 53985
-	self:addTradeSkill(RecipeDB,53985,390,40049,3,25229,nil,2)
+	AddRecipe(53985,390,40049,3,2)
 	self:addTradeFlags(RecipeDB,53985,1,2,4,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53985,2,28721,2,33602)

 	-- Durable Monarch Topaz -- 53986
-	self:addTradeSkill(RecipeDB,53986,390,40050,3,25229,nil,2)
+	AddRecipe(53986,390,40050,3,2)
 	self:addTradeFlags(RecipeDB,53986,1,2,4,9,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53986,2,30489,2,32294,2,32296)

 	-- Reckless Monarch Topaz -- 53987
-	self:addTradeSkill(RecipeDB,53987,390,40051,3,25229,nil,2)
+	AddRecipe(53987,390,40051,3,2)
 	self:addTradeFlags(RecipeDB,53987,1,2,4,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,53987,2,28721,2,33602)

 	-- Wicked Monarch Topaz -- 53988
-	self:addTradeSkill(RecipeDB,53988,390,40052,3,25229,nil,2)
+	AddRecipe(53988,390,40052,3,2)
 	self:addTradeFlags(RecipeDB,53988,1,2,4,36,41,51,117)
 	self:addTradeAcquire(RecipeDB,53988,6,1098,3,32538)

 	-- Pristine Monarch Topaz -- 53989
-	self:addTradeSkill(RecipeDB,53989,390,40053,3,25229,nil,2)
+	AddRecipe(53989,390,40053,3,2)
 	self:addTradeFlags(RecipeDB,53989,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,53989,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Empowered Monarch Topaz -- 53990
-	self:addTradeSkill(RecipeDB,53990,390,40054,3,25229,nil,2)
+	AddRecipe(53990,390,40054,3,2)
 	self:addTradeFlags(RecipeDB,53990,1,2,4,9,36,41,51)
 	self:addTradeAcquire(RecipeDB,53990,2,30489,2,32294,2,32296)

 	-- Stark Monarch Topaz -- 53991
-	self:addTradeSkill(RecipeDB,53991,390,40055,3,25229,nil,2)
+	AddRecipe(53991,390,40055,3,2)
 	self:addTradeFlags(RecipeDB,53991,1,2,4,36,41,51)
 	self:addTradeAcquire(RecipeDB,53991,2,28721,2,33602)

 	-- Stalwart Monarch Topaz -- 53992
-	self:addTradeSkill(RecipeDB,53992,390,40056,3,25229,nil,2)
+	AddRecipe(53992,390,40056,3,2)
 	self:addTradeFlags(RecipeDB,53992,1,2,10,36,40,52)
 	self:addTradeAcquire(RecipeDB,53992,7,3)

 	-- Glimmering Monarch Topaz -- 53993
-	self:addTradeSkill(RecipeDB,53993,390,40057,3,25229,nil,2)
+	AddRecipe(53993,390,40057,3,2)
 	self:addTradeFlags(RecipeDB,53993,1,2,4,36,41,52,122)
 	self:addTradeAcquire(RecipeDB,53993,6,1091,4,32533)

 	-- Accurate Monarch Topaz -- 53994
-	self:addTradeSkill(RecipeDB,53994,390,40058,3,25229,nil,2)
+	AddRecipe(53994,390,40058,3,2)
 	self:addTradeFlags(RecipeDB,53994,1,2,11,36,41,51)
 	self:addTradeAcquire(RecipeDB,53994,3,28379,3,28851,3,29402,3,30260,3,30448)

 	-- Timeless Forest Emerald -- 53995
-	self:addTradeSkill(RecipeDB,53995,390,40085,3,25229,nil,2)
+	AddRecipe(53995,390,40085,3,2)
 	self:addTradeFlags(RecipeDB,53995,1,2,5,11,36,41)
 	self:addTradeAcquire(RecipeDB,53995,3,26632)

 	-- Jagged Forest Emerald -- 53996
-	self:addTradeSkill(RecipeDB,53996,390,40086,3,25229,nil,2)
+	AddRecipe(53996,390,40086,3,2)
 	self:addTradeFlags(RecipeDB,53996,1,2,4,36,41,116)
 	self:addTradeAcquire(RecipeDB,53996,6,1104,3,31911)

 	-- Vivid Forest Emerald -- 53997
-	self:addTradeSkill(RecipeDB,53997,390,40088,3,25229,nil,2)
+	AddRecipe(53997,390,40088,3,2)
 	self:addTradeFlags(RecipeDB,53997,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,53997,2,28721,2,33602)

 	-- Enduring Forest Emerald -- 53998
-	self:addTradeSkill(RecipeDB,53998,390,40089,3,25229,nil,2)
+	AddRecipe(53998,390,40089,3,2)
 	self:addTradeFlags(RecipeDB,53998,1,2,4,36,41,52)
 	self:addTradeAcquire(RecipeDB,53998,2,28721,2,33602)

 	-- Steady Forest Emerald -- 54000
-	self:addTradeSkill(RecipeDB,54000,390,40090,3,25229,nil,2)
+	AddRecipe(54000,390,40090,3,2)
 	self:addTradeFlags(RecipeDB,54000,1,2,4,9,36,41)
 	self:addTradeAcquire(RecipeDB,54000,2,30489,2,32294,2,32296)

 	-- Forceful Forest Emerald -- 54001
-	self:addTradeSkill(RecipeDB,54001,390,40091,3,25229,nil,2)
+	AddRecipe(54001,390,40091,3,2)
 	self:addTradeFlags(RecipeDB,54001,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,54001,2,28721,2,33602)

 	-- Seer's Forest Emerald -- 54002
-	self:addTradeSkill(RecipeDB,54002,390,40092,3,25229,nil,2)
+	AddRecipe(54002,390,40092,3,2)
 	self:addTradeFlags(RecipeDB,54002,1,2,4,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,54002,2,28721,2,33602)

 	-- Misty Forest Emerald -- 54003
-	self:addTradeSkill(RecipeDB,54003,380,40095,3,25229,nil,2)
+	AddRecipe(54003,380,40095,3,2)
 	self:addTradeFlags(RecipeDB,54003,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,54003,7,3)

 	-- Shining Forest Emerald -- 54004
-	self:addTradeSkill(RecipeDB,54004,380,40099,3,25229,nil,2)
+	AddRecipe(54004,380,40099,3,2)
 	self:addTradeFlags(RecipeDB,54004,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,54004,7,3)

 	-- Turbid Forest Emerald -- 54005
-	self:addTradeSkill(RecipeDB,54005,390,40102,3,25229,nil,2)
+	AddRecipe(54005,390,40102,3,2)
 	self:addTradeFlags(RecipeDB,54005,1,2,4,9,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,54005,2,30489,2,32294,2,32296)

 	-- Intricate Forest Emerald -- 54006
-	self:addTradeSkill(RecipeDB,54006,390,40104,3,25229,nil,2)
+	AddRecipe(54006,390,40104,3,2)
 	self:addTradeFlags(RecipeDB,54006,1,2,4,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,54006,2,28721,2,33602)

 	-- Dazzling Forest Emerald -- 54007
-	self:addTradeSkill(RecipeDB,54007,390,40094,3,25229,nil,2)
+	AddRecipe(54007,390,40094,3,2)
 	self:addTradeFlags(RecipeDB,54007,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,54007,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Sundered Forest Emerald -- 54008
-	self:addTradeSkill(RecipeDB,54008,390,40096,3,25229,nil,2)
+	AddRecipe(54008,390,40096,3,2)
 	self:addTradeFlags(RecipeDB,54008,1,2,4,36,41,53,54,121)
 	self:addTradeAcquire(RecipeDB,54008,6,1105,3,31910)

 	-- Lambent Forest Emerald -- 54009
-	self:addTradeSkill(RecipeDB,54009,390,40100,3,25229,nil,2)
+	AddRecipe(54009,390,40100,3,2)
 	self:addTradeFlags(RecipeDB,54009,1,2,4,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,54009,2,28721,2,33602)

 	-- Opaque Forest Emerald -- 54010
-	self:addTradeSkill(RecipeDB,54010,390,40103,3,25229,nil,2)
+	AddRecipe(54010,390,40103,3,2)
 	self:addTradeFlags(RecipeDB,54010,1,2,4,9,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,54010,2,30489,2,32294,2,32296)

 	-- Energized Forest Emerald -- 54011
-	self:addTradeSkill(RecipeDB,54011,390,40105,3,25229,nil,2)
+	AddRecipe(54011,390,40105,3,2)
 	self:addTradeFlags(RecipeDB,54011,1,2,4,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,54011,2,28721,2,33602)

 	-- Radiant Forest Emerald -- 54012
-	self:addTradeSkill(RecipeDB,54012,390,40098,3,25229,nil,2)
+	AddRecipe(54012,390,40098,3,2)
 	self:addTradeFlags(RecipeDB,54012,1,2,11,36,41,54)
 	self:addTradeAcquire(RecipeDB,54012,3,29792,3,29793)

 	-- Tense Forest Emerald -- 54013
-	self:addTradeSkill(RecipeDB,54013,390,40101,3,25229,nil,2)
+	AddRecipe(54013,390,40101,3,2)
 	self:addTradeFlags(RecipeDB,54013,1,2,4,9,36,41,54)
 	self:addTradeAcquire(RecipeDB,54013,2,30489,2,32294,2,32296)

 	-- Shattered Forest Emerald -- 54014
-	self:addTradeSkill(RecipeDB,54014,390,40106,3,25229,nil,2)
+	AddRecipe(54014,390,40106,3,2)
 	self:addTradeFlags(RecipeDB,54014,1,2,4,9,36,41,54)
 	self:addTradeAcquire(RecipeDB,54014,2,30489,2,32294,2,32296)

 	-- Precise Bloodstone -- 54017
-	self:addTradeSkill(RecipeDB,54017,350,39910,2,25229,nil,2)
+	AddRecipe(54017,350,39910,2,2)
 	self:addTradeFlags(RecipeDB,54017,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,54017,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Fierce Monarch Topaz -- 54019
-	self:addTradeSkill(RecipeDB,54019,390,40041,3,25229,nil,2)
+	AddRecipe(54019,390,40041,3,2)
 	self:addTradeFlags(RecipeDB,54019,1,2,5,11,36,41,51)
 	self:addTradeAcquire(RecipeDB,54019,3,23954)

 	-- Resolute Monarch Topaz -- 54023
-	self:addTradeSkill(RecipeDB,54023,380,40059,3,25229,nil,2)
+	AddRecipe(54023,380,40059,3,2)
 	self:addTradeFlags(RecipeDB,54023,1,2,10,36,40,51,52)
 	self:addTradeAcquire(RecipeDB,54023,7,3)

 	-- Effulgent Skyflare Diamond -- 55384
-	self:addTradeSkill(RecipeDB,55384,420,41377,3,25229,nil,2)
+	AddRecipe(55384,420,41377,3,2)
 	self:addTradeFlags(RecipeDB,55384,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,55384,2,28721,2,33602)

 	-- Tireless Skyflare Diamond -- 55386
-	self:addTradeSkill(RecipeDB,55386,420,41375,3,25229,nil,2)
+	AddRecipe(55386,420,41375,3,2)
 	self:addTradeFlags(RecipeDB,55386,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,55386,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Forlorn Skyflare Diamond -- 55387
-	self:addTradeSkill(RecipeDB,55387,420,41378,3,25229,nil,2)
+	AddRecipe(55387,420,41378,3,2)
 	self:addTradeFlags(RecipeDB,55387,1,2,4,9,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,55387,2,30489,2,32294,2,32296)

 	-- Impassive Skyflare Diamond -- 55388
-	self:addTradeSkill(RecipeDB,55388,420,41379,3,25229,nil,2)
+	AddRecipe(55388,420,41379,3,2)
 	self:addTradeFlags(RecipeDB,55388,1,2,4,9,36,41)
 	self:addTradeAcquire(RecipeDB,55388,2,30489,2,32294,2,32296)

 	-- Chaotic Skyflare Diamond -- 55389
-	self:addTradeSkill(RecipeDB,55389,420,41285,3,25229,nil,2)
+	AddRecipe(55389,420,41285,3,2)
 	self:addTradeFlags(RecipeDB,55389,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,55389,2,28721,2,33602)

 	-- Destructive Skyflare Diamond -- 55390
-	self:addTradeSkill(RecipeDB,55390,420,41307,3,25229,nil,2)
+	AddRecipe(55390,420,41307,3,2)
 	self:addTradeFlags(RecipeDB,55390,1,2,10,36,41)
 	self:addTradeAcquire(RecipeDB,55390,7,3)

 	-- Ember Skyflare Diamond -- 55392
-	self:addTradeSkill(RecipeDB,55392,420,41333,3,25229,nil,2)
+	AddRecipe(55392,420,41333,3,2)
 	self:addTradeFlags(RecipeDB,55392,1,2,4,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,55392,2,28721,2,33602)

 	-- Enigmatic Skyflare Diamond -- 55393
-	self:addTradeSkill(RecipeDB,55393,420,41335,3,25229,nil,2)
+	AddRecipe(55393,420,41335,3,2)
 	self:addTradeFlags(RecipeDB,55393,1,2,4,9,36,41)
 	self:addTradeAcquire(RecipeDB,55393,2,30489,2,32294,2,32296)

 	-- Swift Skyflare Diamond -- 55394
-	self:addTradeSkill(RecipeDB,55394,420,41339,3,25229,nil,2)
+	AddRecipe(55394,420,41339,3,2)
 	self:addTradeFlags(RecipeDB,55394,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,55394,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Thundering Skyflare Diamond -- 55395
-	self:addTradeSkill(RecipeDB,55395,420,41400,3,25229,nil,2)
+	AddRecipe(55395,420,41400,3,2)
 	self:addTradeFlags(RecipeDB,55395,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,55395,7,3)

 	-- Insightful Earthsiege Diamond -- 55396
-	self:addTradeSkill(RecipeDB,55396,420,41401,3,25229,nil,2)
+	AddRecipe(55396,420,41401,3,2)
 	self:addTradeFlags(RecipeDB,55396,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,55396,2,28721,2,33602)

 	-- Bracing Earthsiege Diamond -- 55397
-	self:addTradeSkill(RecipeDB,55397,420,41395,3,25229,nil,2)
+	AddRecipe(55397,420,41395,3,2)
 	self:addTradeFlags(RecipeDB,55397,1,2,5,11,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,55397,3,27656)

 	-- Eternal Earthsiege Diamond -- 55398
-	self:addTradeSkill(RecipeDB,55398,420,41396,3,25229,nil,2)
+	AddRecipe(55398,420,41396,3,2)
 	self:addTradeFlags(RecipeDB,55398,1,2,5,11,36,41,52)
 	self:addTradeAcquire(RecipeDB,55398,3,28923)

 	-- Powerful Earthsiege Diamond -- 55399
-	self:addTradeSkill(RecipeDB,55399,420,41397,3,25229,nil,2)
+	AddRecipe(55399,420,41397,3,2)
 	self:addTradeFlags(RecipeDB,55399,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,55399,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Relentless Earthsiege Diamond -- 55400
-	self:addTradeSkill(RecipeDB,55400,420,41398,3,25229,nil,2)
+	AddRecipe(55400,420,41398,3,2)
 	self:addTradeFlags(RecipeDB,55400,1,2,4,36,41,51)
 	self:addTradeAcquire(RecipeDB,55400,2,28721,2,33602)

 	-- Austere Earthsiege Diamond -- 55401
-	self:addTradeSkill(RecipeDB,55401,420,41380,3,25229,nil,2)
+	AddRecipe(55401,420,41380,3,2)
 	self:addTradeFlags(RecipeDB,55401,1,2,5,11,36,41)
 	self:addTradeAcquire(RecipeDB,55401,3,26861)

 	-- Persistent Earthsiege Diamond -- 55402
-	self:addTradeSkill(RecipeDB,55402,420,41381,3,25229,nil,2)
+	AddRecipe(55402,420,41381,3,2)
 	self:addTradeFlags(RecipeDB,55402,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,55402,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Trenchant Earthsiege Diamond -- 55403
-	self:addTradeSkill(RecipeDB,55403,420,41382,3,25229,nil,2)
+	AddRecipe(55403,420,41382,3,2)
 	self:addTradeFlags(RecipeDB,55403,1,2,4,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,55403,2,28721,2,33602)

 	-- Invigorating Earthsiege Diamond -- 55404
-	self:addTradeSkill(RecipeDB,55404,420,41385,3,25229,nil,2)
+	AddRecipe(55404,420,41385,3,2)
 	self:addTradeFlags(RecipeDB,55404,1,2,4,36,41,51)
 	self:addTradeAcquire(RecipeDB,55404,2,28721,2,33602)

 	-- Beaming Earthsiege Diamond -- 55405
-	self:addTradeSkill(RecipeDB,55405,420,41389,3,25229,nil,2)
+	AddRecipe(55405,420,41389,3,2)
 	self:addTradeFlags(RecipeDB,55405,1,2,10,36,40,53,54)
 	self:addTradeAcquire(RecipeDB,55405,7,3)

 	-- Revitalizing Skyflare Diamond -- 55407
-	self:addTradeSkill(RecipeDB,55407,420,41376,3,25229,nil,2)
+	AddRecipe(55407,420,41376,3,2)
 	self:addTradeFlags(RecipeDB,55407,1,2,4,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,55407,2,28721,2,33602)

 	-- Bold Dragon's Eye -- 56049
-	self:addTradeSkill(RecipeDB,56049,370,42142,3,25229,nil,2)
+	AddRecipe(56049,370,42142,3,2)
 	self:addTradeFlags(RecipeDB,56049,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,56049,2,28721,2,33602)

 	-- Delicate Dragon's Eye -- 56052
-	self:addTradeSkill(RecipeDB,56052,370,42143,3,25229,nil,2)
+	AddRecipe(56052,370,42143,3,2)
 	self:addTradeFlags(RecipeDB,56052,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,56052,2,28721,2,33602)

 	-- Runed Dragon's Eye -- 56053
-	self:addTradeSkill(RecipeDB,56053,370,42144,3,25229,nil,2)
+	AddRecipe(56053,370,42144,3,2)
 	self:addTradeFlags(RecipeDB,56053,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,56053,2,28721,2,33602)

 	-- Bright Dragon's Eye -- 56054
-	self:addTradeSkill(RecipeDB,56054,370,36766,3,25229,nil,2)
+	AddRecipe(56054,370,36766,3,2)
 	self:addTradeFlags(RecipeDB,56054,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,56054,2,28721,2,33602)

 	-- Subtle Dragon's Eye -- 56055
-	self:addTradeSkill(RecipeDB,56055,370,42151,3,25229,nil,2)
+	AddRecipe(56055,370,42151,3,2)
 	self:addTradeFlags(RecipeDB,56055,1,2,4,37,41,52)
 	self:addTradeAcquire(RecipeDB,56055,2,28721,2,33602)

 	-- Flashing Dragon's Eye -- 56056
-	self:addTradeSkill(RecipeDB,56056,370,42152,3,25229,nil,2)
+	AddRecipe(56056,370,42152,3,2)
 	self:addTradeFlags(RecipeDB,56056,1,2,4,37,41,52)
 	self:addTradeAcquire(RecipeDB,56056,2,28721,2,33602)

 	-- Brilliant Dragon's Eye -- 56074
-	self:addTradeSkill(RecipeDB,56074,370,42148,3,25229,nil,2)
+	AddRecipe(56074,370,42148,3,2)
 	self:addTradeFlags(RecipeDB,56074,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,56074,2,28721,2,33602)

 	-- Fractured Dragon's Eye -- 56076
-	self:addTradeSkill(RecipeDB,56076,370,42153,3,25229,nil,2)
+	AddRecipe(56076,370,42153,3,2)
 	self:addTradeFlags(RecipeDB,56076,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,56076,2,28721,2,33602)

 	-- Lustrous Dragon's Eye -- 56077
-	self:addTradeSkill(RecipeDB,56077,370,42146,3,25229,nil,2)
+	AddRecipe(56077,370,42146,3,2)
 	self:addTradeFlags(RecipeDB,56077,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,56077,2,28721,2,33602)

 	-- Mystic Dragon's Eye -- 56079
-	self:addTradeSkill(RecipeDB,56079,370,42158,3,25229,nil,2)
+	AddRecipe(56079,370,42158,3,2)
 	self:addTradeFlags(RecipeDB,56079,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,56079,2,28721,2,33602)

 	-- Precise Dragon's Eye -- 56081
-	self:addTradeSkill(RecipeDB,56081,370,42154,3,25229,nil,2)
+	AddRecipe(56081,370,42154,3,2)
 	self:addTradeFlags(RecipeDB,56081,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,56081,2,28721,2,33602)

 	-- Quick Dragon's Eye -- 56083
-	self:addTradeSkill(RecipeDB,56083,370,42150,3,25229,nil,2)
+	AddRecipe(56083,370,42150,3,2)
 	self:addTradeFlags(RecipeDB,56083,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,56083,2,28721,2,33602)

 	-- Rigid Dragon's Eye -- 56084
-	self:addTradeSkill(RecipeDB,56084,370,42156,3,25229,nil,2)
+	AddRecipe(56084,370,42156,3,2)
 	self:addTradeFlags(RecipeDB,56084,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,56084,2,28721,2,33602)

 	-- Smooth Dragon's Eye -- 56085
-	self:addTradeSkill(RecipeDB,56085,370,42149,3,25229,nil,2,370,390,415,440)
+	AddRecipe(56085,370,42149,3,2,370,390,415,440)
 	self:addTradeFlags(RecipeDB,56085,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,56085,2,28721,2,33602)

 	-- Solid Dragon's Eye -- 56086
-	self:addTradeSkill(RecipeDB,56086,370,36767,3,25229,nil,2,370,390,415,440)
+	AddRecipe(56086,370,36767,3,2,370,390,415,440)
 	self:addTradeFlags(RecipeDB,56086,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,56086,2,28721,2,33602)

 	-- Sparkling Dragon's Eye -- 56087
-	self:addTradeSkill(RecipeDB,56087,370,42145,3,25229,nil,2)
+	AddRecipe(56087,370,42145,3,2)
 	self:addTradeFlags(RecipeDB,56087,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,56087,2,28721,2,33602)

 	-- Stormy Dragon's Eye -- 56088
-	self:addTradeSkill(RecipeDB,56088,370,42155,3,25229,nil,2)
+	AddRecipe(56088,370,42155,3,2)
 	self:addTradeFlags(RecipeDB,56088,1,2,4,37,41,54)
 	self:addTradeAcquire(RecipeDB,56088,2,28721,2,33602)

 	-- Thick Dragon's Eye -- 56089
-	self:addTradeSkill(RecipeDB,56089,370,42157,3,25229,nil,2)
+	AddRecipe(56089,370,42157,3,2)
 	self:addTradeFlags(RecipeDB,56089,1,2,4,37,41,52)
 	self:addTradeAcquire(RecipeDB,56089,2,28721,2,33602)

 	-- Bloodstone Band -- 56193
-	self:addTradeSkill(RecipeDB,56193,350,42336,1,25229,nil,2)
+	AddRecipe(56193,350,42336,1,2)
 	self:addTradeFlags(RecipeDB,56193,1,2,3,36,41,51,62)
 	self:addTradeAcquire(RecipeDB,56193,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Sun Rock Ring -- 56194
-	self:addTradeSkill(RecipeDB,56194,350,42337,1,25229,nil,2)
+	AddRecipe(56194,350,42337,1,2)
 	self:addTradeFlags(RecipeDB,56194,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,56194,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Jade Dagger Pendant -- 56195
-	self:addTradeSkill(RecipeDB,56195,380,42338,1,25229,nil,2)
+	AddRecipe(56195,380,42338,1,2)
 	self:addTradeFlags(RecipeDB,56195,1,2,3,36,41,51,63)
 	self:addTradeAcquire(RecipeDB,56195,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Blood Sun Necklace -- 56196
-	self:addTradeSkill(RecipeDB,56196,380,42339,3,25229,nil,2)
+	AddRecipe(56196,380,42339,3,2)
 	self:addTradeFlags(RecipeDB,56196,1,2,3,36,41,53,54,63)
 	self:addTradeAcquire(RecipeDB,56196,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Dream Signet -- 56197
-	self:addTradeSkill(RecipeDB,56197,420,42340,3,25229,nil,2)
+	AddRecipe(56197,420,42340,3,2)
 	self:addTradeFlags(RecipeDB,56197,1,2,3,36,41,62)
 	self:addTradeAcquire(RecipeDB,56197,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Ruby Hare -- 56199
-	self:addTradeSkill(RecipeDB,56199,400,42341,3,25229,nil,2)
+	AddRecipe(56199,400,42341,3,2)
 	self:addTradeFlags(RecipeDB,56199,1,2,3,37,41,61)
 	self:addTradeAcquire(RecipeDB,56199,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Twilight Serpent -- 56201
-	self:addTradeSkill(RecipeDB,56201,400,42395,3,25229,nil,2)
+	AddRecipe(56201,400,42395,3,2)
 	self:addTradeFlags(RecipeDB,56201,1,2,3,37,41,53,54,61)
 	self:addTradeAcquire(RecipeDB,56201,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Sapphire Owl -- 56202
-	self:addTradeSkill(RecipeDB,56202,400,42413,3,25229,nil,2)
+	AddRecipe(56202,400,42413,3,2)
 	self:addTradeFlags(RecipeDB,56202,1,2,3,37,41,61)
 	self:addTradeAcquire(RecipeDB,56202,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Emerald Boar -- 56203
-	self:addTradeSkill(RecipeDB,56203,400,42418,3,25229,nil,2)
+	AddRecipe(56203,400,42418,3,2)
 	self:addTradeFlags(RecipeDB,56203,1,2,3,37,41,51,61)
 	self:addTradeAcquire(RecipeDB,56203,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Dark Jade Focusing Lens -- 56205
-	self:addTradeSkill(RecipeDB,56205,350,41367,2,25229,nil,2)
+	AddRecipe(56205,350,41367,2,2)
 	self:addTradeFlags(RecipeDB,56205,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,56205,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Shadow Crystal Focusing Lens -- 56206
-	self:addTradeSkill(RecipeDB,56206,360,42420,2,25229,nil,2)
+	AddRecipe(56206,360,42420,2,2)
 	self:addTradeFlags(RecipeDB,56206,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,56206,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Shadow Jade Focusing Lens -- 56208
-	self:addTradeSkill(RecipeDB,56208,370,42421,1,25229,nil,2)
+	AddRecipe(56208,370,42421,1,2)
 	self:addTradeFlags(RecipeDB,56208,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,56208,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Titanium Impact Band -- 56496
-	self:addTradeSkill(RecipeDB,56496,430,42642,4,25229,nil,2)
+	AddRecipe(56496,430,42642,4,2)
 	self:addTradeFlags(RecipeDB,56496,1,2,4,36,41,51,62)
 	self:addTradeAcquire(RecipeDB,56496,2,28721,2,33602)

 	-- Titanium Earthguard Ring -- 56497
-	self:addTradeSkill(RecipeDB,56497,430,42643,4,25229,nil,2)
+	AddRecipe(56497,430,42643,4,2)
 	self:addTradeFlags(RecipeDB,56497,1,2,4,36,41,52,62)
 	self:addTradeAcquire(RecipeDB,56497,2,28721,2,33602)

 	-- Titanium Spellshock Ring -- 56498
-	self:addTradeSkill(RecipeDB,56498,430,42644,4,25229,nil,2)
+	AddRecipe(56498,430,42644,4,2)
 	self:addTradeFlags(RecipeDB,56498,1,2,4,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,56498,2,28721,2,33602)

 	-- Titanium Impact Choker -- 56499
-	self:addTradeSkill(RecipeDB,56499,440,42645,4,25229,nil,2)
+	AddRecipe(56499,440,42645,4,2)
 	self:addTradeFlags(RecipeDB,56499,1,2,4,36,41,51,63)
 	self:addTradeAcquire(RecipeDB,56499,2,28721,2,33602)

 	-- Titanium Earthguard Chain -- 56500
-	self:addTradeSkill(RecipeDB,56500,440,42646,4,25229,nil,2)
+	AddRecipe(56500,440,42646,4,2)
 	self:addTradeFlags(RecipeDB,56500,1,2,4,36,41,52,63)
 	self:addTradeAcquire(RecipeDB,56500,2,28721,2,33602)

 	-- Titanium Spellshock Necklace -- 56501
-	self:addTradeSkill(RecipeDB,56501,440,42647,4,25229,nil,2)
+	AddRecipe(56501,440,42647,4,2)
 	self:addTradeFlags(RecipeDB,56501,1,2,4,36,41,53,54,63)
 	self:addTradeAcquire(RecipeDB,56501,2,28721,2,33602)

 	-- Enchanted Pearl -- 56530
-	self:addTradeSkill(RecipeDB,56530,360,42701,1,25229,nil,2)
+	AddRecipe(56530,360,42701,1,2)
 	self:addTradeFlags(RecipeDB,56530,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,56530,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Enchanted Tear -- 56531
-	self:addTradeSkill(RecipeDB,56531,390,42702,3,25229,nil,2)
+	AddRecipe(56531,390,42702,3,2)
 	self:addTradeFlags(RecipeDB,56531,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,56531,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Crystal Citrine Necklace -- 58141
-	self:addTradeSkill(RecipeDB,58141,350,43244,1,25229,nil,2)
+	AddRecipe(58141,350,43244,1,2)
 	self:addTradeFlags(RecipeDB,58141,1,2,3,36,41,53,54,63)
 	self:addTradeAcquire(RecipeDB,58141,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Crystal Chalcedony Amulet -- 58142
-	self:addTradeSkill(RecipeDB,58142,350,43245,1,25229,nil,2)
+	AddRecipe(58142,350,43245,1,2)
 	self:addTradeFlags(RecipeDB,58142,1,2,3,36,41,51,63)
 	self:addTradeAcquire(RecipeDB,58142,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Earthshadow Ring -- 58143
-	self:addTradeSkill(RecipeDB,58143,370,43246,1,25229,nil,2)
+	AddRecipe(58143,370,43246,1,2)
 	self:addTradeFlags(RecipeDB,58143,1,2,3,37,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,58143,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Jade Ring of Slaying -- 58144
-	self:addTradeSkill(RecipeDB,58144,370,43247,1,25229,nil,2)
+	AddRecipe(58144,370,43247,1,2)
 	self:addTradeFlags(RecipeDB,58144,1,2,3,37,41,51,62)
 	self:addTradeAcquire(RecipeDB,58144,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Stoneguard Band -- 58145
-	self:addTradeSkill(RecipeDB,58145,390,43248,1,25229,nil,2)
+	AddRecipe(58145,390,43248,1,2)
 	self:addTradeFlags(RecipeDB,58145,1,2,3,36,41,52,62)
 	self:addTradeAcquire(RecipeDB,58145,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Shadowmight Ring -- 58146
-	self:addTradeSkill(RecipeDB,58146,390,43249,1,25229,nil,2)
+	AddRecipe(58146,390,43249,1,2)
 	self:addTradeFlags(RecipeDB,58146,1,2,3,36,41,62)
 	self:addTradeAcquire(RecipeDB,58146,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Ring of Earthen Might -- 58147
-	self:addTradeSkill(RecipeDB,58147,420,43250,3,25229,nil,2)
+	AddRecipe(58147,420,43250,3,2)
 	self:addTradeFlags(RecipeDB,58147,1,2,4,36,41,52,62)
 	self:addTradeAcquire(RecipeDB,58147,2,28721,2,33602)

 	-- Ring of Scarlet Shadows -- 58148
-	self:addTradeSkill(RecipeDB,58148,420,43251,3,25229,nil,2)
+	AddRecipe(58148,420,43251,3,2)
 	self:addTradeFlags(RecipeDB,58148,1,2,4,36,41,51,62)
 	self:addTradeAcquire(RecipeDB,58148,2,28721,2,33602)

 	-- Windfire Band -- 58149
-	self:addTradeSkill(RecipeDB,58149,420,43252,3,25229,nil,2)
+	AddRecipe(58149,420,43252,3,2)
 	self:addTradeFlags(RecipeDB,58149,1,2,4,36,41,62)
 	self:addTradeAcquire(RecipeDB,58149,2,28721,2,33602)

 	-- Ring of Northern Tears -- 58150
-	self:addTradeSkill(RecipeDB,58150,420,43253,3,25229,nil,2)
+	AddRecipe(58150,420,43253,3,2)
 	self:addTradeFlags(RecipeDB,58150,1,2,4,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,58150,2,28721,2,33602)

 	-- Savage Titanium Ring -- 58492
-	self:addTradeSkill(RecipeDB,58492,420,43482,3,25229,nil,2)
+	AddRecipe(58492,420,43482,3,2)
 	self:addTradeFlags(RecipeDB,58492,1,2,4,36,41,51,62)
 	self:addTradeAcquire(RecipeDB,58492,2,28721,2,33602)

 	-- Savage Titanium Band -- 58507
-	self:addTradeSkill(RecipeDB,58507,420,43498,3,25229,nil,2)
+	AddRecipe(58507,420,43498,3,2)
 	self:addTradeFlags(RecipeDB,58507,1,2,4,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,58507,2,28721,2,33602)

 	-- Titanium Frostguard Ring -- 58954
-	self:addTradeSkill(RecipeDB,58954,420,43582,4,25229,nil,2)
+	AddRecipe(58954,420,43582,4,2)
 	self:addTradeFlags(RecipeDB,58954,1,2,4,36,41,62)
 	self:addTradeAcquire(RecipeDB,58954,2,28721,2,33602)

 	-- Monarch Crab -- 59759
-	self:addTradeSkill(RecipeDB,59759,400,44063,1,25229,nil,2)
+	AddRecipe(59759,400,44063,1,2)
 	self:addTradeFlags(RecipeDB,59759,1,2,3,37,41,52,61)
 	self:addTradeAcquire(RecipeDB,59759,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Icy Prism -- 62242
-	self:addTradeSkill(RecipeDB,62242,425,44943,1,25229,nil,2)
+	AddRecipe(62242,425,44943,1,2)
 	self:addTradeFlags(RecipeDB,62242,1,2,3,37,41)
 	self:addTradeAcquire(RecipeDB,62242,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Shifting Twilight Opal -- 53963
-	self:addTradeSkill(RecipeDB,53963,380,40023,3,25229,nil,2)
+	AddRecipe(53963,380,40023,3,2)
 	self:addTradeFlags(RecipeDB,53963,1,2,4,36,41,51)
 	self:addTradeAcquire(RecipeDB,53963,2,28721,2,33602)

 	-- Subtle Scarlet Ruby -- 53948
-	self:addTradeSkill(RecipeDB,53948,380,40000,3,25229,nil,2)
+	AddRecipe(53948,380,40000,3,2)
 	self:addTradeFlags(RecipeDB,53948,1,2,4,36,41,52)
 	self:addTradeAcquire(RecipeDB,53948,2,28721,2,33602)

 	-- Emerald Choker -- 64725
-	self:addTradeSkill(RecipeDB,64725,420,45812,1,25229,nil,2)
+	AddRecipe(64725,420,45812,1,2)
 	self:addTradeFlags(RecipeDB,64725,1,2,3,36,41,51,63)
 	self:addTradeAcquire(RecipeDB,64725,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Runed Mana Band -- 64727
-	self:addTradeSkill(RecipeDB,64727,420,45808,1,25229,nil,2)
+	AddRecipe(64727,420,45808,1,2)
 	self:addTradeFlags(RecipeDB,64727,1,2,3,36,41,53,54,62)
 	self:addTradeAcquire(RecipeDB,64727,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Scarlet Signet -- 64728
-	self:addTradeSkill(RecipeDB,64728,420,45809,1,25229,nil,2)
+	AddRecipe(64728,420,45809,1,2)
 	self:addTradeFlags(RecipeDB,64728,1,2,3,36,41,51,62)
 	self:addTradeAcquire(RecipeDB,64728,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Sky Sapphire Amulet -- 64726
-	self:addTradeSkill(RecipeDB,64726,420,45813,1,25229,nil,2)
+	AddRecipe(64726,420,45813,1,2)
 	self:addTradeFlags(RecipeDB,64726,1,2,3,36,41,53,54,63)
 	self:addTradeAcquire(RecipeDB,64726,1,26915,1,26960,1,26982,1,26997,1,28701,1,33590)

 	-- Prismatic Black Diamond -- 62941
-	self:addTradeSkill(RecipeDB,62941,300,45054,1,25229,nil,2)
+	AddRecipe(62941,300,45054,1,2)
 	self:addTradeFlags(RecipeDB,62941,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,62941,1,26915,1,26960,1,26982,1,26997,1,28701,1,18751,1,33590,1,33614,1,19063,1,19539,1,18774,1,33680)

 	-- Amulet of Truesight -- 63743
-	self:addTradeSkill(RecipeDB,63743,200,45627,1,25229,nil,2)
+	AddRecipe(63743,200,45627,1,2)
 	self:addTradeFlags(RecipeDB,63743,1,2,3,36,41,51,63)
 	self:addTradeAcquire(RecipeDB,63743,1,26915,1,26960,1,26982,1,26997,1,28701,1,19778,1,15501,1,18751,1,33590,1,19775,1,33614,1,19063,1,19539,1,18774,1,33680)

 	-- Precise Cardinal Ruby -- 66450
-	self:addTradeSkill(RecipeDB,66450,450,40118,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66450,450,40118,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66450,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66450,2,19065,2,33637,2,33680,2,28701)

 	-- Runed Cardinal Ruby -- 66446
-	self:addTradeSkill(RecipeDB,66446,450,40113,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66446,450,40113,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66446,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66446,2,19065,2,33637,2,33680,2,28701)

 	-- Bright Cardinal Ruby -- 66449
-	self:addTradeSkill(RecipeDB,66449,450,40114,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66449,450,40114,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66449,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66449,2,19065,2,33637,2,33680,2,28701)

 	-- Flashing Cardinal Ruby -- 66453
-	self:addTradeSkill(RecipeDB,66453,450,40116,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66453,450,40116,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66453,1,2,4,37,41,52)
 	self:addTradeAcquire(RecipeDB,66453,2,19065,2,33637,2,33680,2,28701)

 	-- Fractured Cardinal Ruby -- 66451
-	self:addTradeSkill(RecipeDB,66451,450,40117,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66451,450,40117,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66451,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66451,2,19065,2,33637,2,33680,2,28701)

 	-- Bold Cardinal Ruby -- 66447
-	self:addTradeSkill(RecipeDB,66447,450,40111,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66447,450,40111,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66447,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66447,2,19065,2,33637,2,33680,2,28701)

 	-- Delicate Cardinal Ruby -- 66448
-	self:addTradeSkill(RecipeDB,66448,450,40112,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66448,450,40112,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66448,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66448,2,19065,2,33637,2,33680,2,28701)

 	-- Subtle Cardinal Ruby -- 66452
-	self:addTradeSkill(RecipeDB,66452,450,40115,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66452,450,40115,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66452,1,2,4,37,41,52)
 	self:addTradeAcquire(RecipeDB,66452,2,19065,2,33637,2,33680,2,28701)

 	-- Sparkling Majestic Zircon -- 66498
-	self:addTradeSkill(RecipeDB,66498,450,40120,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66498,450,40120,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66498,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66498,2,19065,2,33637,2,33680,2,28701)

 	-- Lustrous Majestic Zircon -- 66500
-	self:addTradeSkill(RecipeDB,66500,450,40121,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66500,450,40121,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66500,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66500,2,19065,2,33637,2,33680,2,28701)

 	-- Stormy Majestic Zircon -- 66499
-	self:addTradeSkill(RecipeDB,66499,450,40122,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66499,450,40122,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66499,1,2,4,37,41,54)
 	self:addTradeAcquire(RecipeDB,66499,2,19065,2,33637,2,33680,2,28701)

 	-- Solid Majestic Zircon -- 66497
-	self:addTradeSkill(RecipeDB,66497,450,40119,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66497,450,40119,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66497,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,66497,2,19065,2,33637,2,33680,2,28701)

 	-- Brilliant King's Amber -- 66503
-	self:addTradeSkill(RecipeDB,66503,450,40123,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66503,450,40123,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66503,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,66503,2,19065,2,33637,2,33680,2,28701)

 	-- Rigid King's Amber -- 66501
-	self:addTradeSkill(RecipeDB,66501,450,40125,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66501,450,40125,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66501,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,66501,2,19065,2,33637,2,33680,2,28701)

 	-- Thick King's Amber -- 66504
-	self:addTradeSkill(RecipeDB,66504,450,40126,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66504,450,40126,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66504,1,2,4,37,41,52)
 	self:addTradeAcquire(RecipeDB,66504,2,19065,2,33637,2,33680,2,28701)

 	-- Mystic King's Amber -- 66505
-	self:addTradeSkill(RecipeDB,66505,450,40127,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66505,450,40127,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66505,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,66505,2,19065,2,33637,2,33680,2,28701)

 	-- Smooth King's Amber -- 66502
-	self:addTradeSkill(RecipeDB,66502,450,40124,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66502,450,40124,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66502,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,66502,2,19065,2,33637,2,33680,2,28701)

 	-- Quick King's Amber -- 66506
-	self:addTradeSkill(RecipeDB,66506,450,40128,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66506,450,40128,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66506,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,66506,2,19065,2,33637,2,33680,2,28701)

 	-- Sovereign Dreadstone -- 66554
-	self:addTradeSkill(RecipeDB,66554,450,40129,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66554,450,40129,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66554,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66554,2,19065,2,33637,2,33680,2,28701)

 	-- Shifting Dreadstone -- 66557
-	self:addTradeSkill(RecipeDB,66557,450,40130,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66557,450,40130,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66557,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66557,2,19065,2,33637,2,33680,2,28701)

 	-- Glowing Dreadstone -- 66555
-	self:addTradeSkill(RecipeDB,66555,450,40132,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66555,450,40132,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66555,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66555,2,19065,2,33637,2,33680,2,28701)

 	-- Purified Dreadstone -- 66556
-	self:addTradeSkill(RecipeDB,66556,450,40133,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66556,450,40133,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66556,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66556,2,19065,2,33637,2,33680,2,28701)

 	-- Guardian's Dreadstone -- 66561
-	self:addTradeSkill(RecipeDB,66561,450,40141,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66561,450,40141,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66561,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66561,2,19065,2,33637,2,33680,2,28701)

 	-- Puissant Dreadstone -- 66563
-	self:addTradeSkill(RecipeDB,66563,450,40140,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66563,450,40140,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66563,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66563,2,19065,2,33637,2,33680,2,28701)

 	-- Regal Dreadstone -- 66559
-	self:addTradeSkill(RecipeDB,66559,450,40138,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66559,450,40138,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66559,1,2,4,37,41,52)
 	self:addTradeAcquire(RecipeDB,66559,2,19065,2,33637,2,33680,2,28701)

 	-- Balanced Dreadstone -- 66553
-	self:addTradeSkill(RecipeDB,66553,450,40136,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66553,450,40136,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66553,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66553,2,19065,2,33637,2,33680,2,28701)

 	-- Infused Dreadstone -- 66564
-	self:addTradeSkill(RecipeDB,66564,450,40137,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66564,450,40137,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66564,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66564,2,19065,2,33637,2,33680,2,28701)

 	-- Royal Dreadstone -- 66558
-	self:addTradeSkill(RecipeDB,66558,450,40134,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66558,450,40134,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66558,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66558,2,19065,2,33637,2,33680,2,28701)

 	-- Tenuous Dreadstone -- 66565
-	self:addTradeSkill(RecipeDB,66565,450,40131,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66565,450,40131,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66565,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66565,2,19065,2,33637,2,33680,2,28701)

 	-- Mysterious Dreadstone -- 66562
-	self:addTradeSkill(RecipeDB,66562,450,40135,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66562,450,40135,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66562,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66562,2,19065,2,33637,2,33680,2,28701)

 	-- Defender's Dreadstone -- 66560
-	self:addTradeSkill(RecipeDB,66560,450,40139,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66560,450,40139,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66560,1,2,4,37,41,52)
 	self:addTradeAcquire(RecipeDB,66560,2,19065,2,33637,2,33680,2,28701)

 	-- Etched Ametrine -- 66572
-	self:addTradeSkill(RecipeDB,66572,450,40143,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66572,450,40143,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66572,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66572,2,19065,2,33637,2,33680,2,28701)

 	-- Champion's Ametrine -- 66579
-	self:addTradeSkill(RecipeDB,66579,450,40144,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66579,450,40144,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66579,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66579,2,19065,2,33637,2,33680,2,28701)

 	-- Fierce Ametrine -- 66583
-	self:addTradeSkill(RecipeDB,66583,450,40146,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66583,450,40146,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66583,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66583,2,19065,2,33637,2,33680,2,28701)

 	-- Deadly Ametrine -- 66568
-	self:addTradeSkill(RecipeDB,66568,450,40147,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66568,450,40147,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66568,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66568,2,19065,2,33637,2,33680,2,28701)

 	-- Luminous Ametrine -- 66566
-	self:addTradeSkill(RecipeDB,66566,450,40151,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66566,450,40151,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66566,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66566,2,19065,2,33637,2,33680,2,28701)

 	-- Reckless Ametrine -- 66574
-	self:addTradeSkill(RecipeDB,66574,450,40155,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66574,450,40155,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66574,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66574,2,19065,2,33637,2,33680,2,28701)

 	-- Wicked Ametrine -- 66577
-	self:addTradeSkill(RecipeDB,66577,450,40156,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66577,450,40156,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66577,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66577,2,19065,2,33637,2,33680,2,28701)

 	-- Empowered Ametrine -- 66580
-	self:addTradeSkill(RecipeDB,66580,450,40158,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66580,450,40158,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66580,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66580,2,19065,2,33637,2,33680,2,28701)

 	-- Glinting Ametrine -- 66575
-	self:addTradeSkill(RecipeDB,66575,450,40148,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66575,450,40148,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66575,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66575,2,19065,2,33637,2,33680,2,28701)

 	-- Deft Ametrine -- 66584
-	self:addTradeSkill(RecipeDB,66584,450,40150,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66584,450,40150,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66584,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66584,2,19065,2,33637,2,33680,2,28701)

 	-- Potent Ametrine -- 66569
-	self:addTradeSkill(RecipeDB,66569,450,40152,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66569,450,40152,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66569,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66569,2,19065,2,33637,2,33680,2,28701)

 	-- Durable Ametrine -- 66571
-	self:addTradeSkill(RecipeDB,66571,450,40154,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66571,450,40154,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66571,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66571,2,19065,2,33637,2,33680,2,28701)

 	-- Stark Ametrine -- 66587
-	self:addTradeSkill(RecipeDB,66587,450,40159,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66587,450,40159,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66587,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66587,2,19065,2,33637,2,33680,2,28701)

 	-- Stalwart Ametrine -- 66581
-	self:addTradeSkill(RecipeDB,66581,450,40160,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66581,450,40160,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66581,1,2,4,37,41,52)
 	self:addTradeAcquire(RecipeDB,66581,2,19065,2,33637,2,33680,2,28701)

 	-- Accurate Ametrine -- 66576
-	self:addTradeSkill(RecipeDB,66576,450,40162,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66576,450,40162,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66576,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66576,2,19065,2,33637,2,33680,2,28701)

 	-- Resolute Ametrine -- 66586
-	self:addTradeSkill(RecipeDB,66586,450,40163,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66586,450,40163,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66586,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66586,2,19065,2,33637,2,33680,2,28701)

 	-- Inscribed Ametrine -- 66567
-	self:addTradeSkill(RecipeDB,66567,450,40142,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66567,450,40142,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66567,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66567,2,19065,2,33637,2,33680,2,28701)

 	-- Resplendent Ametrine -- 66582
-	self:addTradeSkill(RecipeDB,66582,450,40145,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66582,450,40145,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66582,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66582,2,19065,2,33637,2,33680,2,28701)

 	-- Lucent Ametrine -- 66585
-	self:addTradeSkill(RecipeDB,66585,450,40149,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66585,450,40149,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66585,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66585,2,19065,2,33637,2,33680,2,28701)

 	-- Veiled Ametrine -- 66570
-	self:addTradeSkill(RecipeDB,66570,450,40153,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66570,450,40153,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66570,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66570,2,19065,2,33637,2,33680,2,28701)

 	-- Pristine Ametrine -- 66573
-	self:addTradeSkill(RecipeDB,66573,450,40157,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66573,450,40157,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66573,1,2,4,37,41,51)
 	self:addTradeAcquire(RecipeDB,66573,2,19065,2,33637,2,33680,2,28701)

 	-- Glimmering Ametrine -- 66578
-	self:addTradeSkill(RecipeDB,66578,450,40161,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66578,450,40161,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66578,1,2,4,37,41,52)
 	self:addTradeAcquire(RecipeDB,66578,2,19065,2,33637,2,33680,2,28701)

 	-- Misty Eye of Zul -- 66435
-	self:addTradeSkill(RecipeDB,66435,450,40171,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66435,450,40171,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66435,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66435,2,19065,2,33637,2,33680,2,28701)

 	-- Shining Eye of Zul -- 66437
-	self:addTradeSkill(RecipeDB,66437,450,40172,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66437,450,40172,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66437,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66437,2,19065,2,33637,2,33680,2,28701)

 	-- Turbid Eye of Zul -- 66445
-	self:addTradeSkill(RecipeDB,66445,450,40173,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66445,450,40173,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66445,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66445,2,19065,2,33637,2,33680,2,28701)

 	-- Intricate Eye of Zul -- 66440
-	self:addTradeSkill(RecipeDB,66440,450,40174,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66440,450,40174,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66440,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66440,2,19065,2,33637,2,33680,2,28701)

 	-- Sundered Eye of Zul -- 66436
-	self:addTradeSkill(RecipeDB,66436,450,40176,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66436,450,40176,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66436,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66436,2,19065,2,33637,2,33680,2,28701)

 	-- Lambent Eye of Zul -- 66439
-	self:addTradeSkill(RecipeDB,66439,450,40177,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66439,450,40177,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66439,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66439,2,19065,2,33637,2,33680,2,28701)

 	-- Opaque Eye of Zul -- 66444
-	self:addTradeSkill(RecipeDB,66444,450,40178,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66444,450,40178,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66444,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66444,2,19065,2,33637,2,33680,2,28701)

 	-- Radiant Eye of Zul -- 66441
-	self:addTradeSkill(RecipeDB,66441,450,40180,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66441,450,40180,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66441,1,2,4,37,41,54)
 	self:addTradeAcquire(RecipeDB,66441,2,19065,2,33637,2,33680,2,28701)

 	-- Tense Eye of Zul -- 66438
-	self:addTradeSkill(RecipeDB,66438,450,40181,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66438,450,40181,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66438,1,2,4,37,41,54)
 	self:addTradeAcquire(RecipeDB,66438,2,19065,2,33637,2,33680,2,28701)

 	-- Shattered Eye of Zul -- 66443
-	self:addTradeSkill(RecipeDB,66443,450,40182,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66443,450,40182,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66443,1,2,4,37,41,54)
 	self:addTradeAcquire(RecipeDB,66443,2,19065,2,33637,2,33680,2,28701)

 	-- Vivid Eye of Zul -- 66429
-	self:addTradeSkill(RecipeDB,66429,450,40166,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66429,450,40166,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66429,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,66429,2,19065,2,33637,2,33680,2,28701)

 	-- Enduring Eye of Zul -- 66338
-	self:addTradeSkill(RecipeDB,66338,450,40167,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66338,450,40167,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66338,1,2,4,37,41,52)
 	self:addTradeAcquire(RecipeDB,66338,2,19065,2,33637,2,33680,2,28701)

 	-- Steady Eye of Zul -- 66428
-	self:addTradeSkill(RecipeDB,66428,450,40168,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66428,450,40168,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66428,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,66428,2,19065,2,33637,2,33680,2,28701)

 	-- Forceful Eye of Zul -- 66434
-	self:addTradeSkill(RecipeDB,66434,450,40169,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66434,450,40169,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66434,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,66434,2,19065,2,33637,2,33680,2,28701)

 	-- Energized Eye of Zul -- 66442
-	self:addTradeSkill(RecipeDB,66442,450,40179,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66442,450,40179,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66442,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66442,2,19065,2,33637,2,33680,2,28701)

 	-- Timeless Eye of Zul -- 66432
-	self:addTradeSkill(RecipeDB,66432,450,40164,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66432,450,40164,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66432,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,66432,2,19065,2,33637,2,33680,2,28701)

 	-- Dazzling Eye of Zul -- 66430
-	self:addTradeSkill(RecipeDB,66430,450,40175,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66430,450,40175,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66430,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66430,2,19065,2,33637,2,33680,2,28701)

 	-- Jagged Eye of Zul -- 66431
-	self:addTradeSkill(RecipeDB,66431,450,40165,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66431,450,40165,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66431,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,66431,2,19065,2,33637,2,33680,2,28701)

 	-- Seer's Eye of Zul -- 66433
-	self:addTradeSkill(RecipeDB,66433,450,40170,2,25229,nil,2,450,450,450,450)
+	AddRecipe(66433,450,40170,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,66433,1,2,4,37,41,53,54)
 	self:addTradeAcquire(RecipeDB,66433,2,19065,2,33637,2,33680,2,28701)

 	-- Nightmare Tear -- 68253
-	self:addTradeSkill(RecipeDB,68253,450,49110,2,25229,nil,2,450,450,450,450)
+	AddRecipe(68253,450,49110,2,2,450,450,450,450)
 	self:addTradeFlags(RecipeDB,68253,1,2,4,37,41)
 	self:addTradeAcquire(RecipeDB,68253,2,19065,2,33637,2,33680,2,28701)

-	return 554
+	return num_recipes

 end
diff --git a/RecipeDB/ARL-Leatherwork.lua b/RecipeDB/ARL-Leatherwork.lua
index a597b46..8b27acd 100644
--- a/RecipeDB/ARL-Leatherwork.lua
+++ b/RecipeDB/ARL-Leatherwork.lua
@@ -1,42 +1,22 @@
---[[
-
-************************************************************************
-
-ARL-Leatherwork.lua
-
-Leatherworking data for all of Ackis Recipe List
-
-************************************************************************
-
-File date: @file-date-iso@
-File revision: @file-revision@
-Project revision: @project-revision@
-Project version: @project-version@
-
-************************************************************************
-
-Format:
-
-	self:addTradeSkill(RecipeDB, SpellID, SkillLevel, ItemID, Rarity,
-	Profession, Specialty, Game, Orange, Yellow, Green, Grey)
-
-
-************************************************************************
-
-Please see http://www.wowace.com/projects/arl/for more information.
-
-License:
-	Please see LICENSE.txt
-
-This source code is released under All Rights Reserved.
-
-************************************************************************
-
-]]--
+--------------------------------------------------------------------------------------------------------------------
+-- ARL-Leatherwork.lua
+-- Leatherworking data for all of Ackis Recipe List
+--------------------------------------------------------------------------------------------------------------------
+-- File date: @file-date-iso@
+-- File revision: @file-revision@
+-- Project revision: @project-revision@
+-- Project version: @project-version@
+--------------------------------------------------------------------------------------------------------------------
+-- Please see http://www.wowace.com/projects/arl/for more information.
+--------------------------------------------------------------------------------------------------------------------
+-- License:
+-- Please see LICENSE.txt
+-- This source code is released under All Rights Reserved.
+--------------------------------------------------------------------------------------------------------------------

-local MODNAME		= "Ackis Recipe List"
-local addon		= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
-local L			= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
+local MODNAME = "Ackis Recipe List"
+local addon	= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
+local L	= LibStub("AceLocale-3.0"):GetLocale(MODNAME)

 --------------------------------------------------------------------------------------------------------------------
 -- Item "rarity"
@@ -61,57 +41,41 @@ local F_1H, F_2H, F_AXE, F_SWORD, F_MACE, F_POLEARM, F_DAGGER = 66, 67, 68, 69,
 local F_STAFF, F_WAND, F_THROWN, F_BOW, F_XBOW, F_AMMO, F_FIST, F_GUN = 73, 74, 75, 76, 77, 78, 79, 80

 --------------------------------------------------------------------------------------------------------------------
--- Reputation Filter flags
---------------------------------------------------------------------------------------------------------------------
-local F_ARGENTDAWN, F_CENARION_CIRCLE, F_THORIUM_BROTHERHOOD, F_TIMBERMAW_HOLD, F_ZANDALAR = 96, 97, 98, 99, 100
-local F_ALDOR, F_ASHTONGUE, F_CENARION_EXPEDITION, F_HELLFIRE, F_CONSORTIUM = 101, 102, 103, 104, 105
-local F_KOT, F_LOWERCITY, F_NAGRAND, F_SCALE_SANDS, F_SCRYER, F_SHATAR = 106, 107, 108, 109, 110
-local F_SHATTEREDSUN, F_SPOREGGAR, F_VIOLETEYE = 111, 112, 113, 114
-local F_ARGENTCRUSADE, F_FRENZYHEART, F_EBONBLADE, F_KIRINTOR, F_HODIR = 115, 116, 117, 118, 119
-local F_KALUAK, F_ORACLES, F_WYRMREST, F_WRATHCOMMON1, F_WRATHCOMMON2 = 120, 121, 122, 123, 124
-local F_WRATHCOMMON3, F_WRATHCOMMON4, F_WRATHCOMMON5 = 125, 126, 127
-
---------------------------------------------------------------------------------------------------------------------
 -- Acquire types
 --------------------------------------------------------------------------------------------------------------------
 local A_TRAINER, A_VENDOR, A_MOB, A_QUEST, A_SEASONAL, A_REPUTATION, A_WORLD_DROP, A_CUSTOM = 1, 2, 3, 4, 5, 6, 7, 8

---------------------------------------------------------------------------------------------------------------------
--- Reputation Acquire Flags
---------------------------------------------------------------------------------------------------------------------
-local R_WINTERSPRING = 589
-
---------------------------------------------------------------------------------------------------------------------
--- Reputation Levels
---------------------------------------------------------------------------------------------------------------------
-local FRIENDLY = 1
-local HONORED = 2
-local REVERED = 3
-local EXALTED = 4
-
-
-local initialized	= false
+local initialized = false
+local num_recipes = 0

 function addon:InitLeatherworking(RecipeDB)

 	if initialized then
-		return
+		return num_recipes
 	end

 	initialized = true

+	--------------------------------------------------------------------------------------------------------------------
+	-- Counter and wrapper function
+	--------------------------------------------------------------------------------------------------------------------
+	local function AddRecipe(SpellID, Skill, ItemID, Rarity, Game, Orange, Yellow, Green, Gray, Speciality)
+		num_recipes = num_recipes + 1
+		self:addTradeSkill(RecipeDB, SpellID, Skill, ItemID, Rarity, 2108, Speciality, Game, Orange, Yellow, Green, Gray)
+	end
+
 	-- Handstitched Leather Boots -- 2149
-	self:addTradeSkill(RecipeDB,2149,10,2302,1,2108,nil,GAME_ORIG,1,40,55,70)
+	AddRecipe(2149,10,2302,1,GAME_ORIG,1,40,55,70)
 	self:addTradeFlags(RecipeDB,2149,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,2149,8,8)

 	-- Light Armor Kit -- 2152
-	self:addTradeSkill(RecipeDB,2152,1,2304,1,2108,nil,GAME_ORIG,1,30,45,60)
+	AddRecipe(2152,1,2304,1,GAME_ORIG,1,30,45,60)
 	self:addTradeFlags(RecipeDB,2152,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,2152,8,8)

 	-- Handstitched Leather Pants -- 2153
-	self:addTradeSkill(RecipeDB,2153,15,2303,1,2108,nil,GAME_ORIG,15,45,60,75)
+	AddRecipe(2153,15,2303,1,GAME_ORIG,15,45,60,75)
 	self:addTradeFlags(RecipeDB,2153,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,2153,1,1632,1,3007,1,3069,1,3365,1,3549,
 	1,3605,1,3703,1,4212,1,4588,1,5127,1,5564,1,5784,1,
@@ -119,19 +83,19 @@ function addon:InitLeatherworking(RecipeDB)
 	1,1385,1,3967,1,33612,1,33635,1,33681,1,8153)

 	-- Fine Leather Boots -- 2158
-	self:addTradeSkill(RecipeDB,2158,90,2307,2,2108,nil,GAME_ORIG,90,120,135,150)
+	AddRecipe(2158,90,2307,2,GAME_ORIG,90,120,135,150)
 	self:addTradeFlags(RecipeDB,2158,1,2,10,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,2158,7,2)

 	-- Fine Leather Cloak -- 2159
-	self:addTradeSkill(RecipeDB,2159,85,2308,1,2108,nil,GAME_ORIG,85,105,120,135)
+	AddRecipe(2159,85,2308,1,GAME_ORIG,85,105,120,135)
 	self:addTradeFlags(RecipeDB,2159,1,2,3,36,41,60)
 	self:addTradeAcquire(RecipeDB,2159,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1
 	,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,8153,1,17442,1,16278,1,3605)

 	-- Embossed Leather Vest -- 2160
-	self:addTradeSkill(RecipeDB,2160,40,2300,1,2108,nil,GAME_ORIG,40,70,85,100)
+	AddRecipe(2160,40,2300,1,GAME_ORIG,40,70,85,100)
 	self:addTradeFlags(RecipeDB,2160,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,2160,1,1632,1,3007,1,3069,1,3365,1,3549
 	,1,3605,1,3703,1,4212,1,4588,1,5127,1,5564,1,5784,1,
@@ -139,7 +103,7 @@ function addon:InitLeatherworking(RecipeDB)
 	,1,1385,1,3967,1,33612,1,33635,1,33681,1,8153)

 	-- Embossed Leather Boots -- 2161
-	self:addTradeSkill(RecipeDB,2161,55,2309,1,2108,nil,GAME_ORIG,55,85,100,115)
+	AddRecipe(2161,55,2309,1,GAME_ORIG,55,85,100,115)
 	self:addTradeFlags(RecipeDB,2161,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,2161,1,1632,1,3007,1,3069,1,3365,1,3549
 	,1,3605,1,3703,1,3967,1,4212,1,4588,1,5127,1,5564,1,5784,1,
@@ -147,7 +111,7 @@ function addon:InitLeatherworking(RecipeDB)
 	,1,21087,1,1385,1,33612,1,33635,1,33681,1,8153)

 	-- Embossed Leather Cloak -- 2162
-	self:addTradeSkill(RecipeDB,2162,60,2310,1,2108,nil,GAME_ORIG,60,90,105,120)
+	AddRecipe(2162,60,2310,1,GAME_ORIG,60,90,105,120)
 	self:addTradeFlags(RecipeDB,2162,1,2,3,36,41,51,60)
 	self:addTradeAcquire(RecipeDB,2162,1,1632,1,3007,1,3069,1,3365,1,3549
 	,1,3605,1,3703,1,3967,1,4212,1,4588,1,5127,1,5564,1,5784,1,
@@ -155,55 +119,55 @@ function addon:InitLeatherworking(RecipeDB)
 	,1,21087,1,1385,1,33612,1,33635,1,33681,1,8153)

 	-- White Leather Jerkin -- 2163
-	self:addTradeSkill(RecipeDB,2163,60,2311,2,2108,nil,GAME_ORIG,60,90,105,120)
+	AddRecipe(2163,60,2311,2,GAME_ORIG,60,90,105,120)
 	self:addTradeFlags(RecipeDB,2163,1,2,10,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,2163,7,2)

 	-- Fine Leather Gloves -- 2164
-	self:addTradeSkill(RecipeDB,2164,75,2312,2,2108,nil,GAME_ORIG,75,105,120,135)
+	AddRecipe(2164,75,2312,2,GAME_ORIG,75,105,120,135)
 	self:addTradeFlags(RecipeDB,2164,1,2,10,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,2164,7,2)

 	-- Medium Armor Kit -- 2165
-	self:addTradeSkill(RecipeDB,2165,100,2313,1,2108,nil,GAME_ORIG,100,115,122,130)
+	AddRecipe(2165,100,2313,1,GAME_ORIG,100,115,122,130)
 	self:addTradeFlags(RecipeDB,2165,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,2165,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,5127,1,
 	5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1,1632,1
 	,5784,1,1385,1,3549,1,33612,1,33635,1,33681,1,8153,1,17442,1,16278,1,3605)

 	-- Toughened Leather Armor -- 2166
-	self:addTradeSkill(RecipeDB,2166,120,2314,1,2108,nil,GAME_ORIG,120,145,157,170)
+	AddRecipe(2166,120,2314,1,GAME_ORIG,120,145,157,170)
 	self:addTradeFlags(RecipeDB,2166,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,2166,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,8153,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,
 	21087,1,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,17442,1,16278,1,3605)

 	-- Dark Leather Boots -- 2167
-	self:addTradeSkill(RecipeDB,2167,100,2315,1,2108,nil,GAME_ORIG,100,125,137,150)
+	AddRecipe(2167,100,2315,1,GAME_ORIG,100,125,137,150)
 	self:addTradeFlags(RecipeDB,2167,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,2167,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1
 	,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,8153,1,17442,1,16278,1,3605)

 	-- Dark Leather Cloak -- 2168
-	self:addTradeSkill(RecipeDB,2168,110,2316,1,2108,nil,GAME_ORIG,110,135,147,160)
+	AddRecipe(2168,110,2316,1,GAME_ORIG,110,135,147,160)
 	self:addTradeFlags(RecipeDB,2168,1,2,3,36,41,51,60)
 	self:addTradeAcquire(RecipeDB,2168,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1
 	,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,8153,1,17442,1,16278,1,3605)

 	-- Dark Leather Tunic -- 2169
-	self:addTradeSkill(RecipeDB,2169,100,2317,2,2108,nil,GAME_ORIG,100,125,137,150)
+	AddRecipe(2169,100,2317,2,GAME_ORIG,100,125,137,150)
 	self:addTradeFlags(RecipeDB,2169,1,2,10,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,2169,7,2)

 	-- Light Leather -- 2881
-	self:addTradeSkill(RecipeDB,2881,1,2318,1,2108,nil,GAME_ORIG,1,20,30,40)
+	AddRecipe(2881,1,2318,1,GAME_ORIG,1,20,30,40)
 	self:addTradeFlags(RecipeDB,2881,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,2881,8,8)

 	-- Handstitched Leather Belt -- 3753
-	self:addTradeSkill(RecipeDB,3753,25,4237,1,2108,nil,GAME_ORIG,25,55,70,85)
+	AddRecipe(3753,25,4237,1,GAME_ORIG,25,55,70,85)
 	self:addTradeFlags(RecipeDB,3753,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,3753,1,1385,1,1632,1,3007,1,3069,1,3365
 	,1,3549,1,3605,1,3703,1,4212,1,4588,1,5127,1,5564,1,5784,1,
@@ -211,7 +175,7 @@ function addon:InitLeatherworking(RecipeDB)
 	,1,21087,1,3967,1,33612,1,33635,1,33681,1,8153)

 	-- Embossed Leather Gloves -- 3756
-	self:addTradeSkill(RecipeDB,3756,55,4239,1,2108,nil,GAME_ORIG,55,85,100,115)
+	AddRecipe(3756,55,4239,1,GAME_ORIG,55,85,100,115)
 	self:addTradeFlags(RecipeDB,3756,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,3756,1,1632,1,3007,1,3069,1,3365,1,3549
 	,1,3605,1,3703,1,3967,1,4212,1,4588,1,5127,1,5564,1,5784,1,
@@ -219,7 +183,7 @@ function addon:InitLeatherworking(RecipeDB)
 	,1,21087,1,1385,1,33635,1,33612,1,33681,1,8153)

 	-- Embossed Leather Pants -- 3759
-	self:addTradeSkill(RecipeDB,3759,75,4242,1,2108,nil,GAME_ORIG,75,105,120,135)
+	AddRecipe(3759,75,4242,1,GAME_ORIG,75,105,120,135)
 	self:addTradeFlags(RecipeDB,3759,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,3759,1,1385,1,1632,1,3007,1,3069,1,3365
 	,1,3549,1,3605,1,3703,1,3967,1,4212,1,4588,1,5127,1,5564,1,5784,1,
@@ -227,132 +191,132 @@ function addon:InitLeatherworking(RecipeDB)
 	,1,19187,1,21087,1,33635,1,33612,1,33681,1,8153)

 	-- Hillman's Cloak -- 3760
-	self:addTradeSkill(RecipeDB,3760,150,3719,1,2108,nil,GAME_ORIG,150,170,180,190)
+	AddRecipe(3760,150,3719,1,GAME_ORIG,150,170,180,190)
 	self:addTradeFlags(RecipeDB,3760,1,2,3,36,41,53,54,60)
 	self:addTradeAcquire(RecipeDB,3760,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,8153,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,
 	21087,1,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,17442,1,16278,1,3605)

 	-- Fine Leather Tunic -- 3761
-	self:addTradeSkill(RecipeDB,3761,85,4243,1,2108,nil,GAME_ORIG,85,115,130,145)
+	AddRecipe(3761,85,4243,1,GAME_ORIG,85,115,130,145)
 	self:addTradeFlags(RecipeDB,3761,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,3761,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,5127,1,
 	5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1,1632,1
 	,5784,1,1385,1,3549,1,33635,1,33612,1,33681,1,8153,1,17442,1,16278,1,3605)

 	-- Hillman's Leather Vest -- 3762
-	self:addTradeSkill(RecipeDB,3762,100,4244,2,2108,nil,GAME_ORIG,100,125,137,150)
+	AddRecipe(3762,100,4244,2,GAME_ORIG,100,125,137,150)
 	self:addTradeFlags(RecipeDB,3762,1,2,10,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,3762,7,2)

 	-- Fine Leather Belt -- 3763
-	self:addTradeSkill(RecipeDB,3763,80,4246,1,2108,nil,GAME_ORIG,80,110,125,140)
+	AddRecipe(3763,80,4246,1,GAME_ORIG,80,110,125,140)
 	self:addTradeFlags(RecipeDB,3763,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,3763,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,5127,1,
 	5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1,1632,1
 	,5784,1,1385,1,3549,1,33635,1,33612,1,33681,1,8153,1,17442,1,16278,1,3605)

 	-- Hillman's Leather Gloves -- 3764
-	self:addTradeSkill(RecipeDB,3764,145,4247,1,2108,nil,GAME_ORIG,145,170,182,195)
+	AddRecipe(3764,145,4247,1,GAME_ORIG,145,170,182,195)
 	self:addTradeFlags(RecipeDB,3764,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,3764,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,8153,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,
 	21087,1,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,17442,1,16278,1,3605)

 	-- Dark Leather Gloves -- 3765
-	self:addTradeSkill(RecipeDB,3765,120,4248,2,2108,nil,GAME_ORIG,120,155,167,180)
+	AddRecipe(3765,120,4248,2,GAME_ORIG,120,155,167,180)
 	self:addTradeFlags(RecipeDB,3765,1,2,10,36,40,57)
 	self:addTradeAcquire(RecipeDB,3765,7,2)

 	-- Dark Leather Belt -- 3766
-	self:addTradeSkill(RecipeDB,3766,125,4249,1,2108,nil,GAME_ORIG,125,150,162,175)
+	AddRecipe(3766,125,4249,1,GAME_ORIG,125,150,162,175)
 	self:addTradeFlags(RecipeDB,3766,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,3766,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,8153,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,
 	21087,1,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,16278,1,3605)

 	-- Hillman's Belt -- 3767
-	self:addTradeSkill(RecipeDB,3767,120,4250,2,2108,nil,GAME_ORIG,120,145,157,170)
+	AddRecipe(3767,120,4250,2,GAME_ORIG,120,145,157,170)
 	self:addTradeFlags(RecipeDB,3767,1,2,10,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,3767,7,2)

 	-- Hillman's Shoulders -- 3768
-	self:addTradeSkill(RecipeDB,3768,130,4251,1,2108,nil,GAME_ORIG,130,155,167,180)
+	AddRecipe(3768,130,4251,1,GAME_ORIG,130,155,167,180)
 	self:addTradeFlags(RecipeDB,3768,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,3768,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,8153,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,
 	21087,1,1632,1,5784,1,3549,1,33612,1,33635,1,17442,1,16278,1,3605)

 	-- Dark Leather Shoulders -- 3769
-	self:addTradeSkill(RecipeDB,3769,140,4252,2,2108,nil,GAME_ORIG,140,165,177,190)
+	AddRecipe(3769,140,4252,2,GAME_ORIG,140,165,177,190)
 	self:addTradeFlags(RecipeDB,3769,1,2,10,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,3769,7,2)

 	-- Toughened Leather Gloves -- 3770
-	self:addTradeSkill(RecipeDB,3770,135,4253,1,2108,nil,GAME_ORIG,135,160,172,185)
+	AddRecipe(3770,135,4253,1,GAME_ORIG,135,160,172,185)
 	self:addTradeFlags(RecipeDB,3770,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,3770,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,8153,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,
 	21087,1,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,17442,1,16278,1,3605)

 	-- Barbaric Gloves -- 3771
-	self:addTradeSkill(RecipeDB,3771,150,4254,2,2108,nil,GAME_ORIG,150,170,180,190)
+	AddRecipe(3771,150,4254,2,GAME_ORIG,150,170,180,190)
 	self:addTradeFlags(RecipeDB,3771,1,2,10,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,3771,7,2)

 	-- Green Leather Armor -- 3772
-	self:addTradeSkill(RecipeDB,3772,155,4255,1,2108,nil,GAME_ORIG,155,175,185,195)
+	AddRecipe(3772,155,4255,1,GAME_ORIG,155,175,185,195)
 	self:addTradeFlags(RecipeDB,3772,1,2,4,36,40,52,57)
 	self:addTradeAcquire(RecipeDB,3772,2,2679,2,2698)

 	-- Guardian Armor -- 3773
-	self:addTradeSkill(RecipeDB,3773,175,4256,2,2108,nil,GAME_ORIG,175,195,205,215)
+	AddRecipe(3773,175,4256,2,GAME_ORIG,175,195,205,215)
 	self:addTradeFlags(RecipeDB,3773,1,2,10,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,3773,7,2)

 	-- Green Leather Belt -- 3774
-	self:addTradeSkill(RecipeDB,3774,160,4257,1,2108,nil,GAME_ORIG,160,180,190,200)
+	AddRecipe(3774,160,4257,1,GAME_ORIG,160,180,190,200)
 	self:addTradeFlags(RecipeDB,3774,1,2,3,36,41,52,57)
 	self:addTradeAcquire(RecipeDB,3774,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187,
 	1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688,1,
 	33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Guardian Belt -- 3775
-	self:addTradeSkill(RecipeDB,3775,170,4258,3,2108,nil,GAME_ORIG,170,190,200,210)
+	AddRecipe(3775,170,4258,3,GAME_ORIG,170,190,200,210)
 	self:addTradeFlags(RecipeDB,3775,1,2,5,11,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,3775,7,3)

 	-- Green Leather Bracers -- 3776
-	self:addTradeSkill(RecipeDB,3776,180,4259,1,2108,nil,GAME_ORIG,180,200,210,220)
+	AddRecipe(3776,180,4259,1,GAME_ORIG,180,200,210,220)
 	self:addTradeFlags(RecipeDB,3776,1,2,3,36,41,52,57)
 	self:addTradeAcquire(RecipeDB,3776,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187,
 	1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688,1,
 	33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Guardian Leather Bracers -- 3777
-	self:addTradeSkill(RecipeDB,3777,195,4260,2,2108,nil,GAME_ORIG,195,215,225,235)
+	AddRecipe(3777,195,4260,2,GAME_ORIG,195,215,225,235)
 	self:addTradeFlags(RecipeDB,3777,1,2,10,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,3777,7,2)

 	-- Gem-studded Leather Belt -- 3778
-	self:addTradeSkill(RecipeDB,3778,185,4262,1,2108,nil,GAME_ORIG,185,205,215,225)
+	AddRecipe(3778,185,4262,1,GAME_ORIG,185,205,215,225)
 	self:addTradeFlags(RecipeDB,3778,1,2,4,36,40,57)
 	self:addTradeAcquire(RecipeDB,3778,2,2699)

 	-- Barbaric Belt -- 3779
-	self:addTradeSkill(RecipeDB,3779,200,4264,3,2108,nil,GAME_ORIG,200,220,230,240)
+	AddRecipe(3779,200,4264,3,GAME_ORIG,200,220,230,240)
 	self:addTradeFlags(RecipeDB,3779,1,2,5,11,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,3779,7,2)

 	-- Heavy Armor Kit -- 3780
-	self:addTradeSkill(RecipeDB,3780,150,4265,1,2108,nil,GAME_ORIG,150,170,180,190)
+	AddRecipe(3780,150,4265,1,GAME_ORIG,150,170,180,190)
 	self:addTradeFlags(RecipeDB,3780,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3780,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,8153,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,
 	21087,1,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,17442,1,16278,1,3605)

 	-- Cured Light Hide -- 3816
-	self:addTradeSkill(RecipeDB,3816,35,4231,1,2108,nil,GAME_ORIG,35,55,65,75)
+	AddRecipe(3816,35,4231,1,GAME_ORIG,35,55,65,75)
 	self:addTradeFlags(RecipeDB,3816,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3816,1,1632,1,3007,1,3069,1,3365,1,3549
 	,1,3605,1,3703,1,4212,1,4588,1,5127,1,5564,1,5784,1,
@@ -360,136 +324,136 @@ function addon:InitLeatherworking(RecipeDB)
 	,1,1385,1,3967,1,33612,1,33635,1,33681,1,8153)

 	-- Cured Medium Hide -- 3817
-	self:addTradeSkill(RecipeDB,3817,100,4233,1,2108,nil,GAME_ORIG,100,115,122,130)
+	AddRecipe(3817,100,4233,1,GAME_ORIG,100,115,122,130)
 	self:addTradeFlags(RecipeDB,3817,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3817,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,5127,1,
 	5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1,1632,1
 	,5784,1,1385,1,3549,1,33612,1,33635,1,33681,1,8153,1,17442,1,16278,1,3605)

 	-- Cured Heavy Hide -- 3818
-	self:addTradeSkill(RecipeDB,3818,150,4236,1,2108,nil,GAME_ORIG,150,160,165,170)
+	AddRecipe(3818,150,4236,1,GAME_ORIG,150,160,165,170)
 	self:addTradeFlags(RecipeDB,3818,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3818,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,8153,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,
 	21087,1,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,17442,1,16278,1,3605)

 	-- Raptor Hide Belt -- 4097
-	self:addTradeSkill(RecipeDB,4097,165,4456,2,2108,nil,GAME_ORIG,165,185,195,205)
+	AddRecipe(4097,165,4456,2,GAME_ORIG,165,185,195,205)
 	self:addTradeFlags(RecipeDB,4097,1,4,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,4097,2,2816)

 	-- Kodo Hide Bag -- 5244
-	self:addTradeSkill(RecipeDB,5244,40,5081,2,2108,nil,GAME_ORIG,40,70,85,100)
+	AddRecipe(5244,40,5081,2,GAME_ORIG,40,70,85,100)
 	self:addTradeFlags(RecipeDB,5244,2,8,36,40)
 	self:addTradeAcquire(RecipeDB,5244,4,769)

 	-- Barbaric Harness -- 6661
-	self:addTradeSkill(RecipeDB,6661,190,5739,1,2108,nil,GAME_ORIG,190,210,220,230)
+	AddRecipe(6661,190,5739,1,GAME_ORIG,190,210,220,230)
 	self:addTradeFlags(RecipeDB,6661,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,6661,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187,
 	1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688,1,
 	33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Murloc Scale Belt -- 6702
-	self:addTradeSkill(RecipeDB,6702,90,5780,1,2108,nil,GAME_ORIG,90,120,135,150)
+	AddRecipe(6702,90,5780,1,GAME_ORIG,90,120,135,150)
 	self:addTradeFlags(RecipeDB,6702,1,2,4,5,11,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,6702,3,1732,3,3385,2,843,2,3556,2,4186)

 	-- Murloc Scale Breastplate -- 6703
-	self:addTradeSkill(RecipeDB,6703,95,5781,1,2108,nil,GAME_ORIG,95,125,140,155)
+	AddRecipe(6703,95,5781,1,GAME_ORIG,95,125,140,155)
 	self:addTradeFlags(RecipeDB,6703,1,2,4,5,11,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,6703,3,657,3,3386,2,843,2,3556,2,4186)

 	-- Thick Murloc Armor -- 6704
-	self:addTradeSkill(RecipeDB,6704,170,5782,2,2108,nil,GAME_ORIG,170,190,200,210)
+	AddRecipe(6704,170,5782,2,GAME_ORIG,170,190,200,210)
 	self:addTradeFlags(RecipeDB,6704,1,2,4,11,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,6704,3,938,3,1160,2,2381,2,2393)

 	-- Murloc Scale Bracers -- 6705
-	self:addTradeSkill(RecipeDB,6705,190,5783,2,2108,nil,GAME_ORIG,190,210,220,230)
+	AddRecipe(6705,190,5783,2,GAME_ORIG,190,210,220,230)
 	self:addTradeFlags(RecipeDB,6705,1,2,11,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,6705,3,2636,3,1561,2,4897)

 	-- Handstitched Leather Vest -- 7126
-	self:addTradeSkill(RecipeDB,7126,10,5957,1,2108,nil,GAME_ORIG,1,40,55,70)
+	AddRecipe(7126,10,5957,1,GAME_ORIG,1,40,55,70)
 	self:addTradeFlags(RecipeDB,7126,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,7126,8,8)

 	-- Fine Leather Pants -- 7133
-	self:addTradeSkill(RecipeDB,7133,105,5958,2,2108,nil,GAME_ORIG,105,130,142,155)
+	AddRecipe(7133,105,5958,2,GAME_ORIG,105,130,142,155)
 	self:addTradeFlags(RecipeDB,7133,1,2,10,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,7133,7,2)

 	-- Dark Leather Pants -- 7135
-	self:addTradeSkill(RecipeDB,7135,115,5961,1,2108,nil,GAME_ORIG,115,140,152,165)
+	AddRecipe(7135,115,5961,1,GAME_ORIG,115,140,152,165)
 	self:addTradeFlags(RecipeDB,7135,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,7135,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1
 	,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,8153,1,17442,1,16278,1,3605)

 	-- Guardian Pants -- 7147
-	self:addTradeSkill(RecipeDB,7147,160,5962,1,2108,nil,GAME_ORIG,160,180,190,200)
+	AddRecipe(7147,160,5962,1,GAME_ORIG,160,180,190,200)
 	self:addTradeFlags(RecipeDB,7147,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,7147,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187,
 	1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688,1,
 	33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Barbaric Leggings -- 7149
-	self:addTradeSkill(RecipeDB,7149,170,5963,1,2108,nil,GAME_ORIG,170,190,200,210)
+	AddRecipe(7149,170,5963,1,GAME_ORIG,170,190,200,210)
 	self:addTradeFlags(RecipeDB,7149,1,2,4,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,7149,2,2810,2,2821,2,3958,2,4877)

 	-- Barbaric Shoulders -- 7151
-	self:addTradeSkill(RecipeDB,7151,175,5964,1,2108,nil,GAME_ORIG,175,195,205,215)
+	AddRecipe(7151,175,5964,1,GAME_ORIG,175,195,205,215)
 	self:addTradeFlags(RecipeDB,7151,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,7151,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187,
 	1,21087,1,1632,1,5784,1,16728,1,1385,1,3549,1,3365,1,3967,1,3703,1,33612,1,33635,1,16688,1,
 	33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Guardian Cloak -- 7153
-	self:addTradeSkill(RecipeDB,7153,185,5965,2,2108,nil,GAME_ORIG,185,205,215,225)
+	AddRecipe(7153,185,5965,2,GAME_ORIG,185,205,215,225)
 	self:addTradeFlags(RecipeDB,7153,1,2,10,36,40,53,54,60)
 	self:addTradeAcquire(RecipeDB,7153,7,2)

 	-- Guardian Gloves -- 7156
-	self:addTradeSkill(RecipeDB,7156,190,5966,1,2108,nil,GAME_ORIG,190,210,220,230)
+	AddRecipe(7156,190,5966,1,GAME_ORIG,190,210,220,230)
 	self:addTradeFlags(RecipeDB,7156,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,7156,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187,
 	1,21087,1,1632,1,5784,1,16728,1,1385,1,3549,1,3365,1,3967,1,3703,1,33612,1,33635,1,16688,1,
 	33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Deviate Scale Cloak -- 7953
-	self:addTradeSkill(RecipeDB,7953,90,6466,1,2108,nil,GAME_ORIG,90,120,135,150)
+	AddRecipe(7953,90,6466,1,GAME_ORIG,90,120,135,150)
 	self:addTradeFlags(RecipeDB,7953,1,2,4,36,40,51,60)
 	self:addTradeAcquire(RecipeDB,7953,2,5783)

 	-- Deviate Scale Gloves -- 7954
-	self:addTradeSkill(RecipeDB,7954,105,6467,1,2108,nil,GAME_ORIG,105,130,142,155)
+	AddRecipe(7954,105,6467,1,GAME_ORIG,105,130,142,155)
 	self:addTradeFlags(RecipeDB,7954,1,2,4,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,7954,2,5783)

 	-- Deviate Scale Belt -- 7955
-	self:addTradeSkill(RecipeDB,7955,115,6468,2,2108,nil,GAME_ORIG,115,140,152,165)
+	AddRecipe(7955,115,6468,2,GAME_ORIG,115,140,152,165)
 	self:addTradeFlags(RecipeDB,7955,1,2,8,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,7955,4,1487)

 	-- Moonglow Vest -- 8322
-	self:addTradeSkill(RecipeDB,8322,90,6709,2,2108,nil,GAME_ORIG,90,115,130,145)
+	AddRecipe(8322,90,6709,2,GAME_ORIG,90,115,130,145)
 	self:addTradeFlags(RecipeDB,8322,1,8,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,8322,4,1582)

 	-- Handstitched Leather Cloak -- 9058
-	self:addTradeSkill(RecipeDB,9058,10,7276,1,2108,nil,GAME_ORIG,1,40,55,70)
+	AddRecipe(9058,10,7276,1,GAME_ORIG,1,40,55,70)
 	self:addTradeFlags(RecipeDB,9058,1,2,3,36,41,60)
 	self:addTradeAcquire(RecipeDB,9058,8,8)

 	-- Handstitched Leather Bracers -- 9059
-	self:addTradeSkill(RecipeDB,9059,10,7277,1,2108,nil,GAME_ORIG,1,40,55,70)
+	AddRecipe(9059,10,7277,1,GAME_ORIG,1,40,55,70)
 	self:addTradeFlags(RecipeDB,9059,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,9059,8,8)

 	-- Light Leather Quiver -- 9060
-	self:addTradeSkill(RecipeDB,9060,30,7278,1,2108,nil,GAME_ORIG,30,60,75,90)
+	AddRecipe(9060,30,7278,1,GAME_ORIG,30,60,75,90)
 	self:addTradeFlags(RecipeDB,9060,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,9060,1,1632,1,3007,1,3069,1,3365,1,3549
 	,1,3605,1,3703,1,4212,1,4588,1,5127,1,5564,1,5784,1,
@@ -497,7 +461,7 @@ function addon:InitLeatherworking(RecipeDB)
 	,1,1385,1,3967,1,33612,1,33635,1,33681,1,8153)

 	-- Small Leather Ammo Pouch -- 9062
-	self:addTradeSkill(RecipeDB,9062,30,7279,1,2108,nil,GAME_ORIG,30,60,75,90)
+	AddRecipe(9062,30,7279,1,GAME_ORIG,30,60,75,90)
 	self:addTradeFlags(RecipeDB,9062,1,2,3,36,41,78)
 	self:addTradeAcquire(RecipeDB,9062,1,1385,1,1632,1,3007,1,3069,1,3365
 	,1,3549,1,3605,1,3703,1,3967,1,4212,1,4588,1,5127,1,5564,1,5784,1,
@@ -505,12 +469,12 @@ function addon:InitLeatherworking(RecipeDB)
 	,1,19187,1,21087,1,33635,1,33612,1,33681,1,8153)

 	-- Rugged Leather Pants -- 9064
-	self:addTradeSkill(RecipeDB,9064,35,7280,2,2108,nil,GAME_ORIG,35,65,80,95)
+	AddRecipe(9064,35,7280,2,GAME_ORIG,35,65,80,95)
 	self:addTradeFlags(RecipeDB,9064,1,2,10,36,40,57)
 	self:addTradeAcquire(RecipeDB,9064,7,2)

 	-- Light Leather Bracers -- 9065
-	self:addTradeSkill(RecipeDB,9065,70,7281,1,2108,nil,GAME_ORIG,70,100,115,130)
+	AddRecipe(9065,70,7281,1,GAME_ORIG,70,100,115,130)
 	self:addTradeFlags(RecipeDB,9065,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,9065,1,1385,1,1632,1,3007,1,3069,1,3365
 	,1,3549,1,3605,1,3703,1,3967,1,4212,1,4588,1,5127,1,5564,1,5784,1,
@@ -518,2379 +482,2371 @@ function addon:InitLeatherworking(RecipeDB)
 	,1,19187,1,21087,1,33635,1,33612,1,33681,1,8153)

 	-- Light Leather Pants -- 9068
-	self:addTradeSkill(RecipeDB,9068,95,7282,1,2108,nil,GAME_ORIG,95,125,140,155)
+	AddRecipe(9068,95,7282,1,GAME_ORIG,95,125,140,155)
 	self:addTradeFlags(RecipeDB,9068,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,9068,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1
 	,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,8153,1,17442,1,16278,1,3605)

 	-- Black Whelp Cloak -- 9070
-	self:addTradeSkill(RecipeDB,9070,100,7283,1,2108,nil,GAME_ORIG,100,125,137,150)
+	AddRecipe(9070,100,7283,1,GAME_ORIG,100,125,137,150)
 	self:addTradeFlags(RecipeDB,9070,1,4,36,40,60)
 	self:addTradeAcquire(RecipeDB,9070,2,2697)

 	-- Red Whelp Gloves -- 9072
-	self:addTradeSkill(RecipeDB,9072,120,7284,1,2108,nil,GAME_ORIG,120,145,157,170)
+	AddRecipe(9072,120,7284,1,GAME_ORIG,120,145,157,170)
 	self:addTradeFlags(RecipeDB,9072,1,4,36,40,57)
 	self:addTradeAcquire(RecipeDB,9072,2,2679)

 	-- Nimble Leather Gloves -- 9074
-	self:addTradeSkill(RecipeDB,9074,120,7285,1,2108,nil,GAME_ORIG,120,145,157,170)
+	AddRecipe(9074,120,7285,1,GAME_ORIG,120,145,157,170)
 	self:addTradeFlags(RecipeDB,9074,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,9074,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,8153,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,
 	21087,1,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,17442,1,16278,1,3605)

 	-- Fletcher's Gloves -- 9145
-	self:addTradeSkill(RecipeDB,9145,125,7348,1,2108,nil,GAME_ORIG,125,150,162,175)
+	AddRecipe(9145,125,7348,1,GAME_ORIG,125,150,162,175)
 	self:addTradeFlags(RecipeDB,9145,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,9145,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,8153,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,
 	21087,1,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,17442,1,16278,1,3605)

 	-- Herbalist's Gloves -- 9146
-	self:addTradeSkill(RecipeDB,9146,135,7349,2,2108,nil,GAME_ORIG,135,160,172,185)
+	AddRecipe(9146,135,7349,2,GAME_ORIG,135,160,172,185)
 	self:addTradeFlags(RecipeDB,9146,1,4,36,41,57)
 	self:addTradeAcquire(RecipeDB,9146,2,6731)

 	-- Earthen Leather Shoulders -- 9147
-	self:addTradeSkill(RecipeDB,9147,135,7352,1,2108,nil,GAME_ORIG,135,160,172,185)
+	AddRecipe(9147,135,7352,1,GAME_ORIG,135,160,172,185)
 	self:addTradeFlags(RecipeDB,9147,1,2,4,36,40,57)
 	self:addTradeAcquire(RecipeDB,9147,2,3537)

 	-- Pilferer's Gloves -- 9148
-	self:addTradeSkill(RecipeDB,9148,140,7358,2,2108,nil,GAME_ORIG,140,165,177,190)
+	AddRecipe(9148,140,7358,2,GAME_ORIG,140,165,177,190)
 	self:addTradeFlags(RecipeDB,9148,1,2,10,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,9148,7,2)

 	-- Heavy Earthen Gloves -- 9149
-	self:addTradeSkill(RecipeDB,9149,145,7359,2,2108,nil,GAME_ORIG,145,170,182,195)
+	AddRecipe(9149,145,7359,2,GAME_ORIG,145,170,182,195)
 	self:addTradeFlags(RecipeDB,9149,1,2,10,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,9149,7,2)

 	-- Heavy Quiver -- 9193
-	self:addTradeSkill(RecipeDB,9193,150,7371,1,2108,nil,GAME_ORIG,150,170,180,190)
+	AddRecipe(9193,150,7371,1,GAME_ORIG,150,170,180,190)
 	self:addTradeFlags(RecipeDB,9193,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,9193,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,8153,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,
 	21087,1,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,17442,1,16278,1,3605)

 	-- Heavy Leather Ammo Pouch -- 9194
-	self:addTradeSkill(RecipeDB,9194,150,7372,1,2108,nil,GAME_ORIG,150,170,180,190)
+	AddRecipe(9194,150,7372,1,GAME_ORIG,150,170,180,190)
 	self:addTradeFlags(RecipeDB,9194,1,2,3,36,41,78)
 	self:addTradeAcquire(RecipeDB,9194,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,8153,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,
 	21087,1,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,17442,1,16278,1,3605)

 	-- Dusky Leather Leggings -- 9195
-	self:addTradeSkill(RecipeDB,9195,165,7373,2,2108,nil,GAME_ORIG,165,185,195,205)
+	AddRecipe(9195,165,7373,2,GAME_ORIG,165,185,195,205)
 	self:addTradeFlags(RecipeDB,9195,1,2,10,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,9195,7,2)

 	-- Dusky Leather Armor -- 9196
-	self:addTradeSkill(RecipeDB,9196,175,7374,1,2108,nil,GAME_ORIG,175,195,205,215)
+	AddRecipe(9196,175,7374,1,GAME_ORIG,175,195,205,215)
 	self:addTradeFlags(RecipeDB,9196,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,9196,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187,
 	1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Green Whelp Armor -- 9197
-	self:addTradeSkill(RecipeDB,9197,175,7375,2,2108,nil,GAME_ORIG,175,195,205,215)
+	AddRecipe(9197,175,7375,2,GAME_ORIG,175,195,205,215)
 	self:addTradeFlags(RecipeDB,9197,1,2,10,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,9197,7,2)

 	-- Frost Leather Cloak -- 9198
-	self:addTradeSkill(RecipeDB,9198,180,7377,1,2108,nil,GAME_ORIG,180,200,210,220)
+	AddRecipe(9198,180,7377,1,GAME_ORIG,180,200,210,220)
 	self:addTradeFlags(RecipeDB,9198,1,2,3,36,41,53,54,60)
 	self:addTradeAcquire(RecipeDB,9198,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187,
 	1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Dusky Bracers -- 9201
-	self:addTradeSkill(RecipeDB,9201,185,7378,1,2108,nil,GAME_ORIG,185,205,215,225)
+	AddRecipe(9201,185,7378,1,GAME_ORIG,185,205,215,225)
 	self:addTradeFlags(RecipeDB,9201,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,9201,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187,
 	1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Green Whelp Bracers -- 9202
-	self:addTradeSkill(RecipeDB,9202,190,7386,2,2108,nil,GAME_ORIG,190,210,220,230)
+	AddRecipe(9202,190,7386,2,GAME_ORIG,190,210,220,230)
 	self:addTradeFlags(RecipeDB,9202,1,2,4,36,41,57)
 	self:addTradeAcquire(RecipeDB,9202,2,7854,2,4589,2,7852,2,4225)

 	-- Dusky Belt -- 9206
-	self:addTradeSkill(RecipeDB,9206,195,7387,1,2108,nil,GAME_ORIG,195,215,225,235)
+	AddRecipe(9206,195,7387,1,GAME_ORIG,195,215,225,235)
 	self:addTradeFlags(RecipeDB,9206,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,9206,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187,
 	1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Dusky Boots -- 9207
-	self:addTradeSkill(RecipeDB,9207,200,7390,3,2108,nil,GAME_ORIG,200,220,230,240)
+	AddRecipe(9207,200,7390,3,GAME_ORIG,200,220,230,240)
 	self:addTradeFlags(RecipeDB,9207,1,2,5,11,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,9207,7,2)

 	-- Swift Boots -- 9208
-	self:addTradeSkill(RecipeDB,9208,200,7391,2,2108,nil,GAME_ORIG,200,220,230,240)
+	AddRecipe(9208,200,7391,2,GAME_ORIG,200,220,230,240)
 	self:addTradeFlags(RecipeDB,9208,1,2,10,36,40,57)
 	self:addTradeAcquire(RecipeDB,9208,7,2)

 	-- Cured Thick Hide -- 10482
-	self:addTradeSkill(RecipeDB,10482,200,8172,1,2108,nil,GAME_ORIG,200,200,200,200)
+	AddRecipe(10482,200,8172,1,GAME_ORIG,200,200,200,200)
 	self:addTradeFlags(RecipeDB,10482,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,10482,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187
 	,1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Thick Armor Kit -- 10487
-	self:addTradeSkill(RecipeDB,10487,200,8173,1,2108,nil,GAME_ORIG,200,220,230,240)
+	AddRecipe(10487,200,8173,1,GAME_ORIG,200,220,230,240)
 	self:addTradeFlags(RecipeDB,10487,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,10487,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187
 	,1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Comfortable Leather Hat -- 10490
-	self:addTradeSkill(RecipeDB,10490,200,8174,3,2108,nil,GAME_ORIG,200,220,230,240)
+	AddRecipe(10490,200,8174,3,GAME_ORIG,200,220,230,240)
 	self:addTradeFlags(RecipeDB,10490,1,2,5,11,36,40,57)
 	self:addTradeAcquire(RecipeDB,10490,7,2)

 	-- Nightscape Tunic -- 10499
-	self:addTradeSkill(RecipeDB,10499,205,8175,1,2108,nil,GAME_ORIG,205,225,235,245)
+	AddRecipe(10499,205,8175,1,GAME_ORIG,205,225,235,245)
 	self:addTradeFlags(RecipeDB,10499,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,10499,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187
 	,1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Nightscape Headband -- 10507
-	self:addTradeSkill(RecipeDB,10507,205,8176,1,2108,nil,GAME_ORIG,205,225,235,245)
+	AddRecipe(10507,205,8176,1,GAME_ORIG,205,225,235,245)
 	self:addTradeFlags(RecipeDB,10507,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,10507,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187
 	,1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Turtle Scale Gloves -- 10509
-	self:addTradeSkill(RecipeDB,10509,205,8187,1,2108,nil,GAME_ORIG,205,225,235,245)
+	AddRecipe(10509,205,8187,1,GAME_ORIG,205,225,235,245)
 	self:addTradeFlags(RecipeDB,10509,1,2,4,36,40,53,54,58)
 	self:addTradeAcquire(RecipeDB,10509,2,7852,2,7854)

 	-- Turtle Scale Breastplate -- 10511
-	self:addTradeSkill(RecipeDB,10511,210,8189,1,2108,nil,GAME_ORIG,210,230,240,250)
+	AddRecipe(10511,210,8189,1,GAME_ORIG,210,230,240,250)
 	self:addTradeFlags(RecipeDB,10511,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,10511,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187
 	,1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Nightscape Shoulders -- 10516
-	self:addTradeSkill(RecipeDB,10516,210,8192,2,2108,nil,GAME_ORIG,210,230,240,250)
+	AddRecipe(10516,210,8192,2,GAME_ORIG,210,230,240,250)
 	self:addTradeFlags(RecipeDB,10516,1,2,4,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,10516,2,7854,2,8160)

 	-- Turtle Scale Bracers -- 10518
-	self:addTradeSkill(RecipeDB,10518,210,8198,1,2108,nil,GAME_ORIG,210,230,240,250)
+	AddRecipe(10518,210,8198,1,GAME_ORIG,210,230,240,250)
 	self:addTradeFlags(RecipeDB,10518,1,2,3,36,41,58)
 	self:addTradeAcquire(RecipeDB,10518,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187
 	,1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,33681
 	,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Big Voodoo Robe -- 10520
-	self:addTradeSkill(RecipeDB,10520,215,8200,2,2108,nil,GAME_ORIG,215,235,245,255)
+	AddRecipe(10520,215,8200,2,GAME_ORIG,215,235,245,255)
 	self:addTradeFlags(RecipeDB,10520,1,2,10,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,10520,7,2)

 	-- Tough Scorpid Breastplate -- 10525
-	self:addTradeSkill(RecipeDB,10525,220,8203,2,2108,nil,GAME_ORIG,220,240,250,260)
+	AddRecipe(10525,220,8203,2,GAME_ORIG,220,240,250,260)
 	self:addTradeFlags(RecipeDB,10525,1,2,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,10525,3,5618)

 	-- Wild Leather Shoulders -- 10529
-	self:addTradeSkill(RecipeDB,10529,220,8210,2,2108,nil,GAME_ORIG,220,240,250,260)
+	AddRecipe(10529,220,8210,2,GAME_ORIG,220,240,250,260)
 	self:addTradeFlags(RecipeDB,10529,1,2,8,36,41,57)
 	self:addTradeAcquire(RecipeDB,10529,4,2848,4,2855)

 	-- Big Voodoo Mask -- 10531
-	self:addTradeSkill(RecipeDB,10531,220,8201,2,2108,nil,GAME_ORIG,220,240,250,260)
+	AddRecipe(10531,220,8201,2,GAME_ORIG,220,240,250,260)
 	self:addTradeFlags(RecipeDB,10531,1,2,10,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,10531,7,2)

 	-- Tough Scorpid Bracers -- 10533
-	self:addTradeSkill(RecipeDB,10533,220,8205,2,2108,nil,GAME_ORIG,220,240,250,260)
+	AddRecipe(10533,220,8205,2,GAME_ORIG,220,240,250,260)
 	self:addTradeFlags(RecipeDB,10533,1,2,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,10533,3,5617)

 	-- Tough Scorpid Gloves -- 10542
-	self:addTradeSkill(RecipeDB,10542,225,8204,2,2108,nil,GAME_ORIG,225,245,255,265)
+	AddRecipe(10542,225,8204,2,GAME_ORIG,225,245,255,265)
 	self:addTradeFlags(RecipeDB,10542,1,2,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,10542,3,5616)

 	-- Wild Leather Vest -- 10544
-	self:addTradeSkill(RecipeDB,10544,225,8211,2,2108,nil,GAME_ORIG,225,245,255,265)
+	AddRecipe(10544,225,8211,2,GAME_ORIG,225,245,255,265)
 	self:addTradeFlags(RecipeDB,10544,1,2,8,36,41,57)
 	self:addTradeAcquire(RecipeDB,10544,4,2849,4,2856)

 	-- Wild Leather Helmet -- 10546
-	self:addTradeSkill(RecipeDB,10546,225,8214,2,2108,nil,GAME_ORIG,225,245,255,265)
+	AddRecipe(10546,225,8214,2,GAME_ORIG,225,245,255,265)
 	self:addTradeFlags(RecipeDB,10546,1,2,8,36,41,57)
 	self:addTradeAcquire(RecipeDB,10546,4,2850,4,2857)

 	-- Nightscape Pants -- 10548
-	self:addTradeSkill(RecipeDB,10548,230,8193,1,2108,nil,GAME_ORIG,230,250,260,270)
+	AddRecipe(10548,230,8193,1,GAME_ORIG,230,250,260,270)
 	self:addTradeFlags(RecipeDB,10548,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,10548,1,11097,1,11098,1,18754,1,18771,1,19187,1,21087,1,
 	4212,1,3007,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Turtle Scale Helm -- 10552
-	self:addTradeSkill(RecipeDB,10552,230,8191,1,2108,nil,GAME_ORIG,230,250,260,270)
+	AddRecipe(10552,230,8191,1,GAME_ORIG,230,250,260,270)
 	self:addTradeFlags(RecipeDB,10552,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,10552,1,11097,1,11098,1,18754,1,18771,1,19187,1,21087,1,
 	4212,1,3007,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Tough Scorpid Boots -- 10554
-	self:addTradeSkill(RecipeDB,10554,235,8209,2,2108,nil,GAME_ORIG,235,255,265,275)
+	AddRecipe(10554,235,8209,2,GAME_ORIG,235,255,265,275)
 	self:addTradeFlags(RecipeDB,10554,1,2,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,10554,3,5615)

 	-- Turtle Scale Leggings -- 10556
-	self:addTradeSkill(RecipeDB,10556,235,8185,1,2108,nil,GAME_ORIG,235,255,265,275)
+	AddRecipe(10556,235,8185,1,GAME_ORIG,235,255,265,275)
 	self:addTradeFlags(RecipeDB,10556,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,10556,1,11097,1,11098,1,18754,1,18771,1,19187,1,21087,1,
 	4212,1,3007,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,5564,1,5127,1,4588)

 	-- Nightscape Boots -- 10558
-	self:addTradeSkill(RecipeDB,10558,235,8197,1,2108,nil,GAME_ORIG,235,255,265,275)
+	AddRecipe(10558,235,8197,1,GAME_ORIG,235,255,265,275)
 	self:addTradeFlags(RecipeDB,10558,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,10558,1,11097,1,11098,1,18754,1,18771,1,19187,1,21087,1,
 	4212,1,3007,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Big Voodoo Pants -- 10560
-	self:addTradeSkill(RecipeDB,10560,240,8202,2,2108,nil,GAME_ORIG,240,260,270,280)
+	AddRecipe(10560,240,8202,2,GAME_ORIG,240,260,270,280)
 	self:addTradeFlags(RecipeDB,10560,1,2,10,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,10560,7,2)

 	-- Big Voodoo Cloak -- 10562
-	self:addTradeSkill(RecipeDB,10562,240,8216,2,2108,nil,GAME_ORIG,240,260,270,280)
+	AddRecipe(10562,240,8216,2,GAME_ORIG,240,260,270,280)
 	self:addTradeFlags(RecipeDB,10562,1,2,10,36,40,53,54,60)
 	self:addTradeAcquire(RecipeDB,10562,7,2)

 	-- Tough Scorpid Shoulders -- 10564
-	self:addTradeSkill(RecipeDB,10564,240,8207,2,2108,nil,GAME_ORIG,240,260,270,280)
+	AddRecipe(10564,240,8207,2,GAME_ORIG,240,260,270,280)
 	self:addTradeFlags(RecipeDB,10564,1,2,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,10564,3,5623,3,7805,3,7883)

 	-- Wild Leather Boots -- 10566
-	self:addTradeSkill(RecipeDB,10566,245,8213,2,2108,nil,GAME_ORIG,245,265,275,285)
+	AddRecipe(10566,245,8213,2,GAME_ORIG,245,265,275,285)
 	self:addTradeFlags(RecipeDB,10566,1,2,8,36,41,57)
 	self:addTradeAcquire(RecipeDB,10566,4,2851,4,2858)

 	-- Tough Scorpid Leggings -- 10568
-	self:addTradeSkill(RecipeDB,10568,245,8206,2,2108,nil,GAME_ORIG,245,265,275,285)
+	AddRecipe(10568,245,8206,2,GAME_ORIG,245,265,275,285)
 	self:addTradeFlags(RecipeDB,10568,1,2,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,10568,3,5615)

 	-- Tough Scorpid Helm -- 10570
-	self:addTradeSkill(RecipeDB,10570,250,8208,2,2108,nil,GAME_ORIG,250,270,280,290)
+	AddRecipe(10570,250,8208,2,GAME_ORIG,250,270,280,290)
 	self:addTradeFlags(RecipeDB,10570,1,2,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,10570,3,5623,3,7805,3,7883)

 	-- Wild Leather Leggings -- 10572
-	self:addTradeSkill(RecipeDB,10572,250,8212,2,2108,nil,GAME_ORIG,250,270,280,290)
+	AddRecipe(10572,250,8212,2,GAME_ORIG,250,270,280,290)
 	self:addTradeFlags(RecipeDB,10572,1,2,8,36,41,57)
 	self:addTradeAcquire(RecipeDB,10572,4,2852,4,2859)

 	-- Wild Leather Cloak -- 10574
-	self:addTradeSkill(RecipeDB,10574,250,8215,2,2108,nil,GAME_ORIG,250,270,280,290)
+	AddRecipe(10574,250,8215,2,GAME_ORIG,250,270,280,290)
 	self:addTradeFlags(RecipeDB,10574,1,2,8,36,41,60)
 	self:addTradeAcquire(RecipeDB,10574,4,2853,4,2860)

 	-- Dragonscale Gauntlets -- 10619
-	self:addTradeSkill(RecipeDB,10619,225,8347,1,2108,nil,GAME_ORIG,225,245,255,265)
+	AddRecipe(10619,225,8347,1,GAME_ORIG,225,245,255,265)
 	self:addTradeFlags(RecipeDB,10619,1,2,3,36,41,58)
 	self:addTradeAcquire(RecipeDB,10619,1,7866,1,7867,1,29508)

 	-- Wolfshead Helm -- 10621
-	self:addTradeSkill(RecipeDB,10621,225,8345,1,2108,nil,GAME_ORIG,225,245,255,265)
+	AddRecipe(10621,225,8345,1,GAME_ORIG,225,245,255,265)
 	self:addTradeFlags(RecipeDB,10621,1,2,3,F_DRUID,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,10621,1,7870,1,7871,1,29509)

 	-- Gauntlets of the Sea -- 10630
-	self:addTradeSkill(RecipeDB,10630,230,8346,1,2108,nil,GAME_ORIG,230,250,260,270)
+	AddRecipe(10630,230,8346,1,GAME_ORIG,230,250,260,270)
 	self:addTradeFlags(RecipeDB,10630,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,10630,1,7868,1,7869,1,29507)

 	-- Helm of Fire -- 10632
-	self:addTradeSkill(RecipeDB,10632,250,8348,1,2108,nil,GAME_ORIG,250,270,280,290)
+	AddRecipe(10632,250,8348,1,GAME_ORIG,250,270,280,290)
 	self:addTradeFlags(RecipeDB,10632,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,10632,1,7868,1,7869,1,29507)

 	-- Feathered Breastplate -- 10647
-	self:addTradeSkill(RecipeDB,10647,250,8349,1,2108,nil,GAME_ORIG,250,270,280,290)
+	AddRecipe(10647,250,8349,1,GAME_ORIG,250,270,280,290)
 	self:addTradeFlags(RecipeDB,10647,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,10647,1,7870,1,7871,1,29509)

 	-- Dragonscale Breastplate -- 10650
-	self:addTradeSkill(RecipeDB,10650,255,8367,1,2108,nil,GAME_ORIG,255,275,285,295)
+	AddRecipe(10650,255,8367,1,GAME_ORIG,255,275,285,295)
 	self:addTradeFlags(RecipeDB,10650,1,2,3,36,41,58)
 	self:addTradeAcquire(RecipeDB,10650,1,7866,1,7867,1,29508)

 	-- Quickdraw Quiver -- 14930
-	self:addTradeSkill(RecipeDB,14930,225,8217,1,2108,nil,GAME_ORIG,225,245,255,265)
+	AddRecipe(14930,225,8217,1,GAME_ORIG,225,245,255,265)
 	self:addTradeFlags(RecipeDB,14930,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,14930,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187
 	,1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Thick Leather Ammo Pouch -- 14932
-	self:addTradeSkill(RecipeDB,14932,225,8218,1,2108,nil,GAME_ORIG,225,245,255,265)
+	AddRecipe(14932,225,8218,1,GAME_ORIG,225,245,255,265)
 	self:addTradeFlags(RecipeDB,14932,1,2,3,36,41,78)
 	self:addTradeAcquire(RecipeDB,14932,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187
 	,1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Cured Rugged Hide -- 19047
-	self:addTradeSkill(RecipeDB,19047,250,15407,1,2108,nil,GAME_ORIG,250,250,255,260)
+	AddRecipe(19047,250,15407,1,GAME_ORIG,250,250,255,260)
 	self:addTradeFlags(RecipeDB,19047,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,19047,1,11097,1,11098,1,18754,1,18771,1,19187,1,21087,1,
 	4212,1,3007,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Heavy Scorpid Bracers -- 19048
-	self:addTradeSkill(RecipeDB,19048,255,15077,1,2108,nil,GAME_ORIG,255,275,285,295)
+	AddRecipe(19048,255,15077,1,GAME_ORIG,255,275,285,295)
 	self:addTradeFlags(RecipeDB,19048,1,2,4,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,19048,2,12956)

 	-- Wicked Leather Gauntlets -- 19049
-	self:addTradeSkill(RecipeDB,19049,260,15083,1,2108,nil,GAME_ORIG,260,280,290,300)
+	AddRecipe(19049,260,15083,1,GAME_ORIG,260,280,290,300)
 	self:addTradeFlags(RecipeDB,19049,1,2,4,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,19049,2,12942,2,12943)

 	-- Green Dragonscale Breastplate -- 19050
-	self:addTradeSkill(RecipeDB,19050,260,15045,1,2108,nil,GAME_ORIG,260,280,290,300)
+	AddRecipe(19050,260,15045,1,GAME_ORIG,260,280,290,300)
 	self:addTradeFlags(RecipeDB,19050,1,2,4,36,40,53,54,58)
 	self:addTradeAcquire(RecipeDB,19050,2,11874)

 	-- Heavy Scorpid Vest -- 19051
-	self:addTradeSkill(RecipeDB,19051,265,15076,2,2108,nil,GAME_ORIG,265,285,295,305)
+	AddRecipe(19051,265,15076,2,GAME_ORIG,265,285,295,305)
 	self:addTradeFlags(RecipeDB,19051,1,2,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,19051,3,5981,3,6005)

 	-- Wicked Leather Bracers -- 19052
-	self:addTradeSkill(RecipeDB,19052,265,15084,2,2108,nil,GAME_ORIG,265,285,295,305)
+	AddRecipe(19052,265,15084,2,GAME_ORIG,265,285,295,305)
 	self:addTradeFlags(RecipeDB,19052,1,2,3,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,19052,1,11097,1,11098,1,18754,1,18771,1,19187,1,21087,1,
 	4212,1,3007,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Chimeric Gloves -- 19053
-	self:addTradeSkill(RecipeDB,19053,265,15074,1,2108,nil,GAME_ORIG,265,285,295,305)
+	AddRecipe(19053,265,15074,1,GAME_ORIG,265,285,295,305)
 	self:addTradeFlags(RecipeDB,19053,1,2,4,36,41,57)
 	self:addTradeAcquire(RecipeDB,19053,2,12957)

 	-- Red Dragonscale Breastplate -- 19054
-	self:addTradeSkill(RecipeDB,19054,300,15047,3,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(19054,300,15047,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,19054,1,2,5,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,19054,3,10363)

 	-- Runic Leather Gauntlets -- 19055
-	self:addTradeSkill(RecipeDB,19055,270,15091,2,2108,nil,GAME_ORIG,270,290,300,310)
+	AddRecipe(19055,270,15091,2,GAME_ORIG,270,290,300,310)
 	self:addTradeFlags(RecipeDB,19055,1,2,3,10,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,19055,7,2,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,
 	1,5127,1,5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087
 	,1,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,8153,1,17442,1,16278,1,3605)

 	-- Rugged Armor Kit -- 19058
-	self:addTradeSkill(RecipeDB,19058,250,15564,1,2108,nil,GAME_ORIG,250,255,265,275)
+	AddRecipe(19058,250,15564,1,GAME_ORIG,250,255,265,275)
 	self:addTradeFlags(RecipeDB,19058,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,19058,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1
 	,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,8153,1,17442,1,3605)

 	-- Volcanic Leggings -- 19059
-	self:addTradeSkill(RecipeDB,19059,270,15054,2,2108,nil,GAME_ORIG,270,290,300,310)
+	AddRecipe(19059,270,15054,2,GAME_ORIG,270,290,300,310)
 	self:addTradeFlags(RecipeDB,19059,1,2,11,36,40,57)
 	self:addTradeAcquire(RecipeDB,19059,3,7035)

 	-- Green Dragonscale Leggings -- 19060
-	self:addTradeSkill(RecipeDB,19060,270,15046,3,2108,nil,GAME_ORIG,270,290,300,310)
+	AddRecipe(19060,270,15046,3,GAME_ORIG,270,290,300,310)
 	self:addTradeFlags(RecipeDB,19060,1,2,5,36,40,53,54,58)
 	self:addTradeAcquire(RecipeDB,19060,3,5226)

 	-- Living Shoulders -- 19061
-	self:addTradeSkill(RecipeDB,19061,270,15061,1,2108,nil,GAME_ORIG,270,290,300,310)
+	AddRecipe(19061,270,15061,1,GAME_ORIG,270,290,300,310)
 	self:addTradeFlags(RecipeDB,19061,1,2,4,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,19061,2,7852,2,7854)

 	-- Ironfeather Shoulders -- 19062
-	self:addTradeSkill(RecipeDB,19062,270,15067,1,2108,nil,GAME_ORIG,270,290,300,310)
+	AddRecipe(19062,270,15067,1,GAME_ORIG,270,290,300,310)
 	self:addTradeFlags(RecipeDB,19062,1,2,4,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,19062,2,12958)

 	-- Chimeric Boots -- 19063
-	self:addTradeSkill(RecipeDB,19063,275,15073,2,2108,nil,GAME_ORIG,275,295,305,315)
+	AddRecipe(19063,275,15073,2,GAME_ORIG,275,295,305,315)
 	self:addTradeFlags(RecipeDB,19063,1,2,10,36,40,57)
 	self:addTradeAcquire(RecipeDB,19063,7,2)

 	-- Heavy Scorpid Gauntlets -- 19064
-	self:addTradeSkill(RecipeDB,19064,275,15078,2,2108,nil,GAME_ORIG,275,295,305,315)
+	AddRecipe(19064,275,15078,2,GAME_ORIG,275,295,305,315)
 	self:addTradeFlags(RecipeDB,19064,1,2,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,19064,3,7025)

 	-- Runic Leather Bracers -- 19065
-	self:addTradeSkill(RecipeDB,19065,275,15092,2,2108,nil,GAME_ORIG,275,295,305,315)
+	AddRecipe(19065,275,15092,2,GAME_ORIG,275,295,305,315)
 	self:addTradeFlags(RecipeDB,19065,1,2,3,36,40,57)
 	self:addTradeAcquire(RecipeDB,19065,1,11097,1,11098,1,18754,1,18771,1,19187,1,21087,1,
 	4212,1,3007,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,3605,1,5564,1,5127,1,4588)

 	-- Frostsaber Boots -- 19066
-	self:addTradeSkill(RecipeDB,19066,275,15071,1,2108,nil,GAME_ORIG,275,295,305,315)
+	AddRecipe(19066,275,15071,1,GAME_ORIG,275,295,305,315)
 	self:addTradeFlags(RecipeDB,19066,1,2,4,36,41,57)
 	self:addTradeAcquire(RecipeDB,19066,2,11189)

 	-- Stormshroud Pants -- 19067
-	self:addTradeSkill(RecipeDB,19067,275,15057,1,2108,nil,GAME_ORIG,275,295,305,315)
+	AddRecipe(19067,275,15057,1,GAME_ORIG,275,295,305,315)
 	self:addTradeFlags(RecipeDB,19067,1,2,4,36,40,51,52,57)
 	self:addTradeAcquire(RecipeDB,19067,2,12942,2,12943)

 	-- Warbear Harness -- 19068
-	self:addTradeSkill(RecipeDB,19068,275,15064,1,2108,nil,GAME_ORIG,275,295,305,315)
+	AddRecipe(19068,275,15064,1,GAME_ORIG,275,295,305,315)
 	self:addTradeFlags(RecipeDB,19068,1,2,4,6,11,36,41,51,57,99)
 	self:addTradeAcquire(RecipeDB,19068,6,576,1,11557)

 	-- Heavy Scorpid Belt -- 19070
-	self:addTradeSkill(RecipeDB,19070,280,15082,2,2108,nil,GAME_ORIG,280,300,310,320)
+	AddRecipe(19070,280,15082,2,GAME_ORIG,280,300,310,320)
 	self:addTradeFlags(RecipeDB,19070,1,2,10,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,19070,7,2)

 	-- Wicked Leather Headband -- 19071
-	self:addTradeSkill(RecipeDB,19071,280,15086,2,2108,nil,GAME_ORIG,280,300,310,320)
+	AddRecipe(19071,280,15086,2,GAME_ORIG,280,300,310,320)
 	self:addTradeFlags(RecipeDB,19071,1,2,3,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,19071,1,11097,1,11098,1,18754,1,18771,1,19187,1,21087,1,
 	4212,1,3007,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Runic Leather Belt -- 19072
-	self:addTradeSkill(RecipeDB,19072,280,15093,2,2108,nil,GAME_ORIG,280,300,310,320)
+	AddRecipe(19072,280,15093,2,GAME_ORIG,280,300,310,320)
 	self:addTradeFlags(RecipeDB,19072,1,2,3,36,40,57)
 	self:addTradeAcquire(RecipeDB,19072,1,11097,1,11098,1,18754,1,18771,1,19187,1,21087,1,
 	4212,1,1632,1,5784,1,16728,1,3007,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Chimeric Leggings -- 19073
-	self:addTradeSkill(RecipeDB,19073,280,15072,2,2108,nil,GAME_ORIG,280,300,310,320)
+	AddRecipe(19073,280,15072,2,GAME_ORIG,280,300,310,320)
 	self:addTradeFlags(RecipeDB,19073,1,2,10,36,40,57)
 	self:addTradeAcquire(RecipeDB,19073,7,2)

 	-- Frostsaber Leggings -- 19074
-	self:addTradeSkill(RecipeDB,19074,285,15069,2,2108,nil,GAME_ORIG,285,305,315,325)
+	AddRecipe(19074,285,15069,2,GAME_ORIG,285,305,315,325)
 	self:addTradeFlags(RecipeDB,19074,1,2,11,36,40,57)
 	self:addTradeAcquire(RecipeDB,19074,3,7440)

 	-- Heavy Scorpid Leggings -- 19075
-	self:addTradeSkill(RecipeDB,19075,285,15079,2,2108,nil,GAME_ORIG,285,305,315,325)
+	AddRecipe(19075,285,15079,2,GAME_ORIG,285,305,315,325)
 	self:addTradeFlags(RecipeDB,19075,1,2,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,19075,3,7027)

 	-- Volcanic Breastplate -- 19076
-	self:addTradeSkill(RecipeDB,19076,285,15053,2,2108,nil,GAME_ORIG,285,305,315,325)
+	AddRecipe(19076,285,15053,2,GAME_ORIG,285,305,315,325)
 	self:addTradeFlags(RecipeDB,19076,1,2,5,36,40,57)
 	self:addTradeAcquire(RecipeDB,19076,3,9259)

 	-- Blue Dragonscale Breastplate -- 19077
-	self:addTradeSkill(RecipeDB,19077,285,15048,1,2108,nil,GAME_ORIG,285,305,315,325)
+	AddRecipe(19077,285,15048,1,GAME_ORIG,285,305,315,325)
 	self:addTradeFlags(RecipeDB,19077,1,2,4,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,19077,2,12957)

 	-- Living Leggings -- 19078
-	self:addTradeSkill(RecipeDB,19078,285,15060,3,2108,nil,GAME_ORIG,285,305,315,325)
+	AddRecipe(19078,285,15060,3,GAME_ORIG,285,305,315,325)
 	self:addTradeFlags(RecipeDB,19078,1,2,11,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,19078,3,7158)

 	-- Stormshroud Armor -- 19079
-	self:addTradeSkill(RecipeDB,19079,285,15056,3,2108,nil,GAME_ORIG,285,305,315,325)
+	AddRecipe(19079,285,15056,3,GAME_ORIG,285,305,315,325)
 	self:addTradeFlags(RecipeDB,19079,1,2,11,36,40,51,52,57)
 	self:addTradeAcquire(RecipeDB,19079,3,6138)

 	-- Warbear Woolies -- 19080
-	self:addTradeSkill(RecipeDB,19080,285,15065,1,2108,nil,GAME_ORIG,285,305,315,325)
+	AddRecipe(19080,285,15065,1,GAME_ORIG,285,305,315,325)
 	self:addTradeFlags(RecipeDB,19080,1,2,4,36,41,51,57,99)
 	self:addTradeAcquire(RecipeDB,19080,6,576,1,11557)

 	-- Chimeric Vest -- 19081
-	self:addTradeSkill(RecipeDB,19081,290,15075,2,2108,nil,GAME_ORIG,280,300,310,320)
+	AddRecipe(19081,290,15075,2,GAME_ORIG,280,300,310,320)
 	self:addTradeFlags(RecipeDB,19081,1,2,10,36,40,57)
 	self:addTradeAcquire(RecipeDB,19081,7,2)

 	-- Runic Leather Headband -- 19082
-	self:addTradeSkill(RecipeDB,19082,290,15094,1,2108,nil,GAME_ORIG,290,310,320,330)
+	AddRecipe(19082,290,15094,1,GAME_ORIG,290,310,320,330)
 	self:addTradeFlags(RecipeDB,19082,1,2,3,36,40,57)
 	self:addTradeAcquire(RecipeDB,19082,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1
 	,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,8153,1,17442,1,16278,1,3605)

 	-- Wicked Leather Pants -- 19083
-	self:addTradeSkill(RecipeDB,19083,290,15087,2,2108,nil,GAME_ORIG,290,315,325,335)
+	AddRecipe(19083,290,15087,2,GAME_ORIG,290,315,325,335)
 	self:addTradeFlags(RecipeDB,19083,1,2,3,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,19083,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1
 	,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,8153,1,17442,1,16278,1,3605)

 	-- Devilsaur Gauntlets -- 19084
-	self:addTradeSkill(RecipeDB,19084,290,15063,1,2108,nil,GAME_ORIG,290,310,320,330)
+	AddRecipe(19084,290,15063,1,GAME_ORIG,290,310,320,330)
 	self:addTradeFlags(RecipeDB,19084,1,2,4,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,19084,2,12959)

 	-- Black Dragonscale Breastplate -- 19085
-	self:addTradeSkill(RecipeDB,19085,290,15050,1,2108,nil,GAME_ORIG,290,310,320,330)
+	AddRecipe(19085,290,15050,1,GAME_ORIG,290,310,320,330)
 	self:addTradeFlags(RecipeDB,19085,1,2,4,5,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,19085,2,9499)

 	-- Ironfeather Breastplate -- 19086
-	self:addTradeSkill(RecipeDB,19086,290,15066,3,2108,nil,GAME_ORIG,290,310,320,330)
+	AddRecipe(19086,290,15066,3,GAME_ORIG,290,310,320,330)
 	self:addTradeFlags(RecipeDB,19086,1,2,11,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,19086,3,2644)

 	-- Frostsaber Gloves -- 19087
-	self:addTradeSkill(RecipeDB,19087,295,15070,2,2108,nil,GAME_ORIG,295,315,325,335)
+	AddRecipe(19087,295,15070,2,GAME_ORIG,295,315,325,335)
 	self:addTradeFlags(RecipeDB,19087,1,2,11,36,40,57)
 	self:addTradeAcquire(RecipeDB,19087,3,7441)

 	-- Heavy Scorpid Helm -- 19088
-	self:addTradeSkill(RecipeDB,19088,295,15080,1,2108,nil,GAME_ORIG,295,315,325,335)
+	AddRecipe(19088,295,15080,1,GAME_ORIG,295,315,325,335)
 	self:addTradeFlags(RecipeDB,19088,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,19088,2,12956)

 	-- Blue Dragonscale Shoulders -- 19089
-	self:addTradeSkill(RecipeDB,19089,295,15049,3,2108,nil,GAME_ORIG,295,315,325,335)
+	AddRecipe(19089,295,15049,3,GAME_ORIG,295,315,325,335)
 	self:addTradeFlags(RecipeDB,19089,1,2,11,36,40,53,54,58)
 	self:addTradeAcquire(RecipeDB,19089,3,6146)

 	-- Stormshroud Shoulders -- 19090
-	self:addTradeSkill(RecipeDB,19090,295,15058,3,2108,nil,GAME_ORIG,295,315,325,335)
+	AddRecipe(19090,295,15058,3,GAME_ORIG,295,315,325,335)
 	self:addTradeFlags(RecipeDB,19090,1,2,11,36,40,51,52,57)
 	self:addTradeAcquire(RecipeDB,19090,3,6144)

 	-- Runic Leather Pants -- 19091
-	self:addTradeSkill(RecipeDB,19091,300,15095,2,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(19091,300,15095,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,19091,1,2,3,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,19091,1,11097,1,11098,1,18754,1,18771,1,19187,1,21087,1,
 	4212,1,3007,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,4588)

 	-- Wicked Leather Belt -- 19092
-	self:addTradeSkill(RecipeDB,19092,300,15088,2,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(19092,300,15088,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,19092,1,2,3,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,19092,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1
 	,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,8153,1,17442,1,16278,1,3605)

 	-- Onyxia Scale Cloak -- 19093
-	self:addTradeSkill(RecipeDB,19093,300,15138,3,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(19093,300,15138,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,19093,1,2,6,8,36,41,60)
 	self:addTradeAcquire(RecipeDB,19093,4,7493,4,7497,8,10)

 	-- Black Dragonscale Shoulders -- 19094
-	self:addTradeSkill(RecipeDB,19094,300,15051,3,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(19094,300,15051,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,19094,1,2,5,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,19094,3,8898)

 	-- Living Breastplate -- 19095
-	self:addTradeSkill(RecipeDB,19095,300,15059,3,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(19095,300,15059,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,19095,1,2,11,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,19095,3,1813)

 	-- Devilsaur Leggings -- 19097
-	self:addTradeSkill(RecipeDB,19097,300,15062,3,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(19097,300,15062,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,19097,1,2,11,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,19097,3,6556,3,6557,3,6559,3,9477)

 	-- Wicked Leather Armor -- 19098
-	self:addTradeSkill(RecipeDB,19098,300,15085,2,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(19098,300,15085,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,19098,1,2,3,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,19098,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1
 	,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,8153,1,17442,1,16278)

 	-- Heavy Scorpid Shoulders -- 19100
-	self:addTradeSkill(RecipeDB,19100,300,15081,2,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(19100,300,15081,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,19100,1,2,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,19100,3,7029)

 	-- Volcanic Shoulders -- 19101
-	self:addTradeSkill(RecipeDB,19101,300,15055,2,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(19101,300,15055,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,19101,1,2,5,36,40,57)
 	self:addTradeAcquire(RecipeDB,19101,3,9260)

 	-- Runic Leather Armor -- 19102
-	self:addTradeSkill(RecipeDB,19102,300,15090,2,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(19102,300,15090,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,19102,1,2,3,36,40,57)
 	self:addTradeAcquire(RecipeDB,19102,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1
 	,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,8153,1,17442,1,16278,1,3605)

 	-- Runic Leather Shoulders -- 19103
-	self:addTradeSkill(RecipeDB,19103,300,15096,2,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(19103,300,15096,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,19103,1,2,3,36,40,57)
 	self:addTradeAcquire(RecipeDB,19103,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1
 	,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,8153,1,17442,1,16278,1,3605)

 	-- Frostsaber Tunic -- 19104
-	self:addTradeSkill(RecipeDB,19104,300,15068,2,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(19104,300,15068,2,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,19104,1,2,11,36,40,57)
 	self:addTradeAcquire(RecipeDB,19104,3,7438)

 	-- Black Dragonscale Leggings -- 19107
-	self:addTradeSkill(RecipeDB,19107,300,15052,3,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(19107,300,15052,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,19107,1,2,5,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,19107,3,8903)

 	-- Medium Leather -- 20648
-	self:addTradeSkill(RecipeDB,20648,100,2319,1,2108,nil,GAME_ORIG,100,100,105,110)
+	AddRecipe(20648,100,2319,1,GAME_ORIG,100,100,105,110)
 	self:addTradeFlags(RecipeDB,20648,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,20648,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,5127,1,
 	5564,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,21087,1,1632,1
 	,5784,1,1385,1,3549,1,33635,1,33612,1,33681,1,8153,1,17442,1,16278,1,3605)

 	-- Heavy Leather -- 20649
-	self:addTradeSkill(RecipeDB,20649,150,4234,1,2108,nil,GAME_ORIG,150,150,155,160)
+	AddRecipe(20649,150,4234,1,GAME_ORIG,150,150,155,160)
 	self:addTradeFlags(RecipeDB,20649,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,20649,1,1385,1,3007,1,3365,1,3703,1,3967,1,4212,1,4588,1,
 	5127,1,5564,1,8153,1,11097,1,11098,1,16688,1,16728,1,18754,1,18771,1,19187,1,
 	21087,1,1632,1,5784,1,3549,1,33612,1,33635,1,33681,1,17442,1,16278,1,3605)

 	-- Thick Leather -- 20650
-	self:addTradeSkill(RecipeDB,20650,200,4304,1,2108,nil,GAME_ORIG,200,200,202,205)
+	AddRecipe(20650,200,4304,1,GAME_ORIG,200,200,202,205)
 	self:addTradeFlags(RecipeDB,20650,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,20650,1,3007,1,4212,1,11097,1,11098,1,18754,1,18771,1,19187
 	,1,21087,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Corehound Boots -- 20853
-	self:addTradeSkill(RecipeDB,20853,295,16982,1,2108,nil,GAME_ORIG,295,315,325,335)
+	AddRecipe(20853,295,16982,1,GAME_ORIG,295,315,325,335)
 	self:addTradeFlags(RecipeDB,20853,1,2,4,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,20853,2,12944)

 	-- Molten Helm -- 20854
-	self:addTradeSkill(RecipeDB,20854,300,16983,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(20854,300,16983,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,20854,1,2,4,36,41,52,57)
 	self:addTradeAcquire(RecipeDB,20854,2,12944)

 	-- Black Dragonscale Boots -- 20855
-	self:addTradeSkill(RecipeDB,20855,300,16984,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(20855,300,16984,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,20855,1,2,4,36,41,51,58,98)
 	self:addTradeAcquire(RecipeDB,20855,6,59,2,12944)

 	-- Gloves of the Greatfather -- 21943
-	self:addTradeSkill(RecipeDB,21943,190,17721,2,2108,nil,GAME_ORIG,190,210,220,230)
+	AddRecipe(21943,190,17721,2,GAME_ORIG,190,210,220,230)
 	self:addTradeFlags(RecipeDB,21943,1,2,7,11,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,21943,5,1)

 	-- Rugged Leather -- 22331
-	self:addTradeSkill(RecipeDB,22331,250,8170,1,2108,nil,GAME_ORIG,250,250,250,250)
+	AddRecipe(22331,250,8170,1,GAME_ORIG,250,250,250,250)
 	self:addTradeFlags(RecipeDB,22331,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,22331,1,11097,1,11098,1,18754,1,18771,1,19187,1,21087,1,
 	4212,1,3007,1,1632,1,5784,1,16728,1,3703,1,1385,1,3549,1,3365,1,3967,1,33612,1,33635,1,16688
 	,1,33681,1,8153,1,17442,1,16278,1,3605,1,5564,1,5127,1,4588)

 	-- Shadowskin Gloves -- 22711
-	self:addTradeSkill(RecipeDB,22711,200,18238,1,2108,nil,GAME_ORIG,200,210,220,230)
+	AddRecipe(22711,200,18238,1,GAME_ORIG,200,210,220,230)
 	self:addTradeFlags(RecipeDB,22711,1,2,4,36,41,57)
 	self:addTradeAcquire(RecipeDB,22711,2,2699)

 	-- Core Armor Kit -- 22727
-	self:addTradeSkill(RecipeDB,22727,300,18251,3,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(22727,300,18251,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,22727,1,2,6,36,41,52)
 	self:addTradeAcquire(RecipeDB,22727,8,26)

 	-- Gordok Ogre Suit -- 22815
-	self:addTradeSkill(RecipeDB,22815,275,18258,2,2108,nil,GAME_ORIG,275,285,290,385)
+	AddRecipe(22815,275,18258,2,GAME_ORIG,275,285,290,385)
 	self:addTradeFlags(RecipeDB,22815,1,2,5,8,36,41)
 	self:addTradeAcquire(RecipeDB,22815,4,5518)

 	-- Girdle of Insight -- 22921
-	self:addTradeSkill(RecipeDB,22921,300,18504,3,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(22921,300,18504,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,22921,1,2,5,36,41,57)
 	self:addTradeAcquire(RecipeDB,22921,8,23)

 	-- Mongoose Boots -- 22922
-	self:addTradeSkill(RecipeDB,22922,300,18506,3,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(22922,300,18506,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,22922,1,2,5,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,22922,8,23)

 	-- Swift Flight Bracers -- 22923
-	self:addTradeSkill(RecipeDB,22923,300,18508,3,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(22923,300,18508,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,22923,1,2,5,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,22923,8,23)

 	-- Chromatic Cloak -- 22926
-	self:addTradeSkill(RecipeDB,22926,300,18509,4,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(22926,300,18509,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,22926,1,2,5,36,40,60)
 	self:addTradeAcquire(RecipeDB,22926,8,23)

 	-- Hide of the Wild -- 22927
-	self:addTradeSkill(RecipeDB,22927,300,18510,4,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(22927,300,18510,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,22927,1,2,5,36,40,53,54,60)
 	self:addTradeAcquire(RecipeDB,22927,8,23)

 	-- Shifting Cloak -- 22928
-	self:addTradeSkill(RecipeDB,22928,300,18511,4,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(22928,300,18511,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,22928,1,2,5,36,40,52,60)
 	self:addTradeAcquire(RecipeDB,22928,8,23)

 	-- Heavy Leather Ball -- 23190
-	self:addTradeSkill(RecipeDB,23190,150,18662,1,2108,nil,GAME_ORIG,150,150,155,160)
+	AddRecipe(23190,150,18662,1,GAME_ORIG,150,150,155,160)
 	self:addTradeFlags(RecipeDB,23190,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,23190,2,5128,2,3366)

 	-- Barbaric Bracers -- 23399
-	self:addTradeSkill(RecipeDB,23399,155,18948,1,2108,nil,GAME_ORIG,155,175,185,195)
+	AddRecipe(23399,155,18948,1,GAME_ORIG,155,175,185,195)
 	self:addTradeFlags(RecipeDB,23399,1,2,4,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,23399,2,4225,2,4589)

 	-- Might of the Timbermaw -- 23703
-	self:addTradeSkill(RecipeDB,23703,290,19044,1,2108,nil,GAME_ORIG,290,310,320,330)
+	AddRecipe(23703,290,19044,1,GAME_ORIG,290,310,320,330)
 	self:addTradeFlags(RecipeDB,23703,1,2,4,36,41,51,57,99)
 	self:addTradeAcquire(RecipeDB,23703,6,576,2,11557)

 	-- Timbermaw Brawlers -- 23704
-	self:addTradeSkill(RecipeDB,23704,300,19049,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(23704,300,19049,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,23704,1,2,4,36,41,51,57,99)
 	self:addTradeAcquire(RecipeDB,23704,6,576,3,11557)

 	-- Dawn Treaders -- 23705
-	self:addTradeSkill(RecipeDB,23705,290,19052,1,2108,nil,GAME_ORIG,290,310,320,330)
+	AddRecipe(23705,290,19052,1,GAME_ORIG,290,310,320,330)
 	self:addTradeFlags(RecipeDB,23705,1,2,4,36,41,51,57,96)
 	self:addTradeAcquire(RecipeDB,23705,6,529,2,10856,6,529,2,10857,6,529,2,11536)

 	-- Golden Mantle of the Dawn -- 23706
-	self:addTradeSkill(RecipeDB,23706,300,19058,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(23706,300,19058,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,23706,1,2,4,36,41,52,57,96)
 	self:addTradeAcquire(RecipeDB,23706,6,529,3,10856,6,529,3,10857,6,529,3,11536)

 	-- Lava Belt -- 23707
-	self:addTradeSkill(RecipeDB,23707,300,19149,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(23707,300,19149,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,23707,1,2,4,36,41,57,98)
 	self:addTradeAcquire(RecipeDB,23707,6,59,2,12944)

 	-- Chromatic Gauntlets -- 23708
-	self:addTradeSkill(RecipeDB,23708,300,19157,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(23708,300,19157,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,23708,1,2,4,36,41,51,58,98)
 	self:addTradeAcquire(RecipeDB,23708,6,59,3,12944)

 	-- Corehound Belt -- 23709
-	self:addTradeSkill(RecipeDB,23709,300,19162,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(23709,300,19162,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,23709,1,2,4,36,41,53,54,57,98)
 	self:addTradeAcquire(RecipeDB,23709,6,59,3,12944)

 	-- Molten Belt -- 23710
-	self:addTradeSkill(RecipeDB,23710,300,19163,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(23710,300,19163,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,23710,1,2,4,36,41,51,57,98)
 	self:addTradeAcquire(RecipeDB,23710,6,59,3,12944)

 	-- Primal Batskin Jerkin -- 24121
-	self:addTradeSkill(RecipeDB,24121,300,19685,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24121,300,19685,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24121,1,2,4,36,41,51,57,100)
 	self:addTradeAcquire(RecipeDB,24121,6,270,3,14921)

 	-- Primal Batskin Gloves -- 24122
-	self:addTradeSkill(RecipeDB,24122,300,19686,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24122,300,19686,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24122,1,2,4,36,41,51,57,100)
 	self:addTradeAcquire(RecipeDB,24122,6,270,2,14921)

 	-- Primal Batskin Bracers -- 24123
-	self:addTradeSkill(RecipeDB,24123,300,19687,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24123,300,19687,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24123,1,2,4,36,41,51,57,100)
 	self:addTradeAcquire(RecipeDB,24123,6,270,1,14921)

 	-- Blood Tiger Breastplate -- 24124
-	self:addTradeSkill(RecipeDB,24124,300,19688,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24124,300,19688,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24124,1,2,4,36,41,53,54,57,100)
 	self:addTradeAcquire(RecipeDB,24124,6,270,3,14921)

 	-- Blood Tiger Shoulders -- 24125
-	self:addTradeSkill(RecipeDB,24125,300,19689,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24125,300,19689,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24125,1,2,4,36,41,53,54,57,100)
 	self:addTradeAcquire(RecipeDB,24125,6,270,2,14921)

 	-- Blue Dragonscale Leggings -- 24654
-	self:addTradeSkill(RecipeDB,24654,300,20295,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24654,300,20295,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24654,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,24654,1,7866,1,7867,1,29508)

 	-- Green Dragonscale Gauntlets -- 24655
-	self:addTradeSkill(RecipeDB,24655,260,20296,1,2108,nil,GAME_ORIG,260,280,290,300)
+	AddRecipe(24655,260,20296,1,GAME_ORIG,260,280,290,300)
 	self:addTradeFlags(RecipeDB,24655,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,24655,1,7866,1,7867,1,29508)

 	-- Dreamscale Breastplate -- 24703
-	self:addTradeSkill(RecipeDB,24703,300,20380,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24703,300,20380,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24703,1,2,4,36,41,51,58,97)
 	self:addTradeAcquire(RecipeDB,24703,6,609,4,15293)

 	-- Spitfire Bracers -- 24846
-	self:addTradeSkill(RecipeDB,24846,300,20481,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24846,300,20481,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24846,1,2,4,36,41,53,54,58,97)
 	self:addTradeAcquire(RecipeDB,24846,6,609,1,15293)

 	-- Spitfire Gauntlets -- 24847
-	self:addTradeSkill(RecipeDB,24847,300,20480,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24847,300,20480,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24847,1,2,4,36,41,53,54,58,97)
 	self:addTradeAcquire(RecipeDB,24847,6,609,2,15293)

 	-- Spitfire Breastplate -- 24848
-	self:addTradeSkill(RecipeDB,24848,300,20479,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24848,300,20479,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24848,1,2,4,36,41,53,54,58,97)
 	self:addTradeAcquire(RecipeDB,24848,6,609,3,15293)

 	-- Sandstalker Bracers -- 24849
-	self:addTradeSkill(RecipeDB,24849,300,20476,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24849,300,20476,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24849,1,2,4,36,41,58,97)
 	self:addTradeAcquire(RecipeDB,24849,6,609,1,15293)

 	-- Sandstalker Gauntlets -- 24850
-	self:addTradeSkill(RecipeDB,24850,300,20477,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24850,300,20477,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24850,1,2,4,36,41,58,97)
 	self:addTradeAcquire(RecipeDB,24850,6,609,2,15293)

 	-- Sandstalker Breastplate -- 24851
-	self:addTradeSkill(RecipeDB,24851,300,20478,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(24851,300,20478,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,24851,1,2,4,36,41,58,97)
 	self:addTradeAcquire(RecipeDB,24851,6,609,3,15293)

 	-- Black Whelp Tunic -- 24940
-	self:addTradeSkill(RecipeDB,24940,100,20575,1,2108,nil,GAME_ORIG,100,125,137,150)
+	AddRecipe(24940,100,20575,1,GAME_ORIG,100,125,137,150)
 	self:addTradeFlags(RecipeDB,24940,1,4,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,24940,2,777)

 	-- Stormshroud Gloves -- 26279
-	self:addTradeSkill(RecipeDB,26279,300,21278,3,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(26279,300,21278,3,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,26279,1,2,11,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,26279,3,14454,3,14457)

 	-- Polar Tunic -- 28219
-	self:addTradeSkill(RecipeDB,28219,300,22661,4,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(28219,300,22661,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,28219,1,2,4,6,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,28219,6,529,4,16365,8,41)

 	-- Polar Gloves -- 28220
-	self:addTradeSkill(RecipeDB,28220,300,22662,4,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(28220,300,22662,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,28220,1,2,4,6,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,28220,6,529,3,16365,8,41)

 	-- Polar Bracers -- 28221
-	self:addTradeSkill(RecipeDB,28221,300,22663,4,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(28221,300,22663,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,28221,1,2,4,6,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,28221,6,529,3,16365,8,41)

 	-- Icy Scale Breastplate -- 28222
-	self:addTradeSkill(RecipeDB,28222,300,22664,4,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(28222,300,22664,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,28222,1,2,4,6,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,28222,6,529,4,16365,8,41)

 	-- Icy Scale Gauntlets -- 28223
-	self:addTradeSkill(RecipeDB,28223,300,22666,4,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(28223,300,22666,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,28223,1,2,4,6,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,28223,6,529,3,16365,8,41)

 	-- Icy Scale Bracers -- 28224
-	self:addTradeSkill(RecipeDB,28224,300,22665,4,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(28224,300,22665,4,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,28224,1,2,4,6,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,28224,6,529,3,16365,8,41)

 	-- Bramblewood Helm -- 28472
-	self:addTradeSkill(RecipeDB,28472,300,22759,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(28472,300,22759,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,28472,1,2,4,36,41,57,97)
 	self:addTradeAcquire(RecipeDB,28472,6,609,3,15293)

 	-- Bramblewood Boots -- 28473
-	self:addTradeSkill(RecipeDB,28473,300,22760,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(28473,300,22760,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,28473,1,2,4,36,41,57,97)
 	self:addTradeAcquire(RecipeDB,28473,6,609,2,15293)

 	-- Bramblewood Belt -- 28474
-	self:addTradeSkill(RecipeDB,28474,300,22761,1,2108,nil,GAME_ORIG,300,320,330,340)
+	AddRecipe(28474,300,22761,1,GAME_ORIG,300,320,330,340)
 	self:addTradeFlags(RecipeDB,28474,1,2,4,36,41,57,97)
 	self:addTradeAcquire(RecipeDB,28474,6,609,1,15293)

 	-- Knothide Leather -- 32454
-	self:addTradeSkill(RecipeDB,32454,300,21887,1,2108,nil,1,300,300,305,310)
+	AddRecipe(32454,300,21887,1,1,300,300,305,310)
 	self:addTradeFlags(RecipeDB,32454,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,32454,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Heavy Knothide Leather -- 32455
-	self:addTradeSkill(RecipeDB,32455,325,23793,1,2108,nil,1,325,325,330,335)
+	AddRecipe(32455,325,23793,1,1,325,325,330,335)
 	self:addTradeFlags(RecipeDB,32455,1,2,4,36,40,57)
 	self:addTradeAcquire(RecipeDB,32455,2,16689,2,16748,2,19196)

 	-- Knothide Armor Kit -- 32456
-	self:addTradeSkill(RecipeDB,32456,300,25650,1,2108,nil,1,300,310,325,340)
+	AddRecipe(32456,300,25650,1,1,300,310,325,340)
 	self:addTradeFlags(RecipeDB,32456,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,32456,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Vindicator's Armor Kit -- 32457
-	self:addTradeSkill(RecipeDB,32457,325,25651,1,2108,nil,1,325,335,340,345)
+	AddRecipe(32457,325,25651,1,1,325,335,340,345)
 	self:addTradeFlags(RecipeDB,32457,1,4,36,41,52,101)
 	self:addTradeAcquire(RecipeDB,32457,6,932,3,19321)

 	-- Magister's Armor Kit -- 32458
-	self:addTradeSkill(RecipeDB,32458,325,25652,1,2108,nil,1,325,335,340,345)
+	AddRecipe(32458,325,25652,1,1,325,335,340,345)
 	self:addTradeFlags(RecipeDB,32458,1,2,4,36,41,53,54,110)
 	self:addTradeAcquire(RecipeDB,32458,6,934,3,19331)

 	-- Riding Crop -- 32461
-	self:addTradeSkill(RecipeDB,32461,350,25653,1,2108,nil,1,350,360,370,380)
+	AddRecipe(32461,350,25653,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,32461,1,2,4,36,40,61)
 	self:addTradeAcquire(RecipeDB,32461,2,18672)

 	-- Felscale Gloves -- 32462
-	self:addTradeSkill(RecipeDB,32462,300,25654,1,2108,nil,1,300,310,320,330)
+	AddRecipe(32462,300,25654,1,1,300,310,320,330)
 	self:addTradeFlags(RecipeDB,32462,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,32462,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Felscale Boots -- 32463
-	self:addTradeSkill(RecipeDB,32463,310,25655,1,2108,nil,1,310,320,330,340)
+	AddRecipe(32463,310,25655,1,1,310,320,330,340)
 	self:addTradeFlags(RecipeDB,32463,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,32463,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Felscale Pants -- 32464
-	self:addTradeSkill(RecipeDB,32464,320,25656,1,2108,nil,1,320,330,340,350)
+	AddRecipe(32464,320,25656,1,1,320,330,340,350)
 	self:addTradeFlags(RecipeDB,32464,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,32464,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Felscale Breastplate -- 32465
-	self:addTradeSkill(RecipeDB,32465,335,25657,1,2108,nil,1,335,345,355,365)
+	AddRecipe(32465,335,25657,1,1,335,345,355,365)
 	self:addTradeFlags(RecipeDB,32465,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,32465,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Scaled Draenic Pants -- 32466
-	self:addTradeSkill(RecipeDB,32466,300,25662,1,2108,nil,1,300,310,320,330)
+	AddRecipe(32466,300,25662,1,1,300,310,320,330)
 	self:addTradeFlags(RecipeDB,32466,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,32466,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Scaled Draenic Gloves -- 32467
-	self:addTradeSkill(RecipeDB,32467,310,25661,1,2108,nil,1,310,320,330,340)
+	AddRecipe(32467,310,25661,1,1,310,320,330,340)
 	self:addTradeFlags(RecipeDB,32467,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,32467,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Scaled Draenic Vest -- 32468
-	self:addTradeSkill(RecipeDB,32468,325,25660,1,2108,nil,1,325,335,345,355)
+	AddRecipe(32468,325,25660,1,1,325,335,345,355)
 	self:addTradeFlags(RecipeDB,32468,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,32468,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Scaled Draenic Boots -- 32469
-	self:addTradeSkill(RecipeDB,32469,335,25659,1,2108,nil,1,335,345,355,365)
+	AddRecipe(32469,335,25659,1,1,335,345,355,365)
 	self:addTradeFlags(RecipeDB,32469,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,32469,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Thick Draenic Gloves -- 32470
-	self:addTradeSkill(RecipeDB,32470,300,25669,1,2108,nil,1,300,310,320,330)
+	AddRecipe(32470,300,25669,1,1,300,310,320,330)
 	self:addTradeFlags(RecipeDB,32470,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,32470,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Thick Draenic Pants -- 32471
-	self:addTradeSkill(RecipeDB,32471,315,25670,1,2108,nil,1,315,325,335,345)
+	AddRecipe(32471,315,25670,1,1,315,325,335,345)
 	self:addTradeFlags(RecipeDB,32471,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,32471,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Thick Draenic Boots -- 32472
-	self:addTradeSkill(RecipeDB,32472,320,25668,1,2108,nil,1,320,330,340,350)
+	AddRecipe(32472,320,25668,1,1,320,330,340,350)
 	self:addTradeFlags(RecipeDB,32472,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,32472,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Thick Draenic Vest -- 32473
-	self:addTradeSkill(RecipeDB,32473,330,25671,1,2108,nil,1,330,340,350,360)
+	AddRecipe(32473,330,25671,1,1,330,340,350,360)
 	self:addTradeFlags(RecipeDB,32473,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,32473,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Wild Draenish Boots -- 32478
-	self:addTradeSkill(RecipeDB,32478,300,25673,1,2108,nil,1,300,310,320,330)
+	AddRecipe(32478,300,25673,1,1,300,310,320,330)
 	self:addTradeFlags(RecipeDB,32478,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,32478,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Wild Draenish Gloves -- 32479
-	self:addTradeSkill(RecipeDB,32479,310,25674,1,2108,nil,1,310,320,330,340)
+	AddRecipe(32479,310,25674,1,1,310,320,330,340)
 	self:addTradeFlags(RecipeDB,32479,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,32479,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Wild Draenish Leggings -- 32480
-	self:addTradeSkill(RecipeDB,32480,320,25675,1,2108,nil,1,320,330,340,350)
+	AddRecipe(32480,320,25675,1,1,320,330,340,350)
 	self:addTradeFlags(RecipeDB,32480,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,32480,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Wild Draenish Vest -- 32481
-	self:addTradeSkill(RecipeDB,32481,330,25676,1,2108,nil,1,330,340,350,360)
+	AddRecipe(32481,330,25676,1,1,330,340,350,360)
 	self:addTradeFlags(RecipeDB,32481,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,32481,1,18754,1,18771,1,19187,1,21087,1,33635,1,33612
 	,1,33681)

 	-- Comfortable Insoles -- 32482
-	self:addTradeSkill(RecipeDB,32482,300,25679,1,2108,nil,1,300,300,305,310)
+	AddRecipe(32482,300,25679,1,1,300,300,305,310)
 	self:addTradeFlags(RecipeDB,32482,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,32482,2,16689,2,16748)

 	-- Stylin' Purple Hat -- 32485
-	self:addTradeSkill(RecipeDB,32485,350,25680,3,2108,nil,1,350,360,370,380)
+	AddRecipe(32485,350,25680,3,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,32485,1,2,5,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,32485,3,18667)

 	-- Stylin' Adventure Hat -- 32487
-	self:addTradeSkill(RecipeDB,32487,350,25681,3,2108,nil,1,350,360,370,380)
+	AddRecipe(32487,350,25681,3,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,32487,1,2,5,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,32487,3,17820,3,28132)

 	-- Stylin' Crimson Hat -- 32488
-	self:addTradeSkill(RecipeDB,32488,350,25683,3,2108,nil,1,350,360,370,380)
+	AddRecipe(32488,350,25683,3,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,32488,1,2,5,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,32488,3,18322)

 	-- Stylin' Jungle Hat -- 32489
-	self:addTradeSkill(RecipeDB,32489,350,25682,3,2108,nil,1,350,360,370,380)
+	AddRecipe(32489,350,25682,3,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,32489,1,2,5,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,32489,3,17839,3,21104)

 	-- Fel Leather Gloves -- 32490
-	self:addTradeSkill(RecipeDB,32490,340,25685,3,2108,nil,1,340,350,360,370)
+	AddRecipe(32490,340,25685,3,1,340,350,360,370)
 	self:addTradeFlags(RecipeDB,32490,1,2,4,36,41,51,57,105)
 	self:addTradeAcquire(RecipeDB,32490,6,933,1,20242,6,933,1,23007)

 	-- Fel Leather Boots -- 32493
-	self:addTradeSkill(RecipeDB,32493,350,25686,3,2108,nil,1,350,360,370,380)
+	AddRecipe(32493,350,25686,3,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,32493,1,2,4,36,41,51,57,105)
 	self:addTradeAcquire(RecipeDB,32493,6,933,2,20242,6,933,2,23007)

 	-- Fel Leather Leggings -- 32494
-	self:addTradeSkill(RecipeDB,32494,350,25687,3,2108,nil,1,350,360,370,380)
+	AddRecipe(32494,350,25687,3,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,32494,1,2,4,36,41,51,57,105)
 	self:addTradeAcquire(RecipeDB,32494,6,933,3,20242,6,933,3,23007)

 	-- Heavy Clefthoof Vest -- 32495
-	self:addTradeSkill(RecipeDB,32495,360,25689,3,2108,nil,1,360,370,380,390)
+	AddRecipe(32495,360,25689,3,1,360,370,380,390)
 	self:addTradeFlags(RecipeDB,32495,1,2,4,36,41,52,57,103)
 	self:addTradeAcquire(RecipeDB,32495,6,942,2,17904)

 	-- Heavy Clefthoof Leggings -- 32496
-	self:addTradeSkill(RecipeDB,32496,355,25690,3,2108,nil,1,355,365,37,385)
+	AddRecipe(32496,355,25690,3,1,355,365,37,385)
 	self:addTradeFlags(RecipeDB,32496,1,2,4,36,41,52,57,103)
 	self:addTradeAcquire(RecipeDB,32496,6,942,2,17904)

 	-- Heavy Clefthoof Boots -- 32497
-	self:addTradeSkill(RecipeDB,32497,355,25691,3,2108,nil,1,355,365,375,385)
+	AddRecipe(32497,355,25691,3,1,355,365,375,385)
 	self:addTradeFlags(RecipeDB,32497,1,2,4,36,41,52,57,103)
 	self:addTradeAcquire(RecipeDB,32497,6,942,1,17904)

 	-- Felstalker Belt -- 32498
-	self:addTradeSkill(RecipeDB,32498,350,25695,3,2108,nil,1,350,360,370,380)
+	AddRecipe(32498,350,25695,3,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,32498,1,4,36,41,51,58,104)
 	self:addTradeAcquire(RecipeDB,32498,6,946,1,17657,6,947,1,17585)

 	-- Felstalker Bracers -- 32499
-	self:addTradeSkill(RecipeDB,32499,360,25697,3,2108,nil,1,360,370,380,390)
+	AddRecipe(32499,360,25697,3,1,360,370,380,390)
 	self:addTradeFlags(RecipeDB,32499,1,4,36,41,51,58,104)
 	self:addTradeAcquire(RecipeDB,32499,6,946,2,17657,6,947,2,17585)

 	-- Felstalker Breastplate -- 32500
-	self:addTradeSkill(RecipeDB,32500,360,25696,3,2108,nil,1,360,370,380,390)
+	AddRecipe(32500,360,25696,3,1,360,370,380,390)
 	self:addTradeFlags(RecipeDB,32500,1,4,36,41,51,58,104)
 	self:addTradeAcquire(RecipeDB,32500,6,946,2,17657,6,947,2,17585)

 	-- Netherfury Belt -- 32501
-	self:addTradeSkill(RecipeDB,32501,340,25694,3,2108,nil,1,340,350,360,370)
+	AddRecipe(32501,340,25694,3,1,340,350,360,370)
 	self:addTradeFlags(RecipeDB,32501,1,4,36,41,53,54,58,108)
 	self:addTradeAcquire(RecipeDB,32501,6,978,1,20240)

 	-- Netherfury Leggings -- 32502
-	self:addTradeSkill(RecipeDB,32502,340,25692,3,2108,nil,1,340,350,360,370)
+	AddRecipe(32502,340,25692,3,1,340,350,360,370)
 	self:addTradeFlags(RecipeDB,32502,1,4,36,41,53,54,58,108)
 	self:addTradeAcquire(RecipeDB,32502,6,978,2,20240)

 	-- Netherfury Boots -- 32503
-	self:addTradeSkill(RecipeDB,32503,350,25693,3,2108,nil,1,350,360,370,380)
+	AddRecipe(32503,350,25693,3,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,32503,1,4,36,41,53,54,58,108)
 	self:addTradeAcquire(RecipeDB,32503,6,978,3,20240)

 	-- Shadow Armor Kit -- 35520
-	self:addTradeSkill(RecipeDB,35520,340,29483,2,2108,nil,1,340,350,355,360)
+	AddRecipe(35520,340,29483,2,1,340,350,355,360)
 	self:addTradeFlags(RecipeDB,35520,1,2,5,11,36,41)
 	self:addTradeAcquire(RecipeDB,35520,3,18320)

 	-- Flame Armor Kit -- 35521
-	self:addTradeSkill(RecipeDB,35521,340,29485,2,2108,nil,1,340,350,355,360)
+	AddRecipe(35521,340,29485,2,1,340,350,355,360)
 	self:addTradeFlags(RecipeDB,35521,1,2,5,36,41)
 	self:addTradeAcquire(RecipeDB,35521,3,20898)

 	-- Frost Armor Kit -- 35522
-	self:addTradeSkill(RecipeDB,35522,340,29486,2,2108,nil,1,340,350,355,360)
+	AddRecipe(35522,340,29486,2,1,340,350,355,360)
 	self:addTradeFlags(RecipeDB,35522,1,2,5,36,41)
 	self:addTradeAcquire(RecipeDB,35522,3,17797)

 	-- Nature Armor Kit -- 35523
-	self:addTradeSkill(RecipeDB,35523,340,29487,2,2108,nil,1,340,350,355,360)
+	AddRecipe(35523,340,29487,2,1,340,350,355,360)
 	self:addTradeFlags(RecipeDB,35523,1,2,5,36,41)
 	self:addTradeAcquire(RecipeDB,35523,3,17941)

 	-- Arcane Armor Kit -- 35524
-	self:addTradeSkill(RecipeDB,35524,340,29488,2,2108,nil,1,340,350,355,360)
+	AddRecipe(35524,340,29488,2,1,340,350,355,360)
 	self:addTradeFlags(RecipeDB,35524,1,2,5,36,41)
 	self:addTradeAcquire(RecipeDB,35524,3,17879)

 	-- Enchanted Felscale Leggings -- 35525
-	self:addTradeSkill(RecipeDB,35525,350,29489,1,2108,nil,1,350,360,370,380)
+	AddRecipe(35525,350,29489,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,35525,1,2,4,36,41,51,58,110)
 	self:addTradeAcquire(RecipeDB,35525,6,934,4,19331)

 	-- Enchanted Felscale Gloves -- 35526
-	self:addTradeSkill(RecipeDB,35526,350,29490,1,2108,nil,1,350,360,370,380)
+	AddRecipe(35526,350,29490,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,35526,1,2,4,36,41,51,58,110)
 	self:addTradeAcquire(RecipeDB,35526,6,934,2,19331)

 	-- Enchanted Felscale Boots -- 35527
-	self:addTradeSkill(RecipeDB,35527,350,29491,1,2108,nil,1,350,360,370,380)
+	AddRecipe(35527,350,29491,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,35527,1,2,4,36,41,51,58,110)
 	self:addTradeAcquire(RecipeDB,35527,6,934,3,19331)

 	-- Flamescale Boots -- 35528
-	self:addTradeSkill(RecipeDB,35528,350,29493,1,2108,nil,1,350,360,370,380)
+	AddRecipe(35528,350,29493,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,35528,1,4,36,41,51,58,101)
 	self:addTradeAcquire(RecipeDB,35528,6,932,3,19321)

 	-- Flamescale Leggings -- 35529
-	self:addTradeSkill(RecipeDB,35529,350,29492,1,2108,nil,1,350,360,370,380)
+	AddRecipe(35529,350,29492,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,35529,1,4,36,41,51,58,101)
 	self:addTradeAcquire(RecipeDB,35529,6,932,4,19321)

 	-- Reinforced Mining Bag -- 35530
-	self:addTradeSkill(RecipeDB,35530,325,29540,1,2108,nil,1,325,335,340,345)
+	AddRecipe(35530,325,29540,1,1,325,335,340,345)
 	self:addTradeFlags(RecipeDB,35530,1,4,36,41,108)
 	self:addTradeAcquire(RecipeDB,35530,6,978,2,20240)

 	-- Flamescale Belt -- 35531
-	self:addTradeSkill(RecipeDB,35531,350,29494,1,2108,nil,1,350,360,370,380)
+	AddRecipe(35531,350,29494,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,35531,1,4,36,41,51,58,101)
 	self:addTradeAcquire(RecipeDB,35531,6,932,2,19321)

 	-- Enchanted Clefthoof Leggings -- 35532
-	self:addTradeSkill(RecipeDB,35532,350,29495,1,2108,nil,1,350,360,370,380)
+	AddRecipe(35532,350,29495,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,35532,1,2,4,36,41,51,57,110)
 	self:addTradeAcquire(RecipeDB,35532,6,934,4,19331)

 	-- Enchanted Clefthoof Gloves -- 35533
-	self:addTradeSkill(RecipeDB,35533,350,29496,1,2108,nil,1,350,360,370,380)
+	AddRecipe(35533,350,29496,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,35533,1,2,4,36,41,51,57,110)
 	self:addTradeAcquire(RecipeDB,35533,6,934,3,19331)

 	-- Enchanted Clefthoof Boots -- 35534
-	self:addTradeSkill(RecipeDB,35534,350,29497,1,2108,nil,1,350,360,370,380)
+	AddRecipe(35534,350,29497,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,35534,1,2,4,36,41,51,57,110)
 	self:addTradeAcquire(RecipeDB,35534,6,934,2,19331)

 	-- Blastguard Pants -- 35535
-	self:addTradeSkill(RecipeDB,35535,350,29498,1,2108,nil,1,350,360,370,380)
+	AddRecipe(35535,350,29498,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,35535,1,4,36,41,51,57,101)
 	self:addTradeAcquire(RecipeDB,35535,6,932,4,19321)

 	-- Blastguard Boots -- 35536
-	self:addTradeSkill(RecipeDB,35536,350,29499,1,2108,nil,1,350,360,370,380)
+	AddRecipe(35536,350,29499,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,35536,1,4,36,41,51,57,101)
 	self:addTradeAcquire(RecipeDB,35536,6,932,3,19321)

 	-- Blastguard Belt -- 35537
-	self:addTradeSkill(RecipeDB,35537,350,29500,1,2108,nil,1,350,360,370,380)
+	AddRecipe(35537,350,29500,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,35537,1,4,36,41,51,57,101)
 	self:addTradeAcquire(RecipeDB,35537,6,932,2,19321)

 	-- Drums of Panic -- 35538
-	self:addTradeSkill(RecipeDB,35538,370,29532,1,2108,nil,1,370,370,377,385)
+	AddRecipe(35538,370,29532,1,1,370,370,377,385)
 	self:addTradeFlags(RecipeDB,35538,1,2,4,36,41,106)
 	self:addTradeAcquire(RecipeDB,35538,6,989,2,21643)

 	-- Drums of Restoration -- 35539
-	self:addTradeSkill(RecipeDB,35539,350,29531,1,2108,nil,1,350,350,357,365)
+	AddRecipe(35539,350,29531,1,1,350,350,357,365)
 	self:addTradeFlags(RecipeDB,35539,1,4,36,41,108)
 	self:addTradeAcquire(RecipeDB,35539,6,978,2,20240)

 	-- Drums of War -- 35540
-	self:addTradeSkill(RecipeDB,35540,340,29528,1,2108,nil,1,340,340,347,355)
+	AddRecipe(35540,340,29528,1,1,340,340,347,355)
 	self:addTradeFlags(RecipeDB,35540,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,35540,1,18754,1,18771,1,19187,1,21087,1,33681,1,33612,1,
 33635)

 	-- Drums of Battle -- 35543
-	self:addTradeSkill(RecipeDB,35543,365,29529,1,2108,nil,1,365,365,372,380)
+	AddRecipe(35543,365,29529,1,1,365,365,372,380)
 	self:addTradeFlags(RecipeDB,35543,1,2,4,36,41,111)
 	self:addTradeAcquire(RecipeDB,35543,6,935,2,21432)

 	-- Drums of Speed -- 35544
-	self:addTradeSkill(RecipeDB,35544,345,29530,1,2108,nil,1,345,345,352,360)
+	AddRecipe(35544,345,29530,1,1,345,345,352,360)
 	self:addTradeFlags(RecipeDB,35544,1,2,4,5,36,41,108)
 	self:addTradeAcquire(RecipeDB,35544,6,941,2,20241,6,978,2,20240)

 	-- Cobrahide Leg Armor -- 35549
-	self:addTradeSkill(RecipeDB,35549,335,29533,1,2108,nil,1,335,335,345,355)
+	AddRecipe(35549,335,29533,1,1,335,335,345,355)
 	self:addTradeFlags(RecipeDB,35549,1,2,4,36,41,51,104)
 	self:addTradeAcquire(RecipeDB,35549,6,946,2,17657,6,947,2,17585)

 	-- Nethercobra Leg Armor -- 35554
-	self:addTradeSkill(RecipeDB,35554,365,29535,1,2108,nil,1,365,365,375,385)
+	AddRecipe(35554,365,29535,1,1,365,365,375,385)
 	self:addTradeFlags(RecipeDB,35554,1,2,4,36,41,51,104)
 	self:addTradeAcquire(RecipeDB,35554,6,946,4,17657,6,947,4,17585)

 	-- Clefthide Leg Armor -- 35555
-	self:addTradeSkill(RecipeDB,35555,335,29534,1,2108,nil,1,335,335,345,355)
+	AddRecipe(35555,335,29534,1,1,335,335,345,355)
 	self:addTradeFlags(RecipeDB,35555,1,2,4,36,41,51,52,103)
 	self:addTradeAcquire(RecipeDB,35555,6,942,2,17904)

 	-- Nethercleft Leg Armor -- 35557
-	self:addTradeSkill(RecipeDB,35557,365,29536,1,2108,nil,1,365,365,375,385,395)
+	AddRecipe(35557,365,29536,1,1,365,365,375,385,395)
 	self:addTradeFlags(RecipeDB,35557,1,2,4,36,41,51,52,103)
 	self:addTradeAcquire(RecipeDB,35557,6,942,4,17904)

 	-- Cobrascale Hood -- 35558
-	self:addTradeSkill(RecipeDB,35558,365,29502,4,2108,nil,1,365,375,385,395)
+	AddRecipe(35558,365,29502,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,35558,1,2,10,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,35558,7,4)

 	-- Cobrascale Gloves -- 35559
-	self:addTradeSkill(RecipeDB,35559,365,29503,4,2108,nil,1,365,375,385,395)
+	AddRecipe(35559,365,29503,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,35559,1,2,10,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,35559,3,24664,7,4)

 	-- Windscale Hood -- 35560
-	self:addTradeSkill(RecipeDB,35560,365,29504,4,2108,nil,1,365,375,385,395)
+	AddRecipe(35560,365,29504,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,35560,1,2,10,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,35560,7,4)

 	-- Hood of Primal Life -- 35561
-	self:addTradeSkill(RecipeDB,35561,365,29505,4,2108,nil,1,365,375,385,395)
+	AddRecipe(35561,365,29505,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,35561,1,2,10,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,35561,7,4)

 	-- Gloves of the Living Touch -- 35562
-	self:addTradeSkill(RecipeDB,35562,365,29506,4,2108,nil,1,365,375,385,395)
+	AddRecipe(35562,365,29506,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,35562,1,2,11,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,35562,3,24664)

 	-- Windslayer Wraps -- 35563
-	self:addTradeSkill(RecipeDB,35563,365,29507,4,2108,nil,1,365,375,385,395)
+	AddRecipe(35563,365,29507,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,35563,1,2,5,6,11,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,35563,7,4)

 	-- Living Dragonscale Helm -- 35564
-	self:addTradeSkill(RecipeDB,35564,365,29508,4,2108,nil,1,365,375,385,395)
+	AddRecipe(35564,365,29508,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,35564,1,2,5,6,11,36,40,53,54,58)
 	self:addTradeAcquire(RecipeDB,35564,7,4)

 	-- Earthen Netherscale Boots -- 35567
-	self:addTradeSkill(RecipeDB,35567,365,29512,4,2108,nil,1,365,375,385,395)
+	AddRecipe(35567,365,29512,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,35567,1,2,6,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,35567,7,4)

 	-- Windstrike Gloves -- 35568
-	self:addTradeSkill(RecipeDB,35568,365,29509,4,2108,nil,1,365,375,385,395)
+	AddRecipe(35568,365,29509,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,35568,1,2,11,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,35568,3,24664)

 	-- Netherdrake Helm -- 35572
-	self:addTradeSkill(RecipeDB,35572,365,29510,4,2108,nil,1,365,375,385,395)
+	AddRecipe(35572,365,29510,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,35572,1,2,10,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,35572,7,4)

 	-- Netherdrake Gloves -- 35573
-	self:addTradeSkill(RecipeDB,35573,365,29511,4,2108,nil,1,365,375,385,395)
+	AddRecipe(35573,365,29511,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,35573,1,2,11,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,35573,3,24664)

 	-- Thick Netherscale Breastplate -- 35574
-	self:addTradeSkill(RecipeDB,35574,365,29514,4,2108,nil,1,365,375,385,395)
+	AddRecipe(35574,365,29514,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,35574,1,2,5,6,11,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,35574,7,4)

 	-- Ebon Netherscale Breastplate -- 35575
-	self:addTradeSkill(RecipeDB,35575,375,29515,1,2108,10657,1,375,385,395,405)
+	AddRecipe(35575,375,29515,1,1,375,385,395,405,10657)
 	self:addTradeFlags(RecipeDB,35575,1,2,3,37,41,51,58)
 	self:addTradeAcquire(RecipeDB,35575,1,7866,1,7867,1,29508)

 	-- Ebon Netherscale Belt -- 35576
-	self:addTradeSkill(RecipeDB,35576,375,29516,1,2108,10657,1,375,385,395,405)
+	AddRecipe(35576,375,29516,1,1,375,385,395,405,10657)
 	self:addTradeFlags(RecipeDB,35576,1,2,3,37,41,51,58)
 	self:addTradeAcquire(RecipeDB,35576,1,7866,1,7867,1,29508)

 	-- Ebon Netherscale Bracers -- 35577
-	self:addTradeSkill(RecipeDB,35577,375,29517,1,2108,10657,1,375,385,395,405)
+	AddRecipe(35577,375,29517,1,1,375,385,395,405,10657)
 	self:addTradeFlags(RecipeDB,35577,1,2,3,37,41,51,58)
 	self:addTradeAcquire(RecipeDB,35577,1,7866,1,7867,1,29508)

 	-- Netherstrike Breastplate -- 35580
-	self:addTradeSkill(RecipeDB,35580,375,29519,1,2108,10657,1,375,385,395,405)
+	AddRecipe(35580,375,29519,1,1,375,385,395,405,10657)
 	self:addTradeFlags(RecipeDB,35580,1,2,3,37,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,35580,1,7866,1,7867,1,29508)

 	-- Netherstrike Belt -- 35582
-	self:addTradeSkill(RecipeDB,35582,375,29520,1,2108,10657,1,375,385,395,405)
+	AddRecipe(35582,375,29520,1,1,375,385,395,405,10657)
 	self:addTradeFlags(RecipeDB,35582,1,2,3,37,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,35582,1,7866,1,7867,1,29508)

 	-- Netherstrike Bracers -- 35584
-	self:addTradeSkill(RecipeDB,35584,375,29521,1,2108,10657,1,375,385,395,405)
+	AddRecipe(35584,375,29521,1,1,375,385,395,405,10657)
 	self:addTradeFlags(RecipeDB,35584,1,2,3,37,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,35584,1,7866,1,7867,1,29508)

 	-- Windhawk Hauberk -- 35585
-	self:addTradeSkill(RecipeDB,35585,375,29522,1,2108,10661,1,375,385,395,405)
+	AddRecipe(35585,375,29522,1,1,375,385,395,405,10661)
 	self:addTradeFlags(RecipeDB,35585,1,2,3,37,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,35585,1,7870,1,7871,1,29509)

 	-- Windhawk Belt -- 35587
-	self:addTradeSkill(RecipeDB,35587,375,29524,1,2108,10661,1,375,385,395,405)
+	AddRecipe(35587,375,29524,1,1,375,385,395,405,10661)
 	self:addTradeFlags(RecipeDB,35587,1,2,3,37,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,35587,1,7870,1,7871,1,29509)

 	-- Windhawk Bracers -- 35588
-	self:addTradeSkill(RecipeDB,35588,375,29523,1,2108,10661,1,375,385,395,405)
+	AddRecipe(35588,375,29523,1,1,375,385,395,405,10661)
 	self:addTradeFlags(RecipeDB,35588,1,2,3,37,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,35588,1,7870,1,7871,1,29509)

 	-- Primalstrike Vest -- 35589
-	self:addTradeSkill(RecipeDB,35589,375,29525,1,2108,10659,1,375,385,395,405)
+	AddRecipe(35589,375,29525,1,1,375,385,395,405,10659)
 	self:addTradeFlags(RecipeDB,35589,1,2,3,37,41,51,57)
 	self:addTradeAcquire(RecipeDB,35589,1,7868,1,7869,1,29507)

 	-- Primalstrike Belt -- 35590
-	self:addTradeSkill(RecipeDB,35590,375,29526,1,2108,10659,1,375,385,395,405)
+	AddRecipe(35590,375,29526,1,1,375,385,395,405,10659)
 	self:addTradeFlags(RecipeDB,35590,1,2,3,37,41,51,57)
 	self:addTradeAcquire(RecipeDB,35590,1,7868,1,7869,1,29507)

 	-- Primalstrike Bracers -- 35591
-	self:addTradeSkill(RecipeDB,35591,375,29527,1,2108,10659,1,375,385,395,405)
+	AddRecipe(35591,375,29527,1,1,375,385,395,405,10659)
 	self:addTradeFlags(RecipeDB,35591,1,2,3,37,41,51,57)
 	self:addTradeAcquire(RecipeDB,35591,1,7868,1,7869,1,29507)

 	-- Blackstorm Leggings -- 36074
-	self:addTradeSkill(RecipeDB,36074,260,29964,1,2108,10659,1,260,280,290,300)
+	AddRecipe(36074,260,29964,1,1,260,280,290,300,10659)
 	self:addTradeFlags(RecipeDB,36074,1,2,3,37,41,51,57)
 	self:addTradeAcquire(RecipeDB,36074,1,7868,1,7869,1,29507)

 	-- Wildfeather Leggings -- 36075
-	self:addTradeSkill(RecipeDB,36075,260,29970,1,2108,10661,1,260,280,290,300)
+	AddRecipe(36075,260,29970,1,2108,10661,1,260,280,290,300)
 	self:addTradeFlags(RecipeDB,36075,1,2,3,37,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,36075,1,7870,1,7871,1,29509)

 	-- Dragonstrike Leggings -- 36076
-	self:addTradeSkill(RecipeDB,36076,260,29971,1,2108,10657,1,260,280,290,300)
+	AddRecipe(36076,260,29971,1,1,260,280,290,300,10657)
 	self:addTradeFlags(RecipeDB,36076,1,2,3,37,41,51,58)
 	self:addTradeAcquire(RecipeDB,36076,1,7866,1,7867,1,29508)

 	-- Primalstorm Breastplate -- 36077
-	self:addTradeSkill(RecipeDB,36077,330,29973,1,2108,10659,1,330,350,360,370)
+	AddRecipe(36077,330,29973,1,1,330,350,360,370,10659)
 	self:addTradeFlags(RecipeDB,36077,1,2,3,37,41,51,57)
 	self:addTradeAcquire(RecipeDB,36077,1,7868,1,7869,1,29507)

 	-- Living Crystal Breastplate -- 36078
-	self:addTradeSkill(RecipeDB,36078,330,29974,1,2108,10661,1,330,350,360,370)
+	AddRecipe(36078,330,29974,1,1,330,350,360,370,10661)
 	self:addTradeFlags(RecipeDB,36078,1,2,3,37,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,36078,1,7870,1,7871,1,29509)

 	-- Golden Dragonstrike Breastplate -- 36079
-	self:addTradeSkill(RecipeDB,36079,330,29975,1,2108,10657,1,330,350,360,370)
+	AddRecipe(36079,330,29975,1,1,330,350,360,370,10657)
 	self:addTradeFlags(RecipeDB,36079,1,2,3,37,41,51,58)
 	self:addTradeAcquire(RecipeDB,36079,1,7866,1,7867,1,29508)

 	-- Belt of Natural Power -- 36349
-	self:addTradeSkill(RecipeDB,36349,375,30042,4,2108,nil,1,375,385,395,405)
+	AddRecipe(36349,375,30042,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,36349,1,2,6,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,36349,8,37,8,43)

 	-- Belt of Deep Shadow -- 36351
-	self:addTradeSkill(RecipeDB,36351,375,30040,4,2108,nil,1,375,385,395,405)
+	AddRecipe(36351,375,30040,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,36351,1,2,6,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,36351,8,37,8,43)

 	-- Belt of the Black Eagle -- 36352
-	self:addTradeSkill(RecipeDB,36352,375,30046,4,2108,nil,1,375,385,395,405)
+	AddRecipe(36352,375,30046,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,36352,1,2,6,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,36352,8,37,8,43)

 	-- Monsoon Belt -- 36353
-	self:addTradeSkill(RecipeDB,36353,375,30044,4,2108,nil,1,375,385,395,405)
+	AddRecipe(36353,375,30044,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,36353,1,2,6,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,36353,8,37,8,43)

 	-- Boots of Natural Grace -- 36355
-	self:addTradeSkill(RecipeDB,36355,375,30041,4,2108,nil,1,375,385,395,405)
+	AddRecipe(36355,375,30041,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,36355,1,2,6,37,41,51,57)
 	self:addTradeAcquire(RecipeDB,36355,8,37,8,43)

 	-- Boots of Utter Darkness -- 36357
-	self:addTradeSkill(RecipeDB,36357,375,30039,4,2108,nil,1,375,385,395,405)
+	AddRecipe(36357,375,30039,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,36357,1,2,6,37,41,51,57)
 	self:addTradeAcquire(RecipeDB,36357,8,37,8,43)

 	-- Boots of the Crimson Hawk -- 36358
-	self:addTradeSkill(RecipeDB,36358,375,30045,4,2108,nil,1,375,385,395,405)
+	AddRecipe(36358,375,30045,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,36358,1,2,6,37,41,51,58)
 	self:addTradeAcquire(RecipeDB,36358,8,37,8,43)

 	-- Hurricane Boots -- 36359
-	self:addTradeSkill(RecipeDB,36359,375,30043,4,2108,nil,1,375,385,395,405)
+	AddRecipe(36359,375,30043,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,36359,1,2,6,37,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,36359,8,37,8,43)

 	-- Boots of Shackled Souls -- 39997
-	self:addTradeSkill(RecipeDB,39997,375,32398,1,2108,nil,1,375,385,395,405)
+	AddRecipe(39997,375,32398,1,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,39997,1,2,4,36,41,58,102)
 	self:addTradeAcquire(RecipeDB,39997,6,1012,1,23159)

 	-- Greaves of Shackled Souls -- 40001
-	self:addTradeSkill(RecipeDB,40001,375,32400,1,2108,nil,1,375,385,395,405)
+	AddRecipe(40001,375,32400,1,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,40001,1,2,4,36,41,58,102)
 	self:addTradeAcquire(RecipeDB,40001,6,1012,2,23159)

 	-- Waistguard of Shackled Souls -- 40002
-	self:addTradeSkill(RecipeDB,40002,375,32397,1,2108,nil,1,375,385,395,405)
+	AddRecipe(40002,375,32397,1,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,40002,1,2,4,36,41,58,102)
 	self:addTradeAcquire(RecipeDB,40002,6,1012,2,23159)

 	-- Redeemed Soul Moccasins -- 40003
-	self:addTradeSkill(RecipeDB,40003,375,32394,1,2108,nil,1,375,385,395,405)
+	AddRecipe(40003,375,32394,1,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,40003,1,2,4,36,41,57,102)
 	self:addTradeAcquire(RecipeDB,40003,6,1012,2,23159)

 	-- Redeemed Soul Wristguards -- 40004
-	self:addTradeSkill(RecipeDB,40004,375,32395,1,2108,nil,1,375,385,395,405)
+	AddRecipe(40004,375,32395,1,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,40004,1,2,4,36,41,57,102)
 	self:addTradeAcquire(RecipeDB,40004,6,1012,2,23159)

 	-- Redeemed Soul Legguards -- 40005
-	self:addTradeSkill(RecipeDB,40005,375,32396,1,2108,nil,1,375,385,395,405)
+	AddRecipe(40005,375,32396,1,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,40005,1,2,4,36,41,57,102)
 	self:addTradeAcquire(RecipeDB,40005,6,1012,1,23159)

 	-- Redeemed Soul Cinch -- 40006
-	self:addTradeSkill(RecipeDB,40006,375,32393,1,2108,nil,1,375,385,395,405)
+	AddRecipe(40006,375,32393,1,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,40006,1,2,4,36,41,57,102)
 	self:addTradeAcquire(RecipeDB,40006,6,1012,1,23159)

 	-- Bracers of Renewed Life -- 41156
-	self:addTradeSkill(RecipeDB,41156,375,32582,4,2108,nil,1,375,385,395,405)
+	AddRecipe(41156,375,32582,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,41156,1,2,10,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,41156,7,4)

 	-- Shoulderpads of Renewed Life -- 41157
-	self:addTradeSkill(RecipeDB,41157,375,32583,4,2108,nil,1,375,385,395,405)
+	AddRecipe(41157,375,32583,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,41157,1,2,6,37,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,41157,8,27,8,34)

 	-- Swiftstrike Bracers -- 41158
-	self:addTradeSkill(RecipeDB,41158,375,32580,4,2108,nil,1,375,385,395,405)
+	AddRecipe(41158,375,32580,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,41158,1,2,6,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,41158,8,27,8,34)

 	-- Swiftstrike Shoulders -- 41160
-	self:addTradeSkill(RecipeDB,41160,375,32581,4,2108,nil,1,375,385,395,405)
+	AddRecipe(41160,375,32581,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,41160,1,2,10,37,40,51,57)
 	self:addTradeAcquire(RecipeDB,41160,7,4)

 	-- Bindings of Lightning Reflexes -- 41161
-	self:addTradeSkill(RecipeDB,41161,375,32574,4,2108,nil,1,375,385,395,405)
+	AddRecipe(41161,375,32574,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,41161,1,2,6,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,41161,8,27,8,34)

 	-- Shoulders of Lightning Reflexes -- 41162
-	self:addTradeSkill(RecipeDB,41162,375,32575,4,2108,nil,1,375,385,395,405)
+	AddRecipe(41162,375,32575,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,41162,1,2,10,37,40,51,58)
 	self:addTradeAcquire(RecipeDB,41162,7,4)

 	-- Living Earth Bindings -- 41163
-	self:addTradeSkill(RecipeDB,41163,375,32577,4,2108,nil,1,375,385,395,405)
+	AddRecipe(41163,375,32577,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,41163,1,2,10,36,40,53,54,58)
 	self:addTradeAcquire(RecipeDB,41163,7,4)

 	-- Living Earth Shoulders -- 41164
-	self:addTradeSkill(RecipeDB,41164,375,32579,4,2108,nil,1,375,385,395,405)
+	AddRecipe(41164,375,32579,4,1,375,385,395,405)
 	self:addTradeFlags(RecipeDB,41164,1,2,6,37,40,53,54,58)
 	self:addTradeAcquire(RecipeDB,41164,8,27,8,34)

 	-- Cloak of Darkness -- 42546
-	self:addTradeSkill(RecipeDB,42546,360,33122,3,2108,nil,1,360,370,380,390)
+	AddRecipe(42546,360,33122,3,1,360,370,380,390)
 	self:addTradeFlags(RecipeDB,42546,1,2,4,36,41,51,60,114)
 	self:addTradeAcquire(RecipeDB,42546,6,967,4,18255)

 	-- Shadowprowler's Chestguard -- 42731
-	self:addTradeSkill(RecipeDB,42731,365,33204,4,2108,nil,1,365,375,385,395)
+	AddRecipe(42731,365,33204,4,1,365,375,385,395)
 	self:addTradeFlags(RecipeDB,42731,1,2,4,36,41,51,57,114)
 	self:addTradeAcquire(RecipeDB,42731,6,967,3,18255)

 	-- Knothide Ammo Pouch -- 44343
-	self:addTradeSkill(RecipeDB,44343,315,34099,2,2108,nil,1,315,325,335,345)
+	AddRecipe(44343,315,34099,2,1,315,325,335,345)
 	self:addTradeFlags(RecipeDB,44343,1,2,3,36,41,78)
 	self:addTradeAcquire(RecipeDB,44343,1,18754,1,18771,1,19187,1,21087,1,33681,1,33612,1,
 33635)

 	-- Knothide Quiver -- 44344
-	self:addTradeSkill(RecipeDB,44344,315,34100,2,2108,nil,1,315,325,335,345)
+	AddRecipe(44344,315,34100,2,1,315,325,335,345)
 	self:addTradeFlags(RecipeDB,44344,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,44344,1,18754,1,18771,1,19187,1,21087,1,33681,1,33612,1,
 33635)

 	-- Quiver of a Thousand Feathers -- 44359
-	self:addTradeSkill(RecipeDB,44359,350,34105,1,2108,nil,1,350,360,370,380)
+	AddRecipe(44359,350,34105,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,44359,1,2,4,36,41,107)
 	self:addTradeAcquire(RecipeDB,44359,6,1011,3,21655)

 	-- Netherscale Ammo Pouch -- 44768
-	self:addTradeSkill(RecipeDB,44768,350,34106,1,2108,nil,1,350,360,370,380)
+	AddRecipe(44768,350,34106,1,1,350,360,370,380)
 	self:addTradeFlags(RecipeDB,44768,1,2,4,36,41,78,104)
 	self:addTradeAcquire(RecipeDB,44768,6,947,3,17585,6,946,3,17657)

 	-- Glove Reinforcements -- 44770
-	self:addTradeSkill(RecipeDB,44770,350,34207,2,2108,nil,1,350,355,360,365)
+	AddRecipe(44770,350,34207,2,1,350,355,360,365)
 	self:addTradeFlags(RecipeDB,44770,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,44770,1,18754,1,18771,1,19187,1,21087,1,33681,1,33612,1,
 33635)

 	-- Winter Boots -- 44953
-	self:addTradeSkill(RecipeDB,44953,285,34086,2,2108,nil,1,285,285,285,285)
+	AddRecipe(44953,285,34086,2,1,285,285,285,285)
 	self:addTradeFlags(RecipeDB,44953,1,2,4,7,36,41,56)
 	self:addTradeAcquire(RecipeDB,44953,5,1,2,13420,2,13433)

 	-- Heavy Knothide Armor Kit -- 44970
-	self:addTradeSkill(RecipeDB,44970,350,34330,1,2108,nil,1,350,355,360,365)
+	AddRecipe(44970,350,34330,1,1,350,355,360,365)
 	self:addTradeFlags(RecipeDB,44970,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,44970,1,18754,1,18771,1,19187,1,21087,1,33681,1,33612,1,
 33635)

 	-- Leatherworker's Satchel -- 45100
-	self:addTradeSkill(RecipeDB,45100,300,34482,2,2108,nil,1,300,310,320,330)
+	AddRecipe(45100,300,34482,2,1,300,310,320,330)
 	self:addTradeFlags(RecipeDB,45100,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,45100,1,18754,1,18771,1,19187,1,21087,1,33681,1,33612,1,
 33635)

 	-- Bag of Many Hides -- 45117
-	self:addTradeSkill(RecipeDB,45117,360,34490,2,2108,nil,1,360,370,380,390)
+	AddRecipe(45117,360,34490,2,1,360,370,380,390)
 	self:addTradeFlags(RecipeDB,45117,1,2,11,36,41)
 	self:addTradeAcquire(RecipeDB,45117,3,22143,3,22144,3,22148,3,23022)

 	-- Leather Gauntlets of the Sun -- 46132
-	self:addTradeSkill(RecipeDB,46132,365,34372,4,2108,nil,1,365,375,392,410)
+	AddRecipe(46132,365,34372,4,1,365,375,392,410)
 	self:addTradeFlags(RecipeDB,46132,1,2,6,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,46132,8,24)

 	-- Fletcher's Gloves of the Phoenix -- 46133
-	self:addTradeSkill(RecipeDB,46133,365,34374,4,2108,nil,1,365,375,392,410)
+	AddRecipe(46133,365,34374,4,1,365,375,392,410)
 	self:addTradeFlags(RecipeDB,46133,1,2,6,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,46133,8,24)

 	-- Gloves of Immortal Dusk -- 46134
-	self:addTradeSkill(RecipeDB,46134,365,34370,4,2108,nil,1,365,375,392,410)
+	AddRecipe(46134,365,34370,4,1,365,375,392,410)
 	self:addTradeFlags(RecipeDB,46134,1,2,6,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,46134,8,24)

 	-- Sun-Drenched Scale Gloves -- 46135
-	self:addTradeSkill(RecipeDB,46135,365,34376,4,2108,nil,1,365,375,392,410)
+	AddRecipe(46135,365,34376,4,1,365,375,392,410)
 	self:addTradeFlags(RecipeDB,46135,1,2,6,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,46135,8,24)

 	-- Leather Chestguard of the Sun -- 46136
-	self:addTradeSkill(RecipeDB,46136,365,34371,4,2108,nil,1,365,375,392,410)
+	AddRecipe(46136,365,34371,4,1,365,375,392,410)
 	self:addTradeFlags(RecipeDB,46136,1,2,6,37,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,46136,8,24)

 	-- Embrace of the Phoenix -- 46137
-	self:addTradeSkill(RecipeDB,46137,365,34373,4,2108,nil,1,365,375,392,410)
+	AddRecipe(46137,365,34373,4,1,365,375,392,410)
 	self:addTradeFlags(RecipeDB,46137,1,2,6,37,40,51,58)
 	self:addTradeAcquire(RecipeDB,46137,8,24)

 	-- Carapace of Sun and Shadow -- 46138
-	self:addTradeSkill(RecipeDB,46138,365,34369,4,2108,nil,1,365,375,392,410)
+	AddRecipe(46138,365,34369,4,1,365,375,392,410)
 	self:addTradeFlags(RecipeDB,46138,1,2,6,37,40,51,57)
 	self:addTradeAcquire(RecipeDB,46138,8,24)

 	-- Sun-Drenched Scale Chestguard -- 46139
-	self:addTradeSkill(RecipeDB,46139,365,34375,4,2108,nil,1,365,375,392,410)
+	AddRecipe(46139,365,34375,4,1,365,375,392,410)
 	self:addTradeFlags(RecipeDB,46139,1,2,6,37,40,53,54,58)
 	self:addTradeAcquire(RecipeDB,46139,8,24)

 	-- Heavy Borean Leather -- 50936
-	self:addTradeSkill(RecipeDB,50936,390,38425,1,2108,nil,2,390,390,395,405)
+	AddRecipe(50936,390,38425,1,2,390,390,395,405)
 	self:addTradeFlags(RecipeDB,50936,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,50936,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Iceborne Chestguard -- 50938
-	self:addTradeSkill(RecipeDB,50938,375,38408,1,2108,nil,2,375,390,400,410)
+	AddRecipe(50938,375,38408,1,2,375,390,400,410)
 	self:addTradeFlags(RecipeDB,50938,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,50938,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Iceborne Leggings -- 50939
-	self:addTradeSkill(RecipeDB,50939,370,38410,1,2108,nil,2,370,385,395,405)
+	AddRecipe(50939,370,38410,1,2,370,385,395,405)
 	self:addTradeFlags(RecipeDB,50939,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,50939,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Iceborne Shoulderpads -- 50940
-	self:addTradeSkill(RecipeDB,50940,380,38411,1,2108,nil,2,380,395,405,415)
+	AddRecipe(50940,380,38411,1,2,380,395,405,415)
 	self:addTradeFlags(RecipeDB,50940,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,50940,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Iceborne Gloves -- 50941
-	self:addTradeSkill(RecipeDB,50941,370,38409,1,2108,nil,2,370,385,395,405)
+	AddRecipe(50941,370,38409,1,2,370,385,395,405)
 	self:addTradeFlags(RecipeDB,50941,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,50941,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Iceborne Boots -- 50942
-	self:addTradeSkill(RecipeDB,50942,375,38407,1,2108,nil,2,375,390,400,410)
+	AddRecipe(50942,375,38407,1,2,375,390,400,410)
 	self:addTradeFlags(RecipeDB,50942,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,50942,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Iceborne Belt -- 50943
-	self:addTradeSkill(RecipeDB,50943,380,38406,1,2108,nil,2,380,380,387,395)
+	AddRecipe(50943,380,38406,1,2,380,380,387,395)
 	self:addTradeFlags(RecipeDB,50943,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,50943,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Arctic Chestpiece -- 50944
-	self:addTradeSkill(RecipeDB,50944,370,38400,2,2108,nil,2,370,385,395,405)
+	AddRecipe(50944,370,38400,2,2,370,385,395,405)
 	self:addTradeFlags(RecipeDB,50944,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,50944,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Arctic Leggings -- 50945
-	self:addTradeSkill(RecipeDB,50945,375,38401,2,2108,nil,2,375,390,400,410)
+	AddRecipe(50945,375,38401,2,2,375,390,400,410)
 	self:addTradeFlags(RecipeDB,50945,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,50945,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Arctic Shoulderpads -- 50946
-	self:addTradeSkill(RecipeDB,50946,380,38402,2,2108,nil,2,380,395,405,415)
+	AddRecipe(50946,380,38402,2,2,380,395,405,415)
 	self:addTradeFlags(RecipeDB,50946,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,50946,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Arctic Gloves -- 50947
-	self:addTradeSkill(RecipeDB,50947,375,38403,2,2108,nil,2,375,390,400,410)
+	AddRecipe(50947,375,38403,2,2,375,390,400,410)
 	self:addTradeFlags(RecipeDB,50947,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,50947,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Arctic Boots -- 50948
-	self:addTradeSkill(RecipeDB,50948,370,38404,2,2108,nil,2,370,385,395,405)
+	AddRecipe(50948,370,38404,2,2,370,385,395,405)
 	self:addTradeFlags(RecipeDB,50948,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,50948,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Arctic Belt -- 50949
-	self:addTradeSkill(RecipeDB,50949,380,38405,2,2108,nil,2,380,395,405,415)
+	AddRecipe(50949,380,38405,2,2,380,395,405,415)
 	self:addTradeFlags(RecipeDB,50949,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,50949,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Frostscale Chestguard -- 50950
-	self:addTradeSkill(RecipeDB,50950,375,38414,1,2108,nil,2,375,390,400,410)
+	AddRecipe(50950,375,38414,1,2,375,390,400,410)
 	self:addTradeFlags(RecipeDB,50950,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,50950,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Frostscale Leggings -- 50951
-	self:addTradeSkill(RecipeDB,50951,370,38416,1,2108,nil,2,370,385,395,405)
+	AddRecipe(50951,370,38416,1,2,370,385,395,405)
 	self:addTradeFlags(RecipeDB,50951,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,50951,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Frostscale Shoulders -- 50952
-	self:addTradeSkill(RecipeDB,50952,375,38424,1,2108,nil,2,375,390,400,410)
+	AddRecipe(50952,375,38424,1,2,375,390,400,410)
 	self:addTradeFlags(RecipeDB,50952,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,50952,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Frostscale Gloves -- 50953
-	self:addTradeSkill(RecipeDB,50953,380,38415,1,2108,nil,2,380,395,405,415)
+	AddRecipe(50953,380,38415,1,2,380,395,405,415)
 	self:addTradeFlags(RecipeDB,50953,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,50953,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Frostscale Boots -- 50954
-	self:addTradeSkill(RecipeDB,50954,380,38413,1,2108,nil,2,380,395,405,415)
+	AddRecipe(50954,380,38413,1,2,380,395,405,415)
 	self:addTradeFlags(RecipeDB,50954,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,50954,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Frostscale Belt -- 50955
-	self:addTradeSkill(RecipeDB,50955,370,38412,1,2108,nil,2,370,385,395,405)
+	AddRecipe(50955,370,38412,1,2,370,385,395,405)
 	self:addTradeFlags(RecipeDB,50955,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,50955,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Nerubian Chestguard -- 50956
-	self:addTradeSkill(RecipeDB,50956,375,38420,1,2108,nil,2,375,390,400,410)
+	AddRecipe(50956,375,38420,1,2,375,390,400,410)
 	self:addTradeFlags(RecipeDB,50956,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,50956,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Nerubian Legguards -- 50957
-	self:addTradeSkill(RecipeDB,50957,370,38422,2,2108,nil,2,370,385,395,405)
+	AddRecipe(50957,370,38422,2,2,370,385,395,405)
 	self:addTradeFlags(RecipeDB,50957,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,50957,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Nerubian Shoulders -- 50958
-	self:addTradeSkill(RecipeDB,50958,380,38417,1,2108,nil,2,380,395,405,415)
+	AddRecipe(50958,380,38417,1,2,380,395,405,415)
 	self:addTradeFlags(RecipeDB,50958,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,50958,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Nerubian Gloves -- 50959
-	self:addTradeSkill(RecipeDB,50959,370,38421,1,2108,nil,2,370,385,395,405)
+	AddRecipe(50959,370,38421,1,2,370,385,395,405)
 	self:addTradeFlags(RecipeDB,50959,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,50959,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Nerubian Boots -- 50960
-	self:addTradeSkill(RecipeDB,50960,380,38419,1,2108,nil,2,380,395,405,415)
+	AddRecipe(50960,380,38419,1,2,380,395,405,415)
 	self:addTradeFlags(RecipeDB,50960,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,50960,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Nerubian Belt -- 50961
-	self:addTradeSkill(RecipeDB,50961,375,38418,1,2108,nil,2,375,390,400,410)
+	AddRecipe(50961,375,38418,1,2,375,390,400,410)
 	self:addTradeFlags(RecipeDB,50961,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,50961,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Borean Armor Kit -- 50962
-	self:addTradeSkill(RecipeDB,50962,350,38375,1,2108,nil,2,350,375,380,385)
+	AddRecipe(50962,350,38375,1,2,350,375,380,385)
 	self:addTradeFlags(RecipeDB,50962,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,50962,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Heavy Borean Armor Kit -- 50963
-	self:addTradeSkill(RecipeDB,50963,395,38376,2,2108,nil,2,395,400,402,405)
+	AddRecipe(50963,395,38376,2,2,395,400,402,405)
 	self:addTradeFlags(RecipeDB,50963,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,50963,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Jormungar Leg Armor -- 50964
-	self:addTradeSkill(RecipeDB,50964,405,38371,1,2108,nil,2,405,410,415,420)
+	AddRecipe(50964,405,38371,1,2,405,410,415,420)
 	self:addTradeFlags(RecipeDB,50964,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,50964,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Frosthide Leg Armor -- 50965
-	self:addTradeSkill(RecipeDB,50965,425,38373,4,2108,nil,2,425,435,440,445)
+	AddRecipe(50965,425,38373,4,2,425,435,440,445)
 	self:addTradeFlags(RecipeDB,50965,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,50965,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Nerubian Leg Armor -- 50966
-	self:addTradeSkill(RecipeDB,50966,400,38372,1,2108,nil,2,400,405,410,415)
+	AddRecipe(50966,400,38372,1,2,400,405,410,415)
 	self:addTradeFlags(RecipeDB,50966,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,50966,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Icescale Leg Armor -- 50967
-	self:addTradeSkill(RecipeDB,50967,425,38374,4,2108,nil,2,425,435,440,445)
+	AddRecipe(50967,425,38374,4,2,425,435,440,445)
 	self:addTradeFlags(RecipeDB,50967,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,50967,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Trapper's Traveling Pack -- 50970
-	self:addTradeSkill(RecipeDB,50970,415,38399,3,2108,nil,2,415,420,422,425)
+	AddRecipe(50970,415,38399,3,2,415,420,422,425)
 	self:addTradeFlags(RecipeDB,50970,1,2,4,36,41,120)
 	self:addTradeAcquire(RecipeDB,50970,6,1073,3,31916,6,1073,3,32763)

 	-- Mammoth Mining Bag -- 50971
-	self:addTradeSkill(RecipeDB,50971,415,38347,3,2108,nil,2,415,420,422,425)
+	AddRecipe(50971,415,38347,3,2,415,420,422,425)
 	self:addTradeFlags(RecipeDB,50971,1,2,4,36,41,119)
 	self:addTradeAcquire(RecipeDB,50971,6,1119,2,32540)

 	-- Black Chitinguard Boots -- 51568
-	self:addTradeSkill(RecipeDB,51568,400,38590,1,2108,nil,2,400,415,425,435)
+	AddRecipe(51568,400,38590,1,2,400,415,425,435)
 	self:addTradeFlags(RecipeDB,51568,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,51568,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Dark Arctic Leggings -- 51569
-	self:addTradeSkill(RecipeDB,51569,395,38591,1,2108,nil,2,395,410,420,430)
+	AddRecipe(51569,395,38591,1,2,395,410,420,430)
 	self:addTradeFlags(RecipeDB,51569,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,51569,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Dark Arctic Chestpiece -- 51570
-	self:addTradeSkill(RecipeDB,51570,395,38592,1,2108,nil,2,395,410,420,430)
+	AddRecipe(51570,395,38592,1,2,395,410,420,430)
 	self:addTradeFlags(RecipeDB,51570,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,51570,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Arctic Wristguards -- 51571
-	self:addTradeSkill(RecipeDB,51571,385,38433,1,2108,nil,2,385,400,410,420)
+	AddRecipe(51571,385,38433,1,2,385,400,410,420)
 	self:addTradeFlags(RecipeDB,51571,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,51571,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Arctic Helm -- 51572
-	self:addTradeSkill(RecipeDB,51572,385,38437,1,2108,nil,2,385,400,410,420)
+	AddRecipe(51572,385,38437,1,2,385,400,410,420)
 	self:addTradeFlags(RecipeDB,51572,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,51572,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Bracers of Shackled Souls -- 52733
-	self:addTradeSkill(RecipeDB,52733,375,32399,1,2108,nil,2,375,385,395,405)
+	AddRecipe(52733,375,32399,1,2,375,385,395,405)
 	self:addTradeFlags(RecipeDB,52733,1,2,4,36,41,58,102)
 	self:addTradeAcquire(RecipeDB,52733,6,1012,1,23159)

 	-- Cloak of Tormented Skies -- 55199
-	self:addTradeSkill(RecipeDB,55199,395,41238,1,2108,nil,2,395,405,415,425)
+	AddRecipe(55199,395,41238,1,2,395,405,415,425)
 	self:addTradeFlags(RecipeDB,55199,1,2,3,36,41,52,60)
 	self:addTradeAcquire(RecipeDB,55199,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Fur Lining - Attack Power -- 57683
-	self:addTradeSkill(RecipeDB,57683,400,nil,1,2108,nil,2,400,425,430,435)
+	AddRecipe(57683,400,nil,1,2,400,425,430,435)
 	self:addTradeFlags(RecipeDB,57683,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,57683,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Fur Lining - Stamina -- 57690
-	self:addTradeSkill(RecipeDB,57690,400,nil,1,2108,nil,2,400,425,430,435)
+	AddRecipe(57690,400,nil,1,2,400,425,430,435)
 	self:addTradeFlags(RecipeDB,57690,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,57690,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Fur Lining - Spell Power -- 57691
-	self:addTradeSkill(RecipeDB,57691,400,nil,1,2108,nil,2,400,425,430,435)
+	AddRecipe(57691,400,nil,1,2,400,425,430,435)
 	self:addTradeFlags(RecipeDB,57691,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,57691,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Fur Lining - Fire Resist -- 57692
-	self:addTradeSkill(RecipeDB,57692,400,nil,3,2108,nil,2,400,425,430,435)
+	AddRecipe(57692,400,nil,3,2,400,425,430,435)
 	self:addTradeFlags(RecipeDB,57692,1,2,11,36,41)
 	self:addTradeAcquire(RecipeDB,57692,3,30921)

 	-- Fur Lining - Frost Resist -- 57694
-	self:addTradeSkill(RecipeDB,57694,400,nil,3,2108,nil,2,400,425,430,435)
+	AddRecipe(57694,400,nil,3,2,400,425,430,435)
 	self:addTradeFlags(RecipeDB,57694,1,2,11,36,41)
 	self:addTradeAcquire(RecipeDB,57694,3,32289)

 	-- Fur Lining - Shadow Resist -- 57696
-	self:addTradeSkill(RecipeDB,57696,400,nil,3,2108,nil,2,400,425,430,435)
+	AddRecipe(57696,400,nil,3,2,400,425,430,435)
 	self:addTradeFlags(RecipeDB,57696,1,2,11,36,41)
 	self:addTradeAcquire(RecipeDB,57696,3,32349)

 	-- Fur Lining - Nature Resist -- 57699
-	self:addTradeSkill(RecipeDB,57699,400,nil,3,2108,nil,2,400,425,430,435)
+	AddRecipe(57699,400,nil,3,2,400,425,430,435)
 	self:addTradeFlags(RecipeDB,57699,1,2,11,36,41)
 	self:addTradeAcquire(RecipeDB,57699,3,32290)

 	-- Fur Lining - Arcane Resist -- 57701
-	self:addTradeSkill(RecipeDB,57701,400,nil,3,2108,nil,2,400,425,430,435)
+	AddRecipe(57701,400,nil,3,2,400,425,430,435)
 	self:addTradeFlags(RecipeDB,57701,1,2,11,36,41)
 	self:addTradeAcquire(RecipeDB,57701,3,31702,3,32297)

 	-- Jormungar Leg Reinforcements -- 60583
-	self:addTradeSkill(RecipeDB,60583,405,nil,1,2108,nil,2,405,405,405,410)
+	AddRecipe(60583,405,nil,1,2,405,405,405,410)
 	self:addTradeFlags(RecipeDB,60583,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,60583,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Nerubian Leg Reinforcements -- 60584
-	self:addTradeSkill(RecipeDB,60584,400,nil,1,2108,nil,2,400,400,400,405)
+	AddRecipe(60584,400,nil,1,2,400,400,400,405)
 	self:addTradeFlags(RecipeDB,60584,1,2,3,36,41,51)
 	self:addTradeAcquire(RecipeDB,60584,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Frostscale Bracers -- 60599
-	self:addTradeSkill(RecipeDB,60599,385,38436,1,2108,nil,2,385,400,410,420)
+	AddRecipe(60599,385,38436,1,2,385,400,410,420)
 	self:addTradeFlags(RecipeDB,60599,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60599,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Frostscale Helm -- 60600
-	self:addTradeSkill(RecipeDB,60600,385,38440,1,2108,nil,2,385,400,410,420)
+	AddRecipe(60600,385,38440,1,2,385,400,410,420)
 	self:addTradeFlags(RecipeDB,60600,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60600,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Dark Frostscale Leggings -- 60601
-	self:addTradeSkill(RecipeDB,60601,395,44436,1,2108,nil,2,395,410,420,430)
+	AddRecipe(60601,395,44436,1,2,395,410,420,430)
 	self:addTradeFlags(RecipeDB,60601,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60601,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Dark Frostscale Breastplate -- 60604
-	self:addTradeSkill(RecipeDB,60604,395,44437,1,2108,nil,2,395,410,420,430)
+	AddRecipe(60604,395,44437,1,2,395,410,420,430)
 	self:addTradeFlags(RecipeDB,60604,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60604,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Dragonstompers -- 60605
-	self:addTradeSkill(RecipeDB,60605,400,44438,1,2108,nil,2,400,415,425,435)
+	AddRecipe(60605,400,44438,1,2,400,415,425,435)
 	self:addTradeFlags(RecipeDB,60605,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60605,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Iceborne Wristguards -- 60607
-	self:addTradeSkill(RecipeDB,60607,385,38434,1,2108,nil,2,385,400,410,420)
+	AddRecipe(60607,385,38434,1,2,385,400,410,420)
 	self:addTradeFlags(RecipeDB,60607,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60607,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Iceborne Helm -- 60608
-	self:addTradeSkill(RecipeDB,60608,385,38438,1,2108,nil,2,385,400,410,420)
+	AddRecipe(60608,385,38438,1,2,385,400,410,420)
 	self:addTradeFlags(RecipeDB,60608,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60608,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Dark Iceborne Leggings -- 60611
-	self:addTradeSkill(RecipeDB,60611,395,44440,1,2108,nil,2,395,410,420,430)
+	AddRecipe(60611,395,44440,1,2,395,410,420,430)
 	self:addTradeFlags(RecipeDB,60611,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60611,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Dark Iceborne Chestguard -- 60613
-	self:addTradeSkill(RecipeDB,60613,395,44441,1,2108,nil,2,395,410,420,430)
+	AddRecipe(60613,395,44441,1,2,395,410,420,430)
 	self:addTradeFlags(RecipeDB,60613,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60613,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Bugsquashers -- 60620
-	self:addTradeSkill(RecipeDB,60620,400,44442,1,2108,nil,2,400,415,425,435)
+	AddRecipe(60620,400,44442,1,2,400,415,425,435)
 	self:addTradeFlags(RecipeDB,60620,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60620,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Nerubian Bracers -- 60622
-	self:addTradeSkill(RecipeDB,60622,385,38435,1,2108,nil,2,385,400,410,420)
+	AddRecipe(60622,385,38435,1,2,385,400,410,420)
 	self:addTradeFlags(RecipeDB,60622,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60622,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Nerubian Helm -- 60624
-	self:addTradeSkill(RecipeDB,60624,385,38439,1,2108,nil,2,385,400,410,420)
+	AddRecipe(60624,385,38439,1,2,385,400,410,420)
 	self:addTradeFlags(RecipeDB,60624,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60624,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Dark Nerubian Leggings -- 60627
-	self:addTradeSkill(RecipeDB,60627,395,44443,1,2108,nil,2,395,410,420,430)
+	AddRecipe(60627,395,44443,1,2,395,410,420,430)
 	self:addTradeFlags(RecipeDB,60627,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60627,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Dark Nerubian Chestpiece -- 60629
-	self:addTradeSkill(RecipeDB,60629,395,44444,1,2108,nil,2,395,410,420,430)
+	AddRecipe(60629,395,44444,1,2,395,410,420,430)
 	self:addTradeFlags(RecipeDB,60629,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60629,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Scaled Icewalkers -- 60630
-	self:addTradeSkill(RecipeDB,60630,400,44445,1,2108,nil,2,400,415,425,435)
+	AddRecipe(60630,400,44445,1,2,400,415,425,435)
 	self:addTradeFlags(RecipeDB,60630,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60630,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Cloak of Harsh Winds -- 60631
-	self:addTradeSkill(RecipeDB,60631,380,38441,1,2108,nil,2,380,390,400,410)
+	AddRecipe(60631,380,38441,1,2,380,390,400,410)
 	self:addTradeFlags(RecipeDB,60631,1,2,3,36,41,51,60)
 	self:addTradeAcquire(RecipeDB,60631,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Ice Striker's Cloak -- 60637
-	self:addTradeSkill(RecipeDB,60637,440,43566,1,2108,nil,2,440,450,455,460)
+	AddRecipe(60637,440,43566,1,2,440,450,455,460)
 	self:addTradeFlags(RecipeDB,60637,1,2,3,36,41,51,60)
 	self:addTradeAcquire(RecipeDB,60637,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Durable Nerubhide Cape -- 60640
-	self:addTradeSkill(RecipeDB,60640,440,43565,1,2108,nil,2,440,450,455,460)
+	AddRecipe(60640,440,43565,1,2,440,450,455,460)
 	self:addTradeFlags(RecipeDB,60640,1,2,3,36,41,51,52,60)
 	self:addTradeAcquire(RecipeDB,60640,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Pack of Endless Pockets -- 60643
-	self:addTradeSkill(RecipeDB,60643,415,44446,3,2108,nil,2,415,420,422,425)
+	AddRecipe(60643,415,44446,3,2,415,420,422,425)
 	self:addTradeFlags(RecipeDB,60643,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,60643,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Dragonscale Ammo Pouch -- 60645
-	self:addTradeSkill(RecipeDB,60645,415,44447,3,2108,nil,2,415,420,422,425)
+	AddRecipe(60645,415,44447,3,2,415,420,422,425)
 	self:addTradeFlags(RecipeDB,60645,1,2,4,36,41,78,120)
 	self:addTradeAcquire(RecipeDB,60645,6,1073,2,31916,6,1073,2,32763)

 	-- Nerubian Reinforced Quiver -- 60647
-	self:addTradeSkill(RecipeDB,60647,415,44448,3,2108,nil,2,415,420,422,425)
+	AddRecipe(60647,415,44448,3,2,415,420,422,425)
 	self:addTradeFlags(RecipeDB,60647,1,2,4,36,41,117)
 	self:addTradeAcquire(RecipeDB,60647,6,1098,2,32538)

 	-- Razorstrike Breastplate -- 60649
-	self:addTradeSkill(RecipeDB,60649,425,43129,1,2108,nil,2,425,430,435,440)
+	AddRecipe(60649,425,43129,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60649,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60649,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Virulent Spaulders -- 60651
-	self:addTradeSkill(RecipeDB,60651,420,43130,1,2108,nil,2,420,425,430,435)
+	AddRecipe(60651,420,43130,1,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60651,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60651,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Eaglebane Bracers -- 60652
-	self:addTradeSkill(RecipeDB,60652,420,43131,1,2108,nil,2,420,425,430,435)
+	AddRecipe(60652,420,43131,1,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60652,1,2,3,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60652,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Nightshock Hood -- 60655
-	self:addTradeSkill(RecipeDB,60655,425,43132,1,2108,nil,2,425,430,435,440)
+	AddRecipe(60655,425,43132,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60655,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60655,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Nightshock Girdle -- 60658
-	self:addTradeSkill(RecipeDB,60658,420,43133,1,2108,nil,2,420,425,430,435)
+	AddRecipe(60658,420,43133,1,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60658,1,2,3,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60658,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Leggings of Visceral Strikes -- 60660
-	self:addTradeSkill(RecipeDB,60660,425,42731,1,2108,nil,2,425,430,435,440)
+	AddRecipe(60660,425,42731,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60660,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,60660,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Seafoam Gauntlets -- 60665
-	self:addTradeSkill(RecipeDB,60665,420,43255,1,2108,nil,2,420,425,430,435)
+	AddRecipe(60665,420,43255,1,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60665,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,60665,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Jormscale Footpads -- 60666
-	self:addTradeSkill(RecipeDB,60666,420,43256,1,2108,nil,2,420,425,430,435)
+	AddRecipe(60666,420,43256,1,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60666,1,2,3,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,60666,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Wildscale Breastplate -- 60669
-	self:addTradeSkill(RecipeDB,60669,425,43257,1,2108,nil,2,425,430,435,440)
+	AddRecipe(60669,425,43257,1,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60669,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60669,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Purehorn Spaulders -- 60671
-	self:addTradeSkill(RecipeDB,60671,420,43258,1,2108,nil,2,420,425,430,435)
+	AddRecipe(60671,420,43258,1,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60671,1,2,3,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60671,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Eviscerator's Facemask -- 60697
-	self:addTradeSkill(RecipeDB,60697,420,43260,3,2108,nil,2,420,425,430,435)
+	AddRecipe(60697,420,43260,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60697,1,2,4,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,60697,2,32515)

 	-- Eviscerator's Shoulderpads -- 60702
-	self:addTradeSkill(RecipeDB,60702,420,43433,3,2108,nil,2,420,425,430,435)
+	AddRecipe(60702,420,43433,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60702,1,2,4,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,60702,2,32515)

 	-- Eviscerator's Chestguard -- 60703
-	self:addTradeSkill(RecipeDB,60703,420,43434,3,2108,nil,2,420,425,430,435)
+	AddRecipe(60703,420,43434,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60703,1,2,4,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,60703,2,32515)

 	-- Eviscerator's Bindings -- 60704
-	self:addTradeSkill(RecipeDB,60704,420,43435,3,2108,nil,2,420,425,430,435)
+	AddRecipe(60704,420,43435,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60704,1,2,4,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,60704,2,32515)

 	-- Eviscerator's Gauntlets -- 60705
-	self:addTradeSkill(RecipeDB,60705,425,43436,3,2108,nil,2,425,430,435,440)
+	AddRecipe(60705,425,43436,3,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60705,1,2,4,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,60705,2,32515)

 	-- Eviscerator's Waistguard -- 60706
-	self:addTradeSkill(RecipeDB,60706,425,43437,3,2108,nil,2,425,430,435,440)
+	AddRecipe(60706,425,43437,3,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60706,1,2,4,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,60706,2,32515)

 	-- Eviscerator's Legguards -- 60711
-	self:addTradeSkill(RecipeDB,60711,425,43438,3,2108,nil,2,425,430,435,440)
+	AddRecipe(60711,425,43438,3,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60711,1,2,4,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,60711,2,32515)

 	-- Eviscerator's Treads -- 60712
-	self:addTradeSkill(RecipeDB,60712,425,43439,3,2108,nil,2,425,430,435,440)
+	AddRecipe(60712,425,43439,3,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60712,1,2,4,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,60712,2,32515)

 	-- Overcast Headguard -- 60715
-	self:addTradeSkill(RecipeDB,60715,420,43261,3,2108,nil,2,420,425,430,435)
+	AddRecipe(60715,420,43261,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60715,1,2,4,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60715,2,32515)

 	-- Overcast Spaulders -- 60716
-	self:addTradeSkill(RecipeDB,60716,420,43262,3,2108,nil,2,420,425,430,435)
+	AddRecipe(60716,420,43262,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60716,1,2,4,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60716,2,32515)

 	-- Overcast Chestguard -- 60718
-	self:addTradeSkill(RecipeDB,60718,420,43263,3,2108,nil,2,420,425,430,435)
+	AddRecipe(60718,420,43263,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60718,1,2,4,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60718,2,32515)

 	-- Overcast Bracers -- 60720
-	self:addTradeSkill(RecipeDB,60720,420,43264,3,2108,nil,2,420,425,430,435)
+	AddRecipe(60720,420,43264,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60720,1,2,4,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60720,2,32515)

 	-- Overcast Handwraps -- 60721
-	self:addTradeSkill(RecipeDB,60721,425,43265,3,2108,nil,2,425,430,435,440)
+	AddRecipe(60721,425,43265,3,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60721,1,2,4,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60721,2,32515)

 	-- Overcast Belt -- 60723
-	self:addTradeSkill(RecipeDB,60723,425,43266,3,2108,nil,2,425,430,435,440)
+	AddRecipe(60723,425,43266,3,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60723,1,2,4,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60723,2,32515)

 	-- Overcast Leggings -- 60725
-	self:addTradeSkill(RecipeDB,60725,425,43271,3,2108,nil,2,425,430,435,440)
+	AddRecipe(60725,425,43271,3,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60725,1,2,4,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60725,2,32515)

 	-- Overcast Boots -- 60727
-	self:addTradeSkill(RecipeDB,60727,425,43273,3,2108,nil,2,425,430,435,440)
+	AddRecipe(60727,425,43273,3,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60727,1,2,4,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60727,2,32515)

 	-- Swiftarrow Helm -- 60728
-	self:addTradeSkill(RecipeDB,60728,420,43447,3,2108,nil,2,420,425,430,435)
+	AddRecipe(60728,420,43447,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60728,1,2,4,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60728,2,32515)

 	-- Swiftarrow Shoulderguards -- 60729
-	self:addTradeSkill(RecipeDB,60729,420,43449,3,2108,nil,2,420,425,430,435)
+	AddRecipe(60729,420,43449,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60729,1,2,4,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60729,2,32515)

 	-- Swiftarrow Hauberk -- 60730
-	self:addTradeSkill(RecipeDB,60730,420,43445,3,2108,nil,2,420,425,430,435)
+	AddRecipe(60730,420,43445,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60730,1,2,4,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60730,2,32515)

 	-- Swiftarrow Bracers -- 60731
-	self:addTradeSkill(RecipeDB,60731,420,43444,3,2108,nil,2,420,425,430,435)
+	AddRecipe(60731,420,43444,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60731,1,2,4,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60731,2,32515)

 	-- Swiftarrow Gauntlets -- 60732
-	self:addTradeSkill(RecipeDB,60732,425,43446,3,2108,nil,2,425,430,435,440)
+	AddRecipe(60732,425,43446,3,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60732,1,2,4,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60732,2,32515)

 	-- Swiftarrow Belt -- 60734
-	self:addTradeSkill(RecipeDB,60734,425,43442,3,2108,nil,2,425,430,435,440)
+	AddRecipe(60734,425,43442,3,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60734,1,2,4,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60734,2,32515)

 	-- Swiftarrow Leggings -- 60735
-	self:addTradeSkill(RecipeDB,60735,425,43448,3,2108,nil,2,425,430,435,440)
+	AddRecipe(60735,425,43448,3,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60735,1,2,4,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60735,2,32515)

 	-- Swiftarrow Boots -- 60737
-	self:addTradeSkill(RecipeDB,60737,425,43443,3,2108,nil,2,425,430,435,440)
+	AddRecipe(60737,425,43443,3,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60737,1,2,4,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60737,2,32515)

 	-- Stormhide Crown -- 60743
-	self:addTradeSkill(RecipeDB,60743,420,43455,3,2108,nil,2,420,425,430,435)
+	AddRecipe(60743,420,43455,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60743,1,2,4,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60743,2,32515)

 	-- Stormhide Shoulders -- 60746
-	self:addTradeSkill(RecipeDB,60746,420,43457,3,2108,nil,2,420,425,430,435)
+	AddRecipe(60746,420,43457,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60746,1,2,4,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60746,2,32515)

 	-- Stormhide Hauberk -- 60747
-	self:addTradeSkill(RecipeDB,60747,420,43453,3,2108,nil,2,420,425,430,435)
+	AddRecipe(60747,420,43453,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60747,1,2,4,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60747,2,32515)

 	-- Stormhide Wristguards -- 60748
-	self:addTradeSkill(RecipeDB,60748,420,43452,3,2108,nil,2,420,425,430,435)
+	AddRecipe(60748,420,43452,3,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60748,1,2,4,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60748,2,32515)

 	-- Stormhide Grips -- 60749
-	self:addTradeSkill(RecipeDB,60749,425,43454,3,2108,nil,2,425,430,435,440)
+	AddRecipe(60749,425,43454,3,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60749,1,2,4,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60749,2,32515)

 	-- Stormhide Belt -- 60750
-	self:addTradeSkill(RecipeDB,60750,425,43450,3,2108,nil,2,425,430,435,440)
+	AddRecipe(60750,425,43450,3,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60750,1,2,4,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60750,2,32515)

 	-- Stormhide Legguards -- 60751
-	self:addTradeSkill(RecipeDB,60751,425,43456,3,2108,nil,2,425,430,435,440)
+	AddRecipe(60751,425,43456,3,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60751,1,2,4,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60751,2,32515)

 	-- Stormhide Stompers -- 60752
-	self:addTradeSkill(RecipeDB,60752,425,43451,3,2108,nil,2,425,430,435,440)
+	AddRecipe(60752,425,43451,3,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60752,1,2,4,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60752,2,32515)

 	-- Giantmaim Legguards -- 60754
-	self:addTradeSkill(RecipeDB,60754,440,43458,4,2108,nil,2,440,450,455,460)
+	AddRecipe(60754,440,43458,4,2,440,450,455,460)
 	self:addTradeFlags(RecipeDB,60754,1,2,4,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60754,2,32515)

 	-- Giantmaim Bracers -- 60755
-	self:addTradeSkill(RecipeDB,60755,440,43459,4,2108,nil,2,440,450,455,460)
+	AddRecipe(60755,440,43459,4,2,440,450,455,460)
 	self:addTradeFlags(RecipeDB,60755,1,2,4,36,41,51,58)
 	self:addTradeAcquire(RecipeDB,60755,2,32515)

 	-- Revenant's Breastplate -- 60756
-	self:addTradeSkill(RecipeDB,60756,440,43461,4,2108,nil,2,440,450,455,460)
+	AddRecipe(60756,440,43461,4,2,440,450,455,460)
 	self:addTradeFlags(RecipeDB,60756,1,2,4,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60756,2,32515)

 	-- Revenant's Treads -- 60757
-	self:addTradeSkill(RecipeDB,60757,440,43469,4,2108,nil,2,440,450,455,460)
+	AddRecipe(60757,440,43469,4,2,440,450,455,460)
 	self:addTradeFlags(RecipeDB,60757,1,2,4,36,41,53,54,58)
 	self:addTradeAcquire(RecipeDB,60757,2,32515)

 	-- Trollwoven Spaulders -- 60758
-	self:addTradeSkill(RecipeDB,60758,440,43481,4,2108,nil,2,440,450,455,460)
+	AddRecipe(60758,440,43481,4,2,440,450,455,460)
 	self:addTradeFlags(RecipeDB,60758,1,2,4,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,60758,2,32515)

 	-- Trollwoven Girdle -- 60759
-	self:addTradeSkill(RecipeDB,60759,440,43484,4,2108,nil,2,440,450,455,460)
+	AddRecipe(60759,440,43484,4,2,440,450,455,460)
 	self:addTradeFlags(RecipeDB,60759,1,2,4,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,60759,2,32515)

 	-- Earthgiving Legguards -- 60760
-	self:addTradeSkill(RecipeDB,60760,440,43495,4,2108,nil,2,440,450,455,460)
+	AddRecipe(60760,440,43495,4,2,440,450,455,460)
 	self:addTradeFlags(RecipeDB,60760,1,2,4,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60760,2,32515)

 	-- Earthgiving Boots -- 60761
-	self:addTradeSkill(RecipeDB,60761,440,43502,4,2108,nil,2,440,450,455,460)
+	AddRecipe(60761,440,43502,4,2,440,450,455,460)
 	self:addTradeFlags(RecipeDB,60761,1,2,4,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,60761,2,32515)

 	-- Polar Vest -- 60996
-	self:addTradeSkill(RecipeDB,60996,425,43590,4,2108,nil,2,425,435,445,455)
+	AddRecipe(60996,425,43590,4,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,60996,1,2,4,36,41,57)
 	self:addTradeAcquire(RecipeDB,60996,2,32515)

 	-- Polar Cord -- 60997
-	self:addTradeSkill(RecipeDB,60997,420,43591,4,2108,nil,2,420,425,430,435)
+	AddRecipe(60997,420,43591,4,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60997,1,2,4,36,41,57)
 	self:addTradeAcquire(RecipeDB,60997,2,32515)

 	-- Polar Boots -- 60998
-	self:addTradeSkill(RecipeDB,60998,420,43592,4,2108,nil,2,420,425,430,435)
+	AddRecipe(60998,420,43592,4,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,60998,1,2,4,36,41,57)
 	self:addTradeAcquire(RecipeDB,60998,2,32515)

 	-- Icy Scale Chestguard -- 60999
-	self:addTradeSkill(RecipeDB,60999,425,43593,4,2108,nil,2,425,430,435,440)
+	AddRecipe(60999,425,43593,4,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,60999,1,2,4,36,41,58)
 	self:addTradeAcquire(RecipeDB,60999,2,32515)

 	-- Icy Scale Belt -- 61000
-	self:addTradeSkill(RecipeDB,61000,420,43594,4,2108,nil,2,420,425,430,435)
+	AddRecipe(61000,420,43594,4,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,61000,1,2,4,36,41,58)
 	self:addTradeAcquire(RecipeDB,61000,2,32515)

 	-- Icy Scale Boots -- 61002
-	self:addTradeSkill(RecipeDB,61002,420,43595,4,2108,nil,2,420,425,430,435)
+	AddRecipe(61002,420,43595,4,2,420,425,430,435)
 	self:addTradeFlags(RecipeDB,61002,1,2,4,36,41,58)
 	self:addTradeAcquire(RecipeDB,61002,2,32515)

 	-- Raptor Hide Harness -- 4096
-	self:addTradeSkill(RecipeDB,4096,165,4455,2,2108,nil,2,165,185,195,205)
+	AddRecipe(4096,165,4455,2,2,165,185,195,205)
 	self:addTradeFlags(RecipeDB,4096,2,4,36,41,51,57)
 	self:addTradeAcquire(RecipeDB,4096,2,2819)

 	-- Windripper Boots -- 62176
-	self:addTradeSkill(RecipeDB,62176,440,44930,4,2108,nil,2,440,450,455,460)
+	AddRecipe(62176,440,44930,4,2,440,450,455,460)
 	self:addTradeFlags(RecipeDB,62176,1,2,4,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,62176,2,32515)

 	-- Windripper Leggings -- 62177
-	self:addTradeSkill(RecipeDB,62177,440,44931,4,2108,nil,2,440,450,455,460)
+	AddRecipe(62177,440,44931,4,2,440,450,455,460)
 	self:addTradeFlags(RecipeDB,62177,1,2,4,36,41,53,54,57)
 	self:addTradeAcquire(RecipeDB,62177,2,32515)

 	-- Earthen Leg Armor -- 62448
-	self:addTradeSkill(RecipeDB,62448,425,44963,4,2108,nil,2,425,430,435,440)
+	AddRecipe(62448,425,44963,4,2,425,430,435,440)
 	self:addTradeFlags(RecipeDB,62448,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,62448,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Borean Leather -- 64661
-	self:addTradeSkill(RecipeDB,64661,350,33568,1,2108,nil,2,350,350,362,375)
+	AddRecipe(64661,350,33568,1,2,350,350,362,375)
 	self:addTradeFlags(RecipeDB,64661,1,2,3,36,41,57)
 	self:addTradeAcquire(RecipeDB,64661,1,26911,1,26961,1,26996,1,26998,1,28700,1,33581)

 	-- Lightning Grounded Boots -- 63197
-	self:addTradeSkill(RecipeDB,63197,450,45097,4,2108,nil,2,450,455,465,475)
+	AddRecipe(63197,450,45097,4,2,450,455,465,475)
 	self:addTradeFlags(RecipeDB,63197,1,2,6,36,40,53,54,58)
 	self:addTradeAcquire(RecipeDB,63197,8,39)

 	-- Footpads of Silence -- 63199
-	self:addTradeSkill(RecipeDB,63199,450,45099,4,2108,nil,2,450,455,465,475)
+	AddRecipe(63199,450,45099,4,2,450,455,465,475)
 	self:addTradeFlags(RecipeDB,63199,1,2,6,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,63199,8,39)

 	-- Death-warmed Belt -- 63198
-	self:addTradeSkill(RecipeDB,63198,450,45098,4,2108,nil,2,450,455,465,475)
+	AddRecipe(63198,450,45098,4,2,450,455,465,475)
 	self:addTradeFlags(RecipeDB,63198,1,2,6,36,40,51,57)
 	self:addTradeAcquire(RecipeDB,63198,8,39)

 	-- Boots of Wintry Endurance -- 63201
-	self:addTradeSkill(RecipeDB,63201,450,45101,4,2108,nil,2,450,455,465,475)
+	AddRecipe(63201,450,45101,4,2,450,455,465,475)
 	self:addTradeFlags(RecipeDB,63201,1,2,6,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,63201,8,39)

 	-- Boots of Living Scale -- 63195
-	self:addTradeSkill(RecipeDB,63195,450,45095,4,2108,nil,2,450,455,465,475)
+	AddRecipe(63195,450,45095,4,2,450,455,465,475)
 	self:addTradeFlags(RecipeDB,63195,1,2,6,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,63195,8,39)

 	-- Blue Belt of Chaos -- 63196
-	self:addTradeSkill(RecipeDB,63196,450,45096,4,2108,nil,2,450,455,465,475)
+	AddRecipe(63196,450,45096,4,2,450,455,465,475)
 	self:addTradeFlags(RecipeDB,63196,1,2,6,36,40,53,54,58)
 	self:addTradeAcquire(RecipeDB,63196,8,39)

 	-- Belt of Dragons -- 63194
-	self:addTradeSkill(RecipeDB,63194,450,45553,4,2108,nil,2,450,455,465,475)
+	AddRecipe(63194,450,45553,4,2,450,455,465,475)
 	self:addTradeFlags(RecipeDB,63194,1,2,6,36,40,51,58)
 	self:addTradeAcquire(RecipeDB,63194,8,39)

 	-- Belt of Arctic Life -- 63200
-	self:addTradeSkill(RecipeDB,63200,450,45100,4,2108,nil,2,450,455,465,475)
+	AddRecipe(63200,450,45100,4,2,450,455,465,475)
 	self:addTradeFlags(RecipeDB,63200,1,2,6,36,40,53,54,57)
 	self:addTradeAcquire(RecipeDB,63200,8,39)

-	-- The number of items added with patches
-	local patchitems322 = 0
-
 	-- last recent patches Items (Leave this code in here because I think asian servers don't actually have 3.1 even)
 	local version = GetBuildInfo()

 	if (version == "3.2.2") then

 		-- Drums of Forgotten Kings -- 69386
-		self:addTradeSkill(RecipeDB,69386,450,49633,1,2108,nil,2,450,450,455,470)
+		AddRecipe(69386,450,49633,1,2,450,450,455,470)
 		self:addTradeFlags(RecipeDB,69386,1,2,3,36,41)
 		self:addTradeAcquire(RecipeDB,69386,1,28700)

 		-- Drums of the Wild -- 69388
-		self:addTradeSkill(RecipeDB,69388,450,49634,1,2108,nil,2,450,450,455,470)
+		AddRecipe(69388,450,49634,1,2,450,450,455,470)
 		self:addTradeFlags(RecipeDB,69388,1,2,3,36,41)
 		self:addTradeAcquire(RecipeDB,69388,1,28700)

-		patchitems322 = 2
-
 	end


 		-- The number of items added with patches
-	-- local ICECROWNpatchitems = 0
-
 	-- if (version == "3.3.0") then
 	     -- Legwraps of Unleashed Nature
-		 -- self:addTradeSkill(RecipeDB,)
+		 -- AddRecipe()
 		 -- self:addTradeFlags(RecipeDB,)
 		 -- self:addTradeAcquire(RecipeDB,)
      -- Blessed Cenarion Boots
-	 -- self:addTradeSkill(RecipeDB,)
+	 -- AddRecipe()
 	 -- self:addTradeFlags(RecipeDB,)
 	 -- self:addTradeAcquire(RecipeDB,)
      -- Bladeborn Leggings
-	 -- self:addTradeSkill(RecipeDB,)
+	 -- AddRecipe()
 	 -- self:addTradeFlags(RecipeDB,)
 	 -- self:addTradeAcquire(RecipeDB,)
      -- Footpads of Impending Death
-	 -- self:addTradeSkill(RecipeDB,)
+	 -- AddRecipe()
 	-- self:addTradeFlags(RecipeDB,)
 	 -- self:addTradeAcquire(RecipeDB,)
      -- Lightning-infused Leggings
-	 -- self:addTradeSkill(RecipeDB,)
+	 -- AddRecipe()
 	-- self:addTradeFlags(RecipeDB,)
 	-- self:addTradeAcquire(RecipeDB,)
      -- Earthsoul Boots
-	 -- self:addTradeSkill(RecipeDB,)
+	 -- AddRecipe()
 	 -- self:addTradeFlags(RecipeDB,)
 	 -- self:addTradeAcquire(RecipeDB,)
      -- Draconic Bonesplinter Legguards
-	 -- self:addTradeSkill(RecipeDB,)
+	 -- AddRecipe()
 	 -- self:addTradeFlags(RecipeDB,)
 	 -- self:addTradeAcquire(RecipeDB,)
      -- Rock-steady Treads
-	 -- self:addTradeSkill(RecipeDB,)
+	 -- AddRecipe()
 	 -- self:addTradeFlags(RecipeDB,)
      -- self:addTradeAcquire(RecipeDB,)

-		 --ICECROWNpatchitems = 8
-
+
 	--end


@@ -2898,100 +2854,94 @@ function addon:InitLeatherworking(RecipeDB)
 	-- We only add the faction specific recipes if the user is part of that faction
 	local BFAC = LibStub("LibBabble-Faction-3.0"):GetLookupTable()
 	local _,faction = UnitFactionGroup("player")
-	-- Counter for how many faction specific recipes we have
-	local factioncount = 0

 	if (faction == BFAC["Alliance"]) then

 		-- Black Chitin Bracers -- 67081
-		self:addTradeSkill(RecipeDB,67081,450,47579,4,2108,nil,2,450,460,467,475)
+		AddRecipe(67081,450,47579,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67081,1,6,11)
 		self:addTradeAcquire(RecipeDB,67081,8,42)

 		-- Bracers of Swift Death -- 67087
-		self:addTradeSkill(RecipeDB,67087,450,47581,4,2108,nil,2,450,460,467,475)
+		AddRecipe(67087,450,47581,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67087,1,6,11)
 		self:addTradeAcquire(RecipeDB,67087,8,42)

 		-- Crusader's Dragonscale Bracers -- 67083
-		self:addTradeSkill(RecipeDB,67083,450,47576,4,2108,nil,2,450,460,467,475)
+		AddRecipe(67083,450,47576,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67083,1,6,11,36,40,51,58)
 		self:addTradeAcquire(RecipeDB,67083,8,42)

 		-- Crusader's Dragonscale Breastplate -- 67082
-		self:addTradeSkill(RecipeDB,67082,450,47595,4,2108,nil,2,450,460,467,475)
+		AddRecipe(67082,450,47595,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67082,1,6,11)
 		self:addTradeAcquire(RecipeDB,67082,8,42)

 		-- Ensorcelled Nerubian Breastplate -- 67080
-		self:addTradeSkill(RecipeDB,67080,450,47597,4,2108,nil,2,450,460,467,475)
+		AddRecipe(67080,450,47597,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67080,1,6,11,36,40,53,54,58)
 		self:addTradeAcquire(RecipeDB,67080,8,42)

 		-- Knightbane Carapace -- 67086
-		self:addTradeSkill(RecipeDB,67086,450,47599,4,2108,nil,2,450,460,467,475)
+		AddRecipe(67086,450,47599,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67086,1,6,11)
 		self:addTradeAcquire(RecipeDB,67086,8,42)

 		-- Lunar Eclipse Chestguard -- 67084
-		self:addTradeSkill(RecipeDB,67084,450,47602,4,2108,nil,2,450,460,467,475)
+		AddRecipe(67084,450,47602,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67084,1,6,11)
 		self:addTradeAcquire(RecipeDB,67084,8,42)

 		-- Moonshadow Armguards -- 67085
-		self:addTradeSkill(RecipeDB,67085,450,47583,4,2108,nil,2,450,460,467,475)
+		AddRecipe(67085,450,47583,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67085,1,6,11)
 		self:addTradeAcquire(RecipeDB,67085,8,42)

-		factioncount = 8
-
 	elseif (faction == BFAC["Horde"]) then

 		-- Black Chitin Bracers -- 67137
-		self:addTradeSkill(RecipeDB,67137,450,47580,4,2108,nil,2,450,460,467,475)
+		AddRecipe(67137,450,47580,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67137,2,6,11,36,40,53,54,58)
 		self:addTradeAcquire(RecipeDB,67137,8,42)

 		-- Bracers of Swift Death -- 67139
-		self:addTradeSkill(RecipeDB,67139,450,47582,4,2108,nil,2,450,460,467,475)
+		AddRecipe(67139,450,47582,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67139,2,6,11,36,40,51,57)
 		self:addTradeAcquire(RecipeDB,67139,8,42)

 		-- Crusader's Dragonscale Bracers -- 67143
-		self:addTradeSkill(RecipeDB,67143,450,47577,4,2108,nil,2,450,460,467,475)
+		AddRecipe(67143,450,47577,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67143,2,6,11,36,40,51,58)
 		self:addTradeAcquire(RecipeDB,67143,8,42)

 		-- Crusader's Dragonscale Breastplate -- 67138
-		self:addTradeSkill(RecipeDB,67138,450,47596,4,2108,nil,2,450,460,467,475)
+		AddRecipe(67138,450,47596,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67138,2,6,11,36,40,51,58)
 		self:addTradeAcquire(RecipeDB,67138,8,42)

 		-- Ensorcelled Nerubian Breastplate -- 67136
-		self:addTradeSkill(RecipeDB,67136,450,47598,4,2108,nil,2,450,460,467,475)
+		AddRecipe(67136,450,47598,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67136,2,6,11,36,40,53,54,58)
 		self:addTradeAcquire(RecipeDB,67136,8,42)

 		-- Knightbane Carapace -- 67142
-		self:addTradeSkill(RecipeDB,67142,450,47600,4,2108,nil,2,450,460,467,475)
+		AddRecipe(67142,450,47600,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67142,2,6,11,36,40,51,57)
 		self:addTradeAcquire(RecipeDB,67142,8,42)

 		-- Lunar Eclipse Chestguard -- 67140
-		self:addTradeSkill(RecipeDB,67140,450,47601,4,2108,nil,2,450,460,467,475)
+		AddRecipe(67140,450,47601,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67140,2,6,11,36,40,53,54,57)
 		self:addTradeAcquire(RecipeDB,67140,8,42)

 		-- Moonshadow Armguards -- 67141
-		self:addTradeSkill(RecipeDB,67141,450,47584,4,2108,nil,2,450,460,467,475)
+		AddRecipe(67141,450,47584,4,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67141,2,6,11,36,40,53,54,57)
 		self:addTradeAcquire(RecipeDB,67141,8,42)

-		factioncount = 8
-
 	end

-	return 510 + factioncount + patchitems322 --+ ICECROWNpatchitems
+	return num_recipes


 end
diff --git a/RecipeDB/ARL-Smelt.lua b/RecipeDB/ARL-Smelt.lua
index 47a1106..06a3d2d 100644
--- a/RecipeDB/ARL-Smelt.lua
+++ b/RecipeDB/ARL-Smelt.lua
@@ -1,188 +1,213 @@
---[[
-
-************************************************************************
-
-ARL-Smelt.lua
-
-Smelting data for all of Ackis Recipe List
-
-************************************************************************
-
-File date: @file-date-iso@
-File revision: @file-revision@
-Project revision: @project-revision@
-Project version: @project-version@
-
-************************************************************************
-
-Please see http://www.wowace.com/projects/arl/for more information.
-
-License:
-	Please see LICENSE.txt
-
-This source code is released under All Rights Reserved.
-
-************************************************************************
-
-]]--
-
-local MODNAME		= "Ackis Recipe List"
-local addon		= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
-local L			= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
-
-local initialized	= false
+--------------------------------------------------------------------------------------------------------------------
+-- ARL-Smelt.lua
+-- Smelting data for all of Ackis Recipe List
+--------------------------------------------------------------------------------------------------------------------
+-- File date: @file-date-iso@
+-- File revision: @file-revision@
+-- Project revision: @project-revision@
+-- Project version: @project-version@
+--------------------------------------------------------------------------------------------------------------------
+-- Please see http://www.wowace.com/projects/arl/for more information.
+--------------------------------------------------------------------------------------------------------------------
+-- License:
+-- Please see LICENSE.txt
+-- This source code is released under All Rights Reserved.
+--------------------------------------------------------------------------------------------------------------------
+
+local MODNAME = "Ackis Recipe List"
+local addon	= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
+local L	= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
+
+--------------------------------------------------------------------------------------------------------------------
+-- Item "rarity"
+--------------------------------------------------------------------------------------------------------------------
+local R_COMMON, R_UNCOMMON, R_RARE, R_EPIC, R_LEGENDARY, R_ARTIFACT = 1, 2, 3, 4, 5, 6
+
+--------------------------------------------------------------------------------------------------------------------
+-- Origin
+--------------------------------------------------------------------------------------------------------------------
+local GAME_ORIG, GAME_TBC, GAME_WOTLK = 0, 1, 2
+
+--------------------------------------------------------------------------------------------------------------------
+-- Filter flags
+--------------------------------------------------------------------------------------------------------------------
+local F_ALLIANCE, F_HORDE, F_TRAINER, F_VENDOR, F_INSTANCE, F_RAID = 1, 2, 3, 4, 5, 6
+local F_SEASONAL, F_QUEST, F_PVP, F_WORLD_DROP, F_MOB_DROP, F_DISC = 7, 8, 9, 10, 11, 12
+local F_DK, F_DRUID, F_HUNTER, F_MAGE, F_PALADIN, F_PRIEST, F_SHAMAN, F_ROGUE, F_WARLOCK, F_WARRIOR = 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
+local F_IBOE, F_IBOP, F_IBOA, F_RBOE, F_RBOP, F_RBOA = 36, 37, 38, 40, 41, 42
+local F_DPS, F_TANK, F_HEALER, F_CASTER = 51, 52, 53, 54
+local F_CLOTH, F_LEATHER, F_MAIL, F_PLATE, F_CLOAK, F_TRINKET, F_RING, F_NECK, F_SHIELD = 56, 57, 58, 59, 60, 61, 62, 63, 64
+local F_1H, F_2H, F_AXE, F_SWORD, F_MACE, F_POLEARM, F_DAGGER = 66, 67, 68, 69, 70, 71, 72
+local F_STAFF, F_WAND, F_THROWN, F_BOW, F_XBOW, F_AMMO, F_FIST, F_GUN = 73, 74, 75, 76, 77, 78, 79, 80
+
+--------------------------------------------------------------------------------------------------------------------
+-- Acquire types
+--------------------------------------------------------------------------------------------------------------------
+local A_TRAINER, A_VENDOR, A_MOB, A_QUEST, A_SEASONAL, A_REPUTATION, A_WORLD_DROP, A_CUSTOM = 1, 2, 3, 4, 5, 6, 7, 8
+
+
+local initialized = false
+local num_recipes = 0

 function addon:InitSmelting(RecipeDB)

 	if initialized then
-		return
+		return num_recipes
 	end

 	initialized = true

+	--------------------------------------------------------------------------------------------------------------------
+	-- Counter and wrapper function
+	--------------------------------------------------------------------------------------------------------------------
+	local function AddRecipe(SpellID, Skill, ItemID, Rarity, Game, Orange, Yellow, Green, Gray)
+		num_recipes = num_recipes + 1
+		self:addTradeSkill(RecipeDB, SpellID, Skill, ItemID, Rarity, 32606, nil, Game, Orange, Yellow, Green, Gray)
+	end
+
 	-- Smelt Copper -- 2657
-	self:addTradeSkill(RecipeDB,2657,1,2840,1,32606,nil,0,1,25,47,70)
+	AddRecipe(2657,1,2840,1,0,1,25,47,70)
 	self:addTradeFlags(RecipeDB,2657,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,2657,8,8)

 	-- Smelt Silver -- 2658
-	self:addTradeSkill(RecipeDB,2658,75,2842,1,32606,nil,0,75,115,122,130)
+	AddRecipe(2658,75,2842,1,0,75,115,122,130)
 	self:addTradeFlags(RecipeDB,2658,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,2658,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,
 	1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976,
 	1,33682,1,26912)

 	-- Smelt Bronze -- 2659
-	self:addTradeSkill(RecipeDB,2659,65,2841,1,32606,nil,0,0,65,90,115)
+	AddRecipe(2659,65,2841,1,0,0,65,90,115)
 	self:addTradeFlags(RecipeDB,2659,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,2659,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,
 	1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976,
 	1,33682,1,26912)

 	-- Smelt Tin -- 3304
-	self:addTradeSkill(RecipeDB,3304,65,3576,1,32606,nil,0,0,65,70,75)
+	AddRecipe(3304,65,3576,1,0,0,65,70,75)
 	self:addTradeFlags(RecipeDB,3304,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3304,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,
 	1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976,
 	1,33682,1,26912)

 	-- Smelt Iron -- 3307
-	self:addTradeSkill(RecipeDB,3307,125,3575,1,32606,nil,0,125,130,145,160)
+	AddRecipe(3307,125,3575,1,0,125,130,145,160)
 	self:addTradeFlags(RecipeDB,3307,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3307,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,
 	1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976,
 	1,33682,1,26912)

 	-- Smelt Gold -- 3308
-	self:addTradeSkill(RecipeDB,3308,155,3577,1,32606,nil,0,155,170,177,185)
+	AddRecipe(3308,155,3577,1,0,155,170,177,185)
 	self:addTradeFlags(RecipeDB,3308,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3308,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,
 	1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976,
 	1,33682,1,26912)

 	-- Smelt Steel -- 3569
-	self:addTradeSkill(RecipeDB,3569,165,3859,1,32606,nil,0,0,0,0,165)
+	AddRecipe(3569,165,3859,1,0,0,0,0,165)
 	self:addTradeFlags(RecipeDB,3569,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3569,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,
 	1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976,
 	1,33682,1,26912)

 	-- Smelt Mithril -- 10097
-	self:addTradeSkill(RecipeDB,10097,175,3860,1,32606,nil,0,0,175,202,230)
+	AddRecipe(10097,175,3860,1,0,0,175,202,230)
 	self:addTradeFlags(RecipeDB,10097,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,10097,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,
 	1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976,
 	1,33682,1,26912)

 	-- Smelt Truesilver -- 10098
-	self:addTradeSkill(RecipeDB,10098,230,6037,1,32606,nil,0,230,235,242,250)
+	AddRecipe(10098,230,6037,1,0,230,235,242,250)
 	self:addTradeFlags(RecipeDB,10098,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,10098,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,
 	1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976,
 	1,33682,1,26912)

 	-- Smelt Dark Iron -- 14891
-	self:addTradeSkill(RecipeDB,14891,230,11371,1,32606,nil,0,230,300,305,310)
+	AddRecipe(14891,230,11371,1,0,230,300,305,310)
 	self:addTradeFlags(RecipeDB,14891,1,2,8,36,41)
 	self:addTradeAcquire(RecipeDB,14891,4,4083)

 	-- Smelt Thorium -- 16153
-	self:addTradeSkill(RecipeDB,16153,250,12359,1,32606,nil,0,0,250,270,290)
+	AddRecipe(16153,250,12359,1,0,0,250,270,290)
 	self:addTradeFlags(RecipeDB,16153,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,16153,1,1681,1,1701,1,3001,1,3137,1,3175,1,3357,1,3555,1,4254,1,4598,1,5392,
 	1,5513,1,6297,1,8128,1,16663,1,16752,1,17488,1,18747,1,18779,1,18804,1,26999,1,33617,1,28698,1,26962,1,26976,
 	1,33682,1,26912)

 	-- Smelt Elementium -- 22967
-	self:addTradeSkill(RecipeDB,22967,300,17771,5,32606,nil,0,300,350,362,375)
+	AddRecipe(22967,300,17771,5,0,300,350,362,375)
 	self:addTradeFlags(RecipeDB,22967,1,2,6,11,36,41)
 	self:addTradeAcquire(RecipeDB,22967,3,14401)

 	-- Smelt Fel Iron -- 29356
-	self:addTradeSkill(RecipeDB,29356,300,23445,1,32606,nil,1,0,300,307,315)
+	AddRecipe(29356,300,23445,1,1,0,300,307,315)
 	self:addTradeFlags(RecipeDB,29356,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,29356,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682,1,26912)

 	-- Smelt Adamantite -- 29358
-	self:addTradeSkill(RecipeDB,29358,325,23446,1,32606,nil,1,0,325,332,340)
+	AddRecipe(29358,325,23446,1,1,0,325,332,340)
 	self:addTradeFlags(RecipeDB,29358,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,29358,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682,1,26912)

 	-- Smelt Eternium -- 29359
-	self:addTradeSkill(RecipeDB,29359,350,23447,1,32606,nil,1,0,350,357,365)
+	AddRecipe(29359,350,23447,1,1,0,350,357,365)
 	self:addTradeFlags(RecipeDB,29359,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,29359,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682,1,26912)

 	-- Smelt Felsteel -- 29360
-	self:addTradeSkill(RecipeDB,29360,350,23448,1,32606,nil,1,0,350,357,375)
+	AddRecipe(29360,350,23448,1,1,0,350,357,375)
 	self:addTradeFlags(RecipeDB,29360,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,29360,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682,1,26912)

 	-- Smelt Khorium -- 29361
-	self:addTradeSkill(RecipeDB,29361,375,23449,1,32606,nil,1,0,0,0,375)
+	AddRecipe(29361,375,23449,1,1,0,0,0,375)
 	self:addTradeFlags(RecipeDB,29361,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,29361,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682,1,26912)

 	-- Smelt Hardened Adamantite -- 29686
-	self:addTradeSkill(RecipeDB,29686,375,23573,1,32606,nil,1,0,0,0,375)
+	AddRecipe(29686,375,23573,1,1,0,0,0,375)
 	self:addTradeFlags(RecipeDB,29686,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,29686,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682,1,26912)

 	-- Earth Shatter -- 35750
-	self:addTradeSkill(RecipeDB,35750,300,22573,1,32606,nil,1,0,0,0,300)
+	AddRecipe(35750,300,22573,1,1,0,0,0,300)
 	self:addTradeFlags(RecipeDB,35750,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,35750,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682,1,26912)

 	-- Fire Sunder -- 35751
-	self:addTradeSkill(RecipeDB,35751,300,22574,1,32606,nil,1,0,0,0,300)
+	AddRecipe(35751,300,22574,1,1,0,0,0,300)
 	self:addTradeFlags(RecipeDB,35751,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,35751,1,18747,1,18779,1,26999,1,33617,1,28698,1,26962,1,26976,1,33682,1,26912)

 	-- Smelt Cobalt -- 49252
-	self:addTradeSkill(RecipeDB,49252,350,36916,1,32606,nil,2,0,350,362,375)
+	AddRecipe(49252,350,36916,1,2,0,350,362,375)
 	self:addTradeFlags(RecipeDB,49252,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,49252,1,26912,1,26962,1,26976,1,26999,1,28698)

 	-- Smelt Saronite -- 49258
-	self:addTradeSkill(RecipeDB,49258,400,36913,1,32606,nil,2,0,0,0,400)
+	AddRecipe(49258,400,36913,1,2,0,0,0,400)
 	self:addTradeFlags(RecipeDB,49258,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,49258,1,26912,1,26962,1,26976,1,26999,1,28698)

 	-- Smelt Titansteel -- 55208
-	self:addTradeSkill(RecipeDB,55208,450,37663,2,32606,nil,2,0,0,0,450)
+	AddRecipe(55208,450,37663,2,2,0,0,0,450)
 	self:addTradeFlags(RecipeDB,55208,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,55208,1,26912,1,26962,1,26976,1,26999,1,28698)

 	-- Smelt Titanium -- 55211
-	self:addTradeSkill(RecipeDB,55211,450,41163,2,32606,nil,2,0,0,0,450)
+	AddRecipe(55211,450,41163,2,2,0,0,0,450)
 	self:addTradeFlags(RecipeDB,55211,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,55211,1,26912,1,26962,1,26976,1,26999,1,28698)

 	-- Smelt Hardened Khorium -- 46353
-	self:addTradeSkill(RecipeDB,46353,375,35128,3,32606,nil,1,0,0,0,375)
+	AddRecipe(46353,375,35128,3,1,0,0,0,375)
 	self:addTradeFlags(RecipeDB,46353,1,2,6,36,41)
 	self:addTradeAcquire(RecipeDB,46353,8,24)

-	return 25
+	return num_recipes

 end
diff --git a/RecipeDB/ARL-Tailor.lua b/RecipeDB/ARL-Tailor.lua
index 99d9a13..e61ee6b 100644
--- a/RecipeDB/ARL-Tailor.lua
+++ b/RecipeDB/ARL-Tailor.lua
@@ -1,40 +1,22 @@
---[[
-
-************************************************************************
-
-ARL-Tailor.lua
-
-Tailoring data for all of Ackis Recipe List
-
-************************************************************************
-
-File date: @file-date-iso@
-File revision: @file-revision@
-Project revision: @project-revision@
-Project version: @project-version@
-
-************************************************************************
-
-Format:
-
-	self:addTradeSkill(RecipeDB,Spell ID,Skill Level,Item ID,Rarity,Specialty)
-
-************************************************************************
-
-Please see http://www.wowace.com/projects/arl/for more information.
-
-License:
-	Please see LICENSE.txt
-
-This source code is released under All Rights Reserved.
-
-************************************************************************
-
-]]--
+--------------------------------------------------------------------------------------------------------------------
+-- ARL-Tailor.lua
+-- Tailoring data for all of Ackis Recipe List
+--------------------------------------------------------------------------------------------------------------------
+-- File date: @file-date-iso@
+-- File revision: @file-revision@
+-- Project revision: @project-revision@
+-- Project version: @project-version@
+--------------------------------------------------------------------------------------------------------------------
+-- Please see http://www.wowace.com/projects/arl/for more information.
+--------------------------------------------------------------------------------------------------------------------
+-- License:
+-- Please see LICENSE.txt
+-- This source code is released under All Rights Reserved.
+--------------------------------------------------------------------------------------------------------------------

-local MODNAME	= "Ackis Recipe List"
-local addon		= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
-local L			= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
+local MODNAME = "Ackis Recipe List"
+local addon	= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
+local L	= LibStub("AceLocale-3.0"):GetLocale(MODNAME)

 --------------------------------------------------------------------------------------------------------------------
 -- Item "rarity"
@@ -59,45 +41,32 @@ local F_1H, F_2H, F_AXE, F_SWORD, F_MACE, F_POLEARM, F_DAGGER = 66, 67, 68, 69,
 local F_STAFF, F_WAND, F_THROWN, F_BOW, F_XBOW, F_AMMO, F_FIST, F_GUN = 73, 74, 75, 76, 77, 78, 79, 80

 --------------------------------------------------------------------------------------------------------------------
--- Reputation Filter flags
---------------------------------------------------------------------------------------------------------------------
-local F_ARGENTDAWN, F_CENARION_CIRCLE, F_THORIUM_BROTHERHOOD, F_TIMBERMAW_HOLD, F_ZANDALAR = 96, 97, 98, 99, 100
-local F_ALDOR, F_ASHTONGUE, F_CENARION_EXPEDITION, F_HELLFIRE, F_CONSORTIUM = 101, 102, 103, 104, 105
-local F_KOT, F_LOWERCITY, F_NAGRAND, F_SCALE_SANDS, F_SCRYER, F_SHATAR = 106, 107, 108, 109, 110
-local F_SHATTEREDSUN, F_SPOREGGAR, F_VIOLETEYE = 111, 112, 113, 114
-local F_ARGENTCRUSADE, F_FRENZYHEART, F_EBONBLADE, F_KIRINTOR, F_HODIR = 115, 116, 117, 118, 119
-local F_KALUAK, F_ORACLES, F_WYRMREST, F_WRATHCOMMON1, F_WRATHCOMMON2 = 120, 121, 122, 123, 124
-local F_WRATHCOMMON3, F_WRATHCOMMON4, F_WRATHCOMMON5 = 125, 126, 127
-
---------------------------------------------------------------------------------------------------------------------
 -- Acquire types
 --------------------------------------------------------------------------------------------------------------------
 local A_TRAINER, A_VENDOR, A_MOB, A_QUEST, A_SEASONAL, A_REPUTATION, A_WORLD_DROP, A_CUSTOM = 1, 2, 3, 4, 5, 6, 7, 8

---------------------------------------------------------------------------------------------------------------------
--- Reputation Acquire Flags
---------------------------------------------------------------------------------------------------------------------
-local R_WINTERSPRING = 589

---------------------------------------------------------------------------------------------------------------------
--- Reputation Levels
---------------------------------------------------------------------------------------------------------------------
-local FRIENDLY = 1
-local HONORED = 2
-local REVERED = 3
-local EXALTED = 4
-local initialized	= false
+local initialized = false
+local num_recipes = 0

 function addon:InitTailoring(RecipeDB)

 	if initialized then
-		return
+		return num_recipes
 	end

 	initialized = true

+	--------------------------------------------------------------------------------------------------------------------
+	-- Counter and wrapper function
+	--------------------------------------------------------------------------------------------------------------------
+	local function AddRecipe(SpellID, Skill, ItemID, Rarity, Game, Orange, Yellow, Green, Gray, Speciality)
+		num_recipes = num_recipes + 1
+		self:addTradeSkill(RecipeDB, SpellID, Skill, ItemID, Rarity, 3908, Speciality, Game, Orange, Yellow, Green, Gray)
+	end
+
 	-- Brown Linen Vest -- 2385
-	self:addTradeSkill(RecipeDB,2385,10,2568,1,3908,nil,GAME_ORIG,10,45,57,70)
+	AddRecipe(2385,10,2568,1,GAME_ORIG,10,45,57,70)
 	self:addTradeFlags(RecipeDB,2385,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,2385,1,1103,1,1346,1,2399,1,2627,1,3004
 	,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1,
@@ -105,7 +74,7 @@ function addon:InitTailoring(RecipeDB)
 	1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Linen Boots -- 2386
-	self:addTradeSkill(RecipeDB,2386,65,2569,1,3908,nil,GAME_ORIG,65,90,107,125)
+	AddRecipe(2386,65,2569,1,GAME_ORIG,65,90,107,125)
 	self:addTradeFlags(RecipeDB,2386,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,2386,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -113,17 +82,17 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Linen Cloak -- 2387
-	self:addTradeSkill(RecipeDB,2387,1,2570,1,3908,nil,GAME_ORIG,1,35,47,60)
+	AddRecipe(2387,1,2570,1,GAME_ORIG,1,35,47,60)
 	self:addTradeFlags(RecipeDB,2387,1,2,3,36,41,60)
 	self:addTradeAcquire(RecipeDB,2387,8,8)

 	-- Red Linen Robe -- 2389
-	self:addTradeSkill(RecipeDB,2389,40,2572,2,3908,nil,GAME_ORIG,40,65,82,100)
+	AddRecipe(2389,40,2572,2,GAME_ORIG,40,65,82,100)
 	self:addTradeFlags(RecipeDB,2389,1,2,10,36,40,56)
 	self:addTradeAcquire(RecipeDB,2389,7,2)

 	-- Red Linen Shirt -- 2392
-	self:addTradeSkill(RecipeDB,2392,40,2575,1,3908,nil,GAME_ORIG,40,65,82,100)
+	AddRecipe(2392,40,2575,1,GAME_ORIG,40,65,82,100)
 	self:addTradeFlags(RecipeDB,2392,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,2392,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -131,7 +100,7 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- White Linen Shirt -- 2393
-	self:addTradeSkill(RecipeDB,2393,1,2576,1,3908,nil,GAME_ORIG,1,35,47,60)
+	AddRecipe(2393,1,2576,1,GAME_ORIG,1,35,47,60)
 	self:addTradeFlags(RecipeDB,2393,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,2393,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -139,7 +108,7 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Blue Linen Shirt -- 2394
-	self:addTradeSkill(RecipeDB,2394,40,2577,1,3908,nil,GAME_ORIG,40,65,82,100)
+	AddRecipe(2394,40,2577,1,GAME_ORIG,40,65,82,100)
 	self:addTradeFlags(RecipeDB,2394,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,2394,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -147,7 +116,7 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Barbaric Linen Vest -- 2395
-	self:addTradeSkill(RecipeDB,2395,70,2578,1,3908,nil,GAME_ORIG,70,95,112,130)
+	AddRecipe(2395,70,2578,1,GAME_ORIG,70,95,112,130)
 	self:addTradeFlags(RecipeDB,2395,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,2395,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -155,7 +124,7 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Green Linen Shirt -- 2396
-	self:addTradeSkill(RecipeDB,2396,70,2579,1,3908,nil,GAME_ORIG,70,95,112,130)
+	AddRecipe(2396,70,2579,1,GAME_ORIG,70,95,112,130)
 	self:addTradeFlags(RecipeDB,2396,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,2396,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -163,7 +132,7 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Reinforced Linen Cape -- 2397
-	self:addTradeSkill(RecipeDB,2397,60,2580,1,3908,nil,GAME_ORIG,60,85,102,120)
+	AddRecipe(2397,60,2580,1,GAME_ORIG,60,85,102,120)
 	self:addTradeFlags(RecipeDB,2397,1,2,3,36,41,60)
 	self:addTradeAcquire(RecipeDB,2397,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -171,21 +140,21 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Green Woolen Vest -- 2399
-	self:addTradeSkill(RecipeDB,2399,85,2582,1,3908,nil,GAME_ORIG,85,110,127,145)
+	AddRecipe(2399,85,2582,1,GAME_ORIG,85,110,127,145)
 	self:addTradeFlags(RecipeDB,2399,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,2399,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Woolen Boots -- 2401
-	self:addTradeSkill(RecipeDB,2401,95,2583,1,3908,nil,GAME_ORIG,95,120,137,155)
+	AddRecipe(2401,95,2583,1,GAME_ORIG,95,120,137,155)
 	self:addTradeFlags(RecipeDB,2401,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,2401,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Woolen Cape -- 2402
-	self:addTradeSkill(RecipeDB,2402,75,2584,1,3908,nil,GAME_ORIG,75,100,117,135)
+	AddRecipe(2402,75,2584,1,GAME_ORIG,75,100,117,135)
 	self:addTradeFlags(RecipeDB,2402,1,2,3,36,41,60)
 	self:addTradeAcquire(RecipeDB,2402,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -193,24 +162,24 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Gray Woolen Robe -- 2403
-	self:addTradeSkill(RecipeDB,2403,105,2585,2,3908,nil,GAME_ORIG,105,130,147,165)
+	AddRecipe(2403,105,2585,2,GAME_ORIG,105,130,147,165)
 	self:addTradeFlags(RecipeDB,2403,1,2,10,36,40,56)
 	self:addTradeAcquire(RecipeDB,2403,7,2)

 	-- Gray Woolen Shirt -- 2406
-	self:addTradeSkill(RecipeDB,2406,100,2587,1,3908,nil,GAME_ORIG,100,110,120,130)
+	AddRecipe(2406,100,2587,1,GAME_ORIG,100,110,120,130)
 	self:addTradeFlags(RecipeDB,2406,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,2406,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Bolt of Linen Cloth -- 2963
-	self:addTradeSkill(RecipeDB,2963,1,2996,1,3908,nil,GAME_ORIG,1,25,37,50)
+	AddRecipe(2963,1,2996,1,GAME_ORIG,1,25,37,50)
 	self:addTradeFlags(RecipeDB,2963,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,2963,8,8)

 	-- Bolt of Woolen Cloth -- 2964
-	self:addTradeSkill(RecipeDB,2964,75,2997,1,3908,nil,GAME_ORIG,75,90,97,105)
+	AddRecipe(2964,75,2997,1,GAME_ORIG,75,90,97,105)
 	self:addTradeFlags(RecipeDB,2964,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,2964,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -218,7 +187,7 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Linen Bag -- 3755
-	self:addTradeSkill(RecipeDB,3755,45,4238,1,3908,nil,GAME_ORIG,45,70,87,105)
+	AddRecipe(3755,45,4238,1,GAME_ORIG,45,70,87,105)
 	self:addTradeFlags(RecipeDB,3755,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3755,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,4159,1,4193,1,4576,1,5153,
@@ -226,33 +195,33 @@ function addon:InitTailoring(RecipeDB)
 	3704,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Woolen Bag -- 3757
-	self:addTradeSkill(RecipeDB,3757,80,4240,1,3908,nil,GAME_ORIG,80,105,122,140)
+	AddRecipe(3757,80,4240,1,GAME_ORIG,80,105,122,140)
 	self:addTradeFlags(RecipeDB,3757,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3757,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Green Woolen Bag -- 3758
-	self:addTradeSkill(RecipeDB,3758,95,4241,2,3908,nil,GAME_ORIG,95,120,137,155)
+	AddRecipe(3758,95,4241,2,GAME_ORIG,95,120,137,155)
 	self:addTradeFlags(RecipeDB,3758,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,3758,7,2)

 	-- Small Silk Pack -- 3813
-	self:addTradeSkill(RecipeDB,3813,150,4245,1,3908,nil,GAME_ORIG,150,170,185,200)
+	AddRecipe(3813,150,4245,1,GAME_ORIG,150,170,185,200)
 	self:addTradeFlags(RecipeDB,3813,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3813,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Bolt of Silk Cloth -- 3839
-	self:addTradeSkill(RecipeDB,3839,125,4305,1,3908,nil,GAME_ORIG,125,135,140,145)
+	AddRecipe(3839,125,4305,1,GAME_ORIG,125,135,140,145)
 	self:addTradeFlags(RecipeDB,3839,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,3839,1,1346,1,3004,1,3363,1,4576,1,5153,1,
 	11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,4159,1,3484,1,3704,1,2627,1,33580,1,
 	1103,1,27001,1,33613,1,33636,1,11052,1,2399,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Heavy Linen Gloves -- 3840
-	self:addTradeSkill(RecipeDB,3840,35,4307,1,3908,nil,GAME_ORIG,35,60,77,95)
+	AddRecipe(3840,35,4307,1,GAME_ORIG,35,60,77,95)
 	self:addTradeFlags(RecipeDB,3840,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,3840,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -260,7 +229,7 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Green Linen Bracers -- 3841
-	self:addTradeSkill(RecipeDB,3841,60,4308,1,3908,nil,GAME_ORIG,60,85,102,120)
+	AddRecipe(3841,60,4308,1,GAME_ORIG,60,85,102,120)
 	self:addTradeFlags(RecipeDB,3841,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,3841,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -268,7 +237,7 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Handstitched Linen Britches -- 3842
-	self:addTradeSkill(RecipeDB,3842,70,4309,1,3908,nil,GAME_ORIG,70,95,112,130)
+	AddRecipe(3842,70,4309,1,GAME_ORIG,70,95,112,130)
 	self:addTradeFlags(RecipeDB,3842,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,3842,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -276,169 +245,169 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Heavy Woolen Gloves -- 3843
-	self:addTradeSkill(RecipeDB,3843,85,4310,1,3908,nil,GAME_ORIG,85,110,127,145)
+	AddRecipe(3843,85,4310,1,GAME_ORIG,85,110,127,145)
 	self:addTradeFlags(RecipeDB,3843,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,3843,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Heavy Woolen Cloak -- 3844
-	self:addTradeSkill(RecipeDB,3844,100,4311,2,3908,nil,GAME_ORIG,100,125,142,160)
+	AddRecipe(3844,100,4311,2,GAME_ORIG,100,125,142,160)
 	self:addTradeFlags(RecipeDB,3844,1,2,10,36,40,53,54,60)
 	self:addTradeAcquire(RecipeDB,3844,7,2)

 	-- Soft-soled Linen Boots -- 3845
-	self:addTradeSkill(RecipeDB,3845,80,4312,1,3908,nil,GAME_ORIG,80,105,122,140)
+	AddRecipe(3845,80,4312,1,GAME_ORIG,80,105,122,140)
 	self:addTradeFlags(RecipeDB,3845,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,3845,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Red Woolen Boots -- 3847
-	self:addTradeSkill(RecipeDB,3847,95,4313,2,3908,nil,GAME_ORIG,95,120,137,155)
+	AddRecipe(3847,95,4313,2,GAME_ORIG,95,120,137,155)
 	self:addTradeFlags(RecipeDB,3847,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,3847,7,2)

 	-- Double-stitched Woolen Shoulders -- 3848
-	self:addTradeSkill(RecipeDB,3848,110,4314,1,3908,nil,GAME_ORIG,110,135,152,170)
+	AddRecipe(3848,110,4314,1,GAME_ORIG,110,135,152,170)
 	self:addTradeFlags(RecipeDB,3848,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,3848,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Reinforced Woolen Shoulders -- 3849
-	self:addTradeSkill(RecipeDB,3849,120,4315,2,3908,nil,GAME_ORIG,120,145,162,180)
+	AddRecipe(3849,120,4315,2,GAME_ORIG,120,145,162,180)
 	self:addTradeFlags(RecipeDB,3849,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,3849,7,2)

 	-- Heavy Woolen Pants -- 3850
-	self:addTradeSkill(RecipeDB,3850,110,4316,1,3908,nil,GAME_ORIG,110,135,152,170)
+	AddRecipe(3850,110,4316,1,GAME_ORIG,110,135,152,170)
 	self:addTradeFlags(RecipeDB,3850,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,3850,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Phoenix Pants -- 3851
-	self:addTradeSkill(RecipeDB,3851,125,4317,2,3908,nil,GAME_ORIG,125,150,167,185)
+	AddRecipe(3851,125,4317,2,GAME_ORIG,125,150,167,185)
 	self:addTradeFlags(RecipeDB,3851,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,3851,7,2)

 	-- Gloves of Meditation -- 3852
-	self:addTradeSkill(RecipeDB,3852,130,4318,1,3908,nil,GAME_ORIG,130,150,165,180)
+	AddRecipe(3852,130,4318,1,GAME_ORIG,130,150,165,180)
 	self:addTradeFlags(RecipeDB,3852,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,3852,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Azure Silk Gloves -- 3854
-	self:addTradeSkill(RecipeDB,3854,145,4319,1,3908,nil,GAME_ORIG,145,165,180,195)
+	AddRecipe(3854,145,4319,1,GAME_ORIG,145,165,180,195)
 	self:addTradeFlags(RecipeDB,3854,1,2,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,3854,2,2679,2,9636)

 	-- Spidersilk Boots -- 3855
-	self:addTradeSkill(RecipeDB,3855,125,4320,1,3908,nil,GAME_ORIG,125,150,167,185)
+	AddRecipe(3855,125,4320,1,GAME_ORIG,125,150,167,185)
 	self:addTradeFlags(RecipeDB,3855,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,3855,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Spider Silk Slippers -- 3856
-	self:addTradeSkill(RecipeDB,3856,140,4321,2,3908,nil,GAME_ORIG,140,160,175,190)
+	AddRecipe(3856,140,4321,2,GAME_ORIG,140,160,175,190)
 	self:addTradeFlags(RecipeDB,3856,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,3856,7,2)

 	-- Enchanter's Cowl -- 3857
-	self:addTradeSkill(RecipeDB,3857,165,4322,1,3908,nil,GAME_ORIG,165,185,200,215)
+	AddRecipe(3857,165,4322,1,GAME_ORIG,165,185,200,215)
 	self:addTradeFlags(RecipeDB,3857,1,2,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,3857,2,2670)

 	-- Shadow Hood -- 3858
-	self:addTradeSkill(RecipeDB,3858,170,4323,2,3908,nil,GAME_ORIG,170,190,205,220)
+	AddRecipe(3858,170,4323,2,GAME_ORIG,170,190,205,220)
 	self:addTradeFlags(RecipeDB,3858,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,3858,7,2)

 	-- Azure Silk Vest -- 3859
-	self:addTradeSkill(RecipeDB,3859,150,4324,1,3908,nil,GAME_ORIG,150,170,185,200)
+	AddRecipe(3859,150,4324,1,GAME_ORIG,150,170,185,200)
 	self:addTradeFlags(RecipeDB,3859,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,3859,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Boots of the Enchanter -- 3860
-	self:addTradeSkill(RecipeDB,3860,175,4325,2,3908,nil,GAME_ORIG,175,195,210,225)
+	AddRecipe(3860,175,4325,2,GAME_ORIG,175,195,210,225)
 	self:addTradeFlags(RecipeDB,3860,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,3860,7,2)

 	-- Long Silken Cloak -- 3861
-	self:addTradeSkill(RecipeDB,3861,185,4326,1,3908,nil,GAME_ORIG,185,205,220,235)
+	AddRecipe(3861,185,4326,1,GAME_ORIG,185,205,220,235)
 	self:addTradeFlags(RecipeDB,3861,1,2,3,36,41,53,54,60)
 	self:addTradeAcquire(RecipeDB,3861,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,1
 	,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Icy Cloak -- 3862
-	self:addTradeSkill(RecipeDB,3862,200,4327,1,3908,nil,GAME_ORIG,200,220,235,250)
+	AddRecipe(3862,200,4327,1,GAME_ORIG,200,220,235,250)
 	self:addTradeFlags(RecipeDB,3862,1,4,36,40,53,54,60)
 	self:addTradeAcquire(RecipeDB,3862,2,2381)

 	-- Spider Belt -- 3863
-	self:addTradeSkill(RecipeDB,3863,180,4328,2,3908,nil,GAME_ORIG,180,200,215,230)
+	AddRecipe(3863,180,4328,2,GAME_ORIG,180,200,215,230)
 	self:addTradeFlags(RecipeDB,3863,1,2,10,36,40,56)
 	self:addTradeAcquire(RecipeDB,3863,7,2)

 	-- Star Belt -- 3864
-	self:addTradeSkill(RecipeDB,3864,200,4329,2,3908,nil,GAME_ORIG,200,220,235,250)
+	AddRecipe(3864,200,4329,2,GAME_ORIG,200,220,235,250)
 	self:addTradeFlags(RecipeDB,3864,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,3864,7,2)

 	-- Bolt of Mageweave -- 3865
-	self:addTradeSkill(RecipeDB,3865,175,4339,1,3908,nil,GAME_ORIG,175,180,182,185)
+	AddRecipe(3865,175,4339,1,GAME_ORIG,175,180,182,185)
 	self:addTradeFlags(RecipeDB,3865,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3865,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,1
 	,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Stylish Red Shirt -- 3866
-	self:addTradeSkill(RecipeDB,3866,110,4330,1,3908,nil,GAME_ORIG,110,135,152,170)
+	AddRecipe(3866,110,4330,1,GAME_ORIG,110,135,152,170)
 	self:addTradeFlags(RecipeDB,3866,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3866,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Phoenix Gloves -- 3868
-	self:addTradeSkill(RecipeDB,3868,125,4331,2,3908,nil,GAME_ORIG,125,150,167,185)
+	AddRecipe(3868,125,4331,2,GAME_ORIG,125,150,167,185)
 	self:addTradeFlags(RecipeDB,3868,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,3868,7,2)

 	-- Bright Yellow Shirt -- 3869
-	self:addTradeSkill(RecipeDB,3869,135,4332,1,3908,nil,GAME_ORIG,135,145,150,155)
+	AddRecipe(3869,135,4332,1,GAME_ORIG,135,145,150,155)
 	self:addTradeFlags(RecipeDB,3869,1,4,36,40)
 	self:addTradeAcquire(RecipeDB,3869,2,2668)

 	-- Dark Silk Shirt -- 3870
-	self:addTradeSkill(RecipeDB,3870,155,4333,1,3908,nil,GAME_ORIG,155,165,170,175)
+	AddRecipe(3870,155,4333,1,GAME_ORIG,155,165,170,175)
 	self:addTradeFlags(RecipeDB,3870,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,3870,2,2394,2,2669)

 	-- Formal White Shirt -- 3871
-	self:addTradeSkill(RecipeDB,3871,170,4334,1,3908,nil,GAME_ORIG,170,180,185,190)
+	AddRecipe(3871,170,4334,1,GAME_ORIG,170,180,185,190)
 	self:addTradeFlags(RecipeDB,3871,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3871,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,1
 	,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

     -- Rich Purple Silk Shirt -- 3872
-	self:addTradeSkill(RecipeDB,3872,185,4335,3,3908,nil,GAME_ORIG,185,195,200,205)
+	AddRecipe(3872,185,4335,3,GAME_ORIG,185,195,200,205)
 	self:addTradeFlags(RecipeDB,3872,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,3872,7,2)

 	-- Black Swashbuckler's Shirt -- 3873
-	self:addTradeSkill(RecipeDB,3873,200,4336,1,3908,nil,GAME_ORIG,200,210,215,220)
+	AddRecipe(3873,200,4336,1,GAME_ORIG,200,210,215,220)
 	self:addTradeFlags(RecipeDB,3873,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,3873,2,2663)

 	-- Brown Linen Pants -- 3914
-	self:addTradeSkill(RecipeDB,3914,30,4343,1,3908,nil,GAME_ORIG,30,55,72,90)
+	AddRecipe(3914,30,4343,1,GAME_ORIG,30,55,72,90)
 	self:addTradeFlags(RecipeDB,3914,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,3914,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -446,52 +415,52 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Brown Linen Shirt -- 3915
-	self:addTradeSkill(RecipeDB,3915,1,4344,1,3908,nil,GAME_ORIG,1,35,47,60)
+	AddRecipe(3915,1,4344,1,GAME_ORIG,1,35,47,60)
 	self:addTradeFlags(RecipeDB,3915,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,3915,8,8)

 	-- Pearl-clasped Cloak -- 6521
-	self:addTradeSkill(RecipeDB,6521,90,5542,1,3908,nil,GAME_ORIG,90,115,132,150)
+	AddRecipe(6521,90,5542,1,GAME_ORIG,90,115,132,150)
 	self:addTradeFlags(RecipeDB,6521,1,2,3,36,41,60)
 	self:addTradeAcquire(RecipeDB,6521,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Red Linen Bag -- 6686
-	self:addTradeSkill(RecipeDB,6686,70,5762,1,3908,nil,GAME_ORIG,70,95,112,130)
+	AddRecipe(6686,70,5762,1,GAME_ORIG,70,95,112,130)
 	self:addTradeFlags(RecipeDB,6686,1,2,4,5,11,36,40)
 	self:addTradeAcquire(RecipeDB,6686,3,590,3,3530,3,3531,2,843,2,3005,2,4189,2,16224,2,3556)

 	-- Red Woolen Bag -- 6688
-	self:addTradeSkill(RecipeDB,6688,115,5763,1,3908,nil,GAME_ORIG,115,140,157,175)
+	AddRecipe(6688,115,5763,1,GAME_ORIG,115,140,157,175)
 	self:addTradeFlags(RecipeDB,6688,1,2,4,5,11,36,40)
 	self:addTradeAcquire(RecipeDB,6688,3,450,3,2264,2,777,2,1454,2,1474,2,3005,2,3364,2,3485,
 	2,3537,2,3683,2,4189,2,4577,2,5944)

 	-- Lesser Wizard's Robe -- 6690
-	self:addTradeSkill(RecipeDB,6690,135,5766,1,3908,nil,GAME_ORIG,135,155,170,185)
+	AddRecipe(6690,135,5766,1,GAME_ORIG,135,155,170,185)
 	self:addTradeFlags(RecipeDB,6690,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,6690,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Robes of Arcana -- 6692
-	self:addTradeSkill(RecipeDB,6692,150,5770,2,3908,nil,GAME_ORIG,150,170,185,200)
+	AddRecipe(6692,150,5770,2,GAME_ORIG,150,170,185,200)
 	self:addTradeFlags(RecipeDB,6692,1,2,11,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,6692,3,910,3,2337,3,10760)

 	-- Green Silk Pack -- 6693
-	self:addTradeSkill(RecipeDB,6693,175,5764,2,3908,nil,GAME_ORIG,175,195,210,225)
+	AddRecipe(6693,175,5764,2,GAME_ORIG,175,195,210,225)
 	self:addTradeFlags(RecipeDB,6693,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,6693,7,2)

 	-- Black Silk Pack -- 6695
-	self:addTradeSkill(RecipeDB,6695,185,5765,2,3908,nil,GAME_ORIG,185,205,220,235)
+	AddRecipe(6695,185,5765,2,GAME_ORIG,185,205,220,235)
 	self:addTradeFlags(RecipeDB,6695,1,2,11,36,40)
 	self:addTradeAcquire(RecipeDB,6695,3,2242,3,2434,3,4834)

 	-- Brown Linen Robe -- 7623
-	self:addTradeSkill(RecipeDB,7623,30,6238,1,3908,nil,GAME_ORIG,30,55,72,90)
+	AddRecipe(7623,30,6238,1,GAME_ORIG,30,55,72,90)
 	self:addTradeFlags(RecipeDB,7623,1,2,3,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,7623,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -499,7 +468,7 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- White Linen Robe -- 7624
-	self:addTradeSkill(RecipeDB,7624,30,6241,1,3908,nil,GAME_ORIG,30,55,72,90)
+	AddRecipe(7624,30,6241,1,GAME_ORIG,30,55,72,90)
 	self:addTradeFlags(RecipeDB,7624,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,7624,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -507,42 +476,42 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Red Linen Vest -- 7629
-	self:addTradeSkill(RecipeDB,7629,55,6239,2,3908,nil,GAME_ORIG,55,80,97,115)
+	AddRecipe(7629,55,6239,2,GAME_ORIG,55,80,97,115)
 	self:addTradeFlags(RecipeDB,7629,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,7629,7,2)

 	-- Blue Linen Vest -- 7630
-	self:addTradeSkill(RecipeDB,7630,55,6240,1,3908,nil,GAME_ORIG,55,80,97,115)
+	AddRecipe(7630,55,6240,1,GAME_ORIG,55,80,97,115)
 	self:addTradeFlags(RecipeDB,7630,1,2,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,7630,2,66,2,3364,2,3485,2,3522,2,4189)

 	-- Blue Linen Robe -- 7633
-	self:addTradeSkill(RecipeDB,7633,70,6242,1,3908,nil,GAME_ORIG,70,95,112,130)
+	AddRecipe(7633,70,6242,1,GAME_ORIG,70,95,112,130)
 	self:addTradeFlags(RecipeDB,7633,1,2,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,7633,2,1250,2,3485,2,4168,2,3499,2,3556)

 	-- Blue Overalls -- 7639
-	self:addTradeSkill(RecipeDB,7639,100,6263,1,3908,nil,GAME_ORIG,100,125,142,160)
+	AddRecipe(7639,100,6263,1,GAME_ORIG,100,125,142,160)
 	self:addTradeFlags(RecipeDB,7639,1,2,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,7639,2,843,2,1347,2,2394,2,3364,2,5944)

 	-- Greater Adept's Robe -- 7643
-	self:addTradeSkill(RecipeDB,7643,115,6264,1,3908,nil,GAME_ORIG,115,140,157,175)
+	AddRecipe(7643,115,6264,1,GAME_ORIG,115,140,157,175)
 	self:addTradeFlags(RecipeDB,7643,1,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,7643,2,1454,2,1474,2,4168,2,2669,2,3499,2,4577)

 	-- Stylish Blue Shirt -- 7892
-	self:addTradeSkill(RecipeDB,7892,120,6384,2,3908,nil,GAME_ORIG,120,145,162,180)
+	AddRecipe(7892,120,6384,2,GAME_ORIG,120,145,162,180)
 	self:addTradeFlags(RecipeDB,7892,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,7892,7,2)

 	-- Stylish Green Shirt -- 7893
-	self:addTradeSkill(RecipeDB,7893,120,6385,2,3908,nil,GAME_ORIG,120,145,162,180)
+	AddRecipe(7893,120,6385,2,GAME_ORIG,120,145,162,180)
 	self:addTradeFlags(RecipeDB,7893,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,7893,7,2)

 	-- Simple Dress -- 8465
-	self:addTradeSkill(RecipeDB,8465,40,6786,1,3908,nil,GAME_ORIG,40,65,82,100)
+	AddRecipe(8465,40,6786,1,GAME_ORIG,40,65,82,100)
 	self:addTradeFlags(RecipeDB,8465,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,8465,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -550,84 +519,84 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- White Woolen Dress -- 8467
-	self:addTradeSkill(RecipeDB,8467,110,6787,1,3908,nil,GAME_ORIG,110,135,152,170)
+	AddRecipe(8467,110,6787,1,GAME_ORIG,110,135,152,170)
 	self:addTradeFlags(RecipeDB,8467,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,8467,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- White Swashbuckler's Shirt -- 8483
-	self:addTradeSkill(RecipeDB,8483,160,6795,1,3908,nil,GAME_ORIG,160,170,175,180)
+	AddRecipe(8483,160,6795,1,GAME_ORIG,160,170,175,180)
 	self:addTradeFlags(RecipeDB,8483,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,8483,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,1
 	,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Red Swashbuckler's Shirt -- 8489
-	self:addTradeSkill(RecipeDB,8489,175,6796,1,3908,nil,GAME_ORIG,175,185,190,195)
+	AddRecipe(8489,175,6796,1,GAME_ORIG,175,185,190,195)
 	self:addTradeFlags(RecipeDB,8489,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,8489,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,1
 	,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Azure Silk Pants -- 8758
-	self:addTradeSkill(RecipeDB,8758,140,7046,1,3908,nil,GAME_ORIG,140,160,175,190)
+	AddRecipe(8758,140,7046,1,GAME_ORIG,140,160,175,190)
 	self:addTradeFlags(RecipeDB,8758,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,8758,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Azure Silk Hood -- 8760
-	self:addTradeSkill(RecipeDB,8760,145,7048,1,3908,nil,GAME_ORIG,145,155,160,165)
+	AddRecipe(8760,145,7048,1,GAME_ORIG,145,155,160,165)
 	self:addTradeFlags(RecipeDB,8760,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,8760,1,1346,1,2399,1,2627,1,3004,1,3363,1,3704,1,4159,1,
 	4576,1,5153,1,11052,1,11557,1,16640,1,16729,1,17487,1,18749,1,18772,1,28699,1,
 	3484,1,33580,1,1103,1,27001,1,33613,1,33636,1,26914,1,16366,1,26969,1,4193,1,26964,1,3523,1,33684)

 	-- Silk Headband -- 8762
-	self:addTradeSkill(RecipeDB,8762,160,7050,1,3908,nil,GAME_ORIG,160,170,175,180)
+	AddRecipe(8762,160,7050,1,GAME_ORIG,160,170,175,180)
 	self:addTradeFlags(RecipeDB,8762,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,8762,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,1
 	,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Earthen Vest -- 8764
-	self:addTradeSkill(RecipeDB,8764,170,7051,1,3908,nil,GAME_ORIG,170,190,205,220)
+	AddRecipe(8764,170,7051,1,GAME_ORIG,170,190,205,220)
 	self:addTradeFlags(RecipeDB,8764,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,8764,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,1
 	,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Azure Silk Belt -- 8766
-	self:addTradeSkill(RecipeDB,8766,175,7052,1,3908,nil,GAME_ORIG,175,195,210,225)
+	AddRecipe(8766,175,7052,1,GAME_ORIG,175,195,210,225)
 	self:addTradeFlags(RecipeDB,8766,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,8766,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,1
 	,28699,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,
 	4159,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Robe of Power -- 8770
-	self:addTradeSkill(RecipeDB,8770,190,7054,1,3908,nil,GAME_ORIG,190,210,225,240)
+	AddRecipe(8770,190,7054,1,GAME_ORIG,190,210,225,240)
 	self:addTradeFlags(RecipeDB,8770,1,2,3,37,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,8770,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,1
 	,28699,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,
 	4159,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Crimson Silk Belt -- 8772
-	self:addTradeSkill(RecipeDB,8772,175,7055,1,3908,nil,GAME_ORIG,175,195,210,225)
+	AddRecipe(8772,175,7055,1,GAME_ORIG,175,195,210,225)
 	self:addTradeFlags(RecipeDB,8772,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,8772,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,1
 	,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,33684)

 	-- Green Silken Shoulders -- 8774
-	self:addTradeSkill(RecipeDB,8774,180,7057,1,3908,nil,GAME_ORIG,180,200,215,230)
+	AddRecipe(8774,180,7057,1,GAME_ORIG,180,200,215,230)
 	self:addTradeFlags(RecipeDB,8774,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,8774,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,1
 	,28699,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,
 	4159,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Linen Belt -- 8776
-	self:addTradeSkill(RecipeDB,8776,15,7026,1,3908,nil,GAME_ORIG,15,50,67,85)
+	AddRecipe(8776,15,7026,1,GAME_ORIG,15,50,67,85)
 	self:addTradeFlags(RecipeDB,8776,1,2,3,36,40,56)
 	self:addTradeAcquire(RecipeDB,8776,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -635,78 +604,78 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Hands of Darkness -- 8780
-	self:addTradeSkill(RecipeDB,8780,145,7047,2,3908,nil,GAME_ORIG,145,165,180,195)
+	AddRecipe(8780,145,7047,2,GAME_ORIG,145,165,180,195)
 	self:addTradeFlags(RecipeDB,8780,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,8780,7,2)

 	-- Truefaith Gloves -- 8782
-	self:addTradeSkill(RecipeDB,8782,150,7049,2,3908,nil,GAME_ORIG,150,170,185,200)
+	AddRecipe(8782,150,7049,2,GAME_ORIG,150,170,185,200)
 	self:addTradeFlags(RecipeDB,8782,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,8782,7,2)

 	-- Green Silk Armor -- 8784
-	self:addTradeSkill(RecipeDB,8784,165,7065,2,3908,nil,GAME_ORIG,165,185,200,215)
+	AddRecipe(8784,165,7065,2,GAME_ORIG,165,185,200,215)
 	self:addTradeFlags(RecipeDB,8784,1,2,10,36,40,56)
 	self:addTradeAcquire(RecipeDB,8784,7,2)

 	-- Azure Silk Cloak -- 8786
-	self:addTradeSkill(RecipeDB,8786,175,7053,1,3908,nil,GAME_ORIG,175,195,210,225)
+	AddRecipe(8786,175,7053,1,GAME_ORIG,175,195,210,225)
 	self:addTradeFlags(RecipeDB,8786,1,2,4,36,41,53,54,60)
 	self:addTradeAcquire(RecipeDB,8786,2,6574,2,6576)

 	-- Crimson Silk Cloak -- 8789
-	self:addTradeSkill(RecipeDB,8789,180,7056,1,3908,nil,GAME_ORIG,180,200,215,230)
+	AddRecipe(8789,180,7056,1,GAME_ORIG,180,200,215,230)
 	self:addTradeFlags(RecipeDB,8789,1,2,4,36,41,60)
 	self:addTradeAcquire(RecipeDB,8789,2,2670)

 	-- Crimson Silk Vest -- 8791
-	self:addTradeSkill(RecipeDB,8791,185,7058,1,3908,nil,GAME_ORIG,185,205,215,225)
+	AddRecipe(8791,185,7058,1,GAME_ORIG,185,205,215,225)
 	self:addTradeFlags(RecipeDB,8791,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,8791,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,1
 	,28699,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,
 	4159,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Crimson Silk Shoulders -- 8793
-	self:addTradeSkill(RecipeDB,8793,190,7059,2,3908,nil,GAME_ORIG,190,210,225,240)
+	AddRecipe(8793,190,7059,2,GAME_ORIG,190,210,225,240)
 	self:addTradeFlags(RecipeDB,8793,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,8793,7,2)

 	-- Azure Shoulders -- 8795
-	self:addTradeSkill(RecipeDB,8795,190,7060,2,3908,nil,GAME_ORIG,190,210,225,240)
+	AddRecipe(8795,190,7060,2,GAME_ORIG,190,210,225,240)
 	self:addTradeFlags(RecipeDB,8795,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,8795,7,2)

 	-- Earthen Silk Belt -- 8797
-	self:addTradeSkill(RecipeDB,8797,195,7061,2,3908,nil,GAME_ORIG,195,215,230,245)
+	AddRecipe(8797,195,7061,2,GAME_ORIG,195,215,230,245)
 	self:addTradeFlags(RecipeDB,8797,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,8797,7,2)

 	-- Crimson Silk Pantaloons -- 8799
-	self:addTradeSkill(RecipeDB,8799,195,7062,1,3908,nil,GAME_ORIG,195,215,225,235)
+	AddRecipe(8799,195,7062,1,GAME_ORIG,195,215,225,235)
 	self:addTradeFlags(RecipeDB,8799,1,2,3,36,40,56)
 	self:addTradeAcquire(RecipeDB,8799,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,1
 	,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Crimson Silk Robe -- 8802
-	self:addTradeSkill(RecipeDB,8802,205,7063,1,3908,nil,GAME_ORIG,205,220,235,250)
+	AddRecipe(8802,205,7063,1,GAME_ORIG,205,220,235,250)
 	self:addTradeFlags(RecipeDB,8802,1,2,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,8802,2,6568)

 	-- Crimson Silk Gloves -- 8804
-	self:addTradeSkill(RecipeDB,8804,210,7064,1,3908,nil,GAME_ORIG,210,225,240,255)
+	AddRecipe(8804,210,7064,1,GAME_ORIG,210,225,240,255)
 	self:addTradeFlags(RecipeDB,8804,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,8804,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,1
 	,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,33613,1,33636,1,
 	27001,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Simple Linen Pants -- 12044
-	self:addTradeSkill(RecipeDB,12044,1,10045,1,3908,nil,GAME_ORIG,1,35,47,60)
+	AddRecipe(12044,1,10045,1,GAME_ORIG,1,35,47,60)
 	self:addTradeFlags(RecipeDB,12044,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,12044,8,8)

 	-- Simple Linen Boots -- 12045
-	self:addTradeSkill(RecipeDB,12045,20,10046,1,3908,nil,GAME_ORIG,20,50,67,85)
+	AddRecipe(12045,20,10046,1,GAME_ORIG,20,50,67,85)
 	self:addTradeFlags(RecipeDB,12045,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,12045,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -714,7 +683,7 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Simple Kilt -- 12046
-	self:addTradeSkill(RecipeDB,12046,75,10047,1,3908,nil,GAME_ORIG,75,100,117,135)
+	AddRecipe(12046,75,10047,1,GAME_ORIG,75,100,117,135)
 	self:addTradeFlags(RecipeDB,12046,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12046,1,1103,1,1346,1,2399,1,2627,1,
 	3004,1,3363,1,3484,1,3523,1,3704,1,4159,1,4193,1,4576,1,5153,1
@@ -722,1635 +691,1630 @@ function addon:InitTailoring(RecipeDB)
 	28699,1,33580,1,27001,1,33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Colorful Kilt -- 12047
-	self:addTradeSkill(RecipeDB,12047,120,10048,2,3908,nil,GAME_ORIG,120,145,162,180)
+	AddRecipe(12047,120,10048,2,GAME_ORIG,120,145,162,180)
 	self:addTradeFlags(RecipeDB,12047,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,12047,7,2)

 	-- Black Mageweave Vest -- 12048
-	self:addTradeSkill(RecipeDB,12048,205,9998,1,3908,nil,GAME_ORIG,205,220,235,250)
+	AddRecipe(12048,205,9998,1,GAME_ORIG,205,220,235,250)
 	self:addTradeFlags(RecipeDB,12048,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12048,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,
 	1,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Black Mageweave Leggings -- 12049
-	self:addTradeSkill(RecipeDB,12049,205,9999,1,3908,nil,GAME_ORIG,205,220,235,250)
+	AddRecipe(12049,205,9999,1,GAME_ORIG,205,220,235,250)
 	self:addTradeFlags(RecipeDB,12049,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12049,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,
 	1,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Black Mageweave Robe -- 12050
-	self:addTradeSkill(RecipeDB,12050,210,10001,1,3908,nil,GAME_ORIG,210,225,240,255)
+	AddRecipe(12050,210,10001,1,GAME_ORIG,210,225,240,255)
 	self:addTradeFlags(RecipeDB,12050,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12050,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,
 	1,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Shadoweave Pants -- 12052
-	self:addTradeSkill(RecipeDB,12052,210,10002,1,3908,nil,GAME_ORIG,210,225,240,255)
+	AddRecipe(12052,210,10002,1,GAME_ORIG,210,225,240,255)
 	self:addTradeFlags(RecipeDB,12052,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12052,1,4578,1,9584)

 	-- Black Mageweave Gloves -- 12053
-	self:addTradeSkill(RecipeDB,12053,215,10003,1,3908,nil,GAME_ORIG,215,230,245,260)
+	AddRecipe(12053,215,10003,1,GAME_ORIG,215,230,245,260)
 	self:addTradeFlags(RecipeDB,12053,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12053,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,
 	1,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Shadoweave Robe -- 12055
-	self:addTradeSkill(RecipeDB,12055,215,10004,1,3908,nil,GAME_ORIG,215,230,245,260)
+	AddRecipe(12055,215,10004,1,GAME_ORIG,215,230,245,260)
 	self:addTradeFlags(RecipeDB,12055,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12055,1,4578,1,9584)

 	-- Red Mageweave Vest -- 12056
-	self:addTradeSkill(RecipeDB,12056,215,10007,2,3908,nil,GAME_ORIG,215,230,245,260)
+	AddRecipe(12056,215,10007,2,GAME_ORIG,215,230,245,260)
 	self:addTradeFlags(RecipeDB,12056,1,2,10,36,40,56)
 	self:addTradeAcquire(RecipeDB,12056,7,2)

 	-- White Bandit Mask -- 12059
-	self:addTradeSkill(RecipeDB,12059,215,10008,2,3908,nil,GAME_ORIG,215,220,225,230)
+	AddRecipe(12059,215,10008,2,GAME_ORIG,215,220,225,230)
 	self:addTradeFlags(RecipeDB,12059,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,12059,7,2)

 	-- Red Mageweave Pants -- 12060
-	self:addTradeSkill(RecipeDB,12060,215,10009,2,3908,nil,GAME_ORIG,215,230,245,260)
+	AddRecipe(12060,215,10009,2,GAME_ORIG,215,230,245,260)
 	self:addTradeFlags(RecipeDB,12060,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,12060,7,2)

 	-- Orange Mageweave Shirt -- 12061
-	self:addTradeSkill(RecipeDB,12061,215,10056,1,3908,nil,GAME_ORIG,215,220,225,230)
+	AddRecipe(12061,215,10056,1,GAME_ORIG,215,220,225,230)
 	self:addTradeFlags(RecipeDB,12061,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,12061,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,
 	1,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Orange Martial Shirt -- 12064
-	self:addTradeSkill(RecipeDB,12064,220,10052,1,3908,nil,GAME_ORIG,220,225,230,235)
+	AddRecipe(12064,220,10052,1,GAME_ORIG,220,225,230,235)
 	self:addTradeFlags(RecipeDB,12064,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,12064,2,3005,2,4168)

 	-- Mageweave Bag -- 12065
-	self:addTradeSkill(RecipeDB,12065,225,10050,1,3908,nil,GAME_ORIG,225,240,255,270)
+	AddRecipe(12065,225,10050,1,GAME_ORIG,225,240,255,270)
 	self:addTradeFlags(RecipeDB,12065,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,12065,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,
 	1,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Red Mageweave Gloves -- 12066
-	self:addTradeSkill(RecipeDB,12066,225,10018,2,3908,nil,GAME_ORIG,225,240,255,270)
+	AddRecipe(12066,225,10018,2,GAME_ORIG,225,240,255,270)
 	self:addTradeFlags(RecipeDB,12066,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,12066,7,2)

 	-- Dreamweave Gloves -- 12067
-	self:addTradeSkill(RecipeDB,12067,225,10019,1,3908,nil,GAME_ORIG,225,240,255,270)
+	AddRecipe(12067,225,10019,1,GAME_ORIG,225,240,255,270)
 	self:addTradeFlags(RecipeDB,12067,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12067,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,
 	1,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Cindercloth Robe -- 12069
-	self:addTradeSkill(RecipeDB,12069,225,10042,1,3908,nil,GAME_ORIG,225,240,255,270)
+	AddRecipe(12069,225,10042,1,GAME_ORIG,225,240,255,270)
 	self:addTradeFlags(RecipeDB,12069,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12069,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,
 	1,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Dreamweave Vest -- 12070
-	self:addTradeSkill(RecipeDB,12070,225,10021,1,3908,nil,GAME_ORIG,225,240,255,270)
+	AddRecipe(12070,225,10021,1,GAME_ORIG,225,240,255,270)
 	self:addTradeFlags(RecipeDB,12070,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12070,1,1346,1,2399,1,4576,1,11052,1,11557,1,18749,1,18772,
 	1,28699,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,
 	33636,1,26914,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Shadoweave Gloves -- 12071
-	self:addTradeSkill(RecipeDB,12071,225,10023,1,3908,nil,GAME_ORIG,225,240,255,270)
+	AddRecipe(12071,225,10023,1,GAME_ORIG,225,240,255,270)
 	self:addTradeFlags(RecipeDB,12071,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12071,1,4578,1,9584)

 	-- Black Mageweave Headband -- 12072
-	self:addTradeSkill(RecipeDB,12072,230,10024,1,3908,nil,GAME_ORIG,230,245,260,275)
+	AddRecipe(12072,230,10024,1,GAME_ORIG,230,245,260,275)
 	self:addTradeFlags(RecipeDB,12072,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12072,1,2399,1,11052,1,11557,1,18749,1,18772,1,28699,1,1346
 	,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636
 	,1,26914,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Black Mageweave Boots -- 12073
-	self:addTradeSkill(RecipeDB,12073,230,10026,1,3908,nil,GAME_ORIG,230,245,260,275)
+	AddRecipe(12073,230,10026,1,GAME_ORIG,230,245,260,275)
 	self:addTradeFlags(RecipeDB,12073,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12073,1,2399,1,11052,1,11557,1,18749,1,18772,1,28699,1,1346
 	,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636
 	,1,26914,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Black Mageweave Shoulders -- 12074
-	self:addTradeSkill(RecipeDB,12074,230,10027,1,3908,nil,GAME_ORIG,230,245,260,275)
+	AddRecipe(12074,230,10027,1,GAME_ORIG,230,245,260,275)
 	self:addTradeFlags(RecipeDB,12074,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12074,1,2399,1,11052,1,11557,1,18749,1,18772,1,28699,1,1346
 	,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636
 	,1,26914,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Lavender Mageweave Shirt -- 12075
-	self:addTradeSkill(RecipeDB,12075,230,10054,1,3908,nil,GAME_ORIG,230,235,240,245)
+	AddRecipe(12075,230,10054,1,GAME_ORIG,230,235,240,245)
 	self:addTradeFlags(RecipeDB,12075,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,12075,2,3364,2,8681)

 	-- Shadoweave Shoulders -- 12076
-	self:addTradeSkill(RecipeDB,12076,235,10028,1,3908,nil,GAME_ORIG,235,250,265,280)
+	AddRecipe(12076,235,10028,1,GAME_ORIG,235,250,265,280)
 	self:addTradeFlags(RecipeDB,12076,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12076,1,4578,1,9584)

 	-- Simple Black Dress -- 12077
-	self:addTradeSkill(RecipeDB,12077,235,10053,1,3908,nil,GAME_ORIG,235,240,245,250)
+	AddRecipe(12077,235,10053,1,GAME_ORIG,235,240,245,250)
 	self:addTradeFlags(RecipeDB,12077,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,12077,1,2399,1,11052,1,11557,1,18749,1,18772,1,28699,1,1346
 	,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636
 	,1,26914,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Red Mageweave Shoulders -- 12078
-	self:addTradeSkill(RecipeDB,12078,235,10029,2,3908,nil,GAME_ORIG,235,250,265,280)
+	AddRecipe(12078,235,10029,2,GAME_ORIG,235,250,265,280)
 	self:addTradeFlags(RecipeDB,12078,1,2,10,36,40,56)
 	self:addTradeAcquire(RecipeDB,12078,7,2)

 	-- Red Mageweave Bag -- 12079
-	self:addTradeSkill(RecipeDB,12079,235,10051,1,3908,nil,GAME_ORIG,235,250,265,280)
+	AddRecipe(12079,235,10051,1,GAME_ORIG,235,250,265,280)
 	self:addTradeFlags(RecipeDB,12079,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,12079,1,2399,1,11052,1,11557,1,18749,1,18772,1,28699,1,1346
 	,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636
 	,1,26914,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523)

 	-- Pink Mageweave Shirt -- 12080
-	self:addTradeSkill(RecipeDB,12080,235,10055,1,3908,nil,GAME_ORIG,235,240,245,250)
+	AddRecipe(12080,235,10055,1,GAME_ORIG,235,240,245,250)
 	self:addTradeFlags(RecipeDB,12080,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,12080,2,3364,2,8681)

 	-- Admiral's Hat -- 12081
-	self:addTradeSkill(RecipeDB,12081,240,10030,1,3908,nil,GAME_ORIG,240,255,270,285)
+	AddRecipe(12081,240,10030,1,GAME_ORIG,240,255,270,285)
 	self:addTradeFlags(RecipeDB,12081,1,2,4,36,41,56)
 	self:addTradeAcquire(RecipeDB,12081,2,2672)

 	-- Shadoweave Boots -- 12082
-	self:addTradeSkill(RecipeDB,12082,240,10031,1,3908,nil,GAME_ORIG,240,255,270,285)
+	AddRecipe(12082,240,10031,1,GAME_ORIG,240,255,270,285)
 	self:addTradeFlags(RecipeDB,12082,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12082,1,4578,1,9584)

 	-- Red Mageweave Headband -- 12084
-	self:addTradeSkill(RecipeDB,12084,240,10033,2,3908,nil,GAME_ORIG,240,255,270,285)
+	AddRecipe(12084,240,10033,2,GAME_ORIG,240,255,270,285)
 	self:addTradeFlags(RecipeDB,12084,1,2,10,36,40,56)
 	self:addTradeAcquire(RecipeDB,12084,7,2)

 	-- Tuxedo Shirt -- 12085
-	self:addTradeSkill(RecipeDB,12085,240,10034,1,3908,nil,GAME_ORIG,240,245,250,255)
+	AddRecipe(12085,240,10034,1,GAME_ORIG,240,245,250,255)
 	self:addTradeFlags(RecipeDB,12085,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,12085,2,4577,2,8681)

 	-- Shadoweave Mask -- 12086
-	self:addTradeSkill(RecipeDB,12086,245,10025,2,3908,nil,GAME_ORIG,245,260,275,290)
+	AddRecipe(12086,245,10025,2,GAME_ORIG,245,260,275,290)
 	self:addTradeFlags(RecipeDB,12086,1,2,8,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,12086,4,3402)

 	-- Cindercloth Boots -- 12088
-	self:addTradeSkill(RecipeDB,12088,245,10044,1,3908,nil,GAME_ORIG,245,260,275,290)
+	AddRecipe(12088,245,10044,1,GAME_ORIG,245,260,275,290)
 	self:addTradeFlags(RecipeDB,12088,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12088,1,2399,1,11052,1,11557,1,18749,1,18772,1,28699,1,1346
 	,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636
 	,1,26914,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Tuxedo Pants -- 12089
-	self:addTradeSkill(RecipeDB,12089,245,10035,1,3908,nil,GAME_ORIG,245,250,255,260)
+	AddRecipe(12089,245,10035,1,GAME_ORIG,245,250,255,260)
 	self:addTradeFlags(RecipeDB,12089,1,2,4,36,40,56)
 	self:addTradeAcquire(RecipeDB,12089,2,4577,2,8681)

 	-- White Wedding Dress -- 12091
-	self:addTradeSkill(RecipeDB,12091,250,10040,1,3908,nil,GAME_ORIG,250,255,260,265)
+	AddRecipe(12091,250,10040,1,GAME_ORIG,250,255,260,265)
 	self:addTradeFlags(RecipeDB,12091,1,2,4,36,40,56)
 	self:addTradeAcquire(RecipeDB,12091,2,1347,2,3005)

 	-- Dreamweave Circlet -- 12092
-	self:addTradeSkill(RecipeDB,12092,250,10041,1,3908,nil,GAME_ORIG,250,265,280,295)
+	AddRecipe(12092,250,10041,1,GAME_ORIG,250,265,280,295)
 	self:addTradeFlags(RecipeDB,12092,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,12092,1,2399,1,11052,1,11557,1,18749,1,18772,1,28699,1,1346
 	,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636
 	,1,26914,1,4576,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Tuxedo Jacket -- 12093
-	self:addTradeSkill(RecipeDB,12093,250,10036,1,3908,nil,GAME_ORIG,250,265,280,295)
+	AddRecipe(12093,250,10036,1,GAME_ORIG,250,265,280,295)
 	self:addTradeFlags(RecipeDB,12093,1,2,4,36,40,56)
 	self:addTradeAcquire(RecipeDB,12093,2,4577,2,8681)

 	-- Bolt of Runecloth -- 18401
-	self:addTradeSkill(RecipeDB,18401,250,14048,1,3908,nil,GAME_ORIG,250,255,257,260)
+	AddRecipe(18401,250,14048,1,GAME_ORIG,250,255,257,260)
 	self:addTradeFlags(RecipeDB,18401,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,18401,1,2399,1,11052,1,11557,1,18749,1,18772,1,28699,1,1346
 	,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636
 	,1,26914,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Runecloth Belt -- 18402
-	self:addTradeSkill(RecipeDB,18402,255,13856,1,3908,nil,GAME_ORIG,255,270,285,300)
+	AddRecipe(18402,255,13856,1,GAME_ORIG,255,270,285,300)
 	self:addTradeFlags(RecipeDB,18402,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,18402,1,2399,1,11052,1,11557,1,18749,1,18772,1,28699,1,1346
 	,1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636
 	,1,26914,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Frostweave Tunic -- 18403
-	self:addTradeSkill(RecipeDB,18403,255,13869,2,3908,nil,GAME_ORIG,255,270,285,300)
+	AddRecipe(18403,255,13869,2,GAME_ORIG,255,270,285,300)
 	self:addTradeFlags(RecipeDB,18403,1,2,3,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18403,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636
 	,1,26914,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Frostweave Robe -- 18404
-	self:addTradeSkill(RecipeDB,18404,255,13868,2,3908,nil,GAME_ORIG,255,270,285,300)
+	AddRecipe(18404,255,13868,2,GAME_ORIG,255,270,285,300)
 	self:addTradeFlags(RecipeDB,18404,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18404,7,2)

 	-- Runecloth Bag -- 18405
-	self:addTradeSkill(RecipeDB,18405,260,14046,1,3908,nil,GAME_ORIG,260,275,290,305)
+	AddRecipe(18405,260,14046,1,GAME_ORIG,260,275,290,305)
 	self:addTradeFlags(RecipeDB,18405,1,2,4,36,41)
 	self:addTradeAcquire(RecipeDB,18405,2,11189)

 	-- Runecloth Robe -- 18406
-	self:addTradeSkill(RecipeDB,18406,260,13858,1,3908,nil,GAME_ORIG,260,275,290,305)
+	AddRecipe(18406,260,13858,1,GAME_ORIG,260,275,290,305)
 	self:addTradeFlags(RecipeDB,18406,1,2,3,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18406,1,2399,1,11052,1,18749,1,18772,2,7940,1,28699,1,1346,
 	1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636
 	,1,26914,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Runecloth Tunic -- 18407
-	self:addTradeSkill(RecipeDB,18407,260,13857,2,3908,nil,GAME_ORIG,260,275,290,305)
+	AddRecipe(18407,260,13857,2,GAME_ORIG,260,275,290,305)
 	self:addTradeFlags(RecipeDB,18407,1,2,3,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18407,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Cindercloth Vest -- 18408
-	self:addTradeSkill(RecipeDB,18408,260,14042,2,3908,nil,GAME_ORIG,260,275,290,305)
+	AddRecipe(18408,260,14042,2,GAME_ORIG,260,275,290,305)
 	self:addTradeFlags(RecipeDB,18408,1,2,11,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18408,3,5861)

 	-- Runecloth Cloak -- 18409
-	self:addTradeSkill(RecipeDB,18409,265,13860,1,3908,nil,GAME_ORIG,265,280,295,310)
+	AddRecipe(18409,265,13860,1,GAME_ORIG,265,280,295,310)
 	self:addTradeFlags(RecipeDB,18409,1,2,3,4,36,41,53,54,60)
 	self:addTradeAcquire(RecipeDB,18409,1,2399,1,11052,1,18749,1,18772,2,7940,1,28699,1,1346,
 	1,4159,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636
 	,1,26914,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Ghostweave Belt -- 18410
-	self:addTradeSkill(RecipeDB,18410,265,14143,2,3908,nil,GAME_ORIG,265,280,295,310)
+	AddRecipe(18410,265,14143,2,GAME_ORIG,265,280,295,310)
 	self:addTradeFlags(RecipeDB,18410,1,2,3,36,40,56)
 	self:addTradeAcquire(RecipeDB,18410,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Frostweave Gloves -- 18411
-	self:addTradeSkill(RecipeDB,18411,265,13870,2,3908,nil,GAME_ORIG,265,280,295,310)
+	AddRecipe(18411,265,13870,2,GAME_ORIG,265,280,295,310)
 	self:addTradeFlags(RecipeDB,18411,1,2,3,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18411,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Cindercloth Gloves -- 18412
-	self:addTradeSkill(RecipeDB,18412,270,14043,2,3908,nil,GAME_ORIG,270,285,300,315)
+	AddRecipe(18412,270,14043,2,GAME_ORIG,270,285,300,315)
 	self:addTradeFlags(RecipeDB,18412,1,2,11,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18412,3,5861)

 	-- Ghostweave Gloves -- 18413
-	self:addTradeSkill(RecipeDB,18413,270,14142,2,3908,nil,GAME_ORIG,270,285,300,315)
+	AddRecipe(18413,270,14142,2,GAME_ORIG,270,285,300,315)
 	self:addTradeFlags(RecipeDB,18413,1,2,3,36,40,56)
 	self:addTradeAcquire(RecipeDB,18413,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Brightcloth Robe -- 18414
-	self:addTradeSkill(RecipeDB,18414,270,14100,2,3908,nil,GAME_ORIG,270,285,300,315)
+	AddRecipe(18414,270,14100,2,GAME_ORIG,270,285,300,315)
 	self:addTradeFlags(RecipeDB,18414,1,2,3,36,40,56)
 	self:addTradeAcquire(RecipeDB,18414,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Brightcloth Gloves -- 18415
-	self:addTradeSkill(RecipeDB,18415,270,14101,2,3908,nil,GAME_ORIG,270,285,300,315)
+	AddRecipe(18415,270,14101,2,GAME_ORIG,270,285,300,315)
 	self:addTradeFlags(RecipeDB,18415,1,2,3,36,40,56)
 	self:addTradeAcquire(RecipeDB,18415,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Ghostweave Vest -- 18416
-	self:addTradeSkill(RecipeDB,18416,275,14141,2,3908,nil,GAME_ORIG,275,290,305,320)
+	AddRecipe(18416,275,14141,2,GAME_ORIG,275,290,305,320)
 	self:addTradeFlags(RecipeDB,18416,1,2,3,36,40,56)
 	self:addTradeAcquire(RecipeDB,18416,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Runecloth Gloves -- 18417
-	self:addTradeSkill(RecipeDB,18417,275,13863,1,3908,nil,GAME_ORIG,275,290,305,320)
+	AddRecipe(18417,275,13863,1,GAME_ORIG,275,290,305,320)
 	self:addTradeFlags(RecipeDB,18417,1,2,3,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18417,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Cindercloth Cloak -- 18418
-	self:addTradeSkill(RecipeDB,18418,275,14044,2,3908,nil,GAME_ORIG,275,290,305,320)
+	AddRecipe(18418,275,14044,2,GAME_ORIG,275,290,305,320)
 	self:addTradeFlags(RecipeDB,18418,1,2,11,36,40,53,54,60)
 	self:addTradeAcquire(RecipeDB,18418,3,7037)

 	-- Felcloth Pants -- 18419
-	self:addTradeSkill(RecipeDB,18419,275,14107,1,3908,nil,GAME_ORIG,275,290,305,320)
+	AddRecipe(18419,275,14107,1,GAME_ORIG,275,290,305,320)
 	self:addTradeFlags(RecipeDB,18419,1,2,4,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,18419,2,12022)

 	-- Brightcloth Cloak -- 18420
-	self:addTradeSkill(RecipeDB,18420,275,14103,2,3908,nil,GAME_ORIG,275,290,305,320)
+	AddRecipe(18420,275,14103,2,GAME_ORIG,275,290,305,320)
 	self:addTradeFlags(RecipeDB,18420,1,2,3,36,40,53,54,60)
 	self:addTradeAcquire(RecipeDB,18420,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Wizardweave Leggings -- 18421
-	self:addTradeSkill(RecipeDB,18421,275,14132,2,3908,nil,GAME_ORIG,275,290,305,320)
+	AddRecipe(18421,275,14132,2,GAME_ORIG,275,290,305,320)
 	self:addTradeFlags(RecipeDB,18421,1,2,3,36,40,56)
 	self:addTradeAcquire(RecipeDB,18421,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Cloak of Fire -- 18422
-	self:addTradeSkill(RecipeDB,18422,275,14134,3,3908,nil,GAME_ORIG,275,290,305,320)
+	AddRecipe(18422,275,14134,3,GAME_ORIG,275,290,305,320)
 	self:addTradeFlags(RecipeDB,18422,1,2,5,11,36,41,60)
 	self:addTradeAcquire(RecipeDB,18422,3,9026)

 	-- Runecloth Boots -- 18423
-	self:addTradeSkill(RecipeDB,18423,280,13864,1,3908,nil,GAME_ORIG,280,295,310,325)
+	AddRecipe(18423,280,13864,1,GAME_ORIG,280,295,310,325)
 	self:addTradeFlags(RecipeDB,18423,1,2,3,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18423,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Frostweave Pants -- 18424
-	self:addTradeSkill(RecipeDB,18424,280,13871,2,3908,nil,GAME_ORIG,280,295,310,325)
+	AddRecipe(18424,280,13871,2,GAME_ORIG,280,295,310,325)
 	self:addTradeFlags(RecipeDB,18424,1,2,3,11,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18424,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Cindercloth Pants -- 18434
-	self:addTradeSkill(RecipeDB,18434,280,14045,2,3908,nil,GAME_ORIG,280,295,310,325)
+	AddRecipe(18434,280,14045,2,GAME_ORIG,280,295,310,325)
 	self:addTradeFlags(RecipeDB,18434,1,2,11,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18434,3,7037)

 	-- Robe of Winter Night -- 18436
-	self:addTradeSkill(RecipeDB,18436,285,14136,3,3908,nil,GAME_ORIG,285,300,315,330)
+	AddRecipe(18436,285,14136,3,GAME_ORIG,285,300,315,330)
 	self:addTradeFlags(RecipeDB,18436,1,2,11,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,18436,3,7437)

 	-- Felcloth Boots -- 18437
-	self:addTradeSkill(RecipeDB,18437,285,14108,2,3908,nil,GAME_ORIG,285,300,315,330)
+	AddRecipe(18437,285,14108,2,GAME_ORIG,285,300,315,330)
 	self:addTradeFlags(RecipeDB,18437,1,2,3,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18437,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Runecloth Pants -- 18438
-	self:addTradeSkill(RecipeDB,18438,285,13865,2,3908,nil,GAME_ORIG,285,300,315,330)
+	AddRecipe(18438,285,13865,2,GAME_ORIG,285,300,315,330)
 	self:addTradeFlags(RecipeDB,18438,1,2,3,11,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18438,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Brightcloth Pants -- 18439
-	self:addTradeSkill(RecipeDB,18439,290,14104,2,3908,nil,GAME_ORIG,290,305,320,335)
+	AddRecipe(18439,290,14104,2,GAME_ORIG,290,305,320,335)
 	self:addTradeFlags(RecipeDB,18439,1,2,10,36,40,56)
 	self:addTradeAcquire(RecipeDB,18439,7,2)

 	-- Mooncloth Leggings -- 18440
-	self:addTradeSkill(RecipeDB,18440,290,14137,3,3908,nil,GAME_ORIG,290,305,320,335)
+	AddRecipe(18440,290,14137,3,GAME_ORIG,290,305,320,335)
 	self:addTradeFlags(RecipeDB,18440,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18440,7,2)

 	-- Ghostweave Pants -- 18441
-	self:addTradeSkill(RecipeDB,18441,290,14144,2,3908,nil,GAME_ORIG,290,305,320,335)
+	AddRecipe(18441,290,14144,2,GAME_ORIG,290,305,320,335)
 	self:addTradeFlags(RecipeDB,18441,1,2,3,36,40,56)
 	self:addTradeAcquire(RecipeDB,18441,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Felcloth Hood -- 18442
-	self:addTradeSkill(RecipeDB,18442,290,14111,2,3908,nil,GAME_ORIG,290,305,320,335)
+	AddRecipe(18442,290,14111,2,GAME_ORIG,290,305,320,335)
 	self:addTradeFlags(RecipeDB,18442,1,2,3,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18442,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Runecloth Headband -- 18444
-	self:addTradeSkill(RecipeDB,18444,295,13866,2,3908,nil,GAME_ORIG,295,310,325,340)
+	AddRecipe(18444,295,13866,2,GAME_ORIG,295,310,325,340)
 	self:addTradeFlags(RecipeDB,18444,1,2,3,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18444,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Mooncloth Bag -- 18445
-	self:addTradeSkill(RecipeDB,18445,300,14155,2,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(18445,300,14155,2,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,18445,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,18445,7,2)

 	-- Wizardweave Robe -- 18446
-	self:addTradeSkill(RecipeDB,18446,300,14128,2,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(18446,300,14128,2,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,18446,1,2,3,36,40,56)
 	self:addTradeAcquire(RecipeDB,18446,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Mooncloth Vest -- 18447
-	self:addTradeSkill(RecipeDB,18447,300,14138,3,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(18447,300,14138,3,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,18447,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18447,7,2)

 	-- Mooncloth Shoulders -- 18448
-	self:addTradeSkill(RecipeDB,18448,300,14139,3,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(18448,300,14139,3,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,18448,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18448,7,2)

 	-- Runecloth Shoulders -- 18449
-	self:addTradeSkill(RecipeDB,18449,300,13867,2,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(18449,300,13867,2,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,18449,1,2,3,11,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18449,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Wizardweave Turban -- 18450
-	self:addTradeSkill(RecipeDB,18450,300,14130,2,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(18450,300,14130,2,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,18450,1,2,3,36,40,56)
 	self:addTradeAcquire(RecipeDB,18450,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Felcloth Robe -- 18451
-	self:addTradeSkill(RecipeDB,18451,300,14106,2,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(18451,300,14106,2,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,18451,1,2,3,11,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18451,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Mooncloth Circlet -- 18452
-	self:addTradeSkill(RecipeDB,18452,300,14140,3,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(18452,300,14140,3,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,18452,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18452,7,2)

 	-- Felcloth Shoulders -- 18453
-	self:addTradeSkill(RecipeDB,18453,300,14112,2,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(18453,300,14112,2,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,18453,1,2,3,11,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18453,1,2399,1,11052,1,18749,1,18772,1,28699,1,1346,1,4159,
 	1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,27001,1,33613,1,33636,1,26914
 	,1,4576,1,17487,1,16640,1,16366,1,26969,1,5153,1,4193,1,26964,1,3523,1,33684)

 	-- Gloves of Spell Mastery -- 18454
-	self:addTradeSkill(RecipeDB,18454,300,14146,4,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(18454,300,14146,4,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,18454,1,2,10,F_MAGE,F_PRIEST,F_WARLOCK,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18454,7,2)

 	-- Bottomless Bag -- 18455
-	self:addTradeSkill(RecipeDB,18455,300,14156,3,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(18455,300,14156,3,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,18455,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,18455,7,2)

 	-- Truefaith Vestments -- 18456
-	self:addTradeSkill(RecipeDB,18456,300,14154,4,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(18456,300,14154,4,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,18456,1,2,5,F_PRIEST,37,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,18456,3,10813)

 	-- Robe of the Archmage -- 18457
-	self:addTradeSkill(RecipeDB,18457,300,14152,4,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(18457,300,14152,4,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,18457,1,2,5,37,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,18457,3,9264)

 	-- Robe of the Void -- 18458
-	self:addTradeSkill(RecipeDB,18458,300,14153,4,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(18458,300,14153,4,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,18458,1,2,5,37,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,18458,3,1853)

 	-- Mooncloth -- 18560
-	self:addTradeSkill(RecipeDB,18560,250,14342,1,3908,nil,GAME_ORIG,250,290,305,320)
+	AddRecipe(18560,250,14342,1,GAME_ORIG,250,290,305,320)
 	self:addTradeFlags(RecipeDB,18560,1,2,4,36,40,56)
 	self:addTradeAcquire(RecipeDB,18560,2,11189)

 	-- Mooncloth Boots -- 19435
-	self:addTradeSkill(RecipeDB,19435,290,15802,3,3908,nil,GAME_ORIG,290,295,310,325)
+	AddRecipe(19435,290,15802,3,GAME_ORIG,290,295,310,325)
 	self:addTradeFlags(RecipeDB,19435,1,2,8,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,19435,4,6032)

 	-- Flarecore Mantle -- 20848
-	self:addTradeSkill(RecipeDB,20848,300,16980,1,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(20848,300,16980,1,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,20848,1,2,4,36,41,53,54,56,98)
 	self:addTradeAcquire(RecipeDB,20848,6,59,2,12944)

 	-- Flarecore Gloves -- 20849
-	self:addTradeSkill(RecipeDB,20849,300,16979,1,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(20849,300,16979,1,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,20849,1,2,4,F_MAGE,F_PRIEST,F_WARLOCK,36,41,56,98)
 	self:addTradeAcquire(RecipeDB,20849,6,59,1,12944)

 	-- Green Holiday Shirt -- 21945
-	self:addTradeSkill(RecipeDB,21945,190,17723,1,3908,nil,GAME_ORIG,190,200,205,210)
+	AddRecipe(21945,190,17723,1,GAME_ORIG,190,200,205,210)
 	self:addTradeFlags(RecipeDB,21945,1,2,11,36,40)
 	self:addTradeAcquire(RecipeDB,21945,5,1)

 	-- Flarecore Wraps -- 22759
-	self:addTradeSkill(RecipeDB,22759,300,18263,3,3908,nil,GAME_ORIG,300,320,335,350)
+	AddRecipe(22759,300,18263,3,GAME_ORIG,300,320,335,350)
 	self:addTradeFlags(RecipeDB,22759,1,2,6,36,40,56)
 	self:addTradeAcquire(RecipeDB,22759,8,26)

 	-- Gordok Ogre Suit -- 22813
-	self:addTradeSkill(RecipeDB,22813,275,18258,2,3908,nil,GAME_ORIG,275,285,290,295)
+	AddRecipe(22813,275,18258,2,GAME_ORIG,275,285,290,295)
 	self:addTradeFlags(RecipeDB,22813,1,2,5,8,36,41)
 	self:addTradeAcquire(RecipeDB,22813,4,5518)

 	-- Belt of the Archmage -- 22866
-	self:addTradeSkill(RecipeDB,22866,300,18405,4,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(22866,300,18405,4,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,22866,1,2,5,36,40,56)
 	self:addTradeAcquire(RecipeDB,22866,8,23)

 	-- Felcloth Gloves -- 22867
-	self:addTradeSkill(RecipeDB,22867,300,18407,3,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(22867,300,18407,3,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,22867,1,2,5,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,22867,8,23)

 	-- Inferno Gloves -- 22868
-	self:addTradeSkill(RecipeDB,22868,300,18408,3,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(22868,300,18408,3,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,22868,1,2,5,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,22868,8,23)

 	-- Mooncloth Gloves -- 22869
-	self:addTradeSkill(RecipeDB,22869,300,18409,3,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(22869,300,18409,3,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,22869,1,2,5,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,22869,8,23)

 	-- Cloak of Warding -- 22870
-	self:addTradeSkill(RecipeDB,22870,300,18413,3,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(22870,300,18413,3,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,22870,1,2,5,36,41,52,60)
 	self:addTradeAcquire(RecipeDB,22870,8,23)

 	-- Mooncloth Robe -- 22902
-	self:addTradeSkill(RecipeDB,22902,300,18486,1,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(22902,300,18486,1,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,22902,1,2,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,22902,2,14371)

 	-- Wisdom of the Timbermaw -- 23662
-	self:addTradeSkill(RecipeDB,23662,290,19047,1,3908,nil,GAME_ORIG,290,305,320,335)
+	AddRecipe(23662,290,19047,1,GAME_ORIG,290,305,320,335)
 	self:addTradeFlags(RecipeDB,23662,1,2,4,36,41,56,99)
 	self:addTradeAcquire(RecipeDB,23662,6,576,2,11557)

 	-- Mantle of the Timbermaw -- 23663
-	self:addTradeSkill(RecipeDB,23663,300,19050,1,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(23663,300,19050,1,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,23663,1,2,4,36,41,56,99)
 	self:addTradeAcquire(RecipeDB,23663,6,576,3,11557)

 	-- Argent Boots -- 23664
-	self:addTradeSkill(RecipeDB,23664,290,19056,1,3908,nil,GAME_ORIG,290,305,320,335)
+	AddRecipe(23664,290,19056,1,GAME_ORIG,290,305,320,335)
 	self:addTradeFlags(RecipeDB,23664,1,2,4,36,41,56,53,54,96)
 	self:addTradeAcquire(RecipeDB,23664,6,529,2,10856,6,529,2,10857,6,529,2,11536)

 	-- Argent Shoulders -- 23665
-	self:addTradeSkill(RecipeDB,23665,300,19059,1,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(23665,300,19059,1,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,23665,1,2,4,36,41,56,53,54,96)
 	self:addTradeAcquire(RecipeDB,23665,6,529,3,10856,6,529,3,10857,6,529,3,11536)

 	-- Flarecore Robe -- 23666
-	self:addTradeSkill(RecipeDB,23666,300,19156,1,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(23666,300,19156,1,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,23666,1,2,4,36,41,53,54,56,98)
 	self:addTradeAcquire(RecipeDB,23666,6,59,2,12944)

 	-- Flarecore Leggings -- 23667
-	self:addTradeSkill(RecipeDB,23667,300,19165,1,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(23667,300,19165,1,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,23667,1,2,4,36,41,53,54,56,98)
 	self:addTradeAcquire(RecipeDB,23667,6,59,3,12944)

 	-- Bloodvine Vest -- 24091
-	self:addTradeSkill(RecipeDB,24091,300,19682,1,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(24091,300,19682,1,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,24091,1,2,4,36,41,53,54,56,100)
 	self:addTradeAcquire(RecipeDB,24091,6,270,3,14921)

 	-- Bloodvine Leggings -- 24092
-	self:addTradeSkill(RecipeDB,24092,300,19683,1,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(24092,300,19683,1,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,24092,1,2,4,36,41,53,54,56,100)
 	self:addTradeAcquire(RecipeDB,24092,6,270,2,14921)

 	-- Bloodvine Boots -- 24093
-	self:addTradeSkill(RecipeDB,24093,300,19684,1,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(24093,300,19684,1,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,24093,1,2,4,36,41,53,54,56,100)
 	self:addTradeAcquire(RecipeDB,24093,6,270,1,14921)

 	-- Runed Stygian Leggings -- 24901
-	self:addTradeSkill(RecipeDB,24901,300,20538,3,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(24901,300,20538,3,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,24901,1,2,8,36,40,56)
 	self:addTradeAcquire(RecipeDB,24901,4,8323)

 	-- Runed Stygian Belt -- 24902
-	self:addTradeSkill(RecipeDB,24902,300,20539,3,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(24902,300,20539,3,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,24902,1,2,8,36,40,56)
 	self:addTradeAcquire(RecipeDB,24902,4,8323)

 	-- Runed Stygian Boots -- 24903
-	self:addTradeSkill(RecipeDB,24903,300,20537,3,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(24903,300,20537,3,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,24903,1,2,8,36,40,56)
 	self:addTradeAcquire(RecipeDB,24903,4,8323)

 	-- Soul Pouch -- 26085
-	self:addTradeSkill(RecipeDB,26085,260,21340,1,3908,nil,GAME_ORIG,260,275,290,305)
+	AddRecipe(26085,260,21340,1,GAME_ORIG,260,275,290,305)
 	self:addTradeFlags(RecipeDB,26085,1,2,4,F_WARLOCK,36,40)
 	self:addTradeAcquire(RecipeDB,26085,2,6568)

 	-- Felcloth Bag -- 26086
-	self:addTradeSkill(RecipeDB,26086,280,21341,3,3908,nil,GAME_ORIG,280,300,315,330)
+	AddRecipe(26086,280,21341,3,GAME_ORIG,280,300,315,330)
 	self:addTradeFlags(RecipeDB,26086,1,2,5,F_WARLOCK,36,41)
 	self:addTradeAcquire(RecipeDB,26086,3,10503,8,30)

 	-- Core Felcloth Bag -- 26087
-	self:addTradeSkill(RecipeDB,26087,300,21342,3,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(26087,300,21342,3,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,26087,1,2,6,11,F_WARLOCK,36,40)
 	self:addTradeAcquire(RecipeDB,26087,8,26)

 	-- Festival Dress -- 26403
-	self:addTradeSkill(RecipeDB,26403,250,21154,2,3908,nil,GAME_ORIG,250,265,280,295)
+	AddRecipe(26403,250,21154,2,GAME_ORIG,250,265,280,295)
 	self:addTradeFlags(RecipeDB,26403,1,2,4,7,36,41,56)
 	self:addTradeAcquire(RecipeDB,26403,5,2,2,15909)

 	-- Festive Red Pant Suit -- 26407
-	self:addTradeSkill(RecipeDB,26407,250,21542,2,3908,nil,GAME_ORIG,250,265,280,295)
+	AddRecipe(26407,250,21542,2,GAME_ORIG,250,265,280,295)
 	self:addTradeFlags(RecipeDB,26407,1,2,4,7,36,41)
 	self:addTradeAcquire(RecipeDB,26407,5,2,2,15909)

 	-- Bolt of Netherweave -- 26745
-	self:addTradeSkill(RecipeDB,26745,300,21840,1,3908,nil,1,300,305,315,325)
+	AddRecipe(26745,300,21840,1,1,300,305,315,325)
 	self:addTradeFlags(RecipeDB,26745,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,26745,1,18749,1,18772,1,28699,1,33580,1,27001,1,33613,1,
 	33636,1,26914,1,26969,1,26964,1,33684)

 	-- Netherweave Bag -- 26746
-	self:addTradeSkill(RecipeDB,26746,315,21841,1,3908,nil,1,315,320,330,340)
+	AddRecipe(26746,315,21841,1,1,315,320,330,340)
 	self:addTradeFlags(RecipeDB,26746,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,26746,1,18749,1,18772,1,28699,1,33580,1,27001,1,33613,1,
 	33636,1,26914,1,26969,1,26964,1,33684)

 	-- Bolt of Imbued Netherweave -- 26747
-	self:addTradeSkill(RecipeDB,26747,325,21842,1,3908,nil,1,325,330,335,340)
+	AddRecipe(26747,325,21842,1,1,325,330,335,340)
 	self:addTradeFlags(RecipeDB,26747,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,26747,2,16638,2,16767,2,19213)

 	-- Imbued Netherweave Bag -- 26749
-	self:addTradeSkill(RecipeDB,26749,340,21843,1,3908,nil,1,340,340,345,350)
+	AddRecipe(26749,340,21843,1,1,340,340,345,350)
 	self:addTradeFlags(RecipeDB,26749,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,26749,2,19015,2,19213)

 	-- Bolt of Soulcloth -- 26750
-	self:addTradeSkill(RecipeDB,26750,345,21844,1,3908,nil,1,345,345,350,355)
+	AddRecipe(26750,345,21844,1,1,345,345,350,355)
 	self:addTradeFlags(RecipeDB,26750,1,2,4,36,40,56)
 	self:addTradeAcquire(RecipeDB,26750,2,16638,2,16767,2,19015,2,19017)

 	-- Primal Mooncloth -- 26751
-	self:addTradeSkill(RecipeDB,26751,350,21845,1,3908,nil,1,350,350,355,360)
+	AddRecipe(26751,350,21845,1,1,350,350,355,360)
 	self:addTradeFlags(RecipeDB,26751,1,2,4,36,40,56)
 	self:addTradeAcquire(RecipeDB,26751,2,22208,2,29512)

 	-- Spellfire Belt -- 26752
-	self:addTradeSkill(RecipeDB,26752,355,21846,1,3908,26797,1,355,365,370,375)
+	AddRecipe(26752,355,21846,1,1,355,365,370,375,26797)
 	self:addTradeFlags(RecipeDB,26752,1,2,4,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,26752,2,22213,2,29511)

 	-- Spellfire Gloves -- 26753
-	self:addTradeSkill(RecipeDB,26753,365,21847,1,3908,26797,1,365,375,380,385)
+	AddRecipe(26753,365,21847,1,1,365,375,380,385,26797)
 	self:addTradeFlags(RecipeDB,26753,1,2,4,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,26753,2,22213,2,29511)

 	-- Spellfire Robe -- 26754
-	self:addTradeSkill(RecipeDB,26754,375,21848,1,3908,26797,1,375,385,390,395)
+	AddRecipe(26754,375,21848,1,1,375,385,390,395,26797)
 	self:addTradeFlags(RecipeDB,26754,1,2,4,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,26754,2,22213,2,29511)

 	-- Spellfire Bag -- 26755
-	self:addTradeSkill(RecipeDB,26755,375,21858,3,3908,nil,1,375,385,390,395)
+	AddRecipe(26755,375,21858,3,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,26755,1,2,4,11,36,41)
 	self:addTradeAcquire(RecipeDB,26755,3,20134,3,20135,2,22213,2,29511)

 	-- Frozen Shadoweave Shoulders -- 26756
-	self:addTradeSkill(RecipeDB,26756,355,21869,1,3908,26801,1,355,365,370,375)
+	AddRecipe(26756,355,21869,1,1,355,365,370,375,26801)
 	self:addTradeFlags(RecipeDB,26756,1,2,4,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,26756,2,22212,2,29510)

 	-- Frozen Shadoweave Boots -- 26757
-	self:addTradeSkill(RecipeDB,26757,365,21870,1,3908,26801,1,365,375,380,385)
+	AddRecipe(26757,365,21870,1,1,365,375,380,385,26801)
 	self:addTradeFlags(RecipeDB,26757,1,2,4,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,26757,2,22212,2,29510)

 	-- Frozen Shadoweave Robe -- 26758
-	self:addTradeSkill(RecipeDB,26758,375,21871,1,3908,26801,1,375,385,390,395)
+	AddRecipe(26758,375,21871,1,1,375,385,390,395,26801)
 	self:addTradeFlags(RecipeDB,26758,1,2,4,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,26758,2,22212,2,29510)

 	-- Ebon Shadowbag -- 26759
-	self:addTradeSkill(RecipeDB,26759,375,21872,3,3908,nil,1,375,385,390,395)
+	AddRecipe(26759,375,21872,3,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,26759,1,2,4,F_WARLOCK,36,41)
 	self:addTradeAcquire(RecipeDB,26759,2,22212,2,29510)

 	-- Primal Mooncloth Belt -- 26760
-	self:addTradeSkill(RecipeDB,26760,355,21873,1,3908,26798,1,355,365,370,375)
+	AddRecipe(26760,355,21873,1,1,355,365,370,375,26798)
 	self:addTradeFlags(RecipeDB,26760,1,2,4,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,26760,2,22208,2,29512)

 	-- Primal Mooncloth Shoulders -- 26761
-	self:addTradeSkill(RecipeDB,26761,365,21874,1,3908,26798,1,365,375,380,385)
+	AddRecipe(26761,365,21874,1,1,365,375,380,385,26798)
 	self:addTradeFlags(RecipeDB,26761,1,2,4,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,26761,2,22208,2,29512)

 	-- Primal Mooncloth Robe -- 26762
-	self:addTradeSkill(RecipeDB,26762,375,21875,1,3908,26798,1,375,385,390,395)
+	AddRecipe(26762,375,21875,1,1,375,385,390,395,26798)
 	self:addTradeFlags(RecipeDB,26762,1,2,4,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,26762,2,22208,2,29512)

 	-- Primal Mooncloth Bag -- 26763
-	self:addTradeSkill(RecipeDB,26763,375,21876,3,3908,nil,1,375,385,390,395)
+	AddRecipe(26763,375,21876,3,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,26763,1,2,4,11,36,41)
 	self:addTradeAcquire(RecipeDB,26763,3,18872,2,22208,2,29512)

 	-- Netherweave Bracers -- 26764
-	self:addTradeSkill(RecipeDB,26764,310,21849,1,3908,nil,1,310,320,325,330)
+	AddRecipe(26764,310,21849,1,1,310,320,325,330)
 	self:addTradeFlags(RecipeDB,26764,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,26764,1,18749,1,18772,1,28699,1,33580,1,27001,1,33613,1,
 	33636,1,26914,1,26969,1,26964,1,33684)

 	-- Netherweave Belt -- 26765
-	self:addTradeSkill(RecipeDB,26765,310,21850,1,3908,nil,1,310,320,325,330)
+	AddRecipe(26765,310,21850,1,1,310,320,325,330)
 	self:addTradeFlags(RecipeDB,26765,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,26765,1,18749,1,18772,1,28699,1,33580,1,27001,1,33613,1,
 	33636,1,26914,1,26969,1,26964,1,33684)

 	-- Netherweave Gloves -- 26770
-	self:addTradeSkill(RecipeDB,26770,320,21851,1,3908,nil,1,320,330,335,340)
+	AddRecipe(26770,320,21851,1,1,320,330,335,340)
 	self:addTradeFlags(RecipeDB,26770,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,26770,1,18749,1,18772,1,28699,1,33580,1,27001,1,33613,1,
 	33636,1,26914,1,26969,1,26964,1,33684)

 	-- Netherweave Pants -- 26771
-	self:addTradeSkill(RecipeDB,26771,325,21852,1,3908,nil,1,325,335,340,345)
+	AddRecipe(26771,325,21852,1,1,325,335,340,345)
 	self:addTradeFlags(RecipeDB,26771,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,26771,1,18749,1,18772,1,28699,1,33580,1,27001,1,33613,1,
 	33636,1,26914,1,26969,1,26964,1,33684)

 	-- Netherweave Boots -- 26772
-	self:addTradeSkill(RecipeDB,26772,335,21853,1,3908,nil,1,335,345,350,355)
+	AddRecipe(26772,335,21853,1,1,335,345,350,355)
 	self:addTradeFlags(RecipeDB,26772,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,26772,1,18749,1,18772,1,28699,1,33580,1,27001,1,33613,1,
 	33636,1,26914,1,26969,1,26964,1,33684)

 	-- Netherweave Robe -- 26773
-	self:addTradeSkill(RecipeDB,26773,340,21854,1,3908,nil,1,340,350,355,360)
+	AddRecipe(26773,340,21854,1,1,340,350,355,360)
 	self:addTradeFlags(RecipeDB,26773,1,2,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,26773,2,16638,2,16767,2,19213)

 	-- Netherweave Tunic -- 26774
-	self:addTradeSkill(RecipeDB,26774,345,21855,1,3908,nil,1,345,355,360,365)
+	AddRecipe(26774,345,21855,1,1,345,355,360,365)
 	self:addTradeFlags(RecipeDB,26774,1,2,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,26774,2,16638,2,16767,2,19213)

 	-- Imbued Netherweave Pants -- 26775
-	self:addTradeSkill(RecipeDB,26775,340,21859,1,3908,nil,1,340,350,355,360)
+	AddRecipe(26775,340,21859,1,1,340,350,355,360)
 	self:addTradeFlags(RecipeDB,26775,1,2,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,26775,2,18011,2,19722)

 	-- Imbued Netherweave Boots -- 26776
-	self:addTradeSkill(RecipeDB,26776,350,21860,1,3908,nil,1,350,360,365,370)
+	AddRecipe(26776,350,21860,1,1,350,360,365,370)
 	self:addTradeFlags(RecipeDB,26776,1,2,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,26776,2,18011,2,19722)

 	-- Imbued Netherweave Robe -- 26777
-	self:addTradeSkill(RecipeDB,26777,360,21861,1,3908,nil,1,360,370,375,380)
+	AddRecipe(26777,360,21861,1,1,360,370,375,380)
 	self:addTradeFlags(RecipeDB,26777,1,2,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,26777,2,19521)

 	-- Imbued Netherweave Tunic -- 26778
-	self:addTradeSkill(RecipeDB,26778,360,21862,1,3908,nil,1,360,370,375,380)
+	AddRecipe(26778,360,21862,1,1,360,370,375,380)
 	self:addTradeFlags(RecipeDB,26778,1,2,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,26778,2,19521)

 	-- Soulcloth Gloves -- 26779
-	self:addTradeSkill(RecipeDB,26779,355,21863,1,3908,nil,1,355,365,370,375)
+	AddRecipe(26779,355,21863,1,1,355,365,370,375)
 	self:addTradeFlags(RecipeDB,26779,1,2,4,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,26779,2,19015,2,19017)

 	-- Soulcloth Shoulders -- 26780
-	self:addTradeSkill(RecipeDB,26780,365,21864,4,3908,nil,1,365,375,380,385)
+	AddRecipe(26780,365,21864,4,1,365,375,380,385)
 	self:addTradeFlags(RecipeDB,26780,1,2,6,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,26780,3,16406)

 	-- Soulcloth Vest -- 26781
-	self:addTradeSkill(RecipeDB,26781,375,21865,4,3908,nil,1,375,380,382,385)
+	AddRecipe(26781,375,21865,4,1,375,380,382,385)
 	self:addTradeFlags(RecipeDB,26781,1,2,6,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,26781,3,16408)

 	-- Arcanoweave Bracers -- 26782
-	self:addTradeSkill(RecipeDB,26782,350,21866,2,3908,nil,1,350,360,365,370)
+	AddRecipe(26782,350,21866,2,1,350,360,365,370)
 	self:addTradeFlags(RecipeDB,26782,1,2,5,36,41,56)
 	self:addTradeAcquire(RecipeDB,26782,3,20869)

 	-- Arcanoweave Boots -- 26783
-	self:addTradeSkill(RecipeDB,26783,360,21867,2,3908,nil,1,360,370,375,380)
+	AddRecipe(26783,360,21867,2,1,360,370,375,380)
 	self:addTradeFlags(RecipeDB,26783,1,2,5,36,41,56)
 	self:addTradeAcquire(RecipeDB,26783,3,19168)

 	-- Arcanoweave Robe -- 26784
-	self:addTradeSkill(RecipeDB,26784,370,21868,2,3908,nil,1,370,380,385,390)
+	AddRecipe(26784,370,21868,2,1,370,380,385,390)
 	self:addTradeFlags(RecipeDB,26784,1,2,5,36,41,56)
 	self:addTradeAcquire(RecipeDB,26784,3,19220)

 	-- Enchanted Mageweave Pouch -- 27658
-	self:addTradeSkill(RecipeDB,27658,225,22246,1,3908,nil,1,225,240,255,270)
+	AddRecipe(27658,225,22246,1,1,225,240,255,270)
 	self:addTradeFlags(RecipeDB,27658,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,27658,2,1318,2,3012,2,3346,2,4228,2,4617,2,5158,2,5757,2,
 	5758,2,15419,2,16635,2,16722,2,18753,2,18773,2,18951,2,19234,2,19537,2,19540,2,19663,2,26569,
 	2,27030,2,27054,2,27147,2,28714)

 	-- Enchanted Runecloth Bag -- 27659
-	self:addTradeSkill(RecipeDB,27659,275,22248,1,3908,nil,GAME_ORIG,275,290,305,320)
+	AddRecipe(27659,275,22248,1,GAME_ORIG,275,290,305,320)
 	self:addTradeFlags(RecipeDB,27659,1,2,4,36,40)
 	self:addTradeAcquire(RecipeDB,27659,2,15419)

 	-- Big Bag of Enchantment -- 27660
-	self:addTradeSkill(RecipeDB,27660,300,22249,2,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(27660,300,22249,2,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,27660,1,2,5,36,40)
 	self:addTradeAcquire(RecipeDB,27660,3,11487)

 	-- Cenarion Herb Bag -- 27724
-	self:addTradeSkill(RecipeDB,27724,275,22251,1,3908,nil,GAME_ORIG,275,290,305,320)
+	AddRecipe(27724,275,22251,1,GAME_ORIG,275,290,305,320)
 	self:addTradeFlags(RecipeDB,27724,1,2,4,36,41,97)
 	self:addTradeAcquire(RecipeDB,27724,6,609,1,15179)

 	-- Satchel of Cenarius -- 27725
-	self:addTradeSkill(RecipeDB,27725,300,22252,1,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(27725,300,22252,1,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,27725,1,2,4,36,41,97)
 	self:addTradeAcquire(RecipeDB,27725,6,609,3,15179)

 	-- Glacial Gloves -- 28205
-	self:addTradeSkill(RecipeDB,28205,300,22654,4,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(28205,300,22654,4,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,28205,1,2,4,6,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,28205,6,529,3,16365,8,41)

 	-- Glacial Vest -- 28207
-	self:addTradeSkill(RecipeDB,28207,300,22652,4,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(28207,300,22652,4,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,28207,1,2,4,6,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,28207,6,529,4,16365,8,41)

 	-- Glacial Cloak -- 28208
-	self:addTradeSkill(RecipeDB,28208,300,22658,4,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(28208,300,22658,4,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,28208,1,2,4,6,36,41,60)
 	self:addTradeAcquire(RecipeDB,28208,6,529,2,16365,8,41)

 	-- Glacial Wrists -- 28209
-	self:addTradeSkill(RecipeDB,28209,300,22655,4,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(28209,300,22655,4,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,28209,1,2,4,6,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,28209,6,529,3,16365,8,41)

 	-- Gaea's Embrace -- 28210
-	self:addTradeSkill(RecipeDB,28210,300,22660,1,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(28210,300,22660,1,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,28210,1,2,4,36,41,60,97)
 	self:addTradeAcquire(RecipeDB,28210,6,609,3,15179)

 	-- Sylvan Vest -- 28480
-	self:addTradeSkill(RecipeDB,28480,300,22756,1,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(28480,300,22756,1,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,28480,1,2,4,36,41,53,54,56,97)
 	self:addTradeAcquire(RecipeDB,28480,6,609,3,15179)

 	-- Sylvan Crown -- 28481
-	self:addTradeSkill(RecipeDB,28481,300,22757,1,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(28481,300,22757,1,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,28481,1,2,4,36,41,56,53,54,97)
 	self:addTradeAcquire(RecipeDB,28481,6,609,2,15179)

 	-- Sylvan Shoulders -- 28482
-	self:addTradeSkill(RecipeDB,28482,300,22758,1,3908,nil,GAME_ORIG,300,315,330,345)
+	AddRecipe(28482,300,22758,1,GAME_ORIG,300,315,330,345)
 	self:addTradeFlags(RecipeDB,28482,1,2,4,36,41,53,54,56,97)
 	self:addTradeAcquire(RecipeDB,28482,6,609,1,15179)

 	-- Spellcloth -- 31373
-	self:addTradeSkill(RecipeDB,31373,350,24271,1,3908,nil,1,350,350,355,360)
+	AddRecipe(31373,350,24271,1,1,350,350,355,360)
 	self:addTradeFlags(RecipeDB,31373,1,2,4,36,40,56)
 	self:addTradeAcquire(RecipeDB,31373,2,22213,2,29511)

 	-- Mystic Spellthread -- 31430
-	self:addTradeSkill(RecipeDB,31430,335,24273,1,3908,nil,1,335,345,350,355)
+	AddRecipe(31430,335,24273,1,1,335,345,350,355)
 	self:addTradeFlags(RecipeDB,31430,1,2,4,36,41,53,54,110)
 	self:addTradeAcquire(RecipeDB,31430,6,934,2,19331)

 	-- Silver Spellthread -- 31431
-	self:addTradeSkill(RecipeDB,31431,335,24275,1,3908,nil,1,335,345,350,355)
+	AddRecipe(31431,335,24275,1,1,335,345,350,355)
 	self:addTradeFlags(RecipeDB,31431,1,4,36,41,53,54,101)
 	self:addTradeAcquire(RecipeDB,31431,6,932,2,19321)

 	-- Runic Spellthread -- 31432
-	self:addTradeSkill(RecipeDB,31432,375,24274,1,3908,nil,1,375,385,390,395)
+	AddRecipe(31432,375,24274,1,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,31432,1,2,4,36,41,53,54,110)
 	self:addTradeAcquire(RecipeDB,31432,6,934,4,19331)

 	-- Golden Spellthread -- 31433
-	self:addTradeSkill(RecipeDB,31433,375,24276,1,3908,nil,1,375,385,390,395)
+	AddRecipe(31433,375,24276,1,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,31433,1,4,36,41,53,54,101)
 	self:addTradeAcquire(RecipeDB,31433,6,932,4,19321)

 	-- Unyielding Bracers -- 31434
-	self:addTradeSkill(RecipeDB,31434,350,24249,3,3908,nil,1,350,360,365,370)
+	AddRecipe(31434,350,24249,3,1,350,360,365,370)
 	self:addTradeFlags(RecipeDB,31434,1,2,11,36,41,56)
 	self:addTradeAcquire(RecipeDB,31434,3,24664)

 	-- Bracers of Havok -- 31435
-	self:addTradeSkill(RecipeDB,31435,350,24250,3,3908,nil,1,350,360,365,370)
+	AddRecipe(31435,350,24250,3,1,350,360,365,370)
 	self:addTradeFlags(RecipeDB,31435,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,31435,7,3)

 	-- Blackstrike Bracers -- 31437
-	self:addTradeSkill(RecipeDB,31437,350,24251,3,3908,nil,1,350,360,365,370)
+	AddRecipe(31437,350,24251,3,1,350,360,365,370)
 	self:addTradeFlags(RecipeDB,31437,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,31437,7,3)

 	-- Cloak of the Black Void -- 31438
-	self:addTradeSkill(RecipeDB,31438,350,24252,3,3908,nil,1,350,360,365,370)
+	AddRecipe(31438,350,24252,3,1,350,360,365,370)
 	self:addTradeFlags(RecipeDB,31438,1,2,10,36,40,53,54,60)
 	self:addTradeAcquire(RecipeDB,31438,7,3)

 	-- Cloak of Eternity -- 31440
-	self:addTradeSkill(RecipeDB,31440,350,24253,3,3908,nil,1,350,360,365,370)
+	AddRecipe(31440,350,24253,3,1,350,360,365,370)
 	self:addTradeFlags(RecipeDB,31440,1,2,10,36,40,52,60)
 	self:addTradeAcquire(RecipeDB,31440,7,3)

 	-- White Remedy Cape -- 31441
-	self:addTradeSkill(RecipeDB,31441,350,24254,3,3908,nil,1,350,360,365,370)
+	AddRecipe(31441,350,24254,3,1,350,360,365,370)
 	self:addTradeFlags(RecipeDB,31441,1,2,10,36,40,53,54,60)
 	self:addTradeAcquire(RecipeDB,31441,7,3)

 	-- Unyielding Girdle -- 31442
-	self:addTradeSkill(RecipeDB,31442,365,24255,4,3908,nil,1,365,375,380,385)
+	AddRecipe(31442,365,24255,4,1,365,375,380,385)
 	self:addTradeFlags(RecipeDB,31442,1,2,11,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,31442,3,24664)

 	-- Girdle of Ruination -- 31443
-	self:addTradeSkill(RecipeDB,31443,365,24256,4,3908,nil,1,365,375,380,385)
+	AddRecipe(31443,365,24256,4,1,365,375,380,385)
 	self:addTradeFlags(RecipeDB,31443,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,31443,7,4)

 	-- Black Belt of Knowledge -- 31444
-	self:addTradeSkill(RecipeDB,31444,365,24257,4,3908,nil,1,365,375,380,385)
+	AddRecipe(31444,365,24257,4,1,365,375,380,385)
 	self:addTradeFlags(RecipeDB,31444,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,31444,7,4)

 	-- Resolute Cape -- 31448
-	self:addTradeSkill(RecipeDB,31448,365,24258,4,3908,nil,1,365,375,380,385)
+	AddRecipe(31448,365,24258,4,1,365,375,380,385)
 	self:addTradeFlags(RecipeDB,31448,1,2,10,36,40,60)
 	self:addTradeAcquire(RecipeDB,31448,7,4)

 	-- Vengeance Wrap -- 31449
-	self:addTradeSkill(RecipeDB,31449,365,24259,4,3908,nil,1,365,375,380,385)
+	AddRecipe(31449,365,24259,4,1,365,375,380,385)
 	self:addTradeFlags(RecipeDB,31449,1,2,10,36,40,51,60)
 	self:addTradeAcquire(RecipeDB,31449,7,4)

 	-- Manaweave Cloak -- 31450
-	self:addTradeSkill(RecipeDB,31450,365,24260,4,3908,nil,1,365,375,380,385)
+	AddRecipe(31450,365,24260,4,1,365,375,380,385)
 	self:addTradeFlags(RecipeDB,31450,1,2,10,36,40,53,54,60)
 	self:addTradeAcquire(RecipeDB,31450,7,4)

 	-- Whitemend Pants -- 31451
-	self:addTradeSkill(RecipeDB,31451,375,24261,4,3908,nil,1,375,385,390,395)
+	AddRecipe(31451,375,24261,4,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,31451,1,2,5,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,31451,3,20885)

 	-- Spellstrike Pants -- 31452
-	self:addTradeSkill(RecipeDB,31452,375,24262,4,3908,nil,1,375,385,390,395)
+	AddRecipe(31452,375,24262,4,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,31452,1,2,5,11,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,31452,3,18708)

 	-- Battlecast Pants -- 31453
-	self:addTradeSkill(RecipeDB,31453,375,24263,4,3908,nil,1,375,385,390,395)
+	AddRecipe(31453,375,24263,4,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,31453,1,2,5,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,31453,3,17978)

 	-- Whitemend Hood -- 31454
-	self:addTradeSkill(RecipeDB,31454,375,24264,4,3908,nil,1,375,385,390,395)
+	AddRecipe(31454,375,24264,4,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,31454,1,2,5,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,31454,3,17977)

 	-- Spellstrike Hood -- 31455
-	self:addTradeSkill(RecipeDB,31455,375,24266,4,3908,nil,1,375,385,390,395)
+	AddRecipe(31455,375,24266,4,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,31455,1,2,5,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,31455,3,16807)

 	-- Battlecast Hood -- 31456
-	self:addTradeSkill(RecipeDB,31456,375,24267,4,3908,nil,1,375,385,390,395)
+	AddRecipe(31456,375,24267,4,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,31456,1,2,5,11,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,31456,3,17798)

 	-- Bag of Jewels -- 31459
-	self:addTradeSkill(RecipeDB,31459,340,24270,1,3908,nil,1,340,350,355,360)
+	AddRecipe(31459,340,24270,1,1,340,350,355,360)
 	self:addTradeFlags(RecipeDB,31459,1,2,4,36,41,105)
 	self:addTradeAcquire(RecipeDB,31459,6,933,2,20242,6,933,2,23007)

 	-- Netherweave Net -- 31460
-	self:addTradeSkill(RecipeDB,31460,300,24268,1,3908,nil,1,300,300,310,320)
+	AddRecipe(31460,300,24268,1,1,300,300,310,320)
 	self:addTradeFlags(RecipeDB,31460,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,31460,1,11557,1,18749,1,18772,1,28699,1,33580,1,27001,1,
 	33613,1,33636,1,26914,1,26969,1,26964,1,33684)

 	-- Belt of Blasting -- 36315
-	self:addTradeSkill(RecipeDB,36315,375,30038,4,3908,nil,1,375,385,390,395)
+	AddRecipe(36315,375,30038,4,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,36315,1,2,6,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,36315,8,37,8,43)

 	-- Belt of the Long Road -- 36316
-	self:addTradeSkill(RecipeDB,36316,375,30036,4,3908,nil,1,375,385,390,395)
+	AddRecipe(36316,375,30036,4,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,36316,1,2,6,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,36316,8,37,8,43)

 	-- Boots of Blasting -- 36317
-	self:addTradeSkill(RecipeDB,36317,375,30037,4,3908,nil,1,375,385,390,395)
+	AddRecipe(36317,375,30037,4,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,36317,1,2,6,37,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,36317,8,37,8,43)

 	-- Boots of the Long Road -- 36318
-	self:addTradeSkill(RecipeDB,36318,375,30035,4,3908,nil,1,375,385,390,395)
+	AddRecipe(36318,375,30035,4,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,36318,1,2,6,37,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,36318,8,37,8,43)

 	-- Shadowcloth -- 36686
-	self:addTradeSkill(RecipeDB,36686,350,24272,1,3908,nil,1,350,350,355,360)
+	AddRecipe(36686,350,24272,1,1,350,350,355,360)
 	self:addTradeFlags(RecipeDB,36686,1,2,4,36,40,56)
 	self:addTradeAcquire(RecipeDB,36686,2,22212,2,29510)

 	-- Cloak of Arcane Evasion -- 37873
-	self:addTradeSkill(RecipeDB,37873,350,30831,1,3908,nil,1,350,360,365,370)
+	AddRecipe(37873,350,30831,1,1,350,360,365,370)
 	self:addTradeFlags(RecipeDB,37873,1,2,4,36,41,60,107)
 	self:addTradeAcquire(RecipeDB,37873,6,1011,2,21655)

 	-- Flameheart Bracers -- 37882
-	self:addTradeSkill(RecipeDB,37882,350,30837,1,3908,nil,1,350,360,365,370)
+	AddRecipe(37882,350,30837,1,1,350,360,365,370)
 	self:addTradeFlags(RecipeDB,37882,1,4,36,41,56,101)
 	self:addTradeAcquire(RecipeDB,37882,6,932,1,19321)

 	-- Flameheart Gloves -- 37883
-	self:addTradeSkill(RecipeDB,37883,360,30838,1,3908,nil,1,360,370,375,380)
+	AddRecipe(37883,360,30838,1,1,360,370,375,380)
 	self:addTradeFlags(RecipeDB,37883,1,4,36,41,56,101)
 	self:addTradeAcquire(RecipeDB,37883,6,932,2,19321)

 	-- Flameheart Vest -- 37884
-	self:addTradeSkill(RecipeDB,37884,370,30839,1,3908,nil,1,370,380,385,390)
+	AddRecipe(37884,370,30839,1,1,370,380,385,390)
 	self:addTradeFlags(RecipeDB,37884,1,4,36,41,56,101)
 	self:addTradeAcquire(RecipeDB,37884,6,932,4,19321)

 	-- Soulguard Slippers -- 40020
-	self:addTradeSkill(RecipeDB,40020,375,32391,1,3908,nil,1,375,385,390,395)
+	AddRecipe(40020,375,32391,1,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,40020,1,2,4,36,41,56,102)
 	self:addTradeAcquire(RecipeDB,40020,6,1012,2,23159)

 	-- Soulguard Bracers -- 40021
-	self:addTradeSkill(RecipeDB,40021,375,32392,1,3908,nil,1,375,385,390,395)
+	AddRecipe(40021,375,32392,1,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,40021,1,2,4,36,41,56,102)
 	self:addTradeAcquire(RecipeDB,40021,6,1012,1,23159)

 	-- Soulguard Leggings -- 40023
-	self:addTradeSkill(RecipeDB,40023,375,32389,1,3908,nil,1,375,385,390,395)
+	AddRecipe(40023,375,32389,1,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,40023,1,2,4,36,41,56,102)
 	self:addTradeAcquire(RecipeDB,40023,6,1012,2,23159)

 	-- Soulguard Girdle -- 40024
-	self:addTradeSkill(RecipeDB,40024,375,32390,1,3908,nil,1,375,385,390,395)
+	AddRecipe(40024,375,32390,1,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,40024,1,2,4,36,41,56,102)
 	self:addTradeAcquire(RecipeDB,40024,6,1012,1,23159)

 	-- Night's End -- 40060
-	self:addTradeSkill(RecipeDB,40060,375,32420,1,3908,nil,1,375,385,390,395)
+	AddRecipe(40060,375,32420,1,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,40060,1,2,4,36,41,60,102)
 	self:addTradeAcquire(RecipeDB,40060,6,1012,2,23159)

 	-- Bracers of Nimble Thought -- 41205
-	self:addTradeSkill(RecipeDB,41205,375,32586,4,3908,nil,1,375,385,390,395)
+	AddRecipe(41205,375,32586,4,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,41205,1,2,10,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,41205,8,27,8,34)

 	-- Mantle of Nimble Thought -- 41206
-	self:addTradeSkill(RecipeDB,41206,375,32587,4,3908,nil,1,375,385,390,395)
+	AddRecipe(41206,375,32587,4,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,41206,1,2,6,37,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,41206,8,27,8,34)

 	-- Swiftheal Wraps -- 41207
-	self:addTradeSkill(RecipeDB,41207,375,32584,4,3908,nil,1,375,385,390,395)
+	AddRecipe(41207,375,32584,4,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,41207,1,2,6,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,41207,8,27,8,34)

 	-- Swiftheal Mantle -- 41208
-	self:addTradeSkill(RecipeDB,41208,375,32585,4,3908,nil,1,375,385,390,395)
+	AddRecipe(41208,375,32585,4,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,41208,1,2,10,37,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,41208,7,4)

 	-- Green Winter Clothes -- 44950
-	self:addTradeSkill(RecipeDB,44950,250,34087,2,3908,nil,1,250,250,250,250)
+	AddRecipe(44950,250,34087,2,1,250,250,250,250)
 	self:addTradeFlags(RecipeDB,44950,2,4,36,41,56)
 	self:addTradeAcquire(RecipeDB,44950,2,13420)

 	-- Red Winter Clothes -- 44958
-	self:addTradeSkill(RecipeDB,44958,250,34085,2,3908,nil,1,250,250,250,250)
+	AddRecipe(44958,250,34085,2,1,250,250,250,250)
 	self:addTradeFlags(RecipeDB,44958,1,2,4,36,41,56)
 	self:addTradeAcquire(RecipeDB,44958,2,13433)

 	-- Sunfire Handwraps -- 46128
-	self:addTradeSkill(RecipeDB,46128,365,34366,4,3908,nil,1,365,375,392,410)
+	AddRecipe(46128,365,34366,4,1,365,375,392,410)
 	self:addTradeFlags(RecipeDB,46128,1,2,6,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,46128,8,24)

 	-- Hands of Eternal Light -- 46129
-	self:addTradeSkill(RecipeDB,46129,365,34367,4,3908,nil,1,365,375,392,410)
+	AddRecipe(46129,365,34367,4,1,365,375,392,410)
 	self:addTradeFlags(RecipeDB,46129,1,2,6,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,46129,8,24)

 	-- Sunfire Robe -- 46130
-	self:addTradeSkill(RecipeDB,46130,365,34364,4,3908,nil,1,365,375,392,410)
+	AddRecipe(46130,365,34364,4,1,365,375,392,410)
 	self:addTradeFlags(RecipeDB,46130,1,2,6,37,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,46130,8,24)

 	-- Robe of Eternal Light -- 46131
-	self:addTradeSkill(RecipeDB,46131,365,34365,4,3908,nil,1,365,375,392,410)
+	AddRecipe(46131,365,34365,4,1,365,375,392,410)
 	self:addTradeFlags(RecipeDB,46131,1,2,6,37,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,46131,8,24)

 	-- Dress Shoes -- 49677
-	self:addTradeSkill(RecipeDB,49677,250,6836,1,3908,nil,1,250,255,270,285)
+	AddRecipe(49677,250,6836,1,1,250,255,270,285)
 	self:addTradeFlags(RecipeDB,49677,1,2,4,36,40,56)
 	self:addTradeAcquire(RecipeDB,49677,2,15165)

 	-- Mycah's Botanical Bag -- 50194
-	self:addTradeSkill(RecipeDB,50194,375,38225,1,3908,nil,1,375,385,390,395)
+	AddRecipe(50194,375,38225,1,1,375,385,390,395)
 	self:addTradeFlags(RecipeDB,50194,1,2,4,36,41,113)
 	self:addTradeAcquire(RecipeDB,50194,6,970,3,18382)

 	-- Haliscan Jacket -- 50644
-	self:addTradeSkill(RecipeDB,50644,250,38277,1,3908,nil,1,250,265,280,295)
+	AddRecipe(50644,250,38277,1,1,250,265,280,295)
 	self:addTradeFlags(RecipeDB,50644,1,2,4,36,40,56)
 	self:addTradeAcquire(RecipeDB,50644,2,15165)

 	-- Haliscan Pantaloons -- 50647
-	self:addTradeSkill(RecipeDB,50647,245,38278,1,3908,nil,1,245,250,255,260)
+	AddRecipe(50647,245,38278,1,1,245,250,255,260)
 	self:addTradeFlags(RecipeDB,50647,1,2,4,36,40,56)
 	self:addTradeAcquire(RecipeDB,50647,2,15165)

 	-- Lightweave Embroidery -- 55642
-	self:addTradeSkill(RecipeDB,55642,420,nil,1,3908,nil,2,420,420,420,420)
+	AddRecipe(55642,420,nil,1,2,420,420,420,420)
 	self:addTradeFlags(RecipeDB,55642,1,2,3,36,41,53,54,60)
 	self:addTradeAcquire(RecipeDB,55642,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Darkglow Embroidery -- 55769
-	self:addTradeSkill(RecipeDB,55769,420,nil,1,3908,nil,2,420,420,420,420)
+	AddRecipe(55769,420,nil,1,2,420,420,420,420)
 	self:addTradeFlags(RecipeDB,55769,1,2,3,36,41,60)
 	self:addTradeAcquire(RecipeDB,55769,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Swordguard Embroidery -- 55777
-	self:addTradeSkill(RecipeDB,55777,420,nil,1,3908,nil,2,420,420,420,420)
+	AddRecipe(55777,420,nil,1,2,420,420,420,420)
 	self:addTradeFlags(RecipeDB,55777,1,2,3,36,41,51,60)
 	self:addTradeAcquire(RecipeDB,55777,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostweave Net -- 55898
-	self:addTradeSkill(RecipeDB,55898,360,41509,1,3908,nil,2,360,370,375,380)
+	AddRecipe(55898,360,41509,1,2,360,370,375,380)
 	self:addTradeFlags(RecipeDB,55898,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,55898,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Bolt of Frostweave -- 55899
-	self:addTradeSkill(RecipeDB,55899,350,41510,1,3908,nil,2,350,370,372,375)
+	AddRecipe(55899,350,41510,1,2,350,370,372,375)
 	self:addTradeFlags(RecipeDB,55899,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,55899,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Bolt of Imbued Frostweave -- 55900
-	self:addTradeSkill(RecipeDB,55900,400,41511,1,3908,nil,2,400,400,402,405)
+	AddRecipe(55900,400,41511,1,2,400,400,402,405)
 	self:addTradeFlags(RecipeDB,55900,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,55900,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Duskweave Leggings -- 55901
-	self:addTradeSkill(RecipeDB,55901,395,41548,2,3908,nil,2,395,405,410,415)
+	AddRecipe(55901,395,41548,2,2,395,405,410,415)
 	self:addTradeFlags(RecipeDB,55901,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55901,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostwoven Shoulders -- 55902
-	self:addTradeSkill(RecipeDB,55902,350,41513,2,3908,nil,2,350,360,370,380)
+	AddRecipe(55902,350,41513,2,2,350,360,370,380)
 	self:addTradeFlags(RecipeDB,55902,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55902,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostwoven Robe -- 55903
-	self:addTradeSkill(RecipeDB,55903,360,41515,2,3908,nil,2,360,370,380,390)
+	AddRecipe(55903,360,41515,2,2,360,370,380,390)
 	self:addTradeFlags(RecipeDB,55903,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55903,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostwoven Gloves -- 55904
-	self:addTradeSkill(RecipeDB,55904,360,44211,1,3908,nil,2,360,370,380,390)
+	AddRecipe(55904,360,44211,1,2,360,370,380,390)
 	self:addTradeFlags(RecipeDB,55904,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55904,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostwoven Boots -- 55906
-	self:addTradeSkill(RecipeDB,55906,375,41520,2,3908,nil,2,375,385,395,405)
+	AddRecipe(55906,375,41520,2,2,375,385,395,405)
 	self:addTradeFlags(RecipeDB,55906,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55906,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostwoven Cowl -- 55907
-	self:addTradeSkill(RecipeDB,55907,380,41521,2,3908,nil,2)
+	AddRecipe(55907,380,41521,2,2)
 	self:addTradeFlags(RecipeDB,55907,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55907,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostwoven Belt -- 55908
-	self:addTradeSkill(RecipeDB,55908,370,41522,2,3908,nil,2,370,380,390,400)
+	AddRecipe(55908,370,41522,2,2,370,380,390,400)
 	self:addTradeFlags(RecipeDB,55908,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55908,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Mystic Frostwoven Shoulders -- 55910
-	self:addTradeSkill(RecipeDB,55910,385,41523,3,3908,nil,2,385,395,405,415)
+	AddRecipe(55910,385,41523,3,2,385,395,405,415)
 	self:addTradeFlags(RecipeDB,55910,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55910,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Mystic Frostwoven Robe -- 55911
-	self:addTradeSkill(RecipeDB,55911,390,41525,3,3908,nil,2,390,400,410,420)
+	AddRecipe(55911,390,41525,3,2,390,400,410,420)
 	self:addTradeFlags(RecipeDB,55911,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55911,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Mystic Frostwoven Wristwraps -- 55913
-	self:addTradeSkill(RecipeDB,55913,385,41528,3,3908,nil,2,385,395,405,415)
+	AddRecipe(55913,385,41528,3,2,385,395,405,415)
 	self:addTradeFlags(RecipeDB,55913,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55913,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Duskweave Belt -- 55914
-	self:addTradeSkill(RecipeDB,55914,395,41543,2,3908,nil,2,395,400,405,410)
+	AddRecipe(55914,395,41543,2,2,395,400,405,410)
 	self:addTradeFlags(RecipeDB,55914,1,2,3,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,55914,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Duskweave Cowl -- 55919
-	self:addTradeSkill(RecipeDB,55919,395,41546,2,3908,nil,2,395,405,410,415)
+	AddRecipe(55919,395,41546,2,2,395,405,410,415)
 	self:addTradeFlags(RecipeDB,55919,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55919,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Duskweave Wristwraps -- 55920
-	self:addTradeSkill(RecipeDB,55920,400,41551,2,3908,nil,2,400,410,415,420)
+	AddRecipe(55920,400,41551,2,2,400,410,415,420)
 	self:addTradeFlags(RecipeDB,55920,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55920,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Duskweave Robe -- 55921
-	self:addTradeSkill(RecipeDB,55921,405,41549,2,3908,nil,2,405,415,420,425)
+	AddRecipe(55921,405,41549,2,2,405,415,420,425)
 	self:addTradeFlags(RecipeDB,55921,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55921,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Duskweave Gloves -- 55922
-	self:addTradeSkill(RecipeDB,55922,405,41545,2,3908,nil,2,405,415,420,425)
+	AddRecipe(55922,405,41545,2,2,405,415,420,425)
 	self:addTradeFlags(RecipeDB,55922,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55922,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Duskweave Shoulders -- 55923
-	self:addTradeSkill(RecipeDB,55923,410,41550,2,3908,nil,2,410,420,425,430)
+	AddRecipe(55923,410,41550,2,2,410,420,425,430)
 	self:addTradeFlags(RecipeDB,55923,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55923,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Black Duskweave Leggings -- 55925
-	self:addTradeSkill(RecipeDB,55925,415,41553,3,3908,nil,2,415,425,430,435)
+	AddRecipe(55925,415,41553,3,2,415,425,430,435)
 	self:addTradeFlags(RecipeDB,55925,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55925,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Black Duskweave Robe -- 55941
-	self:addTradeSkill(RecipeDB,55941,420,41554,3,3908,nil,2,420,430,435,440)
+	AddRecipe(55941,420,41554,3,2,420,430,435,440)
 	self:addTradeFlags(RecipeDB,55941,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55941,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Black Duskweave Wristwraps -- 55943
-	self:addTradeSkill(RecipeDB,55943,415,41555,3,3908,nil,2,415,425,430,435)
+	AddRecipe(55943,415,41555,3,2,415,425,430,435)
 	self:addTradeFlags(RecipeDB,55943,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55943,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Red Lumberjack Shirt -- 55993
-	self:addTradeSkill(RecipeDB,55993,400,41248,2,3908,nil,2,400,400,405,410)
+	AddRecipe(55993,400,41248,2,2,400,400,405,410)
 	self:addTradeFlags(RecipeDB,55993,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,55993,7,2)

 	-- Blue Lumberjack Shirt -- 55994
-	self:addTradeSkill(RecipeDB,55994,400,41249,2,3908,nil,2,400,400,405,410)
+	AddRecipe(55994,400,41249,2,2,400,400,405,410)
 	self:addTradeFlags(RecipeDB,55994,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,55994,7,2)

 	-- Yellow Lumberjack Shirt -- 55995
-	self:addTradeSkill(RecipeDB,55995,400,41251,1,3908,nil,2,400,400,405,410)
+	AddRecipe(55995,400,41251,1,2,400,400,405,410)
 	self:addTradeFlags(RecipeDB,55995,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,55995,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Green Lumberjack Shirt -- 55996
-	self:addTradeSkill(RecipeDB,55996,400,41250,2,3908,nil,2,400,400,405,410)
+	AddRecipe(55996,400,41250,2,2,400,400,405,410)
 	self:addTradeFlags(RecipeDB,55996,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,55996,7,2)

 	-- Red Workman's Shirt -- 55997
-	self:addTradeSkill(RecipeDB,55997,400,41252,2,3908,nil,2,400,400,405,410)
+	AddRecipe(55997,400,41252,2,2,400,400,405,410)
 	self:addTradeFlags(RecipeDB,55997,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,55997,7,2)

 	-- Blue Workman's Shirt -- 55998
-	self:addTradeSkill(RecipeDB,55998,400,41253,2,3908,nil,2,400,400,405,410)
+	AddRecipe(55998,400,41253,2,2,400,400,405,410)
 	self:addTradeFlags(RecipeDB,55998,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,55998,7,2)

 	-- Rustic Workman's Shirt -- 55999
-	self:addTradeSkill(RecipeDB,55999,400,41254,2,3908,nil,2,400,400,405,410)
+	AddRecipe(55999,400,41254,2,2,400,400,405,410)
 	self:addTradeFlags(RecipeDB,55999,1,2,10,36,40)
 	self:addTradeAcquire(RecipeDB,55999,7,2)

 	-- Green Workman's Shirt -- 56000
-	self:addTradeSkill(RecipeDB,56000,400,41255,1,3908,nil,2,400,400,405,410)
+	AddRecipe(56000,400,41255,1,2,400,400,405,410)
 	self:addTradeFlags(RecipeDB,56000,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,56000,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Moonshroud -- 56001
-	self:addTradeSkill(RecipeDB,56001,415,41594,3,3908,nil,2,415,425,430,435)
+	AddRecipe(56001,415,41594,3,2,415,425,430,435)
 	self:addTradeFlags(RecipeDB,56001,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,56001,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Ebonweave -- 56002
-	self:addTradeSkill(RecipeDB,56002,415,41593,3,3908,nil,2,415,425,430,435)
+	AddRecipe(56002,415,41593,3,2,415,425,430,435)
 	self:addTradeFlags(RecipeDB,56002,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,56002,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Spellweave -- 56003
-	self:addTradeSkill(RecipeDB,56003,415,41595,3,3908,nil,2,415,425,430,435)
+	AddRecipe(56003,415,41595,3,2,415,425,430,435)
 	self:addTradeFlags(RecipeDB,56003,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,56003,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Abyssal Bag -- 56004
-	self:addTradeSkill(RecipeDB,56004,435,41597,1,3908,nil,2,435,440,445,450)
+	AddRecipe(56004,435,41597,1,2,435,440,445,450)
 	self:addTradeFlags(RecipeDB,56004,1,2,4,F_WARLOCK,36,41,117)
 	self:addTradeAcquire(RecipeDB,56004,6,1098,3,32538)

 	-- Glacial Bag -- 56005
-	self:addTradeSkill(RecipeDB,56005,445,41600,1,3908,nil,2,445,450,455,460)
+	AddRecipe(56005,445,41600,1,2,445,450,455,460)
 	self:addTradeFlags(RecipeDB,56005,1,2,4,36,41,119)
 	self:addTradeAcquire(RecipeDB,56005,6,1119,4,32540)

 	-- Mysterious Bag -- 56006
-	self:addTradeSkill(RecipeDB,56006,440,41598,1,3908,nil,2,440,445,450,455)
+	AddRecipe(56006,440,41598,1,2,440,445,450,455)
 	self:addTradeFlags(RecipeDB,56006,1,2,4,36,41,122)
 	self:addTradeAcquire(RecipeDB,56006,6,1091,3,32533)

 	-- Frostweave Bag -- 56007
-	self:addTradeSkill(RecipeDB,56007,410,41599,2,3908,nil,2,410,430,440,450)
+	AddRecipe(56007,410,41599,2,2,410,430,440,450)
 	self:addTradeFlags(RecipeDB,56007,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,56007,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Shining Spellthread -- 56008
-	self:addTradeSkill(RecipeDB,56008,400,41601,3,3908,nil,2,400,400,405,410)
+	AddRecipe(56008,400,41601,3,2,400,400,405,410)
 	self:addTradeFlags(RecipeDB,56008,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,56008,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Brilliant Spellthread -- 56009
-	self:addTradeSkill(RecipeDB,56009,430,41602,1,3908,nil,2,430,435,440,445)
+	AddRecipe(56009,430,41602,1,2,430,435,440,445)
 	self:addTradeFlags(RecipeDB,56009,1,2,4,36,41,53,54,115)
 	self:addTradeAcquire(RecipeDB,56009,6,1106,4,30431)

 	-- Azure Spellthread -- 56010
-	self:addTradeSkill(RecipeDB,56010,400,41603,3,3908,nil,2,400,400,405,410)
+	AddRecipe(56010,400,41603,3,2,400,400,405,410)
 	self:addTradeFlags(RecipeDB,56010,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,56010,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Sapphire Spellthread -- 56011
-	self:addTradeSkill(RecipeDB,56011,430,41604,1,3908,nil,2,430,435,440,445)
+	AddRecipe(56011,430,41604,1,2,430,435,440,445)
 	self:addTradeFlags(RecipeDB,56011,1,2,4,36,41,53,54,118)
 	self:addTradeAcquire(RecipeDB,56011,6,1090,4,32287)

 	-- Cloak of the Moon -- 56014
-	self:addTradeSkill(RecipeDB,56014,390,41607,2,3908,nil,2,390,395,400,405)
+	AddRecipe(56014,390,41607,2,2,390,395,400,405)
 	self:addTradeFlags(RecipeDB,56014,1,2,3,36,41,53,54,60)
 	self:addTradeAcquire(RecipeDB,56014,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Cloak of Frozen Spirits -- 56015
-	self:addTradeSkill(RecipeDB,56015,395,41608,1,3908,nil,2,395,400,405,410)
+	AddRecipe(56015,395,41608,1,2,395,400,405,410)
 	self:addTradeFlags(RecipeDB,56015,1,2,3,36,41,53,54,60)
 	self:addTradeAcquire(RecipeDB,56015,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Wispcloak -- 56016
-	self:addTradeSkill(RecipeDB,56016,420,41609,1,3908,nil,2,420,435,445,455)
+	AddRecipe(56016,420,41609,1,2,420,435,445,455)
 	self:addTradeFlags(RecipeDB,56016,1,2,3,36,41,53,54,60)
 	self:addTradeAcquire(RecipeDB,56016,1,26914,1,26964,1,26969)

 	-- Deathchill Cloak -- 56017
-	self:addTradeSkill(RecipeDB,56017,420,41610,1,3908,nil,2,420,435,445,455)
+	AddRecipe(56017,420,41610,1,2,420,435,445,455)
 	self:addTradeFlags(RecipeDB,56017,1,2,3,36,41,53,54,60)
 	self:addTradeAcquire(RecipeDB,56017,1,26914,1,26964,1,26969)

 	-- Hat of Wintry Doom -- 56018
-	self:addTradeSkill(RecipeDB,56018,425,41984,1,3908,nil,2,425,435,440,445)
+	AddRecipe(56018,425,41984,1,2,425,435,440,445)
 	self:addTradeFlags(RecipeDB,56018,1,2,3,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,56018,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Silky Iceshard Boots -- 56019
-	self:addTradeSkill(RecipeDB,56019,420,41985,1,3908,nil,2,420,430,440,450)
+	AddRecipe(56019,420,41985,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,56019,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,56019,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Deep Frozen Cord -- 56020
-	self:addTradeSkill(RecipeDB,56020,420,41986,1,3908,nil,2,420,430,440,450)
+	AddRecipe(56020,420,41986,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,56020,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,56020,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostmoon Pants -- 56021
-	self:addTradeSkill(RecipeDB,56021,425,42093,1,3908,nil,2,425,435,440,445)
+	AddRecipe(56021,425,42093,1,2,425,435,440,445)
 	self:addTradeFlags(RecipeDB,56021,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,56021,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Light Blessed Mittens -- 56022
-	self:addTradeSkill(RecipeDB,56022,420,42095,1,3908,nil,2,420,403,440,450)
+	AddRecipe(56022,420,42095,1,2,420,403,440,450)
 	self:addTradeFlags(RecipeDB,56022,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,56022,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Aurora Slippers -- 56023
-	self:addTradeSkill(RecipeDB,56023,420,42096,1,3908,nil,2,420,430,440,450)
+	AddRecipe(56023,420,42096,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,56023,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,56023,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Moonshroud Robe -- 56024
-	self:addTradeSkill(RecipeDB,56024,440,42100,4,3908,nil,2,440,450,455,460)
+	AddRecipe(56024,440,42100,4,2,440,450,455,460)
 	self:addTradeFlags(RecipeDB,56024,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,56024,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Moonshroud Gloves -- 56025
-	self:addTradeSkill(RecipeDB,56025,435,42103,1,3908,nil,2,435,445,450,455)
+	AddRecipe(56025,435,42103,1,2,435,445,450,455)
 	self:addTradeFlags(RecipeDB,56025,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,56025,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Ebonweave Robe -- 56026
-	self:addTradeSkill(RecipeDB,56026,440,42101,1,3908,nil,2,440,450,455,460)
+	AddRecipe(56026,440,42101,1,2,440,450,455,460)
 	self:addTradeFlags(RecipeDB,56026,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,56026,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Ebonweave Gloves -- 56027
-	self:addTradeSkill(RecipeDB,56027,435,42111,1,3908,nil,2,435,445,450,455)
+	AddRecipe(56027,435,42111,1,2,435,445,450,455)
 	self:addTradeFlags(RecipeDB,56027,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,56027,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Spellweave Robe -- 56028
-	self:addTradeSkill(RecipeDB,56028,440,42102,1,3908,nil,2,440,450,455,460)
+	AddRecipe(56028,440,42102,1,2,440,450,455,460)
 	self:addTradeFlags(RecipeDB,56028,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,56028,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Spellweave Gloves -- 56029
-	self:addTradeSkill(RecipeDB,56029,435,42113,1,3908,nil,2,435,445,450,455)
+	AddRecipe(56029,435,42113,1,2,435,445,450,455)
 	self:addTradeFlags(RecipeDB,56029,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,56029,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostwoven Leggings -- 56030
-	self:addTradeSkill(RecipeDB,56030,380,41519,2,3908,nil,2,380,390,400,410)
+	AddRecipe(56030,380,41519,2,2,380,390,400,410)
 	self:addTradeFlags(RecipeDB,56030,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,56030,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostwoven Wristwraps -- 56031
-	self:addTradeSkill(RecipeDB,56031,350,41512,2,3908,nil,2,350,360,370,380)
+	AddRecipe(56031,350,41512,2,2,350,360,370,380)
 	self:addTradeFlags(RecipeDB,56031,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,56031,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Master's Spellthread -- 56034
-	self:addTradeSkill(RecipeDB,56034,405,nil,1,3908,nil,2,405,405,405,405)
+	AddRecipe(56034,405,nil,1,2,405,405,405,405)
 	self:addTradeFlags(RecipeDB,56034,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,56034,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Sanctified Spellthread -- 56039
-	self:addTradeSkill(RecipeDB,56039,405,nil,1,3908,nil,2,405,405,405,405)
+	AddRecipe(56039,405,nil,1,2,405,405,405,405)
 	self:addTradeFlags(RecipeDB,56039,1,2,3,36,41,53,54)
 	self:addTradeAcquire(RecipeDB,56039,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostsavage Belt -- 59582
-	self:addTradeSkill(RecipeDB,59582,415,43969,1,3908,nil,2,415,425,435,445)
+	AddRecipe(59582,415,43969,1,2,415,425,435,445)
 	self:addTradeFlags(RecipeDB,59582,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,59582,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostsavage Bracers -- 59583
-	self:addTradeSkill(RecipeDB,59583,415,43974,1,3908,nil,2,415,425,435,445)
+	AddRecipe(59583,415,43974,1,2,415,425,435,445)
 	self:addTradeFlags(RecipeDB,59583,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,59583,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostsavage Shoulders -- 59584
-	self:addTradeSkill(RecipeDB,59584,420,43973,1,3908,nil,2,420,430,440,450)
+	AddRecipe(59584,420,43973,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,59584,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,59584,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostsavage Boots -- 59585
-	self:addTradeSkill(RecipeDB,59585,420,43970,1,3908,nil,2,420,430,440,450)
+	AddRecipe(59585,420,43970,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,59585,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,59585,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostsavage Gloves -- 59586
-	self:addTradeSkill(RecipeDB,59586,420,41516,2,3908,nil,2,420,430,440,450)
+	AddRecipe(59586,420,41516,2,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,59586,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,59586,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostsavage Robe -- 59587
-	self:addTradeSkill(RecipeDB,59587,420,43972,1,3908,nil,2,420,430,440,450)
+	AddRecipe(59587,420,43972,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,59587,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,59587,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostsavage Leggings -- 59588
-	self:addTradeSkill(RecipeDB,59588,420,43975,1,3908,nil,2,420,430,440,450)
+	AddRecipe(59588,420,43975,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,59588,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,59588,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostsavage Cowl -- 59589
-	self:addTradeSkill(RecipeDB,59589,420,43971,1,3908,nil,2,420,430,440,450)
+	AddRecipe(59589,420,43971,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,59589,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,59589,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Flying Carpet -- 60969
-	self:addTradeSkill(RecipeDB,60969,410,44554,3,3908,nil,2,410,420,425,430)
+	AddRecipe(60969,410,44554,3,2,410,420,425,430)
 	self:addTradeFlags(RecipeDB,60969,1,2,3,36,41)
 	self:addTradeAcquire(RecipeDB,60969,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Magnificent Flying Carpet -- 60971
-	self:addTradeSkill(RecipeDB,60971,425,44558,4,3908,nil,2,425,435,445,455)
+	AddRecipe(60971,425,44558,4,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,60971,1,2,3,37,41)
 	self:addTradeAcquire(RecipeDB,60971,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Glacial Waistband -- 60990
-	self:addTradeSkill(RecipeDB,60990,420,43584,1,3908,nil,2,420,430,440,450)
+	AddRecipe(60990,420,43584,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,60990,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,60990,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Glacial Robe -- 60993
-	self:addTradeSkill(RecipeDB,60993,425,43583,4,3908,nil,2,425,435,445,455)
+	AddRecipe(60993,425,43583,4,2,425,435,445,455)
 	self:addTradeFlags(RecipeDB,60993,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,60993,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Glacial Slippers -- 60994
-	self:addTradeSkill(RecipeDB,60994,420,43585,1,3908,nil,2,420,430,440,450)
+	AddRecipe(60994,420,43585,1,2,420,430,440,450)
 	self:addTradeFlags(RecipeDB,60994,1,2,3,36,41,56)
 	self:addTradeAcquire(RecipeDB,60994,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Duskweave Boots -- 55924
-	self:addTradeSkill(RecipeDB,55924,410,41544,1,3908,nil,2,410,410,410,420)
+	AddRecipe(55924,410,41544,1,2,410,410,410,420)
 	self:addTradeFlags(RecipeDB,55924,1,2,3,36,41,53,54,56)
 	self:addTradeAcquire(RecipeDB,55924,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Cord of the White Dawn -- 63205
-	self:addTradeSkill(RecipeDB,63205,450,45104,4,3908,nil,2,450,455,460,465)
+	AddRecipe(63205,450,45104,4,2,450,455,460,465)
 	self:addTradeFlags(RecipeDB,63205,1,2,6,11,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,63205,8,39)

 	-- Sash of Ancient Power -- 63203
-	self:addTradeSkill(RecipeDB,63203,450,45102,4,3908,nil,2,450,455,460,465)
+	AddRecipe(63203,450,45102,4,2,450,455,460,465)
 	self:addTradeFlags(RecipeDB,63203,1,2,6,11,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,63203,8,39)

 	-- Savior's Slippers -- 63206
-	self:addTradeSkill(RecipeDB,63206,450,45567,4,3908,nil,2,450,455,460,465)
+	AddRecipe(63206,450,45567,4,2,450,455,460,465)
 	self:addTradeFlags(RecipeDB,63206,1,2,6,11,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,63206,8,39)

 	-- Spellslinger's Slippers -- 63204
-	self:addTradeSkill(RecipeDB,63204,450,45566,4,3908,nil,2,450,455,460,465)
+	AddRecipe(63204,450,45566,4,2,450,455,460,465)
 	self:addTradeFlags(RecipeDB,63204,1,2,6,11,36,40,53,54,56)
 	self:addTradeAcquire(RecipeDB,63204,8,39)

 	-- Emerald Bag -- 63924
-	self:addTradeSkill(RecipeDB,63924,435,45773,3,3908,nil,2,435,440,445,450)
+	AddRecipe(63924,435,45773,3,2,435,440,445,450)
 	self:addTradeFlags(RecipeDB,63924,1,2,4,36,41,120)
 	self:addTradeAcquire(RecipeDB,63924,6,1073,3,31916,6,1073,3,32763)

 	-- Cloak of Crimson Snow -- 64730
-	self:addTradeSkill(RecipeDB,64730,405,45810,1,3908,nil,2,405,410,415,420)
+	AddRecipe(64730,405,45810,1,2,405,410,415,420)
 	self:addTradeFlags(RecipeDB,64730,1,2,3,36,41,53,54,60)
 	self:addTradeAcquire(RecipeDB,64730,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Frostguard Drape -- 64729
-	self:addTradeSkill(RecipeDB,64729,400,45811,1,3908,nil,2,400,405,410,415)
+	AddRecipe(64729,400,45811,1,2,400,405,410,415)
 	self:addTradeFlags(RecipeDB,64729,1,2,3,36,41,51,60)
 	self:addTradeAcquire(RecipeDB,64729,1,26914,1,26964,1,26969,1,27001,1,28699,1,33580)

 	-- Spidersilk Drape -- 63742
-	self:addTradeSkill(RecipeDB,63742,125,45626,1,3908,nil,2,125,150,167,185)
+	AddRecipe(63742,125,45626,1,2,125,150,167,185)
 	self:addTradeFlags(RecipeDB,63742,1,2,3,36,41,53,54,60)
 	self:addTradeAcquire(RecipeDB,63742,1,26914,1,26964,1,26969,1,27001,1,28699,1,1346,1,4159
 	,1,16729,1,3004,1,3484,1,3704,1,2627,1,33580,1,3363,1,1103,1,33613,1,33636,1,11052,1,18772,1,
 	2399,1,4576,1,17487,1,16640,1,16366,1,5153,1,4193,1,3523,1,33684)

-	-- -- The number of items added with patches
-	-- local patchitems = 0
-
 	-- -- 3.3.0 Items (Leave this code in here because I think asian servers don't actually have 3.1 even)
 	-- local version = GetBuildInfo()

 	-- if (version == "3.3.0") then

 		 -- -- Leggings of Woven Death
-		 -- self:addTradeSkill(RecipeDB,)
+		 -- AddRecipe()
 		 -- self:addTradeFlags(RecipeDB,)
 		 -- self:addTradeAcquire(RecipeDB,)
 		 -- -- Deathfrost Boots
-		 -- self:addTradeSkill(RecipeDB,)
+		 -- AddRecipe()
 		 -- self:addTradeFlags(RecipeDB,)
 		 -- self:addTradeAcquire(RecipeDB,)
 		 -- -- Lightweave Leggings
-		 -- self:addTradeSkill(RecipeDB,)
+		 -- AddRecipe()
 		 -- self:addTradeFlags(RecipeDB,)
 		 -- self:addTradeAcquire(RecipeDB,)
 		 -- -- Sandals of Consecration
-		 -- self:addTradeSkill(RecipeDB,)
+		 -- AddRecipe()
 		 -- self:addTradeFlags(RecipeDB,)
 		 -- self:addTradeAcquire(RecipeDB,)
-
-		  -- patchitems = 4
-
+
 	  -- end


@@ -2364,53 +2328,49 @@ function addon:InitTailoring(RecipeDB)
 	if (faction == BFAC["Alliance"]) then

 		-- Bejeweled Wizard's Bracers -- 67079
-		self:addTradeSkill(RecipeDB,67079,450,47585,3,3908,nil,2,450,460,467,475)
+		AddRecipe(67079,450,47585,3,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67079,1,6,11,36,40,53,54,56)
 		self:addTradeAcquire(RecipeDB,67079,8,42)

 		-- Merlin's Robe -- 67066
-		self:addTradeSkill(RecipeDB,67066,450,47603,3,3908,nil,2,450,460,467,475)
+		AddRecipe(67066,450,47603,3,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67066,1,6,11,36,40,53,54,56)
 		self:addTradeAcquire(RecipeDB,67066,8,42)

 		-- Royal Moonshroud Bracers -- 67065
-		self:addTradeSkill(RecipeDB,67065,450,47587,3,3908,nil,2,450,460,467,475)
+		AddRecipe(67065,450,47587,3,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67065,1,6,11,36,40,53,54,56)
 		self:addTradeAcquire(RecipeDB,67065,8,42)

 		-- Royal Moonshroud Robe -- 67064
-		self:addTradeSkill(RecipeDB,67064,450,47605,3,3908,nil,2,450,460,467,475)
+		AddRecipe(67064,450,47605,3,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67064,1,6,11,36,40,53,54,56)
 		self:addTradeAcquire(RecipeDB,67064,8,42)

-		factioncount = 4
-
 	elseif (faction == BFAC["Horde"]) then

 		-- Royal Moonshroud Robe -- 67144
-		self:addTradeSkill(RecipeDB,67144,450,47606,3,3908,nil,2,450,460,467,475)
+		AddRecipe(67144,450,47606,3,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67144,2,6,11,36,40,53,54,56)
 		self:addTradeAcquire(RecipeDB,67144,8,42)

 		-- Bejeweled Wizard's Bracers -- 67145
-		self:addTradeSkill(RecipeDB,67145,450,47586,3,3908,nil,2,450,460,467,475)
+		AddRecipe(67145,450,47586,3,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67145,2,6,11,36,40,53,54,56)
 		self:addTradeAcquire(RecipeDB,67145,8,42)

 		-- Merlin's Robe -- 67146
-		self:addTradeSkill(RecipeDB,67146,450,47604,3,3908,nil,2,450,460,467,475)
+		AddRecipe(67146,450,47604,3,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67146,2,6,11,36,40,53,54,56)
 		self:addTradeAcquire(RecipeDB,67146,8,42)

 		-- Royal Moonshroud Bracers -- 67147
-		self:addTradeSkill(RecipeDB,67147,450,47588,3,3908,nil,2,450,460,467,475)
+		AddRecipe(67147,450,47588,3,2,450,460,467,475)
 		self:addTradeFlags(RecipeDB,67147,2,6,11,36,40,53,54,56)
 		self:addTradeAcquire(RecipeDB,67147,8,42)

-		factioncount = 4
-
 	end

-	return 400 + factioncount --+ patchitems
+	return num_recipes

 end