Quantcast

Renamed addon:addLookupList() to addon:AddListEntry(). Converted all relevant files, and did some cleanup in the process.

James D. Callahan III [03-13-11 - 13:49]
Renamed addon:addLookupList() to addon:AddListEntry(). Converted all relevant files, and did some cleanup in the process.
Filename
Database/Custom.lua
Database/FirstAid.lua
Database/Mob.lua
Database/Quest.lua
Database/Reputation.lua
Database/Seasonal.lua
Database/Trainer.lua
Database/Vendor.lua
core.lua
diff --git a/Database/Custom.lua b/Database/Custom.lua
index 30bdbaf..1352436 100644
--- a/Database/Custom.lua
+++ b/Database/Custom.lua
@@ -1,16 +1,12 @@
 --[[
 ************************************************************************
 Custom.lua
-Custom acquire data for all of Ackis Recipe List
 ************************************************************************
 File date: @file-date-iso@
 File hash: @file-abbreviated-hash@
 Project hash: @project-abbreviated-hash@
 Project version: @project-version@
 ************************************************************************
-Format:
-	self:addLookupList(DB, Custom ID, Custom Name)
-************************************************************************
 Please see http://www.wowace.com/addons/arl/ for more information.
 ************************************************************************
 This source code is released under All Rights Reserved.
@@ -23,63 +19,67 @@ local L			= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
 local BZ		= LibStub("LibBabble-Zone-3.0"):GetLookupTable()

 function addon:InitCustom(DB)
-	self:addLookupList(DB, 1, L["DISCOVERY_ALCH_ELIXIRFLASK"])
-	self:addLookupList(DB, 2, L["DISCOVERY_ALCH_POTION"])
-	self:addLookupList(DB, 3, L["DISCOVERY_ALCH_XMUTE"])
-	self:addLookupList(DB, 4, L["DISCOVERY_ALCH_PROT"])
-	self:addLookupList(DB, 5, L["DAILY_COOKING_MEAT"], BZ["Shattrath"], 0, 0)
-	self:addLookupList(DB, 6, L["DAILY_COOKING_FISH"], BZ["Shattrath"], 0, 0)
-	self:addLookupList(DB, 7, L["DAILY_FISHING_SHATT"], BZ["Shattrath"], 0, 0)
-	self:addLookupList(DB, 8, L["DEFAULT_RECIPE"])
-	self:addLookupList(DB, 9, L["CRAFTED_ENGINEERS"])
-	self:addLookupList(DB, 10, L["ONYXIA_HEAD_QUEST"], BZ["Onyxia's Lair"], 0, 0)
-	--self:addLookupList(DB, 11, )
-	self:addLookupList(DB, 12, L["DISCOVERY_ALCH_WRATH"])
-	self:addLookupList(DB, 13, L["HENRY_STERN_RFD"], BZ["Razorfen Downs"], 0, 0)
-	self:addLookupList(DB, 14, L["DISCOVERY_INSC_MINOR"])
-	self:addLookupList(DB, 15, L["DISCOVERY_INSC_NORTHREND"])
-	self:addLookupList(DB, 16, L["ENG_GNOMER"], BZ["Gnomeregan"], 0, 0)
-	self:addLookupList(DB, 17, L["ENG_FLOOR_ITEM_BRD"], BZ["Blackrock Depths"], 0, 0)
-	self:addLookupList(DB, 18, L["DISCOVERY_ALCH_NORTHREND_RESEARCH"])
-	self:addLookupList(DB, 19, L["DISCOVERY_ALCH_NORTHREND_XMUTE"])
-	--self:addLookupList(DB, 20, )
-	--self:addLookupList(DB, 21, )
-	self:addLookupList(DB, 22, L["AQ40_RANDOM_BOP"], BZ["Temple of Ahn'Qiraj"], 0, 0)
-	self:addLookupList(DB, 23, L["DM_CACHE"], BZ["Dire Maul"], 59.04, 48.82)
-	self:addLookupList(DB, 24, L["SUNWELL_RANDOM"], BZ["Sunwell Plateau"], 0, 0)
-	self:addLookupList(DB, 25, L["BRD_RANDOM_ROOM"], BZ["Blackrock Depths"], 0, 0)
-	self:addLookupList(DB, 26, L["MC_RANDOM"], BZ["Molten Core"], 0, 0)
-	self:addLookupList(DB, 27, L["HYJAL_RANDOM"], BZ["Hyjal Summit"], 0, 0)
-	--self:addLookupList(DB, 28, )
-	self:addLookupList(DB, 29, L["ZA_RANDOM"], BZ["Zul'Aman"], 0, 0)
-	self:addLookupList(DB, 30, L["SCHOLO_BOOK_SPAWN"], BZ["Scholomance"], 0, 0)
-	self:addLookupList(DB, 31, L["STRATH_BS_PLANS"], BZ["Stratholme"], 0, 0)
-	self:addLookupList(DB, 32, L["DM_TRIBUTE"], BZ["Dire Maul"], 59.04, 48.82)
-	--self:addLookupList(DB, 33, )
-	self:addLookupList(DB, 34, L["BT_RANDOM"], BZ["Black Temple"], 0, 0)
-	self:addLookupList(DB, 35, L["Custom35"])
-	self:addLookupList(DB, 36, L["Custom36"])
-	self:addLookupList(DB, 37, L["SSC_RANDOM"], BZ["Serpentshrine Cavern"], 0, 0)
-	self:addLookupList(DB, 38, L["DAILY_COOKING_DAL"], BZ["Dalaran"], 0, 0)
-	self:addLookupList(DB, 39, L["ULDUAR_RANDOM"], BZ["Ulduar"], 0, 0)
-	self:addLookupList(DB, 40, L["DISCOVERY_INSC_BOOK"])
-	self:addLookupList(DB, 41, L["Custom41"])
-	self:addLookupList(DB, 42, L["TOC25_RANDOM"])
-	self:addLookupList(DB, 43, L["TK_RANDOM"], BZ["The Eye"], 0, 0)
-	self:addLookupList(DB, 44, L["Custom44"])
-	self:addLookupList(DB, 45, L["Custom45"])
-	self:addLookupList(DB, 46, L["BUGGED"])
-	self:addLookupList(DB, 47, L["ARCH_DROP"])
-	self:addLookupList(DB, 48, L["REMOVED_FROM_GAME"])
-	self:addLookupList(DB, 49, L["VASHJ'IR_RANDOM_INSC"])
-	self:addLookupList(DB, 50, L["DEEPHOLM_RANDOM_INSC"])
-	self:addLookupList(DB, 51, L["ENG_DISC"])
+	local function AddCustom(identifier, name, location, coord_x, coord_y, faction)
+		addon:AddListEntry(DB, identifier, name, location, coord_x, coord_y, faction)
+	end
+	AddCustom(1, L["DISCOVERY_ALCH_ELIXIRFLASK"])
+	AddCustom(2, L["DISCOVERY_ALCH_POTION"])
+	AddCustom(3, L["DISCOVERY_ALCH_XMUTE"])
+	AddCustom(4, L["DISCOVERY_ALCH_PROT"])
+	AddCustom(5, L["DAILY_COOKING_MEAT"], BZ["Shattrath"], 0, 0)
+	AddCustom(6, L["DAILY_COOKING_FISH"], BZ["Shattrath"], 0, 0)
+	AddCustom(7, L["DAILY_FISHING_SHATT"], BZ["Shattrath"], 0, 0)
+	AddCustom(8, L["DEFAULT_RECIPE"])
+	AddCustom(9, L["CRAFTED_ENGINEERS"])
+	AddCustom(10, L["ONYXIA_HEAD_QUEST"], BZ["Onyxia's Lair"], 0, 0)
+	--AddCustom(11, )
+	AddCustom(12, L["DISCOVERY_ALCH_WRATH"])
+	AddCustom(13, L["HENRY_STERN_RFD"], BZ["Razorfen Downs"], 0, 0)
+	AddCustom(14, L["DISCOVERY_INSC_MINOR"])
+	AddCustom(15, L["DISCOVERY_INSC_NORTHREND"])
+	AddCustom(16, L["ENG_GNOMER"], BZ["Gnomeregan"], 0, 0)
+	AddCustom(17, L["ENG_FLOOR_ITEM_BRD"], BZ["Blackrock Depths"], 0, 0)
+	AddCustom(18, L["DISCOVERY_ALCH_NORTHREND_RESEARCH"])
+	AddCustom(19, L["DISCOVERY_ALCH_NORTHREND_XMUTE"])
+	--AddCustom(20, )
+	--AddCustom(21, )
+	AddCustom(22, L["AQ40_RANDOM_BOP"], BZ["Temple of Ahn'Qiraj"], 0, 0)
+	AddCustom(23, L["DM_CACHE"], BZ["Dire Maul"], 59.04, 48.82)
+	AddCustom(24, L["SUNWELL_RANDOM"], BZ["Sunwell Plateau"], 0, 0)
+	AddCustom(25, L["BRD_RANDOM_ROOM"], BZ["Blackrock Depths"], 0, 0)
+	AddCustom(26, L["MC_RANDOM"], BZ["Molten Core"], 0, 0)
+	AddCustom(27, L["HYJAL_RANDOM"], BZ["Hyjal Summit"], 0, 0)
+	--AddCustom(28, )
+	AddCustom(29, L["ZA_RANDOM"], BZ["Zul'Aman"], 0, 0)
+	AddCustom(30, L["SCHOLO_BOOK_SPAWN"], BZ["Scholomance"], 0, 0)
+	AddCustom(31, L["STRATH_BS_PLANS"], BZ["Stratholme"], 0, 0)
+	AddCustom(32, L["DM_TRIBUTE"], BZ["Dire Maul"], 59.04, 48.82)
+	--AddCustom(33, )
+	AddCustom(34, L["BT_RANDOM"], BZ["Black Temple"], 0, 0)
+	AddCustom(35, L["Custom35"])
+	AddCustom(36, L["Custom36"])
+	AddCustom(37, L["SSC_RANDOM"], BZ["Serpentshrine Cavern"], 0, 0)
+	AddCustom(38, L["DAILY_COOKING_DAL"], BZ["Dalaran"], 0, 0)
+	AddCustom(39, L["ULDUAR_RANDOM"], BZ["Ulduar"], 0, 0)
+	AddCustom(40, L["DISCOVERY_INSC_BOOK"])
+	AddCustom(41, L["Custom41"])
+	AddCustom(42, L["TOC25_RANDOM"])
+	AddCustom(43, L["TK_RANDOM"], BZ["The Eye"], 0, 0)
+	AddCustom(44, L["Custom44"])
+	AddCustom(45, L["Custom45"])
+	AddCustom(46, L["BUGGED"])
+	AddCustom(47, L["ARCH_DROP"])
+	AddCustom(48, L["REMOVED_FROM_GAME"])
+	AddCustom(49, L["VASHJ'IR_RANDOM_INSC"])
+	AddCustom(50, L["DEEPHOLM_RANDOM_INSC"])
+	AddCustom(51, L["ENG_DISC"])

---self:addLookupList(DB, 28, L["BT_HYJAL_RANDOM"])
+--AddCustom(28, L["BT_HYJAL_RANDOM"])
 --[[
 L["Custom35"] = "Drops from dragons in Ogri'la and Blade's Edge Mountains Summon Bosses"
 L["Custom36"] = "From a NPC in Dalaran sewers after doing The Taste Test" -- Update
 L["Custom41"] = "Removed from the game when Naxx 40 was taken out."
 ]]--
+	self.InitCustom = nil
 end

diff --git a/Database/FirstAid.lua b/Database/FirstAid.lua
index ffc9f7f..715d78d 100644
--- a/Database/FirstAid.lua
+++ b/Database/FirstAid.lua
@@ -166,13 +166,13 @@ function addon:InitFirstAid()
 	recipe:SetCraftedItemID(34722)
 	recipe:SetSkillLevels(400, 400, 400, 430, 470)
 	recipe:AddFilters(F.ALLIANCE, F.HORDE, F.TRAINER, F.WORLD_DROP, F.IBOE, F.RBOP)
-	recipe:AddTrainer(2798, 4591, 5759, 5939, 5943, 26956, 28706, 29233, 33589, 45540)
+	recipe:AddTrainer(2798, 4591, 5759, 5939, 5943, 26956, 28706, 29233, 33589, 45540, 49879)
 	recipe:AddWorldDrop("Northrend")

 	-- Embersilk Bandage -- 74556
 	recipe = AddRecipe(74556, V.CATA, Q.COMMON)
 	recipe:SetCraftedItemID(34722)
-	recipe:SetSkillLevels(425, 425, 450, 467, 485)
+	recipe:SetSkillLevels(400, 400, 410, 415, 420)
 	recipe:AddFilters(F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP)
 	recipe:AddTrainer(2326, 2327, 2329, 2798, 3181, 4211, 4591, 5150, 5759, 5939, 5943, 6094, 16272, 16662, 16731, 17214, 17424, 18990, 18991, 19184, 19478, 22477, 23734, 26956, 26992, 28706, 29233, 33589, 33621, 45540, 49879, 50574)

diff --git a/Database/Mob.lua b/Database/Mob.lua
index 673473f..c7f168a 100644
--- a/Database/Mob.lua
+++ b/Database/Mob.lua
@@ -1,17 +1,12 @@
 --[[
 ************************************************************************
 Mob.lua
-Mob data for all of Ackis Recipe List
 ************************************************************************
 File date: @file-date-iso@
 File hash: @file-abbreviated-hash@
 Project hash: @project-abbreviated-hash@
 Project version: @project-version@
 ************************************************************************
-Format:
-	self:addLookupList(DB,NPC ID, NPC Name, NPC Location, X Coord, Y Coord, Faction)
-	the "Faction" parameter is not used in this specific database
-************************************************************************
 Please see http://www.wowace.com/addons/arl/ for more information.
 ************************************************************************
 This source code is released under All Rights Reserved.
@@ -25,8 +20,8 @@ local BZ		= LibStub("LibBabble-Zone-3.0"):GetLookupTable()
 local BB		= LibStub("LibBabble-Boss-3.0"):GetLookupTable()

 function addon:InitMob(DB)
-	local function AddMob(mob_id, mob_name, zone, coord_x, coord_y, faction)
-		addon:addLookupList(DB, mob_id, mob_name, zone, coord_x, coord_y, faction)
+	local function AddMob(mob_id, mob_name, zone, coord_x, coord_y)
+		addon:AddListEntry(DB, mob_id, mob_name, zone, coord_x, coord_y, nil)
 	end

 	-- Arathi Highlands
@@ -443,4 +438,6 @@ function addon:InitMob(DB)

 	-- Utgarde Pinnacle
 	AddMob(26861,	BB["King Ymiron"],			BZ["Utgarde Pinnacle"], 0, 0)
+
+	self.InitMob = nil
 end
diff --git a/Database/Quest.lua b/Database/Quest.lua
index 0422d99..35a5807 100644
--- a/Database/Quest.lua
+++ b/Database/Quest.lua
@@ -1,22 +1,20 @@
 --[[
 ************************************************************************
 Quest.lua
-Quest data for all of Ackis Recipe List
 ************************************************************************
 File date: @file-date-iso@
 File hash: @file-abbreviated-hash@
 Project hash: @project-abbreviated-hash@
 Project version: @project-version@
 ************************************************************************
-Format:
-	AddQuest(QuestID, Zone, X, Y, Faction)
-************************************************************************
 Please see http://www.wowace.com/addons/arl/ for more information.
 ************************************************************************
 This source code is released under All Rights Reserved.
 ************************************************************************
 ]]--

+local _G = getfenv(0)
+
 -------------------------------------------------------------------------------
 -- AddOn namespace.
 -------------------------------------------------------------------------------
@@ -26,7 +24,7 @@ local L		= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
 local BZ	= LibStub("LibBabble-Zone-3.0"):GetLookupTable()

 -- Set up the private intra-file namespace.
-local private	= select(2, ...)
+local FOLDER_NAME, private	= ...

 ------------------------------------------------------------------------------
 -- Constants.
@@ -38,13 +36,13 @@ local HORDE	= 2
 ------------------------------------------------------------------------------
 -- Memoizing table for quest names.
 ------------------------------------------------------------------------------
-private.quest_names = setmetatable({}, {
+private.quest_names = _G.setmetatable({}, {
 	__index = function(t, id_num)
-			  GameTooltip:SetOwner(UIParent, ANCHOR_NONE)
-			  GameTooltip:SetHyperlink("quest:"..tostring(id_num))
+			  _G.GameTooltip:SetOwner(UIParent, ANCHOR_NONE)
+			  _G.GameTooltip:SetHyperlink("quest:"..tostring(id_num))

 			  local quest_name = _G["GameTooltipTextLeft1"]:GetText()
-			  GameTooltip:Hide()
+			  _G.GameTooltip:Hide()

 			  if not quest_name then
 				  return _G.UNKNOWN
@@ -55,8 +53,8 @@ private.quest_names = setmetatable({}, {
 })

 function addon:InitQuest(DB)
-	local function AddQuest(QuestID, Zone, X, Y, Faction)
-		addon:addLookupList(DB, QuestID, nil, Zone, X, Y, Faction)
+	local function AddQuest(quest_id, location, coord_x, coord_y, faction)
+		addon:AddListEntry(DB, quest_id, nil, location, coord_x, coord_y, faction)
 	end

 	AddQuest(384,	BZ["Dun Morogh"],		46.8,	52.5,	ALLIANCE)
@@ -103,14 +101,14 @@ function addon:InitQuest(DB)
 	AddQuest(9635,	BZ["Zangarmarsh"],		33.7,	50.2,	HORDE)
 	AddQuest(9636,	BZ["Zangarmarsh"],		68.6,	50.2,	ALLIANCE)
 	AddQuest(10860,	BZ["Blade's Edge Mountains"],	76.1,	60.3,	HORDE)
-	AddQuest(11377,	BZ["Shattrath City"],		61.6, 16.5, NEUTRAL)
-	AddQuest(11379,	BZ["Shattrath City"],		61.6, 16.5, NEUTRAL)
-	AddQuest(11380,	BZ["Shattrath City"],		61.6, 16.5, NEUTRAL)
-	AddQuest(11381,	BZ["Shattrath City"],		61.6, 16.5, NEUTRAL)
-	AddQuest(11666,	BZ["Terokkar Forest"],		38.7, 12.8, NEUTRAL)
-	AddQuest(11667,	BZ["Terokkar Forest"],		38.7, 12.8, NEUTRAL)
-	AddQuest(11668,	BZ["Terokkar Forest"],		38.7, 12.8, NEUTRAL)
-	AddQuest(11669,	BZ["Terokkar Forest"],		38.7, 12.8, NEUTRAL)
+	AddQuest(11377,	BZ["Shattrath City"],		61.6, 16.5,	NEUTRAL)
+	AddQuest(11379,	BZ["Shattrath City"],		61.6, 16.5,	NEUTRAL)
+	AddQuest(11380,	BZ["Shattrath City"],		61.6, 16.5,	NEUTRAL)
+	AddQuest(11381,	BZ["Shattrath City"],		61.6, 16.5,	NEUTRAL)
+	AddQuest(11666,	BZ["Terokkar Forest"],		38.7, 12.8,	NEUTRAL)
+	AddQuest(11667,	BZ["Terokkar Forest"],		38.7, 12.8,	NEUTRAL)
+	AddQuest(11668,	BZ["Terokkar Forest"],		38.7, 12.8,	NEUTRAL)
+	AddQuest(11669,	BZ["Terokkar Forest"],		38.7, 12.8,	NEUTRAL)
 	AddQuest(12889,	BZ["The Storm Peaks"],		37.7,	46.5,	NEUTRAL)
 	AddQuest(13571,	BZ["Dalaran"],			0,	0,	NEUTRAL)
 	AddQuest(13087,	BZ["Howling Fjord"],		58.2,	62.1,	ALLIANCE)
@@ -130,6 +128,7 @@ function addon:InitQuest(DB)
 	AddQuest(14151,	BZ["Dalaran"],			42.5,	32.1,	NEUTRAL)
 	AddQuest(26620,	BZ["Duskwood"],			73.8,	43.6,	ALLIANCE)
 	AddQuest(26623,	BZ["Duskwood"],			73.8,	43.6,	ALLIANCE)
-	AddQuest(26860,	BZ["Loch Modan"],			34.9,	49.1,	ALLIANCE)
+	AddQuest(26860,	BZ["Loch Modan"],		34.9,	49.1,	ALLIANCE)

-end
\ No newline at end of file
+	self.InitQuest = nil
+end
diff --git a/Database/Reputation.lua b/Database/Reputation.lua
index 413c04e..78a7b54 100644
--- a/Database/Reputation.lua
+++ b/Database/Reputation.lua
@@ -1,16 +1,12 @@
 --[[
 ************************************************************************
 Reputation.lua
-Reputation data for all of Ackis Recipe List
 ************************************************************************
 File date: @file-date-iso@
 File hash: @file-abbreviated-hash@
 Project hash: @project-abbreviated-hash@
 Project version: @project-version@
 ************************************************************************
-Format:
-	self:addLookupList(DB, Rep ID,  Rep Name)
-************************************************************************
 Please see http://www.wowace.com/addons/arl/ for more information.
 ************************************************************************
 This source code is released under All Rights Reserved.
@@ -23,41 +19,46 @@ local L		= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
 local BFAC	= LibStub("LibBabble-Faction-3.0"):GetLookupTable()

 function addon:InitReputation(DB)
-	self:addLookupList(DB, 59, BFAC["Thorium Brotherhood"], "N/A")
-	self:addLookupList(DB, 270, BFAC["Zandalar Tribe"], "N/A")
-	self:addLookupList(DB, 529, BFAC["Argent Dawn"], "N/A")
-	self:addLookupList(DB, 576, BFAC["Timbermaw Hold"], "N/A")
-	self:addLookupList(DB, 609, BFAC["Cenarion Circle"], "N/A")
-	self:addLookupList(DB, 932, BFAC["The Aldor"], "N/A")
-	self:addLookupList(DB, 933, BFAC["The Consortium"], "N/A")
-	self:addLookupList(DB, 934, BFAC["The Scryers"], "N/A")
-	self:addLookupList(DB, 935, BFAC["The Sha'tar"], "N/A")
-	self:addLookupList(DB, 941, BFAC["The Mag'har"], "N/A")
-	self:addLookupList(DB, 942, BFAC["Cenarion Expedition"], "N/A")
-	self:addLookupList(DB, 946, BFAC["Honor Hold"], "N/A")
-	self:addLookupList(DB, 947, BFAC["Thrallmar"], "N/A")
-	self:addLookupList(DB, 967, BFAC["The Violet Eye"], "N/A")
-	self:addLookupList(DB, 970, BFAC["Sporeggar"], "N/A")
-	self:addLookupList(DB, 978, BFAC["Kurenai"], "N/A")
-	self:addLookupList(DB, 989, BFAC["Keepers of Time"], "N/A")
-	self:addLookupList(DB, 990, BFAC["The Scale of the Sands"], "N/A")
-	self:addLookupList(DB, 1011, BFAC["Lower City"], "N/A")
-	self:addLookupList(DB, 1012, BFAC["Ashtongue Deathsworn"], "N/A")
-	self:addLookupList(DB, 1037, BFAC["Alliance Vanguard"], "N/A")
-	self:addLookupList(DB, 1050, BFAC["Valiance Expedition"], "N/A")
-	self:addLookupList(DB, 1052, BFAC["Horde Expedition"], "N/A")
-	self:addLookupList(DB, 1064, BFAC["The Taunka"], "N/A")
-	self:addLookupList(DB, 1067, BFAC["The Hand of Vengeance"], "N/A")
-	self:addLookupList(DB, 1068, BFAC["Explorers' League"], "N/A")
-	self:addLookupList(DB, 1073, BFAC["The Kalu'ak"], "N/A")
-	self:addLookupList(DB, 1077, BFAC["Shattered Sun Offensive"], "N/A")
-	self:addLookupList(DB, 1085, BFAC["Warsong Offensive"], "N/A")
-	self:addLookupList(DB, 1090, BFAC["Kirin Tor"], "N/A")
-	self:addLookupList(DB, 1091, BFAC["The Wyrmrest Accord"], "N/A")
-	self:addLookupList(DB, 1098, BFAC["Knights of the Ebon Blade"], "N/A")
-	self:addLookupList(DB, 1104, BFAC["Frenzyheart Tribe"], "N/A")
-	self:addLookupList(DB, 1105, BFAC["The Oracles"], "N/A")
-	self:addLookupList(DB, 1106, BFAC["Argent Crusade"], "N/A")
-	self:addLookupList(DB, 1119, BFAC["The Sons of Hodir"], "N/A")
-	self:addLookupList(DB, 1156, BFAC["The Ashen Verdict"], "N/A")
+	local function AddReputation(rep_id, name)
+		addon:AddListEntry(DB, rep_id, name, nil, nil, nil, nil)
+	end
+	AddReputation(59, BFAC["Thorium Brotherhood"])
+	AddReputation(270, BFAC["Zandalar Tribe"])
+	AddReputation(529, BFAC["Argent Dawn"])
+	AddReputation(576, BFAC["Timbermaw Hold"])
+	AddReputation(609, BFAC["Cenarion Circle"])
+	AddReputation(932, BFAC["The Aldor"])
+	AddReputation(933, BFAC["The Consortium"])
+	AddReputation(934, BFAC["The Scryers"])
+	AddReputation(935, BFAC["The Sha'tar"])
+	AddReputation(941, BFAC["The Mag'har"])
+	AddReputation(942, BFAC["Cenarion Expedition"])
+	AddReputation(946, BFAC["Honor Hold"])
+	AddReputation(947, BFAC["Thrallmar"])
+	AddReputation(967, BFAC["The Violet Eye"])
+	AddReputation(970, BFAC["Sporeggar"])
+	AddReputation(978, BFAC["Kurenai"])
+	AddReputation(989, BFAC["Keepers of Time"])
+	AddReputation(990, BFAC["The Scale of the Sands"])
+	AddReputation(1011, BFAC["Lower City"])
+	AddReputation(1012, BFAC["Ashtongue Deathsworn"])
+	AddReputation(1037, BFAC["Alliance Vanguard"])
+	AddReputation(1050, BFAC["Valiance Expedition"])
+	AddReputation(1052, BFAC["Horde Expedition"])
+	AddReputation(1064, BFAC["The Taunka"])
+	AddReputation(1067, BFAC["The Hand of Vengeance"])
+	AddReputation(1068, BFAC["Explorers' League"])
+	AddReputation(1073, BFAC["The Kalu'ak"])
+	AddReputation(1077, BFAC["Shattered Sun Offensive"])
+	AddReputation(1085, BFAC["Warsong Offensive"])
+	AddReputation(1090, BFAC["Kirin Tor"])
+	AddReputation(1091, BFAC["The Wyrmrest Accord"])
+	AddReputation(1098, BFAC["Knights of the Ebon Blade"])
+	AddReputation(1104, BFAC["Frenzyheart Tribe"])
+	AddReputation(1105, BFAC["The Oracles"])
+	AddReputation(1106, BFAC["Argent Crusade"])
+	AddReputation(1119, BFAC["The Sons of Hodir"])
+	AddReputation(1156, BFAC["The Ashen Verdict"])
+
+	self.InitReputation = nil
 end
diff --git a/Database/Seasonal.lua b/Database/Seasonal.lua
index 69ea915..31e59d7 100644
--- a/Database/Seasonal.lua
+++ b/Database/Seasonal.lua
@@ -1,16 +1,12 @@
 --[[
 ************************************************************************
 Seasonal.lua
-Seasonal data for all of AckisRecipeList
 ************************************************************************
 File date: @file-date-iso@
 File hash: @file-abbreviated-hash@
 Project hash: @project-abbreviated-hash@
 Project version: @project-version@
 ************************************************************************
-Format:
-	self:addLookupList(SeasonDB, Season ID, Season Name)
-************************************************************************
 Please see http://www.wowace.com/addons/arl/ for more information.
 ************************************************************************
 License:
@@ -19,31 +15,25 @@ This source code is released under All Rights Reserved.
 ************************************************************************
 ]]--

+-------------------------------------------------------------------------------
+-- Upvalued Lua API.
+-------------------------------------------------------------------------------
+local _G = getfenv(0)
+
 local MODNAME		= "Ackis Recipe List"
 local addon		= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
 local L			= LibStub("AceLocale-3.0"):GetLocale(MODNAME)

-local GetCategoryInfo = GetCategoryInfo
+local GetCategoryInfo = _G.GetCategoryInfo

 function addon:InitSeasons(DB)
-	local name = ""
-	local seasonal = GetCategoryInfo(155)
-
-	name = GetCategoryInfo(156) -- Winter's Veil
-	self:addLookupList(DB, 1, name, seasonal)
-
-	name = GetCategoryInfo(160) -- Lunar Festival
-	self:addLookupList(DB, 2, name, seasonal)
-
-	name = L["Darkmoon Faire"] -- Darkmoon Faire
-	self:addLookupList(DB, 3, name, seasonal)
-
-	name = GetCategoryInfo(161) -- Midsummer
-	self:addLookupList(DB, 4, name, seasonal)
-
-	name = GetCategoryInfo(14981) -- Pilgrim's Bounty
-	self:addLookupList(DB, 5, name, seasonal)
-
-	name = L["Day of the Dead"] -- Day of the Dead
-	self:addLookupList(DB, 6, name, seasonal)
+	local function AddSeason(identifier, name)
+		addon:AddListEntry(DB, identifier, name, GetCategoryInfo(155))
+	end
+	AddSeason(1, GetCategoryInfo(156))	-- Winter's Veil
+	AddSeason(2, GetCategoryInfo(160))	-- Lunar Festival
+	AddSeason(3, L["Darkmoon Faire"])
+	AddSeason(4, GetCategoryInfo(161))	-- Midsummer
+	AddSeason(5, GetCategoryInfo(14981))	-- Pilgrim's Bounty
+	AddSeason(6, L["Day of the Dead"])
 end
diff --git a/Database/Trainer.lua b/Database/Trainer.lua
index 5b31374..0850ec4 100644
--- a/Database/Trainer.lua
+++ b/Database/Trainer.lua
@@ -1,400 +1,401 @@
 --[[
 ************************************************************************
 Trainer.lua
-Trainer data for all of Ackis Recipe List
 ************************************************************************
 File date: @file-date-iso@
 File hash: @file-abbreviated-hash@
 Project hash: @project-abbreviated-hash@
 Project version: @project-version@
 ************************************************************************
-Format:
-	self:addLookupList(DB, NPC ID, NPC Name, NPC Location, X Coord, Y Coord, Faction)
-************************************************************************
 Please see http://www.wowace.com/addons/arl/ for more information.
 ************************************************************************
 This source code is released under All Rights Reserved.
 ************************************************************************
-]]--
+]] --

 local _G = getfenv(0)

-local MODNAME	= "Ackis Recipe List"
-local addon		= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
-local L			= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
-local BZ		= LibStub("LibBabble-Zone-3.0"):GetLookupTable()
+local MODNAME = "Ackis Recipe List"
+local addon = LibStub("AceAddon-3.0"):GetAddon(MODNAME)
+local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME)
+local BZ = LibStub("LibBabble-Zone-3.0"):GetLookupTable()

 ------------------------------------------------------------------------------
 -- Constants.
 ------------------------------------------------------------------------------
-local NEUTRAL	= 0
-local ALLIANCE	= 1
-local HORDE	= 2
+local NEUTRAL = 0
+local ALLIANCE = 1
+local HORDE = 2

 function addon:InitTrainer(DB)
-	self:addLookupList(DB, 514, L["Smith Argus"], BZ["Elwynn Forest"], 41.7, 65.6, ALLIANCE)
-	self:addLookupList(DB, 1103, L["Eldrin"], BZ["Elwynn Forest"], 79.3, 69.0, ALLIANCE)
-	self:addLookupList(DB, 1215, L["Alchemist Mallory"], BZ["Elwynn Forest"], 39.8, 48.3, ALLIANCE)
-	self:addLookupList(DB, 1241, L["Tognus Flintfire"], BZ["Dun Morogh"], 45.3, 52.0, ALLIANCE)
-	self:addLookupList(DB, 1246, L["Vosur Brakthel"], BZ["Ironforge"], 66.5, 55.2, ALLIANCE)
-	self:addLookupList(DB, 1317, L["Lucan Cordell"], BZ["Stormwind City"], 53.0, 74.3, ALLIANCE)
-	self:addLookupList(DB, 1346, L["Georgio Bolero"], BZ["Stormwind City"], 53.2, 81.5, ALLIANCE)
-	self:addLookupList(DB, 1355, L["Cook Ghilm"], BZ["Dun Morogh"], 68.4, 54.5, ALLIANCE)
-	self:addLookupList(DB, 1382, L["Mudduk"], BZ["Northern Stranglethorn"], 37.2, 49.2, HORDE)  -- UPDATED
-	self:addLookupList(DB, 1385, L["Brawn"], BZ["Northern Stranglethorn"], 37.8, 50.4, HORDE)  -- UPDATED
-	self:addLookupList(DB, 1386, L["Rogvar"], BZ["Swamp of Sorrows"], 48.4, 55.7, HORDE)
-	self:addLookupList(DB, 1430, L["Tomas"], BZ["Elwynn Forest"], 44.3, 66.0, ALLIANCE)  ---confirm
-	self:addLookupList(DB, 1470, L["Ghak Healtouch"], BZ["Loch Modan"], 37.0, 49.2, ALLIANCE)
-	self:addLookupList(DB, 1632, L["Adele Fielder"], BZ["Elwynn Forest"], 46.4, 62.1, ALLIANCE)
-	self:addLookupList(DB, 1676, L["Finbus Geargrind"], BZ["Duskwood"], 77.4, 48.6, ALLIANCE)
-	self:addLookupList(DB, 1681, L["Brock Stoneseeker"], BZ["Loch Modan"], 37.1, 47.8, ALLIANCE)
-	self:addLookupList(DB, 1699, L["Gremlock Pilsnor"], BZ["Dun Morogh"], 47.6, 52.3, ALLIANCE)
-	self:addLookupList(DB, 1701, L["Dank Drizzlecut"], BZ["Dun Morogh"], 69.3, 55.5, ALLIANCE)
-	self:addLookupList(DB, 1702, L["Bronk Guzzlegear"], BZ["Dun Morogh"], 50.2, 50.4, ALLIANCE)
-	self:addLookupList(DB, 2132, L["Carolai Anise"], BZ["Tirisfal Glades"], 59.5, 52.2, HORDE)
-	self:addLookupList(DB, 2326, L["Thamner Pol"], BZ["Dun Morogh"], 47.2, 52.6, ALLIANCE)
-	self:addLookupList(DB, 2327, L["Shaina Fuller"], BZ["Stormwind City"], 52.9, 44.8, ALLIANCE)
-	self:addLookupList(DB, 2329, L["Michelle Belle"], BZ["Elwynn Forest"], 43.4, 65.6, ALLIANCE)
-	self:addLookupList(DB, 2391, L["Serge Hinott"], BZ["Hillsbrad Foothills"], 61.6, 19.2, HORDE)
-	self:addLookupList(DB, 2399, L["Daryl Stack"], BZ["Hillsbrad Foothills"], 63.7, 20.8, HORDE)
-	self:addLookupList(DB, 2627, L["Grarnik Goodstitch"], BZ["The Cape of Stranglethorn"], 43.6, 73.0, NEUTRAL)   -- UPDATED
-	self:addLookupList(DB, 2798, L["Pand Stonebinder"], BZ["Thunder Bluff"], 29.4, 21.5, HORDE)
-	self:addLookupList(DB, 2818, L["Slagg"], BZ["Arathi Highlands"], 74.1, 33.8, HORDE)
-	self:addLookupList(DB, 2836, L["Brikk Keencraft"], BZ["The Cape of Stranglethorn"], 44.1, 70.9, NEUTRAL)   -- UPDATED
-	self:addLookupList(DB, 2837, L["Jaxin Chong"], BZ["The Cape of Stranglethorn"], 42.6, 74.8, NEUTRAL)   -- UPDATED
-	self:addLookupList(DB, 2998, L["Karn Stonehoof"], BZ["Thunder Bluff"], 39.0, 56.5, HORDE)
-	self:addLookupList(DB, 3001, L["Brek Stonehoof"], BZ["Thunder Bluff"], 34.5, 57.6, HORDE)
-	self:addLookupList(DB, 3004, L["Tepa"], BZ["Thunder Bluff"], 44.3, 45.0, HORDE)
-	self:addLookupList(DB, 3007, L["Una"], BZ["Thunder Bluff"], 41.8, 42.7, HORDE)
-	self:addLookupList(DB, 3009, L["Bena Winterhoof"], BZ["Thunder Bluff"], 46.8, 33.5, HORDE)
-	self:addLookupList(DB, 3011, L["Teg Dawnstrider"], BZ["Thunder Bluff"], 45.0, 38.0, HORDE)
-	self:addLookupList(DB, 3026, L["Aska Mistrunner"], BZ["Thunder Bluff"], 51.1, 52.9, HORDE)
-	self:addLookupList(DB, 3067, L["Pyall Silentstride"], BZ["Mulgore"], 45.5, 58.1, HORDE)
-	self:addLookupList(DB, 3069, L["Chaw Stronghide"], BZ["Mulgore"], 45.5, 57.9, HORDE)
-	self:addLookupList(DB, 3087, L["Crystal Boughman"], BZ["Redridge Mountains"], 22.8, 43.6, ALLIANCE)
-	self:addLookupList(DB, 3136, L["Clarise Gnarltree"], BZ["Duskwood"], 74.0, 48.5, ALLIANCE)
-	self:addLookupList(DB, 3137, L["Matt Johnson"], BZ["Duskwood"], 74.0, 49.7, ALLIANCE)
-	self:addLookupList(DB, 3174, L["Dwukk"], BZ["Durotar"], 52.0, 40.7, HORDE)
-	self:addLookupList(DB, 3175, L["Krunn"], BZ["Durotar"], 51.9, 40.9, HORDE)
-	self:addLookupList(DB, 3181, L["Fremal Doohickey"], BZ["Wetlands"], 10.8, 61.3, ALLIANCE)
-	self:addLookupList(DB, 3184, L["Miao'zan"], BZ["Durotar"], 55.5, 74.0, HORDE)
-	self:addLookupList(DB, 3290, L["Deek Fizzlebizz"], BZ["Loch Modan"], 45.9, 13.6, ALLIANCE)
-	self:addLookupList(DB, 3345, L["Godan"], BZ["Orgrimmar"], 53.8, 38.5, HORDE)
-	self:addLookupList(DB, 3347, L["Yelmak"], BZ["Orgrimmar"], 56.7, 33.2, HORDE)
-	self:addLookupList(DB, 3355, L["Saru Steelfury"], BZ["Orgrimmar"], 76.50, 34.53, HORDE) -- UPDATED
-	self:addLookupList(DB, 3357, L["Makaru"], BZ["Orgrimmar"], 72.31, 34.91, HORDE) -- UPDATED
-	self:addLookupList(DB, 3363, L["Magar"], BZ["Orgrimmar"], 63.5, 50.0, HORDE)
-	self:addLookupList(DB, 3365, L["Karolek"], BZ["Orgrimmar"], 62.8, 44.5, HORDE)
-	self:addLookupList(DB, 3373, L["Arnok"], BZ["Orgrimmar"], 34.1, 84.4, HORDE)
-	self:addLookupList(DB, 3399, L["Zamja"], BZ["Orgrimmar"], 57.5, 53.7, HORDE)
-	self:addLookupList(DB, 3478, L["Traugh"], BZ["Northern Barrens"], 48.3, 56.2, HORDE)   -- UPDATED
-	self:addLookupList(DB, 3484, L["Kil'hala"], BZ["Northern Barrens"], 49.9, 61.2, HORDE)   -- UPDATED
-	self:addLookupList(DB, 3494, L["Tinkerwiz"], BZ["Northern Barrens"], 68.5, 69.2, NEUTRAL)  -- UPDATED
-	self:addLookupList(DB, 3523, L["Bowen Brisboise"], BZ["Tirisfal Glades"], 52.6, 55.6, HORDE)
-	self:addLookupList(DB, 3549, L["Shelene Rhobart"], BZ["Tirisfal Glades"], 65.5, 61.0, HORDE)
-	self:addLookupList(DB, 3555, L["Johan Focht"], BZ["Silverpine Forest"], 43.4, 40.5, HORDE)
-	self:addLookupList(DB, 3557, L["Guillaume Sorouy"], BZ["Silverpine Forest"], 43.2, 41.0, HORDE)
-	self:addLookupList(DB, 3603, L["Cyndra Kindwhisper"], BZ["Teldrassil"], 57.6, 60.7, ALLIANCE)
-	self:addLookupList(DB, 3605, L["Nadyia Maneweaver"], BZ["Teldrassil"], 41.8, 49.5, ALLIANCE)
-	self:addLookupList(DB, 3606, L["Alanna Raveneye"], BZ["Teldrassil"], 36.8, 34.2, ALLIANCE)
-	self:addLookupList(DB, 3704, L["Mahani"], BZ["Southern Barrens"], 41.5, 46.9, HORDE)   -- UPDATED
-	self:addLookupList(DB, 3964, L["Kylanna"], BZ["Ashenvale"], 50.8, 67.1, ALLIANCE)
-	self:addLookupList(DB, 3967, L["Aayndia Floralwind"], BZ["Ashenvale"], 35.9, 52.1, ALLIANCE)
-	self:addLookupList(DB, 4159, L["Me'lynn"], BZ["Darnassus"], 61.7, 23.0, ALLIANCE)
-	self:addLookupList(DB, 4160, L["Ainethil"], BZ["Darnassus"], 55.0, 23.8, ALLIANCE)
-	self:addLookupList(DB, 4193, L["Grondal Moonbreeze"], BZ["Darkshore"], 38.2, 40.5, ALLIANCE)
-	self:addLookupList(DB, 4210, L["Alegorn"], BZ["Darnassus"], 50.0, 36.6, ALLIANCE) -- UPDATED
-	self:addLookupList(DB, 4211, L["Dannelor"], BZ["Darnassus"], 51.7, 12.6, ALLIANCE)
-	self:addLookupList(DB, 4212, L["Telonis"], BZ["Darnassus"], 64.5, 21.3, ALLIANCE)
-	self:addLookupList(DB, 4213, L["Taladan"], BZ["Darnassus"], 58.6, 13.2, ALLIANCE)
-	self:addLookupList(DB, 4254, L["Geofram Bouldertoe"], BZ["Ironforge"], 50.3, 26.0, ALLIANCE)
-	self:addLookupList(DB, 4258, L["Bengus Deepforge"], BZ["Ironforge"], 51.0, 43.0, ALLIANCE)
-	self:addLookupList(DB, 4552, L["Eunice Burch"], BZ["Undercity"], 62.3, 44.6, HORDE)
-	self:addLookupList(DB, 4576, L["Josef Gregorian"], BZ["Undercity"], 70.7, 30.3, HORDE)
-	self:addLookupList(DB, 4578, L["Josephine Lister"], BZ["Undercity"], 86.5, 22.3, HORDE)
-	self:addLookupList(DB, 4588, L["Arthur Moore"], BZ["Undercity"], 70.3, 58.5, HORDE)
-	self:addLookupList(DB, 4591, L["Mary Edras"], BZ["Undercity"], 73.5, 54.8, HORDE)
-	self:addLookupList(DB, 4596, L["James Van Brunt"], BZ["Undercity"], 61.2, 29.9, HORDE)
-	self:addLookupList(DB, 4598, L["Brom Killian"], BZ["Undercity"], 55.8, 37.0, HORDE)
-	self:addLookupList(DB, 4611, L["Doctor Herbert Halsey"], BZ["Undercity"], 47.7, 73.0, HORDE)
-	self:addLookupList(DB, 4616, L["Lavinia Crowe"], BZ["Undercity"], 62.1, 60.5, HORDE)
-	self:addLookupList(DB, 4900, L["Alchemist Narett"], BZ["Dustwallow Marsh"], 64.0, 47.7, ALLIANCE)
-	self:addLookupList(DB, 5127, L["Fimble Finespindle"], BZ["Ironforge"], 39.8, 33.5, ALLIANCE)
-	self:addLookupList(DB, 5150, L["Nissa Firestone"], BZ["Ironforge"], 54.0, 57.8, ALLIANCE)
-	self:addLookupList(DB, 5153, L["Jormund Stonebrow"], BZ["Ironforge"], 43.2, 29.0, ALLIANCE)
-	self:addLookupList(DB, 5157, L["Gimble Thistlefuzz"], BZ["Ironforge"], 60.0, 45.4, ALLIANCE)
-	self:addLookupList(DB, 5159, L["Daryl Riknussun"], BZ["Ironforge"], 60.1, 36.8, ALLIANCE)
-	self:addLookupList(DB, 5164, L["Grumnus Steelshaper"], BZ["Ironforge"], 50.2, 42.8, ALLIANCE)
-	self:addLookupList(DB, 5174, L["Springspindle Fizzlegear"], BZ["Ironforge"], 68.4, 44.0, ALLIANCE)
-	self:addLookupList(DB, 5177, L["Tally Berryfizz"], BZ["Ironforge"], 66.6, 55.2, ALLIANCE)
-	self:addLookupList(DB, 5392, L["Yarr Hammerstone"], BZ["Dun Morogh"], 50.0, 50.3, ALLIANCE)
-	self:addLookupList(DB, 5482, L["Stephen Ryback"], BZ["Stormwind City"], 78.2, 53.2, ALLIANCE)
-	self:addLookupList(DB, 5499, L["Lilyssia Nightbreeze"], BZ["Stormwind City"], 55.6, 85.9, ALLIANCE)
-	self:addLookupList(DB, 5511, L["Therum Deepforge"], BZ["Stormwind City"], 63.9, 37.8, ALLIANCE)
-	self:addLookupList(DB, 5513, L["Gelman Stonehand"], BZ["Stormwind City"], 59.2, 37.7, ALLIANCE)
-	self:addLookupList(DB, 5518, L["Lilliam Sparkspindle"], BZ["Stormwind City"], 62.2, 30.5, ALLIANCE)
-	self:addLookupList(DB, 5564, L["Simon Tanner"], BZ["Stormwind City"], 71.8, 62.9, ALLIANCE)
-	self:addLookupList(DB, 5695, L["Vance Undergloom"], BZ["Tirisfal Glades"], 61.7, 51.6, HORDE)
-	self:addLookupList(DB, 5759, L["Nurse Neela"], BZ["Tirisfal Glades"], 61.8, 52.8, HORDE)
-	self:addLookupList(DB, 5784, L["Waldor"], BZ["Wailing Caverns"], 32.6, 28.5, NEUTRAL)
-	self:addLookupList(DB, 5939, L["Vira Younghoof"], BZ["Mulgore"], 46.8, 60.8, HORDE)
-	self:addLookupList(DB, 5943, L["Rawrk"], BZ["Durotar"], 54.1, 42.0, HORDE)
-	self:addLookupList(DB, 6094, L["Byancie"], BZ["Teldrassil"], 55.3, 56.8, ALLIANCE)
-	self:addLookupList(DB, 6286, L["Zarrin"], BZ["Teldrassil"], 57.1, 61.3, ALLIANCE)
-	self:addLookupList(DB, 6297, L["Kurdram Stonehammer"], BZ["Darkshore"], 38.2, 41.1, ALLIANCE)
-	self:addLookupList(DB, 6299, L["Delfrum Flintbeard"], BZ["Darkshore"], 38.2, 41.0, ALLIANCE)
-	self:addLookupList(DB, 7230, L["Shayis Steelfury"], BZ["Orgrimmar"], 75.91, 37.10, HORDE) -- UPDATED
-	self:addLookupList(DB, 7231, L["Kelgruk Bloodaxe"], BZ["Orgrimmar"], 76.34, 37.08, HORDE) -- UPDATED
-	self:addLookupList(DB, 7406, L["Oglethorpe Obnoticus"], BZ["The Cape of Stranglethorn"], 43.0, 72.1, NEUTRAL)   -- UPDATED
-	self:addLookupList(DB, 7866, L["Peter Galen"], BZ["Azshara"], 37.5, 65.5, ALLIANCE)
-	self:addLookupList(DB, 7867, L["Thorkaf Dragoneye"], BZ["Badlands"], 62.6, 57.6, HORDE)
-	self:addLookupList(DB, 7868, L["Sarah Tanner"], BZ["Searing Gorge"], 63.7, 75.7, ALLIANCE)
-	self:addLookupList(DB, 7869, L["Brumn Winterhoof"], BZ["Arathi Highlands"], 28.2, 45.0, HORDE)
-	self:addLookupList(DB, 7870, L["Caryssia Moonhunter"], BZ["Feralas"], 89.4, 46.5, ALLIANCE) ---confirm
-	self:addLookupList(DB, 7871, L["Se'Jib"], BZ["Northern Stranglethorn"], 45.3, 58.7, HORDE)   -- UPDATED
-	self:addLookupList(DB, 7944, L["Tinkmaster Overspark"], BZ["Ironforge"], 69.8, 50.0, ALLIANCE)
-	self:addLookupList(DB, 7948, L["Kylanna Windwhisper"], BZ["Feralas"], 32.6, 43.8, ALLIANCE)
-	self:addLookupList(DB, 7949, L["Xylinnia Starshine"], BZ["Feralas"], 31.6, 44.3, ALLIANCE)
-	self:addLookupList(DB, 8126, L["Nixx Sprocketspring"], BZ["Tanaris"], 52.5, 27.3, NEUTRAL)
-	self:addLookupList(DB, 8128, L["Pikkle"], BZ["Tanaris"], 51.1, 28.1, NEUTRAL)
-	self:addLookupList(DB, 8153, L["Narv Hidecrafter"], BZ["Desolace"], 55.3, 56.3, HORDE)
-	self:addLookupList(DB, 8306, L["Duhng"], BZ["Northern Barrens"], 55.4, 61.3, HORDE)   -- UPDATED
-	self:addLookupList(DB, 8736, L["Buzzek Bracketswing"], BZ["Tanaris"], 52.3, 27.7, NEUTRAL)
-	self:addLookupList(DB, 8738, L["Vazario Linkgrease"], BZ["Northern Barrens"], 68.5, 69.2, NEUTRAL)   -- UPDATED
-	self:addLookupList(DB, 9584, L["Jalane Ayrole"], BZ["Stormwind City"], 40.6, 83.9, ALLIANCE)
-	self:addLookupList(DB, 11017, L["Roxxik"], BZ["Orgrimmar"], 56.85, 56.54, HORDE)	-- UPDATED
-	self:addLookupList(DB, 11025, L["Mukdrak"], BZ["Durotar"], 52.2, 40.8, HORDE)
-	self:addLookupList(DB, 11031, L["Franklin Lloyd"], BZ["Undercity"], 75.9, 73.7, HORDE)
-	self:addLookupList(DB, 11037, L["Jenna Lemkenilli"], BZ["Darkshore"], 38.3, 41.1, ALLIANCE)
-	self:addLookupList(DB, 11052, L["Timothy Worthington"], BZ["Dustwallow Marsh"], 66.22, 51.7, ALLIANCE)
-	self:addLookupList(DB, 11072, L["Kitta Firewind"], BZ["Elwynn Forest"], 64.9, 70.6, ALLIANCE)
-	self:addLookupList(DB, 11073, L["Annora"], BZ["Uldaman"], 0, 0, NEUTRAL)
-	self:addLookupList(DB, 11074, L["Hgarth"], BZ["Stonetalon Mountains"], 49.2, 57.2, HORDE)
-	self:addLookupList(DB, 11097, L["Drakk Stonehand"], BZ["The Hinterlands"], 13.4, 43.4, ALLIANCE)
-	self:addLookupList(DB, 11098, L["Hahrana Ironhide"], BZ["Feralas"], 74.4, 43.1, HORDE)
-	self:addLookupList(DB, 11146, L["Ironus Coldsteel"], BZ["Ironforge"], 50.5, 43.3, ALLIANCE)
-	self:addLookupList(DB, 11177, L["Okothos Ironrager"], BZ["Orgrimmar"], 75.35, 34.04, HORDE) -- UPDATED
-	self:addLookupList(DB, 11178, L["Borgosh Corebender"], BZ["Orgrimmar"], 75.89, 33.61, HORDE) -- UPDATED
-	self:addLookupList(DB, 11557, L["Meilosh"], BZ["Felwood"], 65.7, 2.9, HORDE)
-	self:addLookupList(DB, 12920, L["Doctor Gregory Victor"], BZ["Arathi Highlands"], 73.4, 36.8, HORDE)
-	self:addLookupList(DB, 12939, L["Doctor Gustaf VanHowzen"], BZ["Dustwallow Marsh"], 68.18, 47.94, ALLIANCE)
-	self:addLookupList(DB, 14742, L["Zap Farflinger"], BZ["Winterspring"], 61.2, 37.6, NEUTRAL)
-	self:addLookupList(DB, 14743, L["Jhordy Lapforge"], BZ["Tanaris"], 52.3, 26.9, NEUTRAL)
-	self:addLookupList(DB, 15400, L["Arathel Sunforge"], BZ["Eversong Woods"], 59.6, 62.6, HORDE)
-	self:addLookupList(DB, 15501, L["Aleinia"], BZ["Eversong Woods"], 48.5, 47.5, HORDE)
-	self:addLookupList(DB, 16160, L["Magistrix Eredania"], BZ["Eversong Woods"], 38.2, 72.6, HORDE)
-	self:addLookupList(DB, 16161, L["Arcanist Sheynathren"], BZ["Eversong Woods"], 38.2, 72.5, HORDE)
-	self:addLookupList(DB, 16253, L["Master Chef Mouldier"], BZ["Ghostlands"], 48.3, 30.9, HORDE)
-	self:addLookupList(DB, 16272, L["Kanaria"], BZ["Eversong Woods"], 48.5, 47.6, HORDE)
-	self:addLookupList(DB, 16277, L["Quarelestra"], BZ["Eversong Woods"], 48.6, 47.1, HORDE)
-	self:addLookupList(DB, 16278, L["Sathein"], BZ["Eversong Woods"], 53.5, 51.0, HORDE)
-	self:addLookupList(DB, 16366, L["Sempstress Ambershine"], BZ["Eversong Woods"], 37.4, 71.9, HORDE)
-	self:addLookupList(DB, 16583, L["Rohok"], BZ["Hellfire Peninsula"], 53.2, 38.2, HORDE)
-	self:addLookupList(DB, 16588, L["Apothecary Antonivich"], BZ["Hellfire Peninsula"], 52.4, 36.5, HORDE)
-	self:addLookupList(DB, 16633, L["Sedana"], BZ["Silvermoon City"], 70.0, 24.0, HORDE)
-	self:addLookupList(DB, 16640, L["Keelen Sheets"], BZ["Silvermoon City"], 57.0, 50.1, HORDE)
-	self:addLookupList(DB, 16642, L["Camberon"], BZ["Silvermoon City"], 66.1, 17.4, HORDE)
-	self:addLookupList(DB, 16662, L["Alestus"], BZ["Silvermoon City"], 77.6, 71.3, HORDE)
-	self:addLookupList(DB, 16663, L["Belil"], BZ["Silvermoon City"], 79.1, 42.9, HORDE)
-	self:addLookupList(DB, 16667, L["Danwe"], BZ["Silvermoon City"], 76.5, 40.9, HORDE)
-	self:addLookupList(DB, 16669, L["Bemarrin"], BZ["Silvermoon City"], 79.5, 39.0, HORDE)
-	self:addLookupList(DB, 16676, L["Sylann"], BZ["Silvermoon City"], 69.5, 71.5, HORDE)
-	self:addLookupList(DB, 16688, L["Lynalis"], BZ["Silvermoon City"], 84.0, 80.2, HORDE)
-	self:addLookupList(DB, 16719, L["Mumman"], BZ["The Exodar"], 55.6, 27.1, ALLIANCE)
-	self:addLookupList(DB, 16723, L["Lucc"], BZ["The Exodar"], 27.5, 60.9, ALLIANCE)
-	self:addLookupList(DB, 16724, L["Miall"], BZ["The Exodar"], 60.0, 89.6, ALLIANCE)
-	self:addLookupList(DB, 16725, L["Nahogg"], BZ["The Exodar"], 40.5, 39.2, ALLIANCE)
-	self:addLookupList(DB, 16726, L["Ockil"], BZ["The Exodar"], 54.0, 92.1, ALLIANCE)
-	self:addLookupList(DB, 16728, L["Akham"], BZ["The Exodar"], 66.0, 74.6, ALLIANCE)
-	self:addLookupList(DB, 16729, L["Refik"], BZ["The Exodar"], 63.0, 67.9, ALLIANCE)
-	self:addLookupList(DB, 16731, L["Nus"], BZ["The Exodar"], 39.0, 22.5, ALLIANCE)
-	self:addLookupList(DB, 16752, L["Muaat"], BZ["The Exodar"], 60.0, 87.9, ALLIANCE)
-	self:addLookupList(DB, 16823, L["Humphry"], BZ["Hellfire Peninsula"], 56.8, 63.8, ALLIANCE)
-	self:addLookupList(DB, 17214, L["Anchorite Fateema"], BZ["Azuremyst Isle"], 48.5, 51.8, ALLIANCE) --- confirm
-	self:addLookupList(DB, 17215, L["Daedal"], BZ["Azuremyst Isle"], 48.5, 51.5, ALLIANCE) --- confirm
-	self:addLookupList(DB, 17222, L["Artificer Daelo"], BZ["Azuremyst Isle"], 48.0, 51.0, ALLIANCE)
-	self:addLookupList(DB, 17245, L["Blacksmith Calypso"], BZ["Azuremyst Isle"], 46.4, 71.1, ALLIANCE)
-	self:addLookupList(DB, 17246, L["\"Cookie\" McWeaksauce"], BZ["Azuremyst Isle"], 46.7, 70.5, ALLIANCE) -- confirm
-	self:addLookupList(DB, 17424, L["Anchorite Paetheus"], BZ["Bloodmyst Isle"], 54.7, 54.0, ALLIANCE)
-	self:addLookupList(DB, 17442, L["Moordo"], BZ["Azuremyst Isle"], 44.8, 23.8, ALLIANCE)
-	self:addLookupList(DB, 17487, L["Erin Kelly"], BZ["Azuremyst Isle"], 46.2, 70.5, ALLIANCE)
-	self:addLookupList(DB, 17488, L["Dulvi"], BZ["Azuremyst Isle"], 48.9, 51.1, ALLIANCE)
-	self:addLookupList(DB, 17634, L["K. Lee Smallfry"], BZ["Zangarmarsh"], 68.6, 50.2, ALLIANCE)
-	self:addLookupList(DB, 17637, L["Mack Diver"], BZ["Zangarmarsh"], 33.9, 51.0, HORDE)
-	self:addLookupList(DB, 18747, L["Krugosh"], BZ["Hellfire Peninsula"], 55.5, 37.6, HORDE)
-	self:addLookupList(DB, 18749, L["Dalinna"], BZ["Hellfire Peninsula"], 56.6, 37.1, HORDE) --- confirm
-	self:addLookupList(DB, 18751, L["Kalaen"], BZ["Hellfire Peninsula"], 56.8, 37.7, HORDE)
-	self:addLookupList(DB, 18752, L["Zebig"], BZ["Hellfire Peninsula"], 54.8, 38.5, HORDE)
-	self:addLookupList(DB, 18753, L["Felannia"], BZ["Hellfire Peninsula"], 52.3, 36.1, HORDE)
-	self:addLookupList(DB, 18754, L["Barim Spilthoof"], BZ["Hellfire Peninsula"], 56.2, 38.6, HORDE)
-	self:addLookupList(DB, 18771, L["Brumman"], BZ["Hellfire Peninsula"], 54.1, 64.0, ALLIANCE)
-	self:addLookupList(DB, 18772, L["Hama"], BZ["Hellfire Peninsula"], 54.1, 63.6, ALLIANCE)
-	self:addLookupList(DB, 18773, L["Johan Barnes"], BZ["Hellfire Peninsula"], 53.7, 66.1, ALLIANCE)
-	self:addLookupList(DB, 18774, L["Tatiana"], BZ["Hellfire Peninsula"], 54.6, 63.6, ALLIANCE)
-	self:addLookupList(DB, 18775, L["Lebowski"], BZ["Hellfire Peninsula"], 55.7, 65.5, ALLIANCE)
-	self:addLookupList(DB, 18779, L["Hurnak Grimmord"], BZ["Hellfire Peninsula"], 56.7, 63.8, ALLIANCE)
-	self:addLookupList(DB, 18802, L["Alchemist Gribble"], BZ["Hellfire Peninsula"], 53.8, 65.8, ALLIANCE)
-	self:addLookupList(DB, 18804, L["Prospector Nachlan"], BZ["Bloodmyst Isle"], 56.3, 54.3, ALLIANCE)
-	self:addLookupList(DB, 18987, L["Gaston"], BZ["Hellfire Peninsula"], 54.1, 63.5, ALLIANCE)
-	self:addLookupList(DB, 18988, L["Baxter"], BZ["Hellfire Peninsula"], 56.8, 37.5, HORDE)
-	self:addLookupList(DB, 18990, L["Burko"], BZ["Hellfire Peninsula"], 22.4, 39.3, ALLIANCE)
-	self:addLookupList(DB, 18991, L["Aresella"], BZ["Hellfire Peninsula"], 26.3, 62.0, HORDE)
-	self:addLookupList(DB, 18993, L["Naka"], BZ["Zangarmarsh"], 78.5, 63.0, NEUTRAL)
-	self:addLookupList(DB, 19052, L["Lorokeem"], BZ["Shattrath City"], 45.4, 19.5, NEUTRAL)
-	self:addLookupList(DB, 19063, L["Hamanar"], BZ["Shattrath City"], 35.7, 20.5, NEUTRAL)
-	self:addLookupList(DB, 19184, L["Mildred Fletcher"], BZ["Shattrath City"], 66.5, 13.5, NEUTRAL)
-	self:addLookupList(DB, 19185, L["Jack Trapper"], BZ["Shattrath City"], 63.0, 68.5, NEUTRAL)
-	self:addLookupList(DB, 19186, L["Kylene"], BZ["Shattrath City"], 76.5, 33.0, NEUTRAL)
-	self:addLookupList(DB, 19187, L["Darmari"], BZ["Shattrath City"], 66.8, 67.1, NEUTRAL)
-	self:addLookupList(DB, 19251, L["Enchantress Volali"], BZ["Shattrath City"], 43.2, 92.3, NEUTRAL)
-	self:addLookupList(DB, 19252, L["High Enchanter Bardolan"], BZ["Shattrath City"], 43.2, 92.2, NEUTRAL)
-	self:addLookupList(DB, 19341, L["Grutah"], BZ["Shadowmoon Valley"], 29.7, 31.5, HORDE)
-	self:addLookupList(DB, 19369, L["Celie Steelwing"], BZ["Shadowmoon Valley"], 37.2, 58.5, ALLIANCE)
-	self:addLookupList(DB, 19478, L["Fera Palerunner"], BZ["Blade's Edge Mountains"], 53.7, 55.0, HORDE)
-	self:addLookupList(DB, 19539, L["Jazdalaad"], BZ["Netherstorm"], 44.5, 34.0, NEUTRAL)
-	self:addLookupList(DB, 19540, L["Asarnan"], BZ["Netherstorm"], 44.2, 33.7, NEUTRAL)
-	self:addLookupList(DB, 19576, L["Xyrol"], BZ["Netherstorm"], 32.5, 66.7, NEUTRAL)
-	self:addLookupList(DB, 19775, L["Kalinda"], BZ["Silvermoon City"], 90.5, 74.1, HORDE)
-	self:addLookupList(DB, 19778, L["Farii"], BZ["The Exodar"], 45.0, 24.0, ALLIANCE)
-	self:addLookupList(DB, 20124, L["Kradu Grimblade"], BZ["Shattrath City"], 69.2, 44.8, NEUTRAL)
-	self:addLookupList(DB, 20125, L["Zula Slagfury"], BZ["Shattrath City"], 70.1, 42.0, NEUTRAL)
-	self:addLookupList(DB, 21087, L["Grikka"], BZ["Blade's Edge Mountains"], 76.8, 65.5, HORDE)
-	self:addLookupList(DB, 21493, L["Kablamm Farflinger"], BZ["Netherstorm"], 32.9, 63.7, NEUTRAL)
-	self:addLookupList(DB, 21494, L["Smiles O'Byron"], BZ["Blade's Edge Mountains"], 60.3,65.2, NEUTRAL)
-	self:addLookupList(DB, 22477, L["Anchorite Ensham"], BZ["Terokkar Forest"], 30.8, 75.9, NEUTRAL)
-	self:addLookupList(DB, 23734, L["Anchorite Yazmina"], BZ["Howling Fjord"], 59.5, 62.3, ALLIANCE)
-	self:addLookupList(DB, 24868, L["Niobe Whizzlespark"], BZ["Shadowmoon Valley"], 36.7, 54.8, ALLIANCE)
-	self:addLookupList(DB, 25099, L["Jonathan Garrett"], BZ["Shadowmoon Valley"], 29.2, 28.5, HORDE)
-	self:addLookupList(DB, 25277, L["Chief Engineer Leveny"], BZ["Borean Tundra"], 42.6, 53.7, HORDE)
-	self:addLookupList(DB, 26564, L["Borus Ironbender"], BZ["Dragonblight"], 36.6, 47.1, HORDE)
-	self:addLookupList(DB, 26903, L["Lanolis Dewdrop"], BZ["Howling Fjord"], 58.4, 62.3, ALLIANCE)
-	self:addLookupList(DB, 26904, L["Rosina Rivet"], BZ["Howling Fjord"], 59.6, 63.7, ALLIANCE)
-	self:addLookupList(DB, 26905, L["Brom Brewbaster"], BZ["Howling Fjord"], 58.2, 62.1, ALLIANCE)
-	self:addLookupList(DB, 26906, L["Elizabeth Jackson"], BZ["Howling Fjord"], 58.6, 62.8, ALLIANCE)
-	self:addLookupList(DB, 26907, L["Tisha Longbridge"], BZ["Howling Fjord"], 59.7, 64.0, ALLIANCE)
-	self:addLookupList(DB, 26911, L["Bernadette Dexter"], BZ["Howling Fjord"], 59.9, 63.6, ALLIANCE)
-	self:addLookupList(DB, 26912, L["Grumbol Stoutpick"], BZ["Howling Fjord"], 59.9, 63.9, ALLIANCE)
-	self:addLookupList(DB, 26914, L["Benjamin Clegg"], BZ["Howling Fjord"], 58.6, 62.8, ALLIANCE)
-	self:addLookupList(DB, 26915, L["Ounhulo"], BZ["Howling Fjord"], 59.9, 63.8, ALLIANCE)
-	self:addLookupList(DB, 26916, L["Mindri Dinkles"], BZ["Howling Fjord"], 58.6, 62.8, ALLIANCE)
-	self:addLookupList(DB, 26951, L["Wilhelmina Renel"], BZ["Howling Fjord"], 78.7, 28.5, HORDE)
-	self:addLookupList(DB, 26952, L["Kristen Smythe"], BZ["Howling Fjord"], 79.2, 29.0, HORDE)
-	self:addLookupList(DB, 26953, L["Thomas Kolichio"], BZ["Howling Fjord"], 78.6, 29.4, HORDE)
-	self:addLookupList(DB, 26954, L["Emil Autumn"], BZ["Howling Fjord"], 78.7, 28.3, HORDE)
-	self:addLookupList(DB, 26955, L["Jamesina Watterly"], BZ["Howling Fjord"], 78.5, 30.0, HORDE)
-	self:addLookupList(DB, 26956, L["Sally Tompkins"], BZ["Howling Fjord"], 79.4, 29.4, HORDE)
-	self:addLookupList(DB, 26959, L["Booker Kells"], BZ["Howling Fjord"], 79.4, 29.3, HORDE)
-	self:addLookupList(DB, 26960, L["Carter Tiffens"], BZ["Howling Fjord"], 79.3, 28.8, HORDE)
-	self:addLookupList(DB, 26961, L["Gunter Hansen"], BZ["Howling Fjord"], 78.3, 28.2, HORDE)
-	self:addLookupList(DB, 26962, L["Jonathan Lewis"], BZ["Howling Fjord"], 79.3, 29.0, HORDE)
-	self:addLookupList(DB, 26964, L["Alexandra McQueen"], BZ["Howling Fjord"], 79.4, 30.7, HORDE)
-	self:addLookupList(DB, 26969, L["Raenah"], BZ["Borean Tundra"], 41.6, 53.5, HORDE)
-	self:addLookupList(DB, 26972, L["Orn Tenderhoof"], BZ["Borean Tundra"], 42.0, 54.2, HORDE) -- confirm
-	self:addLookupList(DB, 26975, L["Arthur Henslowe"], BZ["Borean Tundra"], 41.8, 54.3, HORDE)
-	self:addLookupList(DB, 26976, L["Brunna Ironaxe"], BZ["Borean Tundra"], 42.6, 53.2, HORDE)
-	self:addLookupList(DB, 26977, L["Adelene Sunlance"], BZ["Borean Tundra"], 41.2, 53.9, HORDE)
-	self:addLookupList(DB, 26980, L["Eorain Dawnstrike"], BZ["Borean Tundra"], 41.2, 53.9, HORDE)
-	self:addLookupList(DB, 26981, L["Crog Steelspine"], BZ["Borean Tundra"], 40.8, 55.3, HORDE)
-	self:addLookupList(DB, 26982, L["Geba'li"], BZ["Borean Tundra"], 41.6, 53.4, HORDE)
-	self:addLookupList(DB, 26987, L["Falorn Nightwhisper"], BZ["Borean Tundra"], 57.8, 71.9, ALLIANCE)
-	self:addLookupList(DB, 26988, L["Argo Strongstout"], BZ["Borean Tundra"], 57.2, 66.6, ALLIANCE)
-	self:addLookupList(DB, 26989, L["Rollick MacKreel"], BZ["Borean Tundra"], 57.9, 71.5, ALLIANCE)
-	self:addLookupList(DB, 26990, L["Alexis Marlowe"], BZ["Borean Tundra"], 57.6, 71.6, ALLIANCE)
-	self:addLookupList(DB, 26991, L["Sock Brightbolt"], BZ["Borean Tundra"], 57.7, 72.2, ALLIANCE)
-	self:addLookupList(DB, 26992, L["Brynna Wilson"], BZ["Borean Tundra"], 57.8, 66.5, ALLIANCE)
-	self:addLookupList(DB, 26995, L["Tink Brightbolt"], BZ["Borean Tundra"], 57.6, 71.7, ALLIANCE)
-	self:addLookupList(DB, 26996, L["Awan Iceborn"], BZ["Borean Tundra"], 76.3, 37.0, HORDE) --- confirm
-	self:addLookupList(DB, 26997, L["Alestos"], BZ["Borean Tundra"], 57.5, 72.3, ALLIANCE)
-	self:addLookupList(DB, 26998, L["Rosemary Bovard"], BZ["Borean Tundra"], 57.6, 71.9, ALLIANCE)
-	self:addLookupList(DB, 26999, L["Fendrig Redbeard"], BZ["Borean Tundra"], 57.5, 66.2, ALLIANCE)
-	self:addLookupList(DB, 27001, L["Darin Goodstitch"], BZ["Borean Tundra"], 57.5, 72.3, ALLIANCE)
-	self:addLookupList(DB, 27023, L["Apothecary Bressa"], BZ["Dragonblight"], 36.2, 48.7, HORDE)
-	self:addLookupList(DB, 27029, L["Apothecary Wormwick"], BZ["Dragonblight"], 76.9, 62.2, HORDE)
-	self:addLookupList(DB, 27034, L["Josric Fame"], BZ["Dragonblight"], 75.9, 63.2, HORDE) -- confirm
-	self:addLookupList(DB, 28693, L["Enchanter Nalthanis"], BZ["Dalaran"], 39.1, 40.5, NEUTRAL)
-	self:addLookupList(DB, 28694, L["Alard Schmied"], BZ["Dalaran"], 45.5, 28.5, NEUTRAL)
-	self:addLookupList(DB, 28697, L["Timofey Oshenko"], BZ["Dalaran"], 39.0, 27.5, NEUTRAL)
-	self:addLookupList(DB, 28698, L["Jedidiah Handers"], BZ["Dalaran"], 41.5, 26.0, NEUTRAL)
-	self:addLookupList(DB, 28699, L["Charles Worth"], BZ["Dalaran"], 36.5, 33.5, NEUTRAL)
-	self:addLookupList(DB, 28700, L["Diane Cannings"], BZ["Dalaran"], 35.7, 28.8, NEUTRAL)
-	self:addLookupList(DB, 28701, L["Timothy Jones"], BZ["Dalaran"], 40.5, 35.2, NEUTRAL)
-	self:addLookupList(DB, 28702, L["Professor Pallin"], BZ["Dalaran"], 41.8, 36.9, NEUTRAL)
-	self:addLookupList(DB, 28703, L["Linzy Blackbolt"], BZ["Dalaran"], 42.5, 32.1, NEUTRAL)
-	self:addLookupList(DB, 28705, L["Katherine Lee"], BZ["Dalaran"], 40.8, 65.2, ALLIANCE)
-	self:addLookupList(DB, 28706, L["Olisarra the Kind"], BZ["Dalaran"], 37.5, 36.7, NEUTRAL)
-	self:addLookupList(DB, 29194, L["Amal'thazad"], BZ["Eastern Plaguelands"], 80.5, 48.1, NEUTRAL)
-	self:addLookupList(DB, 29195, L["Lady Alistra"], BZ["Eastern Plaguelands"], 83.7, 44.6, NEUTRAL)
-	self:addLookupList(DB, 29196, L["Lord Thorval"], BZ["Eastern Plaguelands"], 80.9, 43.8, NEUTRAL)
-	self:addLookupList(DB, 29233, L["Nurse Applewood"], BZ["Borean Tundra"], 41.7, 54.5, HORDE)
-	self:addLookupList(DB, 29505, L["Imindril Spearsong"], BZ["Dalaran"], 45.5, 28.6, NEUTRAL)
-	self:addLookupList(DB, 29506, L["Orland Schaeffer"], BZ["Dalaran"], 45.0, 28.4, NEUTRAL)
-	self:addLookupList(DB, 29507, L["Manfred Staller"], BZ["Dalaran"], 34.2, 29.5, NEUTRAL)
-	self:addLookupList(DB, 29508, L["Andellion"], BZ["Dalaran"], 34.5, 27.1, NEUTRAL)
-	self:addLookupList(DB, 29509, L["Namha Moonwater"], BZ["Dalaran"], 36.3, 29.4, NEUTRAL)
-	self:addLookupList(DB, 29513, L["Didi the Wrench"], BZ["Dalaran"], 39.5, 25.5, NEUTRAL)
-	self:addLookupList(DB, 29514, L["Findle Whistlesteam"], BZ["Dalaran"], 39.5, 25.2, NEUTRAL)
-	self:addLookupList(DB, 29631, L["Awilo Lon'gomba"], BZ["Dalaran"], 70.0, 38.6, HORDE)
-	self:addLookupList(DB, 29924, L["Brandig"], BZ["The Storm Peaks"], 28.9, 74.9, ALLIANCE)
-	self:addLookupList(DB, 30706, L["Jo'mah"], BZ["Orgrimmar"], 56.2, 46.5, HORDE)
-	self:addLookupList(DB, 30709, L["Poshken Hardbinder"], BZ["Thunder Bluff"], 29.2, 22.0, HORDE)
-	self:addLookupList(DB, 30710, L["Zantasia"], BZ["Silvermoon City"], 69.5, 24.0, HORDE)
-	self:addLookupList(DB, 30711, L["Margaux Parchley"], BZ["Undercity"], 61.0, 58.5, HORDE)
-	self:addLookupList(DB, 30713, L["Catarina Stanford"], BZ["Stormwind City"], 49.8, 74.7, ALLIANCE)
-	self:addLookupList(DB, 30715, L["Feyden Darkin"], BZ["Darnassus"], 58.9, 14.1, ALLIANCE)
-	self:addLookupList(DB, 30716, L["Thoth"], BZ["The Exodar"], 40.5, 39.1, ALLIANCE)
-	self:addLookupList(DB, 30717, L["Elise Brightletter"], BZ["Ironforge"], 60.7, 44.9, ALLIANCE)
-	self:addLookupList(DB, 30721, L["Michael Schwan"], BZ["Hellfire Peninsula"], 53.9, 65.5, ALLIANCE)
-	self:addLookupList(DB, 30722, L["Neferatti"], BZ["Hellfire Peninsula"], 52.3, 36.1, HORDE)
-	self:addLookupList(DB, 31084, L["Highlord Darion Mograine"], BZ["Eastern Plaguelands"], 83.5, 49.5, NEUTRAL)
-	self:addLookupList(DB, 33580, L["Dustin Vail"], BZ["Icecrown"], 73.0, 20.8, NEUTRAL)
-	self:addLookupList(DB, 33581, L["Kul'de"], BZ["Icecrown"], 71.8, 20.8, NEUTRAL)
-	self:addLookupList(DB, 33583, L["Fael Morningsong"], BZ["Icecrown"], 73.0, 20.6, NEUTRAL)
-	self:addLookupList(DB, 33586, L["Binkie Brightgear"], BZ["Icecrown"], 72.1, 20.9, NEUTRAL)
-	self:addLookupList(DB, 33587, L["Bethany Cromwell"], BZ["Icecrown"], 72.4, 20.8, NEUTRAL)
-	self:addLookupList(DB, 33588, L["Crystal Brightspark"], BZ["Icecrown"], 71.6, 21.0, NEUTRAL)
-	self:addLookupList(DB, 33589, L["Joseph Wilson"], BZ["Icecrown"], 71.5, 22.5, NEUTRAL)
-	self:addLookupList(DB, 33590, L["Oluros"], BZ["Icecrown"], 71.5, 20.8, NEUTRAL)
-	self:addLookupList(DB, 33591, L["Rekka the Hammer"], BZ["Icecrown"], 71.9, 20.9, NEUTRAL)
-	self:addLookupList(DB, 33603, L["Arthur Denny"], BZ["Icecrown"], 71.7, 20.9, NEUTRAL)
-	self:addLookupList(DB, 33608, _G.GetSpellInfo(51304), BZ["Shattrath City"], 44.3, 90.4, NEUTRAL) -- Alchemy
-	self:addLookupList(DB, 33609, _G.GetSpellInfo(51300), BZ["Shattrath City"], 43.9, 90.5, NEUTRAL) -- BS
-	self:addLookupList(DB, 33610, _G.GetSpellInfo(51313), BZ["Shattrath City"], 43.6, 90.4, NEUTRAL) -- Enchanting
-	self:addLookupList(DB, 33611, _G.GetSpellInfo(51306), BZ["Shattrath City"], 43.7, 90.1, NEUTRAL) -- Engineering
-	self:addLookupList(DB, 33612, _G.GetSpellInfo(51302), BZ["Shattrath City"], 43.8, 90.9, NEUTRAL) -- LW
-	self:addLookupList(DB, 33613, _G.GetSpellInfo(51309), BZ["Shattrath City"], 44.0, 91.1, NEUTRAL) -- Tailor
-	self:addLookupList(DB, 33614, _G.GetSpellInfo(51311), BZ["Shattrath City"], 43.6, 90.8, NEUTRAL) -- JC
-	self:addLookupList(DB, 33615, _G.GetSpellInfo(45363), BZ["Shattrath City"], 43.5, 90.7, NEUTRAL) -- Insc
-	self:addLookupList(DB, 33617, _G.GetSpellInfo(32606), BZ["Shattrath City"], 43.6, 90.9, NEUTRAL) -- Mine
-	self:addLookupList(DB, 33619, _G.GetSpellInfo(51296), BZ["Shattrath City"], 43.6, 91.1, NEUTRAL) -- Cooking
-	self:addLookupList(DB, 33621, _G.GetSpellInfo(45542), BZ["Shattrath City"], 43.6, 90.4, NEUTRAL) -- First Aid
-	self:addLookupList(DB, 33631, L["Barien"], BZ["Shattrath City"], 43.5, 65.1, NEUTRAL)
-	self:addLookupList(DB, 33634, L["Engineer Sinbei"], BZ["Shattrath City"], 43.1, 64.9, NEUTRAL)
-	self:addLookupList(DB, 33635, L["Daenril"], BZ["Shattrath City"], 41.9, 63.4, NEUTRAL)
-	self:addLookupList(DB, 33636, L["Miralisse"], BZ["Shattrath City"], 41.6, 63.5, NEUTRAL)
-	self:addLookupList(DB, 33674, L["Alchemist Kanhu"], BZ["Shattrath City"], 38.6, 30.0, NEUTRAL)
-	self:addLookupList(DB, 33675, L["Onodo"], BZ["Shattrath City"], 37.7, 30.3, NEUTRAL)
-	self:addLookupList(DB, 33676, L["Zurii"], BZ["Shattrath City"], 36.4, 44.6, NEUTRAL)
-	self:addLookupList(DB, 33679, L["Recorder Lidio"], BZ["Shattrath City"], 36.2, 44.0, NEUTRAL)
-	self:addLookupList(DB, 33680, L["Nemiha"], BZ["Shattrath City"], 36.1, 47.7, NEUTRAL)
-	self:addLookupList(DB, 33681, L["Korim"], BZ["Shattrath City"], 37.6, 28.0, NEUTRAL)
-	self:addLookupList(DB, 33682, L["Fono"], BZ["Shattrath City"], 36.0, 48.5, NEUTRAL)
-	self:addLookupList(DB, 33684, L["Weaver Aoa"], BZ["Shattrath City"], 37.6, 27.2, NEUTRAL)
-	self:addLookupList(DB, 37072, L["Rogg"], BZ["Orgrimmar"], 44.5, 78.0, HORDE)    -- UPDATED
-	self:addLookupList(DB, 44582, L["Theresa Denman"], BZ["Stormwind City"], 63.5, 61.6, ALLIANCE)
-	self:addLookupList(DB, 44781, L["Opuno Ironhorn"], BZ["Orgrimmar"], 40.6, 49.4, HORDE)   -- UPDATED
-	self:addLookupList(DB, 44783, L["Hiwahi Three-Feathers"], BZ["Orgrimmar"], 38.8, 50.5, HORDE)
-	self:addLookupList(DB, 45540, L["Krenk Choplimb"], BZ["Orgrimmar"], 37.5, 87.3, HORDE)
-	self:addLookupList(DB, 45548, L["Kark Helmbreaker"], BZ["Orgrimmar"], 36.0, 83.0, HORDE)  -- UPDATED
-	self:addLookupList(DB, 45550, L["Zarbo Porkpatty"], BZ["Orgrimmar"], 39.0, 85.8, NEUTRAL)
-	self:addLookupList(DB, 45559, L["Nivi Weavewell"], BZ["Orgrimmar"], 41.1, 79.7, HORDE)
-	self:addLookupList(DB, 46357, L["Gonto"], BZ["Orgrimmar"], 44.57, 78.61, HORDE)
-	self:addLookupList(DB, 46675, L["Lugrah"], BZ["Orgrimmar"], 72.49, 34.31, HORDE) -- UPDATED
-	self:addLookupList(DB, 46709, L["Arugi"], BZ["Orgrimmar"], 56.5, 61.5, HORDE) -- UPDATED
-	self:addLookupList(DB, 46716, L["Nerog"], BZ["Orgrimmar"], 55.2, 56.7, HORDE)
-	self:addLookupList(DB, 47405, L["The Chef"], BZ["Tirisfal Glades"], 61.2, 52.6, HORDE)
-	self:addLookupList(DB, 47418, L["Runda"], BZ["Durotar"], 52.8, 42.0, HORDE)
-	self:addLookupList(DB, 49789, L["Allison"], BZ["Hellfire Peninsula"], 56.8, 37.4, HORDE) -- UPDATED
-	self:addLookupList(DB, 49879, L["Doc Zapnozzle"], BZ["Azshara"], 57.0, 50.7, HORDE)
-	self:addLookupList(DB, 50574, L["Amelia Atherton"], BZ["Gilneas"], 36.8, 65.7, ALLIANCE)
+	local function AddTrainer(id_num, name, location, coord_x, coord_y, faction)
+		addon:AddListEntry(DB, id_num, name, location, coord_x, coord_y, faction)
+	end
+
+	AddTrainer(514, L["Smith Argus"], BZ["Elwynn Forest"], 41.7, 65.6, ALLIANCE)
+	AddTrainer(1103, L["Eldrin"], BZ["Elwynn Forest"], 79.3, 69.0, ALLIANCE)
+	AddTrainer(1215, L["Alchemist Mallory"], BZ["Elwynn Forest"], 39.8, 48.3, ALLIANCE)
+	AddTrainer(1241, L["Tognus Flintfire"], BZ["Dun Morogh"], 45.3, 52.0, ALLIANCE)
+	AddTrainer(1246, L["Vosur Brakthel"], BZ["Ironforge"], 66.5, 55.2, ALLIANCE)
+	AddTrainer(1317, L["Lucan Cordell"], BZ["Stormwind City"], 53.0, 74.3, ALLIANCE)
+	AddTrainer(1346, L["Georgio Bolero"], BZ["Stormwind City"], 53.2, 81.5, ALLIANCE)
+	AddTrainer(1355, L["Cook Ghilm"], BZ["Dun Morogh"], 68.4, 54.5, ALLIANCE)
+	AddTrainer(1382, L["Mudduk"], BZ["Northern Stranglethorn"], 37.2, 49.2, HORDE) -- UPDATED
+	AddTrainer(1385, L["Brawn"], BZ["Northern Stranglethorn"], 37.8, 50.4, HORDE) -- UPDATED
+	AddTrainer(1386, L["Rogvar"], BZ["Swamp of Sorrows"], 48.4, 55.7, HORDE)
+	AddTrainer(1430, L["Tomas"], BZ["Elwynn Forest"], 44.3, 66.0, ALLIANCE) ---confirm
+	AddTrainer(1470, L["Ghak Healtouch"], BZ["Loch Modan"], 37.0, 49.2, ALLIANCE)
+	AddTrainer(1632, L["Adele Fielder"], BZ["Elwynn Forest"], 46.4, 62.1, ALLIANCE)
+	AddTrainer(1676, L["Finbus Geargrind"], BZ["Duskwood"], 77.4, 48.6, ALLIANCE)
+	AddTrainer(1681, L["Brock Stoneseeker"], BZ["Loch Modan"], 37.1, 47.8, ALLIANCE)
+	AddTrainer(1699, L["Gremlock Pilsnor"], BZ["Dun Morogh"], 47.6, 52.3, ALLIANCE)
+	AddTrainer(1701, L["Dank Drizzlecut"], BZ["Dun Morogh"], 69.3, 55.5, ALLIANCE)
+	AddTrainer(1702, L["Bronk Guzzlegear"], BZ["Dun Morogh"], 50.2, 50.4, ALLIANCE)
+	AddTrainer(2132, L["Carolai Anise"], BZ["Tirisfal Glades"], 59.5, 52.2, HORDE)
+	AddTrainer(2326, L["Thamner Pol"], BZ["Dun Morogh"], 47.2, 52.6, ALLIANCE)
+	AddTrainer(2327, L["Shaina Fuller"], BZ["Stormwind City"], 52.9, 44.8, ALLIANCE)
+	AddTrainer(2329, L["Michelle Belle"], BZ["Elwynn Forest"], 43.4, 65.6, ALLIANCE)
+	AddTrainer(2391, L["Serge Hinott"], BZ["Hillsbrad Foothills"], 61.6, 19.2, HORDE)
+	AddTrainer(2399, L["Daryl Stack"], BZ["Hillsbrad Foothills"], 63.7, 20.8, HORDE)
+	AddTrainer(2627, L["Grarnik Goodstitch"], BZ["The Cape of Stranglethorn"], 43.6, 73.0, NEUTRAL) -- UPDATED
+	AddTrainer(2798, L["Pand Stonebinder"], BZ["Thunder Bluff"], 29.4, 21.5, HORDE)
+	AddTrainer(2818, L["Slagg"], BZ["Arathi Highlands"], 74.1, 33.8, HORDE)
+	AddTrainer(2836, L["Brikk Keencraft"], BZ["The Cape of Stranglethorn"], 44.1, 70.9, NEUTRAL) -- UPDATED
+	AddTrainer(2837, L["Jaxin Chong"], BZ["The Cape of Stranglethorn"], 42.6, 74.8, NEUTRAL) -- UPDATED
+	AddTrainer(2998, L["Karn Stonehoof"], BZ["Thunder Bluff"], 39.0, 56.5, HORDE)
+	AddTrainer(3001, L["Brek Stonehoof"], BZ["Thunder Bluff"], 34.5, 57.6, HORDE)
+	AddTrainer(3004, L["Tepa"], BZ["Thunder Bluff"], 44.3, 45.0, HORDE)
+	AddTrainer(3007, L["Una"], BZ["Thunder Bluff"], 41.8, 42.7, HORDE)
+	AddTrainer(3009, L["Bena Winterhoof"], BZ["Thunder Bluff"], 46.8, 33.5, HORDE)
+	AddTrainer(3011, L["Teg Dawnstrider"], BZ["Thunder Bluff"], 45.0, 38.0, HORDE)
+	AddTrainer(3026, L["Aska Mistrunner"], BZ["Thunder Bluff"], 51.1, 52.9, HORDE)
+	AddTrainer(3067, L["Pyall Silentstride"], BZ["Mulgore"], 45.5, 58.1, HORDE)
+	AddTrainer(3069, L["Chaw Stronghide"], BZ["Mulgore"], 45.5, 57.9, HORDE)
+	AddTrainer(3087, L["Crystal Boughman"], BZ["Redridge Mountains"], 22.8, 43.6, ALLIANCE)
+	AddTrainer(3136, L["Clarise Gnarltree"], BZ["Duskwood"], 74.0, 48.5, ALLIANCE)
+	AddTrainer(3137, L["Matt Johnson"], BZ["Duskwood"], 74.0, 49.7, ALLIANCE)
+	AddTrainer(3174, L["Dwukk"], BZ["Durotar"], 52.0, 40.7, HORDE)
+	AddTrainer(3175, L["Krunn"], BZ["Durotar"], 51.9, 40.9, HORDE)
+	AddTrainer(3181, L["Fremal Doohickey"], BZ["Wetlands"], 10.8, 61.3, ALLIANCE)
+	AddTrainer(3184, L["Miao'zan"], BZ["Durotar"], 55.5, 74.0, HORDE)
+	AddTrainer(3290, L["Deek Fizzlebizz"], BZ["Loch Modan"], 45.9, 13.6, ALLIANCE)
+	AddTrainer(3345, L["Godan"], BZ["Orgrimmar"], 53.8, 38.5, HORDE)
+	AddTrainer(3347, L["Yelmak"], BZ["Orgrimmar"], 56.7, 33.2, HORDE)
+	AddTrainer(3355, L["Saru Steelfury"], BZ["Orgrimmar"], 76.50, 34.53, HORDE) -- UPDATED
+	AddTrainer(3357, L["Makaru"], BZ["Orgrimmar"], 72.31, 34.91, HORDE) -- UPDATED
+	AddTrainer(3363, L["Magar"], BZ["Orgrimmar"], 63.5, 50.0, HORDE)
+	AddTrainer(3365, L["Karolek"], BZ["Orgrimmar"], 62.8, 44.5, HORDE)
+	AddTrainer(3373, L["Arnok"], BZ["Orgrimmar"], 34.1, 84.4, HORDE)
+	AddTrainer(3399, L["Zamja"], BZ["Orgrimmar"], 57.5, 53.7, HORDE)
+	AddTrainer(3478, L["Traugh"], BZ["Northern Barrens"], 48.3, 56.2, HORDE) -- UPDATED
+	AddTrainer(3484, L["Kil'hala"], BZ["Northern Barrens"], 49.9, 61.2, HORDE) -- UPDATED
+	AddTrainer(3494, L["Tinkerwiz"], BZ["Northern Barrens"], 68.5, 69.2, NEUTRAL) -- UPDATED
+	AddTrainer(3523, L["Bowen Brisboise"], BZ["Tirisfal Glades"], 52.6, 55.6, HORDE)
+	AddTrainer(3549, L["Shelene Rhobart"], BZ["Tirisfal Glades"], 65.5, 61.0, HORDE)
+	AddTrainer(3555, L["Johan Focht"], BZ["Silverpine Forest"], 43.4, 40.5, HORDE)
+	AddTrainer(3557, L["Guillaume Sorouy"], BZ["Silverpine Forest"], 43.2, 41.0, HORDE)
+	AddTrainer(3603, L["Cyndra Kindwhisper"], BZ["Teldrassil"], 57.6, 60.7, ALLIANCE)
+	AddTrainer(3605, L["Nadyia Maneweaver"], BZ["Teldrassil"], 41.8, 49.5, ALLIANCE)
+	AddTrainer(3606, L["Alanna Raveneye"], BZ["Teldrassil"], 36.8, 34.2, ALLIANCE)
+	AddTrainer(3704, L["Mahani"], BZ["Southern Barrens"], 41.5, 46.9, HORDE) -- UPDATED
+	AddTrainer(3964, L["Kylanna"], BZ["Ashenvale"], 50.8, 67.1, ALLIANCE)
+	AddTrainer(3967, L["Aayndia Floralwind"], BZ["Ashenvale"], 35.9, 52.1, ALLIANCE)
+	AddTrainer(4159, L["Me'lynn"], BZ["Darnassus"], 61.7, 23.0, ALLIANCE)
+	AddTrainer(4160, L["Ainethil"], BZ["Darnassus"], 55.0, 23.8, ALLIANCE)
+	AddTrainer(4193, L["Grondal Moonbreeze"], BZ["Darkshore"], 38.2, 40.5, ALLIANCE)
+	AddTrainer(4210, L["Alegorn"], BZ["Darnassus"], 50.0, 36.6, ALLIANCE) -- UPDATED
+	AddTrainer(4211, L["Dannelor"], BZ["Darnassus"], 51.7, 12.6, ALLIANCE)
+	AddTrainer(4212, L["Telonis"], BZ["Darnassus"], 64.5, 21.3, ALLIANCE)
+	AddTrainer(4213, L["Taladan"], BZ["Darnassus"], 58.6, 13.2, ALLIANCE)
+	AddTrainer(4254, L["Geofram Bouldertoe"], BZ["Ironforge"], 50.3, 26.0, ALLIANCE)
+	AddTrainer(4258, L["Bengus Deepforge"], BZ["Ironforge"], 51.0, 43.0, ALLIANCE)
+	AddTrainer(4552, L["Eunice Burch"], BZ["Undercity"], 62.3, 44.6, HORDE)
+	AddTrainer(4576, L["Josef Gregorian"], BZ["Undercity"], 70.7, 30.3, HORDE)
+	AddTrainer(4578, L["Josephine Lister"], BZ["Undercity"], 86.5, 22.3, HORDE)
+	AddTrainer(4588, L["Arthur Moore"], BZ["Undercity"], 70.3, 58.5, HORDE)
+	AddTrainer(4591, L["Mary Edras"], BZ["Undercity"], 73.5, 54.8, HORDE)
+	AddTrainer(4596, L["James Van Brunt"], BZ["Undercity"], 61.2, 29.9, HORDE)
+	AddTrainer(4598, L["Brom Killian"], BZ["Undercity"], 55.8, 37.0, HORDE)
+	AddTrainer(4611, L["Doctor Herbert Halsey"], BZ["Undercity"], 47.7, 73.0, HORDE)
+	AddTrainer(4616, L["Lavinia Crowe"], BZ["Undercity"], 62.1, 60.5, HORDE)
+	AddTrainer(4900, L["Alchemist Narett"], BZ["Dustwallow Marsh"], 64.0, 47.7, ALLIANCE)
+	AddTrainer(5127, L["Fimble Finespindle"], BZ["Ironforge"], 39.8, 33.5, ALLIANCE)
+	AddTrainer(5150, L["Nissa Firestone"], BZ["Ironforge"], 54.0, 57.8, ALLIANCE)
+	AddTrainer(5153, L["Jormund Stonebrow"], BZ["Ironforge"], 43.2, 29.0, ALLIANCE)
+	AddTrainer(5157, L["Gimble Thistlefuzz"], BZ["Ironforge"], 60.0, 45.4, ALLIANCE)
+	AddTrainer(5159, L["Daryl Riknussun"], BZ["Ironforge"], 60.1, 36.8, ALLIANCE)
+	AddTrainer(5164, L["Grumnus Steelshaper"], BZ["Ironforge"], 50.2, 42.8, ALLIANCE)
+	AddTrainer(5174, L["Springspindle Fizzlegear"], BZ["Ironforge"], 68.4, 44.0, ALLIANCE)
+	AddTrainer(5177, L["Tally Berryfizz"], BZ["Ironforge"], 66.6, 55.2, ALLIANCE)
+	AddTrainer(5392, L["Yarr Hammerstone"], BZ["Dun Morogh"], 50.0, 50.3, ALLIANCE)
+	AddTrainer(5482, L["Stephen Ryback"], BZ["Stormwind City"], 78.2, 53.2, ALLIANCE)
+	AddTrainer(5499, L["Lilyssia Nightbreeze"], BZ["Stormwind City"], 55.6, 85.9, ALLIANCE)
+	AddTrainer(5511, L["Therum Deepforge"], BZ["Stormwind City"], 63.9, 37.8, ALLIANCE)
+	AddTrainer(5513, L["Gelman Stonehand"], BZ["Stormwind City"], 59.2, 37.7, ALLIANCE)
+	AddTrainer(5518, L["Lilliam Sparkspindle"], BZ["Stormwind City"], 62.2, 30.5, ALLIANCE)
+	AddTrainer(5564, L["Simon Tanner"], BZ["Stormwind City"], 71.8, 62.9, ALLIANCE)
+	AddTrainer(5695, L["Vance Undergloom"], BZ["Tirisfal Glades"], 61.7, 51.6, HORDE)
+	AddTrainer(5759, L["Nurse Neela"], BZ["Tirisfal Glades"], 61.8, 52.8, HORDE)
+	AddTrainer(5784, L["Waldor"], BZ["Wailing Caverns"], 32.6, 28.5, NEUTRAL)
+	AddTrainer(5939, L["Vira Younghoof"], BZ["Mulgore"], 46.8, 60.8, HORDE)
+	AddTrainer(5943, L["Rawrk"], BZ["Durotar"], 54.1, 42.0, HORDE)
+	AddTrainer(6094, L["Byancie"], BZ["Teldrassil"], 55.3, 56.8, ALLIANCE)
+	AddTrainer(6286, L["Zarrin"], BZ["Teldrassil"], 57.1, 61.3, ALLIANCE)
+	AddTrainer(6297, L["Kurdram Stonehammer"], BZ["Darkshore"], 38.2, 41.1, ALLIANCE)
+	AddTrainer(6299, L["Delfrum Flintbeard"], BZ["Darkshore"], 38.2, 41.0, ALLIANCE)
+	AddTrainer(7230, L["Shayis Steelfury"], BZ["Orgrimmar"], 75.91, 37.10, HORDE) -- UPDATED
+	AddTrainer(7231, L["Kelgruk Bloodaxe"], BZ["Orgrimmar"], 76.34, 37.08, HORDE) -- UPDATED
+	AddTrainer(7406, L["Oglethorpe Obnoticus"], BZ["The Cape of Stranglethorn"], 43.0, 72.1, NEUTRAL) -- UPDATED
+	AddTrainer(7866, L["Peter Galen"], BZ["Azshara"], 37.5, 65.5, ALLIANCE)
+	AddTrainer(7867, L["Thorkaf Dragoneye"], BZ["Badlands"], 62.6, 57.6, HORDE)
+	AddTrainer(7868, L["Sarah Tanner"], BZ["Searing Gorge"], 63.7, 75.7, ALLIANCE)
+	AddTrainer(7869, L["Brumn Winterhoof"], BZ["Arathi Highlands"], 28.2, 45.0, HORDE)
+	AddTrainer(7870, L["Caryssia Moonhunter"], BZ["Feralas"], 89.4, 46.5, ALLIANCE) ---confirm
+	AddTrainer(7871, L["Se'Jib"], BZ["Northern Stranglethorn"], 45.3, 58.7, HORDE) -- UPDATED
+	AddTrainer(7944, L["Tinkmaster Overspark"], BZ["Ironforge"], 69.8, 50.0, ALLIANCE)
+	AddTrainer(7948, L["Kylanna Windwhisper"], BZ["Feralas"], 32.6, 43.8, ALLIANCE)
+	AddTrainer(7949, L["Xylinnia Starshine"], BZ["Feralas"], 31.6, 44.3, ALLIANCE)
+	AddTrainer(8126, L["Nixx Sprocketspring"], BZ["Tanaris"], 52.5, 27.3, NEUTRAL)
+	AddTrainer(8128, L["Pikkle"], BZ["Tanaris"], 51.1, 28.1, NEUTRAL)
+	AddTrainer(8153, L["Narv Hidecrafter"], BZ["Desolace"], 55.3, 56.3, HORDE)
+	AddTrainer(8306, L["Duhng"], BZ["Northern Barrens"], 55.4, 61.3, HORDE) -- UPDATED
+	AddTrainer(8736, L["Buzzek Bracketswing"], BZ["Tanaris"], 52.3, 27.7, NEUTRAL)
+	AddTrainer(8738, L["Vazario Linkgrease"], BZ["Northern Barrens"], 68.5, 69.2, NEUTRAL) -- UPDATED
+	AddTrainer(9584, L["Jalane Ayrole"], BZ["Stormwind City"], 40.6, 83.9, ALLIANCE)
+	AddTrainer(11017, L["Roxxik"], BZ["Orgrimmar"], 56.85, 56.54, HORDE) -- UPDATED
+	AddTrainer(11025, L["Mukdrak"], BZ["Durotar"], 52.2, 40.8, HORDE)
+	AddTrainer(11031, L["Franklin Lloyd"], BZ["Undercity"], 75.9, 73.7, HORDE)
+	AddTrainer(11037, L["Jenna Lemkenilli"], BZ["Darkshore"], 38.3, 41.1, ALLIANCE)
+	AddTrainer(11052, L["Timothy Worthington"], BZ["Dustwallow Marsh"], 66.22, 51.7, ALLIANCE)
+	AddTrainer(11072, L["Kitta Firewind"], BZ["Elwynn Forest"], 64.9, 70.6, ALLIANCE)
+	AddTrainer(11073, L["Annora"], BZ["Uldaman"], 0, 0, NEUTRAL)
+	AddTrainer(11074, L["Hgarth"], BZ["Stonetalon Mountains"], 49.2, 57.2, HORDE)
+	AddTrainer(11097, L["Drakk Stonehand"], BZ["The Hinterlands"], 13.4, 43.4, ALLIANCE)
+	AddTrainer(11098, L["Hahrana Ironhide"], BZ["Feralas"], 74.4, 43.1, HORDE)
+	AddTrainer(11146, L["Ironus Coldsteel"], BZ["Ironforge"], 50.5, 43.3, ALLIANCE)
+	AddTrainer(11177, L["Okothos Ironrager"], BZ["Orgrimmar"], 75.35, 34.04, HORDE) -- UPDATED
+	AddTrainer(11178, L["Borgosh Corebender"], BZ["Orgrimmar"], 75.89, 33.61, HORDE) -- UPDATED
+	AddTrainer(11557, L["Meilosh"], BZ["Felwood"], 65.7, 2.9, HORDE)
+	AddTrainer(12920, L["Doctor Gregory Victor"], BZ["Arathi Highlands"], 73.4, 36.8, HORDE)
+	AddTrainer(12939, L["Doctor Gustaf VanHowzen"], BZ["Dustwallow Marsh"], 68.18, 47.94, ALLIANCE)
+	AddTrainer(14742, L["Zap Farflinger"], BZ["Winterspring"], 61.2, 37.6, NEUTRAL)
+	AddTrainer(14743, L["Jhordy Lapforge"], BZ["Tanaris"], 52.3, 26.9, NEUTRAL)
+	AddTrainer(15400, L["Arathel Sunforge"], BZ["Eversong Woods"], 59.6, 62.6, HORDE)
+	AddTrainer(15501, L["Aleinia"], BZ["Eversong Woods"], 48.5, 47.5, HORDE)
+	AddTrainer(16160, L["Magistrix Eredania"], BZ["Eversong Woods"], 38.2, 72.6, HORDE)
+	AddTrainer(16161, L["Arcanist Sheynathren"], BZ["Eversong Woods"], 38.2, 72.5, HORDE)
+	AddTrainer(16253, L["Master Chef Mouldier"], BZ["Ghostlands"], 48.3, 30.9, HORDE)
+	AddTrainer(16272, L["Kanaria"], BZ["Eversong Woods"], 48.5, 47.6, HORDE)
+	AddTrainer(16277, L["Quarelestra"], BZ["Eversong Woods"], 48.6, 47.1, HORDE)
+	AddTrainer(16278, L["Sathein"], BZ["Eversong Woods"], 53.5, 51.0, HORDE)
+	AddTrainer(16366, L["Sempstress Ambershine"], BZ["Eversong Woods"], 37.4, 71.9, HORDE)
+	AddTrainer(16583, L["Rohok"], BZ["Hellfire Peninsula"], 53.2, 38.2, HORDE)
+	AddTrainer(16588, L["Apothecary Antonivich"], BZ["Hellfire Peninsula"], 52.4, 36.5, HORDE)
+	AddTrainer(16633, L["Sedana"], BZ["Silvermoon City"], 70.0, 24.0, HORDE)
+	AddTrainer(16640, L["Keelen Sheets"], BZ["Silvermoon City"], 57.0, 50.1, HORDE)
+	AddTrainer(16642, L["Camberon"], BZ["Silvermoon City"], 66.1, 17.4, HORDE)
+	AddTrainer(16662, L["Alestus"], BZ["Silvermoon City"], 77.6, 71.3, HORDE)
+	AddTrainer(16663, L["Belil"], BZ["Silvermoon City"], 79.1, 42.9, HORDE)
+	AddTrainer(16667, L["Danwe"], BZ["Silvermoon City"], 76.5, 40.9, HORDE)
+	AddTrainer(16669, L["Bemarrin"], BZ["Silvermoon City"], 79.5, 39.0, HORDE)
+	AddTrainer(16676, L["Sylann"], BZ["Silvermoon City"], 69.5, 71.5, HORDE)
+	AddTrainer(16688, L["Lynalis"], BZ["Silvermoon City"], 84.0, 80.2, HORDE)
+	AddTrainer(16719, L["Mumman"], BZ["The Exodar"], 55.6, 27.1, ALLIANCE)
+	AddTrainer(16723, L["Lucc"], BZ["The Exodar"], 27.5, 60.9, ALLIANCE)
+	AddTrainer(16724, L["Miall"], BZ["The Exodar"], 60.0, 89.6, ALLIANCE)
+	AddTrainer(16725, L["Nahogg"], BZ["The Exodar"], 40.5, 39.2, ALLIANCE)
+	AddTrainer(16726, L["Ockil"], BZ["The Exodar"], 54.0, 92.1, ALLIANCE)
+	AddTrainer(16728, L["Akham"], BZ["The Exodar"], 66.0, 74.6, ALLIANCE)
+	AddTrainer(16729, L["Refik"], BZ["The Exodar"], 63.0, 67.9, ALLIANCE)
+	AddTrainer(16731, L["Nus"], BZ["The Exodar"], 39.0, 22.5, ALLIANCE)
+	AddTrainer(16752, L["Muaat"], BZ["The Exodar"], 60.0, 87.9, ALLIANCE)
+	AddTrainer(16823, L["Humphry"], BZ["Hellfire Peninsula"], 56.8, 63.8, ALLIANCE)
+	AddTrainer(17214, L["Anchorite Fateema"], BZ["Azuremyst Isle"], 48.5, 51.8, ALLIANCE) --- confirm
+	AddTrainer(17215, L["Daedal"], BZ["Azuremyst Isle"], 48.5, 51.5, ALLIANCE) --- confirm
+	AddTrainer(17222, L["Artificer Daelo"], BZ["Azuremyst Isle"], 48.0, 51.0, ALLIANCE)
+	AddTrainer(17245, L["Blacksmith Calypso"], BZ["Azuremyst Isle"], 46.4, 71.1, ALLIANCE)
+	AddTrainer(17246, L["\"Cookie\" McWeaksauce"], BZ["Azuremyst Isle"], 46.7, 70.5, ALLIANCE) -- confirm
+	AddTrainer(17424, L["Anchorite Paetheus"], BZ["Bloodmyst Isle"], 54.7, 54.0, ALLIANCE)
+	AddTrainer(17442, L["Moordo"], BZ["Azuremyst Isle"], 44.8, 23.8, ALLIANCE)
+	AddTrainer(17487, L["Erin Kelly"], BZ["Azuremyst Isle"], 46.2, 70.5, ALLIANCE)
+	AddTrainer(17488, L["Dulvi"], BZ["Azuremyst Isle"], 48.9, 51.1, ALLIANCE)
+	AddTrainer(17634, L["K. Lee Smallfry"], BZ["Zangarmarsh"], 68.6, 50.2, ALLIANCE)
+	AddTrainer(17637, L["Mack Diver"], BZ["Zangarmarsh"], 33.9, 51.0, HORDE)
+	AddTrainer(18747, L["Krugosh"], BZ["Hellfire Peninsula"], 55.5, 37.6, HORDE)
+	AddTrainer(18749, L["Dalinna"], BZ["Hellfire Peninsula"], 56.6, 37.1, HORDE) --- confirm
+	AddTrainer(18751, L["Kalaen"], BZ["Hellfire Peninsula"], 56.8, 37.7, HORDE)
+	AddTrainer(18752, L["Zebig"], BZ["Hellfire Peninsula"], 54.8, 38.5, HORDE)
+	AddTrainer(18753, L["Felannia"], BZ["Hellfire Peninsula"], 52.3, 36.1, HORDE)
+	AddTrainer(18754, L["Barim Spilthoof"], BZ["Hellfire Peninsula"], 56.2, 38.6, HORDE)
+	AddTrainer(18771, L["Brumman"], BZ["Hellfire Peninsula"], 54.1, 64.0, ALLIANCE)
+	AddTrainer(18772, L["Hama"], BZ["Hellfire Peninsula"], 54.1, 63.6, ALLIANCE)
+	AddTrainer(18773, L["Johan Barnes"], BZ["Hellfire Peninsula"], 53.7, 66.1, ALLIANCE)
+	AddTrainer(18774, L["Tatiana"], BZ["Hellfire Peninsula"], 54.6, 63.6, ALLIANCE)
+	AddTrainer(18775, L["Lebowski"], BZ["Hellfire Peninsula"], 55.7, 65.5, ALLIANCE)
+	AddTrainer(18779, L["Hurnak Grimmord"], BZ["Hellfire Peninsula"], 56.7, 63.8, ALLIANCE)
+	AddTrainer(18802, L["Alchemist Gribble"], BZ["Hellfire Peninsula"], 53.8, 65.8, ALLIANCE)
+	AddTrainer(18804, L["Prospector Nachlan"], BZ["Bloodmyst Isle"], 56.3, 54.3, ALLIANCE)
+	AddTrainer(18987, L["Gaston"], BZ["Hellfire Peninsula"], 54.1, 63.5, ALLIANCE)
+	AddTrainer(18988, L["Baxter"], BZ["Hellfire Peninsula"], 56.8, 37.5, HORDE)
+	AddTrainer(18990, L["Burko"], BZ["Hellfire Peninsula"], 22.4, 39.3, ALLIANCE)
+	AddTrainer(18991, L["Aresella"], BZ["Hellfire Peninsula"], 26.3, 62.0, HORDE)
+	AddTrainer(18993, L["Naka"], BZ["Zangarmarsh"], 78.5, 63.0, NEUTRAL)
+	AddTrainer(19052, L["Lorokeem"], BZ["Shattrath City"], 45.4, 19.5, NEUTRAL)
+	AddTrainer(19063, L["Hamanar"], BZ["Shattrath City"], 35.7, 20.5, NEUTRAL)
+	AddTrainer(19184, L["Mildred Fletcher"], BZ["Shattrath City"], 66.5, 13.5, NEUTRAL)
+	AddTrainer(19185, L["Jack Trapper"], BZ["Shattrath City"], 63.0, 68.5, NEUTRAL)
+	AddTrainer(19186, L["Kylene"], BZ["Shattrath City"], 76.5, 33.0, NEUTRAL)
+	AddTrainer(19187, L["Darmari"], BZ["Shattrath City"], 66.8, 67.1, NEUTRAL)
+	AddTrainer(19251, L["Enchantress Volali"], BZ["Shattrath City"], 43.2, 92.3, NEUTRAL)
+	AddTrainer(19252, L["High Enchanter Bardolan"], BZ["Shattrath City"], 43.2, 92.2, NEUTRAL)
+	AddTrainer(19341, L["Grutah"], BZ["Shadowmoon Valley"], 29.7, 31.5, HORDE)
+	AddTrainer(19369, L["Celie Steelwing"], BZ["Shadowmoon Valley"], 37.2, 58.5, ALLIANCE)
+	AddTrainer(19478, L["Fera Palerunner"], BZ["Blade's Edge Mountains"], 53.7, 55.0, HORDE)
+	AddTrainer(19539, L["Jazdalaad"], BZ["Netherstorm"], 44.5, 34.0, NEUTRAL)
+	AddTrainer(19540, L["Asarnan"], BZ["Netherstorm"], 44.2, 33.7, NEUTRAL)
+	AddTrainer(19576, L["Xyrol"], BZ["Netherstorm"], 32.5, 66.7, NEUTRAL)
+	AddTrainer(19775, L["Kalinda"], BZ["Silvermoon City"], 90.5, 74.1, HORDE)
+	AddTrainer(19778, L["Farii"], BZ["The Exodar"], 45.0, 24.0, ALLIANCE)
+	AddTrainer(20124, L["Kradu Grimblade"], BZ["Shattrath City"], 69.2, 44.8, NEUTRAL)
+	AddTrainer(20125, L["Zula Slagfury"], BZ["Shattrath City"], 70.1, 42.0, NEUTRAL)
+	AddTrainer(21087, L["Grikka"], BZ["Blade's Edge Mountains"], 76.8, 65.5, HORDE)
+	AddTrainer(21493, L["Kablamm Farflinger"], BZ["Netherstorm"], 32.9, 63.7, NEUTRAL)
+	AddTrainer(21494, L["Smiles O'Byron"], BZ["Blade's Edge Mountains"], 60.3, 65.2, NEUTRAL)
+	AddTrainer(22477, L["Anchorite Ensham"], BZ["Terokkar Forest"], 30.8, 75.9, NEUTRAL)
+	AddTrainer(23734, L["Anchorite Yazmina"], BZ["Howling Fjord"], 59.5, 62.3, ALLIANCE)
+	AddTrainer(24868, L["Niobe Whizzlespark"], BZ["Shadowmoon Valley"], 36.7, 54.8, ALLIANCE)
+	AddTrainer(25099, L["Jonathan Garrett"], BZ["Shadowmoon Valley"], 29.2, 28.5, HORDE)
+	AddTrainer(25277, L["Chief Engineer Leveny"], BZ["Borean Tundra"], 42.6, 53.7, HORDE)
+	AddTrainer(26564, L["Borus Ironbender"], BZ["Dragonblight"], 36.6, 47.1, HORDE)
+	AddTrainer(26903, L["Lanolis Dewdrop"], BZ["Howling Fjord"], 58.4, 62.3, ALLIANCE)
+	AddTrainer(26904, L["Rosina Rivet"], BZ["Howling Fjord"], 59.6, 63.7, ALLIANCE)
+	AddTrainer(26905, L["Brom Brewbaster"], BZ["Howling Fjord"], 58.2, 62.1, ALLIANCE)
+	AddTrainer(26906, L["Elizabeth Jackson"], BZ["Howling Fjord"], 58.6, 62.8, ALLIANCE)
+	AddTrainer(26907, L["Tisha Longbridge"], BZ["Howling Fjord"], 59.7, 64.0, ALLIANCE)
+	AddTrainer(26911, L["Bernadette Dexter"], BZ["Howling Fjord"], 59.9, 63.6, ALLIANCE)
+	AddTrainer(26912, L["Grumbol Stoutpick"], BZ["Howling Fjord"], 59.9, 63.9, ALLIANCE)
+	AddTrainer(26914, L["Benjamin Clegg"], BZ["Howling Fjord"], 58.6, 62.8, ALLIANCE)
+	AddTrainer(26915, L["Ounhulo"], BZ["Howling Fjord"], 59.9, 63.8, ALLIANCE)
+	AddTrainer(26916, L["Mindri Dinkles"], BZ["Howling Fjord"], 58.6, 62.8, ALLIANCE)
+	AddTrainer(26951, L["Wilhelmina Renel"], BZ["Howling Fjord"], 78.7, 28.5, HORDE)
+	AddTrainer(26952, L["Kristen Smythe"], BZ["Howling Fjord"], 79.2, 29.0, HORDE)
+	AddTrainer(26953, L["Thomas Kolichio"], BZ["Howling Fjord"], 78.6, 29.4, HORDE)
+	AddTrainer(26954, L["Emil Autumn"], BZ["Howling Fjord"], 78.7, 28.3, HORDE)
+	AddTrainer(26955, L["Jamesina Watterly"], BZ["Howling Fjord"], 78.5, 30.0, HORDE)
+	AddTrainer(26956, L["Sally Tompkins"], BZ["Howling Fjord"], 79.4, 29.4, HORDE)
+	AddTrainer(26959, L["Booker Kells"], BZ["Howling Fjord"], 79.4, 29.3, HORDE)
+	AddTrainer(26960, L["Carter Tiffens"], BZ["Howling Fjord"], 79.3, 28.8, HORDE)
+	AddTrainer(26961, L["Gunter Hansen"], BZ["Howling Fjord"], 78.3, 28.2, HORDE)
+	AddTrainer(26962, L["Jonathan Lewis"], BZ["Howling Fjord"], 79.3, 29.0, HORDE)
+	AddTrainer(26964, L["Alexandra McQueen"], BZ["Howling Fjord"], 79.4, 30.7, HORDE)
+	AddTrainer(26969, L["Raenah"], BZ["Borean Tundra"], 41.6, 53.5, HORDE)
+	AddTrainer(26972, L["Orn Tenderhoof"], BZ["Borean Tundra"], 42.0, 54.2, HORDE) -- confirm
+	AddTrainer(26975, L["Arthur Henslowe"], BZ["Borean Tundra"], 41.8, 54.3, HORDE)
+	AddTrainer(26976, L["Brunna Ironaxe"], BZ["Borean Tundra"], 42.6, 53.2, HORDE)
+	AddTrainer(26977, L["Adelene Sunlance"], BZ["Borean Tundra"], 41.2, 53.9, HORDE)
+	AddTrainer(26980, L["Eorain Dawnstrike"], BZ["Borean Tundra"], 41.2, 53.9, HORDE)
+	AddTrainer(26981, L["Crog Steelspine"], BZ["Borean Tundra"], 40.8, 55.3, HORDE)
+	AddTrainer(26982, L["Geba'li"], BZ["Borean Tundra"], 41.6, 53.4, HORDE)
+	AddTrainer(26987, L["Falorn Nightwhisper"], BZ["Borean Tundra"], 57.8, 71.9, ALLIANCE)
+	AddTrainer(26988, L["Argo Strongstout"], BZ["Borean Tundra"], 57.2, 66.6, ALLIANCE)
+	AddTrainer(26989, L["Rollick MacKreel"], BZ["Borean Tundra"], 57.9, 71.5, ALLIANCE)
+	AddTrainer(26990, L["Alexis Marlowe"], BZ["Borean Tundra"], 57.6, 71.6, ALLIANCE)
+	AddTrainer(26991, L["Sock Brightbolt"], BZ["Borean Tundra"], 57.7, 72.2, ALLIANCE)
+	AddTrainer(26992, L["Brynna Wilson"], BZ["Borean Tundra"], 57.8, 66.5, ALLIANCE)
+	AddTrainer(26995, L["Tink Brightbolt"], BZ["Borean Tundra"], 57.6, 71.7, ALLIANCE)
+	AddTrainer(26996, L["Awan Iceborn"], BZ["Borean Tundra"], 76.3, 37.0, HORDE) --- confirm
+	AddTrainer(26997, L["Alestos"], BZ["Borean Tundra"], 57.5, 72.3, ALLIANCE)
+	AddTrainer(26998, L["Rosemary Bovard"], BZ["Borean Tundra"], 57.6, 71.9, ALLIANCE)
+	AddTrainer(26999, L["Fendrig Redbeard"], BZ["Borean Tundra"], 57.5, 66.2, ALLIANCE)
+	AddTrainer(27001, L["Darin Goodstitch"], BZ["Borean Tundra"], 57.5, 72.3, ALLIANCE)
+	AddTrainer(27023, L["Apothecary Bressa"], BZ["Dragonblight"], 36.2, 48.7, HORDE)
+	AddTrainer(27029, L["Apothecary Wormwick"], BZ["Dragonblight"], 76.9, 62.2, HORDE)
+	AddTrainer(27034, L["Josric Fame"], BZ["Dragonblight"], 75.9, 63.2, HORDE) -- confirm
+	AddTrainer(28693, L["Enchanter Nalthanis"], BZ["Dalaran"], 39.1, 40.5, NEUTRAL)
+	AddTrainer(28694, L["Alard Schmied"], BZ["Dalaran"], 45.5, 28.5, NEUTRAL)
+	AddTrainer(28697, L["Timofey Oshenko"], BZ["Dalaran"], 39.0, 27.5, NEUTRAL)
+	AddTrainer(28698, L["Jedidiah Handers"], BZ["Dalaran"], 41.5, 26.0, NEUTRAL)
+	AddTrainer(28699, L["Charles Worth"], BZ["Dalaran"], 36.5, 33.5, NEUTRAL)
+	AddTrainer(28700, L["Diane Cannings"], BZ["Dalaran"], 35.7, 28.8, NEUTRAL)
+	AddTrainer(28701, L["Timothy Jones"], BZ["Dalaran"], 40.5, 35.2, NEUTRAL)
+	AddTrainer(28702, L["Professor Pallin"], BZ["Dalaran"], 41.8, 36.9, NEUTRAL)
+	AddTrainer(28703, L["Linzy Blackbolt"], BZ["Dalaran"], 42.5, 32.1, NEUTRAL)
+	AddTrainer(28705, L["Katherine Lee"], BZ["Dalaran"], 40.8, 65.2, ALLIANCE)
+	AddTrainer(28706, L["Olisarra the Kind"], BZ["Dalaran"], 37.5, 36.7, NEUTRAL)
+	AddTrainer(29194, L["Amal'thazad"], BZ["Eastern Plaguelands"], 80.5, 48.1, NEUTRAL)
+	AddTrainer(29195, L["Lady Alistra"], BZ["Eastern Plaguelands"], 83.7, 44.6, NEUTRAL)
+	AddTrainer(29196, L["Lord Thorval"], BZ["Eastern Plaguelands"], 80.9, 43.8, NEUTRAL)
+	AddTrainer(29233, L["Nurse Applewood"], BZ["Borean Tundra"], 41.7, 54.5, HORDE)
+	AddTrainer(29505, L["Imindril Spearsong"], BZ["Dalaran"], 45.5, 28.6, NEUTRAL)
+	AddTrainer(29506, L["Orland Schaeffer"], BZ["Dalaran"], 45.0, 28.4, NEUTRAL)
+	AddTrainer(29507, L["Manfred Staller"], BZ["Dalaran"], 34.2, 29.5, NEUTRAL)
+	AddTrainer(29508, L["Andellion"], BZ["Dalaran"], 34.5, 27.1, NEUTRAL)
+	AddTrainer(29509, L["Namha Moonwater"], BZ["Dalaran"], 36.3, 29.4, NEUTRAL)
+	AddTrainer(29513, L["Didi the Wrench"], BZ["Dalaran"], 39.5, 25.5, NEUTRAL)
+	AddTrainer(29514, L["Findle Whistlesteam"], BZ["Dalaran"], 39.5, 25.2, NEUTRAL)
+	AddTrainer(29631, L["Awilo Lon'gomba"], BZ["Dalaran"], 70.0, 38.6, HORDE)
+	AddTrainer(29924, L["Brandig"], BZ["The Storm Peaks"], 28.9, 74.9, ALLIANCE)
+	AddTrainer(30706, L["Jo'mah"], BZ["Orgrimmar"], 56.2, 46.5, HORDE)
+	AddTrainer(30709, L["Poshken Hardbinder"], BZ["Thunder Bluff"], 29.2, 22.0, HORDE)
+	AddTrainer(30710, L["Zantasia"], BZ["Silvermoon City"], 69.5, 24.0, HORDE)
+	AddTrainer(30711, L["Margaux Parchley"], BZ["Undercity"], 61.0, 58.5, HORDE)
+	AddTrainer(30713, L["Catarina Stanford"], BZ["Stormwind City"], 49.8, 74.7, ALLIANCE)
+	AddTrainer(30715, L["Feyden Darkin"], BZ["Darnassus"], 58.9, 14.1, ALLIANCE)
+	AddTrainer(30716, L["Thoth"], BZ["The Exodar"], 40.5, 39.1, ALLIANCE)
+	AddTrainer(30717, L["Elise Brightletter"], BZ["Ironforge"], 60.7, 44.9, ALLIANCE)
+	AddTrainer(30721, L["Michael Schwan"], BZ["Hellfire Peninsula"], 53.9, 65.5, ALLIANCE)
+	AddTrainer(30722, L["Neferatti"], BZ["Hellfire Peninsula"], 52.3, 36.1, HORDE)
+	AddTrainer(31084, L["Highlord Darion Mograine"], BZ["Eastern Plaguelands"], 83.5, 49.5, NEUTRAL)
+	AddTrainer(33580, L["Dustin Vail"], BZ["Icecrown"], 73.0, 20.8, NEUTRAL)
+	AddTrainer(33581, L["Kul'de"], BZ["Icecrown"], 71.8, 20.8, NEUTRAL)
+	AddTrainer(33583, L["Fael Morningsong"], BZ["Icecrown"], 73.0, 20.6, NEUTRAL)
+	AddTrainer(33586, L["Binkie Brightgear"], BZ["Icecrown"], 72.1, 20.9, NEUTRAL)
+	AddTrainer(33587, L["Bethany Cromwell"], BZ["Icecrown"], 72.4, 20.8, NEUTRAL)
+	AddTrainer(33588, L["Crystal Brightspark"], BZ["Icecrown"], 71.6, 21.0, NEUTRAL)
+	AddTrainer(33589, L["Joseph Wilson"], BZ["Icecrown"], 71.5, 22.5, NEUTRAL)
+	AddTrainer(33590, L["Oluros"], BZ["Icecrown"], 71.5, 20.8, NEUTRAL)
+	AddTrainer(33591, L["Rekka the Hammer"], BZ["Icecrown"], 71.9, 20.9, NEUTRAL)
+	AddTrainer(33603, L["Arthur Denny"], BZ["Icecrown"], 71.7, 20.9, NEUTRAL)
+	AddTrainer(33608, _G.GetSpellInfo(51304), BZ["Shattrath City"], 44.3, 90.4, NEUTRAL) -- Alchemy
+	AddTrainer(33609, _G.GetSpellInfo(51300), BZ["Shattrath City"], 43.9, 90.5, NEUTRAL) -- BS
+	AddTrainer(33610, _G.GetSpellInfo(51313), BZ["Shattrath City"], 43.6, 90.4, NEUTRAL) -- Enchanting
+	AddTrainer(33611, _G.GetSpellInfo(51306), BZ["Shattrath City"], 43.7, 90.1, NEUTRAL) -- Engineering
+	AddTrainer(33612, _G.GetSpellInfo(51302), BZ["Shattrath City"], 43.8, 90.9, NEUTRAL) -- LW
+	AddTrainer(33613, _G.GetSpellInfo(51309), BZ["Shattrath City"], 44.0, 91.1, NEUTRAL) -- Tailor
+	AddTrainer(33614, _G.GetSpellInfo(51311), BZ["Shattrath City"], 43.6, 90.8, NEUTRAL) -- JC
+	AddTrainer(33615, _G.GetSpellInfo(45363), BZ["Shattrath City"], 43.5, 90.7, NEUTRAL) -- Insc
+	AddTrainer(33617, _G.GetSpellInfo(32606), BZ["Shattrath City"], 43.6, 90.9, NEUTRAL) -- Mine
+	AddTrainer(33619, _G.GetSpellInfo(51296), BZ["Shattrath City"], 43.6, 91.1, NEUTRAL) -- Cooking
+	AddTrainer(33621, _G.GetSpellInfo(45542), BZ["Shattrath City"], 43.6, 90.4, NEUTRAL) -- First Aid
+	AddTrainer(33631, L["Barien"], BZ["Shattrath City"], 43.5, 65.1, NEUTRAL)
+	AddTrainer(33634, L["Engineer Sinbei"], BZ["Shattrath City"], 43.1, 64.9, NEUTRAL)
+	AddTrainer(33635, L["Daenril"], BZ["Shattrath City"], 41.9, 63.4, NEUTRAL)
+	AddTrainer(33636, L["Miralisse"], BZ["Shattrath City"], 41.6, 63.5, NEUTRAL)
+	AddTrainer(33674, L["Alchemist Kanhu"], BZ["Shattrath City"], 38.6, 30.0, NEUTRAL)
+	AddTrainer(33675, L["Onodo"], BZ["Shattrath City"], 37.7, 30.3, NEUTRAL)
+	AddTrainer(33676, L["Zurii"], BZ["Shattrath City"], 36.4, 44.6, NEUTRAL)
+	AddTrainer(33679, L["Recorder Lidio"], BZ["Shattrath City"], 36.2, 44.0, NEUTRAL)
+	AddTrainer(33680, L["Nemiha"], BZ["Shattrath City"], 36.1, 47.7, NEUTRAL)
+	AddTrainer(33681, L["Korim"], BZ["Shattrath City"], 37.6, 28.0, NEUTRAL)
+	AddTrainer(33682, L["Fono"], BZ["Shattrath City"], 36.0, 48.5, NEUTRAL)
+	AddTrainer(33684, L["Weaver Aoa"], BZ["Shattrath City"], 37.6, 27.2, NEUTRAL)
+	AddTrainer(37072, L["Rogg"], BZ["Orgrimmar"], 44.5, 78.0, HORDE) -- UPDATED
+	AddTrainer(44582, L["Theresa Denman"], BZ["Stormwind City"], 63.5, 61.6, ALLIANCE)
+	AddTrainer(44781, L["Opuno Ironhorn"], BZ["Orgrimmar"], 40.6, 49.4, HORDE) -- UPDATED
+	AddTrainer(44783, L["Hiwahi Three-Feathers"], BZ["Orgrimmar"], 38.8, 50.5, HORDE)
+	AddTrainer(45540, L["Krenk Choplimb"], BZ["Orgrimmar"], 37.5, 87.3, HORDE)
+	AddTrainer(45548, L["Kark Helmbreaker"], BZ["Orgrimmar"], 36.0, 83.0, HORDE) -- UPDATED
+	AddTrainer(45550, L["Zarbo Porkpatty"], BZ["Orgrimmar"], 39.0, 85.8, NEUTRAL)
+	AddTrainer(45559, L["Nivi Weavewell"], BZ["Orgrimmar"], 41.1, 79.7, HORDE)
+	AddTrainer(46357, L["Gonto"], BZ["Orgrimmar"], 44.57, 78.61, HORDE)
+	AddTrainer(46675, L["Lugrah"], BZ["Orgrimmar"], 72.49, 34.31, HORDE) -- UPDATED
+	AddTrainer(46709, L["Arugi"], BZ["Orgrimmar"], 56.5, 61.5, HORDE) -- UPDATED
+	AddTrainer(46716, L["Nerog"], BZ["Orgrimmar"], 55.2, 56.7, HORDE)
+	AddTrainer(47405, L["The Chef"], BZ["Tirisfal Glades"], 61.2, 52.6, HORDE)
+	AddTrainer(47418, L["Runda"], BZ["Durotar"], 52.8, 42.0, HORDE)
+	AddTrainer(49789, L["Allison"], BZ["Hellfire Peninsula"], 56.8, 37.4, HORDE) -- UPDATED
+	AddTrainer(49879, L["Doc Zapnozzle"], BZ["Azshara"], 57.07, 50.71, HORDE) -- UPDATED
+	AddTrainer(50574, L["Amelia Atherton"], BZ["Gilneas"], 36.8, 65.7, ALLIANCE)

+	self.InitTrainer = nil
 end
diff --git a/Database/Vendor.lua b/Database/Vendor.lua
index c4da4b8..6a57733 100644
--- a/Database/Vendor.lua
+++ b/Database/Vendor.lua
@@ -1,16 +1,12 @@
 --[[
 ************************************************************************
 Vendor.lua
-Vendor data for all of Ackis Recipe List
 ************************************************************************
 File date: @file-date-iso@
 File hash: @file-abbreviated-hash@
 Project hash: @project-abbreviated-hash@
 Project version: @project-version@
 ************************************************************************
-Format:
-	self:addLookupList(DB, NPC ID, NPC Name, NPC Location, X Coord, Y Coord, Faction)
-************************************************************************
 Please see http://www.wowace.com/addons/arl/ for more information.
 ************************************************************************
 This source code is released under All Rights Reserved.
@@ -35,370 +31,371 @@ local HORDE	= 2

 function addon:InitVendor(DB)
 	local function AddVendor(id_num, name, zone, x, y, faction)
-		addon:addLookupList(DB, id_num, name, zone, x, y, faction)
+		addon:AddListEntry(DB, id_num, name, zone, x, y, faction)
 	end

-	AddVendor(66,		L["Tharynn Bouden"],			BZ["Elwynn Forest"],		41.9, 67.1, ALLIANCE)
-	AddVendor(340,		L["Kendor Kabonka"],			BZ["Stormwind City"],		76.6, 53.7, ALLIANCE)
-	AddVendor(734,		L["Corporal Bluth"],			BZ["Northern Stranglethorn"],	47.5,  10.3, ALLIANCE) -- UPDATED
-	AddVendor(777,		L["Amy Davenport"],			BZ["Redridge Mountains"],	29.1, 47.5, ALLIANCE)
-	AddVendor(843,		L["Gina MacGregor"],			BZ["Westfall"],			57.6, 54.0, ALLIANCE)
-	AddVendor(989,		L["Banalash"],				BZ["Swamp of Sorrows"],		44.7, 56.7, HORDE)
-	AddVendor(1146,		L["Vharr"],				BZ["Northern Stranglethorn"],	38.7, 49.2, HORDE)   -- UPDATED
-	AddVendor(1148,		L["Nerrist"],				BZ["Northern Stranglethorn"],	39.2, 51.0, HORDE)  -- UPDATED
-	AddVendor(1149,		L["Uthok"],				BZ["Northern Stranglethorn"],	37.5, 49.2, HORDE)   -- UPDATED
-	AddVendor(1250,		L["Drake Lindgren"],			BZ["Elwynn Forest"],		83.3, 66.7, ALLIANCE)
-	AddVendor(1286,		L["Edna Mullby"],			BZ["Stormwind City"],		64.6, 71.5, ALLIANCE)
-	AddVendor(1313,		L["Maria Lumere"],			BZ["Stormwind City"],		55.7, 85.5, ALLIANCE)
-	AddVendor(1318,		L["Jessara Cordell"],			BZ["Stormwind City"],		53.0, 74.2, ALLIANCE)
-	AddVendor(1347,		L["Alexandra Bolero"],			BZ["Stormwind City"],		53.3, 81.7, ALLIANCE)
-	AddVendor(1448,		L["Neal Allen"],			BZ["Wetlands"],			10.7, 56.8, ALLIANCE)
-	AddVendor(1454,		L["Jennabink Powerseam"],		BZ["Wetlands"],			 8.1, 55.9, ALLIANCE)
-	AddVendor(1465,		L["Drac Roughcut"],			BZ["Loch Modan"],		35.6, 49.0, ALLIANCE)
-	AddVendor(1471,		L["Jannos Ironwill"],			BZ["Arathi Highlands"],		46.0, 47.7, ALLIANCE)
-	AddVendor(1474,		L["Rann Flamespinner"],			BZ["Loch Modan"],		36.0, 46.0, ALLIANCE)
-	AddVendor(1684,		L["Khara Deepwater"],			BZ["Loch Modan"],		39.5, 39.3, ALLIANCE)
-	AddVendor(1685,		L["Xandar Goodbeard"],			BZ["Loch Modan"],		82.5, 63.5, ALLIANCE)
-	AddVendor(2118,		L["Abigail Shiel"],			BZ["Tirisfal Glades"],		61.0, 51.0, HORDE) -- UPDATED
-	AddVendor(2380,		L["Nandar Branson"],			BZ["Hillsbrad Foothills"],	50.9, 57.1, ALLIANCE)
-	AddVendor(2383,		L["Lindea Rabonne"],			BZ["Hillsbrad Foothills"],	50.6, 61.0, ALLIANCE)
-	AddVendor(2393,		L["Christoph Jeffcoat"],		BZ["Hillsbrad Foothills"],	62.4, 19.1, HORDE)
-	AddVendor(2394,		L["Mallen Swain"],			BZ["Hillsbrad Foothills"],	62.0, 20.9, HORDE)
-	AddVendor(2397,		L["Derak Nightfall"],			BZ["Hillsbrad Foothills"],	63.0, 18.5, HORDE)
-	AddVendor(2480,		L["Bro'kin"],				BZ["Hillsbrad Foothills"],	44.0, 21.8, NEUTRAL)
+	AddVendor(66,		L["Tharynn Bouden"],			BZ["Elwynn Forest"],			41.9, 67.1, ALLIANCE)
+	AddVendor(340,		L["Kendor Kabonka"],			BZ["Stormwind City"],			76.6, 53.7, ALLIANCE)
+	AddVendor(734,		L["Corporal Bluth"],			BZ["Northern Stranglethorn"],		47.5,  10.3, ALLIANCE) -- UPDATED
+	AddVendor(777,		L["Amy Davenport"],			BZ["Redridge Mountains"],		29.1, 47.5, ALLIANCE)
+	AddVendor(843,		L["Gina MacGregor"],			BZ["Westfall"],				57.6, 54.0, ALLIANCE)
+	AddVendor(989,		L["Banalash"],				BZ["Swamp of Sorrows"],			44.7, 56.7, HORDE)
+	AddVendor(1146,		L["Vharr"],				BZ["Northern Stranglethorn"],		38.7, 49.2, HORDE)   -- UPDATED
+	AddVendor(1148,		L["Nerrist"],				BZ["Northern Stranglethorn"],		39.2, 51.0, HORDE)  -- UPDATED
+	AddVendor(1149,		L["Uthok"],				BZ["Northern Stranglethorn"],		37.5, 49.2, HORDE)   -- UPDATED
+	AddVendor(1250,		L["Drake Lindgren"],			BZ["Elwynn Forest"],			83.3, 66.7, ALLIANCE)
+	AddVendor(1286,		L["Edna Mullby"],			BZ["Stormwind City"],			64.6, 71.5, ALLIANCE)
+	AddVendor(1313,		L["Maria Lumere"],			BZ["Stormwind City"],			55.7, 85.5, ALLIANCE)
+	AddVendor(1318,		L["Jessara Cordell"],			BZ["Stormwind City"],			53.0, 74.2, ALLIANCE)
+	AddVendor(1347,		L["Alexandra Bolero"],			BZ["Stormwind City"],			53.3, 81.7, ALLIANCE)
+	AddVendor(1448,		L["Neal Allen"],			BZ["Wetlands"],				10.7, 56.8, ALLIANCE)
+	AddVendor(1454,		L["Jennabink Powerseam"],		BZ["Wetlands"],				 8.1, 55.9, ALLIANCE)
+	AddVendor(1465,		L["Drac Roughcut"],			BZ["Loch Modan"],			35.6, 49.0, ALLIANCE)
+	AddVendor(1471,		L["Jannos Ironwill"],			BZ["Arathi Highlands"],			46.0, 47.7, ALLIANCE)
+	AddVendor(1474,		L["Rann Flamespinner"],			BZ["Loch Modan"],			36.0, 46.0, ALLIANCE)
+	AddVendor(1684,		L["Khara Deepwater"],			BZ["Loch Modan"],			39.5, 39.3, ALLIANCE)
+	AddVendor(1685,		L["Xandar Goodbeard"],			BZ["Loch Modan"],			82.5, 63.5, ALLIANCE)
+	AddVendor(2118,		L["Abigail Shiel"],			BZ["Tirisfal Glades"],			61.0, 51.0, HORDE) -- UPDATED
+	AddVendor(2380,		L["Nandar Branson"],			BZ["Hillsbrad Foothills"],		50.9, 57.1, ALLIANCE)
+	AddVendor(2383,		L["Lindea Rabonne"],			BZ["Hillsbrad Foothills"],		50.6, 61.0, ALLIANCE)
+	AddVendor(2393,		L["Christoph Jeffcoat"],		BZ["Hillsbrad Foothills"],		62.4, 19.1, HORDE)
+	AddVendor(2394,		L["Mallen Swain"],			BZ["Hillsbrad Foothills"],		62.0, 20.9, HORDE)
+	AddVendor(2397,		L["Derak Nightfall"],			BZ["Hillsbrad Foothills"],		63.0, 18.5, HORDE)
+	AddVendor(2480,		L["Bro'kin"],				BZ["Hillsbrad Foothills"],		44.0, 21.8, NEUTRAL)
 	AddVendor(2482,		L["Zarena Cromwind"],			BZ["The Cape of Stranglethorn"],	43.0, 70.7, NEUTRAL)  -- UPDATED
-	AddVendor(2483,		L["Jaquilina Dramet"],			BZ["Northern Stranglethorn"],	43.7, 23.1, NEUTRAL) -- UPDATED
+	AddVendor(2483,		L["Jaquilina Dramet"],			BZ["Northern Stranglethorn"],		43.7, 23.1, NEUTRAL) -- UPDATED
 	AddVendor(2663,		L["Narkk"],				BZ["The Cape of Stranglethorn"],	42.7, 69.2, NEUTRAL)   -- UPDATED
 	AddVendor(2664,		L["Kelsey Yance"],			BZ["The Cape of Stranglethorn"],	42.8, 69.1, NEUTRAL)   -- UPDATED
-	AddVendor(2668,		L["Danielle Zipstitch"],		BZ["Duskwood"],			75.8, 45.5, ALLIANCE)
-	AddVendor(2669,		L["Sheri Zipstitch"],			BZ["Duskwood"],			75.7, 45.5, ALLIANCE)
+	AddVendor(2668,		L["Danielle Zipstitch"],		BZ["Duskwood"],				75.8, 45.5, ALLIANCE)
+	AddVendor(2669,		L["Sheri Zipstitch"],			BZ["Duskwood"],				75.7, 45.5, ALLIANCE)
 	AddVendor(2670,		L["Xizk Goodstitch"],			BZ["The Cape of Stranglethorn"],	43.6, 73.0, NEUTRAL)  -- UPDATED
 	AddVendor(2672,		L["Cowardly Crosby"],			BZ["The Cape of Stranglethorn"],	40.9, 82.5, NEUTRAL)   -- UPDATED
-	AddVendor(2679,		L["Wenna Silkbeard"],			BZ["Wetlands"],			25.7, 25.8, ALLIANCE)
-	AddVendor(2682,		L["Fradd Swiftgear"],			BZ["Wetlands"],			26.4, 25.8, ALLIANCE)
-	AddVendor(2683,		L["Namdo Bizzfizzle"],			BZ["Gnomeregan"],		   0,	 0, ALLIANCE)
+	AddVendor(2679,		L["Wenna Silkbeard"],			BZ["Wetlands"],				25.7, 25.8, ALLIANCE)
+	AddVendor(2682,		L["Fradd Swiftgear"],			BZ["Wetlands"],				26.4, 25.8, ALLIANCE)
+	AddVendor(2683,		L["Namdo Bizzfizzle"],			BZ["Gnomeregan"],			   0,	 0, ALLIANCE)
 	AddVendor(2685,		L["Mazk Snipeshot"],			BZ["The Cape of Stranglethorn"],	43.2, 70.2, NEUTRAL)  -- UPDATED
-	AddVendor(2687,		L["Gnaz Blunderflame"],			BZ["Northern Stranglethorn"],	67.5, 61.5, NEUTRAL)  -- UPDATED
-	AddVendor(2688,		L["Ruppo Zipcoil"],			BZ["The Hinterlands"],		34.3, 37.9, NEUTRAL)
-	AddVendor(2697,		L["Clyde Ranthal"],			BZ["Redridge Mountains"],	88.9, 70.9, ALLIANCE)
-	AddVendor(2698,		L["George Candarte"],			BZ["Hillsbrad Foothills"],	92.0, 38.4, HORDE)
+	AddVendor(2687,		L["Gnaz Blunderflame"],			BZ["Northern Stranglethorn"],		67.5, 61.5, NEUTRAL)  -- UPDATED
+	AddVendor(2688,		L["Ruppo Zipcoil"],			BZ["The Hinterlands"],			34.3, 37.9, NEUTRAL)
+	AddVendor(2697,		L["Clyde Ranthal"],			BZ["Redridge Mountains"],		88.9, 70.9, ALLIANCE)
+	AddVendor(2698,		L["George Candarte"],			BZ["Hillsbrad Foothills"],		92.0, 38.4, HORDE)
 	AddVendor(2699,		L["Rikqiz"],				BZ["The Cape of Stranglethorn"],	43.2, 71.7, NEUTRAL)   -- UPDATED
-	AddVendor(2803,		L["Malygen"],				BZ["Felwood"],			62.3, 25.6, ALLIANCE)
-	AddVendor(2810,		L["Hammon Karwn"],			BZ["Arathi Highlands"],		46.5, 47.3, ALLIANCE)
-	AddVendor(2812,		L["Drovnar Strongbrew"],		BZ["Arathi Highlands"],		46.4, 47.1, ALLIANCE)
-	AddVendor(2814,		L["Narj Deepslice"],			BZ["Arathi Highlands"],		45.6, 47.6, ALLIANCE)
-	AddVendor(2816,		L["Androd Fadran"],			BZ["Arathi Highlands"],		45.0, 46.9, ALLIANCE)
-	AddVendor(2819,		L["Tunkk"],				BZ["Arathi Highlands"],		74.8, 34.5, HORDE)
-	AddVendor(2821,		L["Keena"],				BZ["Arathi Highlands"],		74.0, 32.7, HORDE)
+	AddVendor(2803,		L["Malygen"],				BZ["Felwood"],				62.3, 25.6, ALLIANCE)
+	AddVendor(2810,		L["Hammon Karwn"],			BZ["Arathi Highlands"],			46.5, 47.3, ALLIANCE)
+	AddVendor(2812,		L["Drovnar Strongbrew"],		BZ["Arathi Highlands"],			46.4, 47.1, ALLIANCE)
+	AddVendor(2814,		L["Narj Deepslice"],			BZ["Arathi Highlands"],			45.6, 47.6, ALLIANCE)
+	AddVendor(2816,		L["Androd Fadran"],			BZ["Arathi Highlands"],			45.0, 46.9, ALLIANCE)
+	AddVendor(2819,		L["Tunkk"],				BZ["Arathi Highlands"],			74.8, 34.5, HORDE)
+	AddVendor(2821,		L["Keena"],				BZ["Arathi Highlands"],			74.0, 32.7, HORDE)
 	AddVendor(2838,		L["Crazk Sparks"],			BZ["The Cape of Stranglethorn"],	43.0, 72.8, NEUTRAL)   -- UPDATED
 	AddVendor(2843,		L["Jutak"],				BZ["The Cape of Stranglethorn"],	41.6, 74.1, NEUTRAL)   -- UPDATED
 	AddVendor(2846,		L["Blixrez Goodstitch"],		BZ["The Cape of Stranglethorn"],	42.8, 74.1, NEUTRAL)   -- UPDATED
 	AddVendor(2848,		L["Glyx Brewright"],			BZ["The Cape of Stranglethorn"],	42.6, 74.9, NEUTRAL)   -- UPDATED
-	AddVendor(3005,		L["Mahu"],				BZ["Thunder Bluff"],		43.8, 44.6, HORDE)
-	AddVendor(3012,		L["Nata Dawnstrider"],			BZ["Thunder Bluff"],		46.5, 38.8, HORDE)
-	AddVendor(3027,		L["Naal Mistrunner"],			BZ["Thunder Bluff"],		51.1, 52.2, HORDE)
-	AddVendor(3029,		L["Sewa Mistrunner"],			BZ["Thunder Bluff"],		56.0, 47.1, HORDE)
-	AddVendor(3081,		L["Wunna Darkmane"],			BZ["Mulgore"],			46.1, 58.2, HORDE)
-	AddVendor(3085,		L["Gloria Femmel"],			BZ["Redridge Mountains"],	26.7, 43.5, ALLIANCE)
-	AddVendor(3134,		L["Kzixx"],				BZ["Duskwood"],			81.9, 19.9, NEUTRAL)
-	AddVendor(3178,		L["Stuart Fleming"],			BZ["Wetlands"],			 8.1, 58.4, ALLIANCE)
-	AddVendor(3333,		L["Shankys"],				BZ["Orgrimmar"],		66.74, 41.86, HORDE) -- UPDATED
-	AddVendor(3335,		L["Hagrus"],				BZ["Orgrimmar"],		46.0, 45.9, HORDE)
-	AddVendor(3346,		L["Kithas"],				BZ["Orgrimmar"],		53.7, 38.0, HORDE)
-	AddVendor(3348,		L["Kor'geld"],				BZ["Orgrimmar"],		55.23, 45.83, HORDE) -- UPDATED
-	AddVendor(3364,		L["Borya"],				BZ["Orgrimmar"],		63.0, 51.2, HORDE)
-	AddVendor(3366,		L["Tamar"],				BZ["Orgrimmar"],		63.0, 45.3, HORDE)
-	AddVendor(3367,		L["Felika"],				BZ["Orgrimmar"],		60.5, 50.7, HORDE)
-	AddVendor(3400,		L["Xen'to"],				BZ["Orgrimmar"],		32.6, 68.6, HORDE) -- UPDATED
-	AddVendor(3413,		L["Sovik"],				BZ["Orgrimmar"],		75.6, 25.2, HORDE)
-	AddVendor(3482,		L["Tari'qa"],				BZ["Northern Barrens"],		49.0, 58.2, HORDE)   -- UPDATED
-	AddVendor(3485,		L["Wrahk"],				BZ["Northern Barrens"],		50.0, 61.1, HORDE)   -- UPDATED
-	AddVendor(3489,		L["Zargh"],				BZ["Northern Barrens"],		50.6, 57.8, HORDE)   -- UPDATED
-	AddVendor(3490,		L["Hula'mahi"],				BZ["Northern Barrens"],		48.6, 58.4, HORDE)   -- UPDATED
-	AddVendor(3495,		L["Gagsprocket"],			BZ["Northern Barrens"],		68.4, 69.2, NEUTRAL)   -- UPDATED
-	AddVendor(3497,		L["Kilxx"],				BZ["Northern Barrens"],		68.6, 72.5, NEUTRAL)   -- UPDATED
-	AddVendor(3499,		L["Ranik"],				BZ["Northern Barrens"],		67.1, 73.5, NEUTRAL)   -- UPDATED
-	AddVendor(3522,		L["Constance Brisboise"],		BZ["Tirisfal Glades"],		52.6, 55.7, HORDE)
-	AddVendor(3537,		L["Zixil"],				BZ["Hillsbrad Foothills"],	53.5, 38.3, NEUTRAL)
-	AddVendor(3550,		L["Martine Tramblay"],			BZ["Tirisfal Glades"],		65.8, 59.6, HORDE) -- UPDATED
-	AddVendor(3556,		L["Andrew Hilbert"],			BZ["Silverpine Forest"],	43.2, 40.7, HORDE)
-	AddVendor(3881,		L["Grimtak"],				BZ["Durotar"],			51.2, 42.6, HORDE)
-	AddVendor(3954,		L["Dalria"],				BZ["Ashenvale"],		35.1, 52.1, ALLIANCE)
-	AddVendor(3956,		L["Harklan Moongrove"],			BZ["Ashenvale"],		50.8, 67.0, ALLIANCE)
-	AddVendor(3958,		L["Lardan"],				BZ["Ashenvale"],		34.8, 49.8, ALLIANCE)
-	AddVendor(4083,		L["Jeeda"],				BZ["Stonetalon Mountains"],	47.6, 61.7, HORDE)
-	AddVendor(4086,		L["Veenix"],				BZ["Stonetalon Mountains"],	58.3, 51.7, NEUTRAL)
-	AddVendor(4168,		L["Elynna"],				BZ["Darnassus"],		64.4, 21.6, ALLIANCE)
-	AddVendor(4186,		L["Mavralyn"],				BZ["Darkshore"],		37.0, 41.2, ALLIANCE)
-	AddVendor(4189,		L["Valdaron"],				BZ["Darkshore"],		38.1, 40.6, ALLIANCE)
-	AddVendor(4223,		L["Fyldan"],				BZ["Darnassus"],		49.0, 37.0, ALLIANCE) -- UPDATED
-	AddVendor(4225,		L["Saenorion"],				BZ["Darnassus"],		63.8, 22.1, ALLIANCE)
-	AddVendor(4226,		L["Ulthir"],				BZ["Darnassus"],		56.0, 24.6, ALLIANCE)
-	AddVendor(4228,		L["Vaean"],				BZ["Darnassus"],		58.5, 14.4, ALLIANCE)
-	AddVendor(4229,		L["Mythrin'dir"],			BZ["Darnassus"],		60.0, 19.1, ALLIANCE)
-	AddVendor(4265,		L["Nyoma"],				BZ["Teldrassil"],		57.2, 61.2, ALLIANCE)
-	AddVendor(4305,		L["Kriggon Talsone"],			BZ["Westfall"],			36.2, 90.1, ALLIANCE)
-	AddVendor(4553,		L["Ronald Burch"],			BZ["Undercity"],		62.4, 43.4, HORDE)
-	AddVendor(4561,		L["Daniel Bartlett"],			BZ["Undercity"],		64.2, 37.7, HORDE)
-	AddVendor(4574,		L["Lizbeth Cromwell"],			BZ["Undercity"],		81.2, 31.0, HORDE)
-	AddVendor(4577,		L["Millie Gregorian"],			BZ["Undercity"],		70.8, 29.6, HORDE)
-	AddVendor(4589,		L["Joseph Moore"],			BZ["Undercity"],		70.2, 57.8, HORDE)
-	AddVendor(4610,		L["Algernon"],				BZ["Undercity"],		51.9, 74.4, HORDE)
-	AddVendor(4617,		L["Thaddeus Webb"],			BZ["Undercity"],		62.0, 60.7, HORDE)
-	AddVendor(4775,		L["Felicia Doan"],			BZ["Undercity"],		64.3, 50.2, HORDE)
-	AddVendor(4782,		L["Truk Wildbeard"],			BZ["The Hinterlands"],		14.4, 42.5, ALLIANCE)
-	AddVendor(4877,		L["Jandia"],				BZ["Thousand Needles"],		46.1, 51.5, HORDE)
-	AddVendor(4878,		L["Montarr"],				BZ["Thousand Needles"],		45.2, 50.7, HORDE)
-	AddVendor(4879,		L["Ogg'marr"],				BZ["Dustwallow Marsh"],		36.7, 31.0, HORDE)
-	AddVendor(4897,		L["Helenia Olden"],			BZ["Dustwallow Marsh"],		66.4, 51.5, ALLIANCE)
-	AddVendor(5128,		L["Bombus Finespindle"],		BZ["Ironforge"],		39.6, 34.1, ALLIANCE)
-	AddVendor(5158,		L["Tilli Thistlefuzz"],			BZ["Ironforge"],		60.7, 44.2, ALLIANCE)
-	AddVendor(5160,		L["Emrul Riknussun"],			BZ["Ironforge"],		59.9, 37.7, ALLIANCE)
-	AddVendor(5162,		L["Tansy Puddlefizz"],			BZ["Ironforge"],		48.0,  6.3, ALLIANCE)
-	AddVendor(5163,		L["Burbik Gearspanner"],		BZ["Ironforge"],		46.5, 27.1, ALLIANCE)
-	AddVendor(5175,		L["Gearcutter Cogspinner"],		BZ["Ironforge"],		68.0, 43.1, ALLIANCE)
-	AddVendor(5178,		L["Soolie Berryfizz"],			BZ["Ironforge"],		66.6, 54.5, ALLIANCE)
-	AddVendor(5411,		L["Krinkle Goodsteel"],			BZ["Tanaris"],			51.5, 28.8, NEUTRAL)
-	AddVendor(5483,		L["Erika Tate"],			BZ["Stormwind City"],		78.5, 53.0, ALLIANCE)
-	AddVendor(5494,		L["Catherine Leland"],			BZ["Stormwind City"],		55.1, 69.5, ALLIANCE)
-	AddVendor(5512,		L["Kaita Deepforge"],			BZ["Stormwind City"],		63.5, 37.6, ALLIANCE)
-	AddVendor(5594,		L["Alchemist Pestlezugg"],		BZ["Tanaris"],			50.9, 27.0, NEUTRAL)
-	AddVendor(5748,		L["Killian Sanatha"],			BZ["Silverpine Forest"],	33.0, 17.8, HORDE)
-	AddVendor(5757,		L["Lilly"],				BZ["Silverpine Forest"],	43.1, 50.8, HORDE)
-	AddVendor(5758,		L["Leo Sarn"],				BZ["Silverpine Forest"],	53.9, 82.3, HORDE)
-	AddVendor(5940,		L["Harn Longcast"],			BZ["Mulgore"],			47.5, 55.1, HORDE)
-	AddVendor(5942,		L["Zansoa"],				BZ["Durotar"],			56.1, 73.4, HORDE)
-	AddVendor(6568,		L["Vizzklick"],				BZ["Tanaris"],			51.0, 27.4, NEUTRAL)
-	AddVendor(6567,		L["Ghok'kah"],				BZ["Dustwallow Marsh"],		35.2, 30.8, HORDE)
-	AddVendor(6574,		L["Jun'ha"],				BZ["Arathi Highlands"],		72.7, 36.5, HORDE)
-	AddVendor(6576,		L["Brienna Starglow"],			BZ["Feralas"],			89.0, 45.9, ALLIANCE)
-	AddVendor(6730,		L["Jinky Twizzlefixxit"],		BZ["Thousand Needles"],		77.7, 77.8, NEUTRAL)
-	AddVendor(6731,		L["Harlown Darkweave"],			BZ["Ashenvale"],		18.2, 60.0, ALLIANCE)
-	AddVendor(6777,		L["Zan Shivsproket"],			BZ["Hillsbrad Foothills"],	71.5, 45.5, NEUTRAL)
-	AddVendor(6779,		L["Smudge Thunderwood"],		BZ["Hillsbrad Foothills"],	71.5, 45.5, NEUTRAL)
-	AddVendor(7733,		L["Innkeeper Fizzgrimble"],		BZ["Tanaris"],			52.6, 27.0, NEUTRAL) -- UPDATED
-	AddVendor(7852,		L["Pratt McGrubben"],			BZ["Feralas"],			30.6, 42.7, ALLIANCE)
-	AddVendor(7854,		L["Jangdor Swiftstrider"],		BZ["Feralas"],			74.5, 42.9, HORDE)
-	AddVendor(7940,		L["Darnall"],				BZ["Moonglade"],		51.6, 33.3, NEUTRAL)
-	AddVendor(7947,		L["Vivianna"],				BZ["Feralas"],			31.3, 43.5, ALLIANCE)
-	AddVendor(8125,		L["Dirge Quikcleave"],			BZ["Tanaris"],			52.6, 28.0, NEUTRAL) -- UPDATED
-	AddVendor(8131,		L["Blizrik Buckshot"],			BZ["Tanaris"],			50.8, 27.6, NEUTRAL)
-	AddVendor(8145,		L["Sheendra Tallgrass"],		BZ["Feralas"],			74.5, 42.8, HORDE)
-	AddVendor(8150,		L["Janet Hommers"],			BZ["Desolace"],			66.2,  6.7, ALLIANCE)
-	AddVendor(8157,		L["Logannas"],				BZ["Feralas"],			32.7, 44.0, ALLIANCE)
-	AddVendor(8158,		L["Bronk"],				BZ["Feralas"],			76.1, 43.3, HORDE)
-	AddVendor(8160,		L["Nioma"],				BZ["The Hinterlands"],		13.4, 43.3, ALLIANCE)
-	AddVendor(8161,		L["Harggan"],				BZ["The Hinterlands"],		13.4, 44.0, ALLIANCE)
-	AddVendor(8176,		L["Gharash"],				BZ["Swamp of Sorrows"],		45.5, 51.6, HORDE)
-	AddVendor(8177,		L["Rartar"],				BZ["Swamp of Sorrows"],		45.4, 57.0, HORDE)
-	AddVendor(8178,		L["Nina Lightbrew"],			BZ["Blasted Lands"],		66.9, 18.3, ALLIANCE)
-	AddVendor(8307,		L["Tarban Hearthgrain"],		BZ["Northern Barrens"],		55.1, 61.7, HORDE)  -- UPDATED
-	AddVendor(8363,		L["Shadi Mistrunner"],			BZ["Thunder Bluff"],		40.4, 63.6, HORDE)
-	AddVendor(8508,		L["Gretta Ganter"],			BZ["Dun Morogh"],		31.5, 44.7, ALLIANCE)
-	AddVendor(8679,		L["Knaz Blunderflame"],			BZ["Northern Stranglethorn"],	67.7, 61.1, NEUTRAL)   -- UPDATED
-	AddVendor(8681,		L["Outfitter Eric"],			BZ["Ironforge"],		43.2, 29.2, ALLIANCE)
-	AddVendor(8878,		L["Muuran"],				BZ["Desolace"],			55.6, 56.5, HORDE)
-	AddVendor(9179,		L["Jazzrik"],				BZ["Badlands"],			42.5, 52.6, HORDE)
-	AddVendor(9499,		BB["Plugger Spazzring"],		BZ["Blackrock Depths"],		   0,	 0, NEUTRAL)
-	AddVendor(9544,		L["Yuka Screwspigot"],			BZ["Burning Steppes"],		66.0, 22.0, NEUTRAL)
-	AddVendor(9636,		L["Kireena"],				BZ["Desolace"],			51.0, 53.5, HORDE)
-	AddVendor(10118,	L["Nessa Shadowsong"],			BZ["Teldrassil"],		56.3, 92.4, ALLIANCE)
-	AddVendor(10856,	L["Argent Quartermaster Hasana"],	BZ["Tirisfal Glades"],		83.2, 68.1, NEUTRAL)
-	AddVendor(10857,	L["Argent Quartermaster Lightspark"],	BZ["Western Plaguelands"],	42.8, 83.8, NEUTRAL)
-	AddVendor(11185,	L["Xizzer Fizzbolt"],			BZ["Winterspring"],		60.8, 38.6, NEUTRAL)
-	AddVendor(11187,	L["Himmik"],				BZ["Winterspring"],		59.8, 51.6, NEUTRAL)  -- UPDATED
-	AddVendor(11189,	L["Qia"],				BZ["Winterspring"],		61.2, 37.2, NEUTRAL)
-	AddVendor(11278,	L["Magnus Frostwake"],			BZ["Western Plaguelands"],	68.1, 77.6, NEUTRAL)
-	AddVendor(11536,	L["Quartermaster Miranda Breechlock"],	BZ["Eastern Plaguelands"],	75.8, 54.1, NEUTRAL)
-	AddVendor(11557,	L["Meilosh"],				BZ["Felwood"],			65.7,  2.9, HORDE)
-	AddVendor(11874,	L["Masat T'andr"],			BZ["Swamp of Sorrows"],		26.3, 31.6, NEUTRAL)
-	AddVendor(12022,	L["Lorelae Wintersong"],		BZ["Moonglade"],		48.3, 40.1, NEUTRAL)
-	AddVendor(12033,	L["Wulan"],				BZ["Desolace"],			26.2, 69.7, HORDE)
-	AddVendor(12043,	L["Kulwia"],				BZ["Stonetalon Mountains"],	45.4, 59.4, HORDE)
-	AddVendor(12245,	L["Vendor-Tron 1000"],			BZ["Desolace"],			60.3, 38.1, NEUTRAL)
-	AddVendor(12246,	L["Super-Seller 680"],			BZ["Desolace"],			40.5, 79.3, NEUTRAL)
-	AddVendor(12941,	L["Jase Farlane"],			BZ["Eastern Plaguelands"],	74.8, 51.8, NEUTRAL)
-	AddVendor(12942,	L["Leonard Porter"],			BZ["Western Plaguelands"],	43.0, 84.3, ALLIANCE)
-	AddVendor(12943,	L["Werg Thickblade"],			BZ["Tirisfal Glades"],		83.2, 69.7, HORDE)
-	AddVendor(12944,	L["Lokhtos Darkbargainer"],		BZ["Blackrock Depths"],		   0,	 0, NEUTRAL)
-	AddVendor(12956,	L["Zannok Hidepiercer"],		BZ["Silithus"],			81.9, 17.8, NEUTRAL)
-	AddVendor(12958,	L["Gigget Zipcoil"],			BZ["The Hinterlands"],		34.5, 38.5, NEUTRAL)
-	AddVendor(12959,	L["Nergal"],				BZ["Un'Goro Crater"],		43.3,  7.7, NEUTRAL)
-	AddVendor(12962,	L["Wik'Tar"],				BZ["Ashenvale"],		11.8, 34.1, HORDE)
-	AddVendor(13420,	L["Penney Copperpinch"],		BZ["Orgrimmar"],		53.5, 66.1, NEUTRAL)
-	AddVendor(13429,	L["Nardstrum Copperpinch"],		BZ["Undercity"],		67.5, 38.7, HORDE)
-	AddVendor(13432,	L["Seersa Copperpinch"],		BZ["Thunder Bluff"],		42.0, 55.1, HORDE)
-	AddVendor(13433,	L["Wulmort Jinglepocket"],		BZ["Ironforge"],		33.0, 67.6, NEUTRAL)
-	AddVendor(13435,	L["Khole Jinglepocket"],		BZ["Stormwind City"],		62.2, 70.6, ALLIANCE)
-	AddVendor(14371,	L["Shen'dralar Provisioner"],		BZ["Dire Maul"],		   0,	 0, NEUTRAL)
-	AddVendor(14637,	L["Zorbin Fandazzle"],			BZ["Feralas"],			44.8, 43.4, NEUTRAL)
-	AddVendor(14738,	L["Otho Moji'ko"],			BZ["The Hinterlands"],		79.3, 79.1, HORDE)
-	AddVendor(15165,	L["Haughty Modiste"],			BZ["Tanaris"],			66.5, 22.3, NEUTRAL)
-	AddVendor(15176,	L["Vargus"],				BZ["Silithus"],			51.2, 38.8, NEUTRAL)
-	AddVendor(15179,	L["Mishta"],				BZ["Silithus"],			49.9, 36.5, NEUTRAL)
-	AddVendor(15293,	L["Aendel Windspear"],			BZ["Silithus"],			62.6, 49.8, NEUTRAL)
-	AddVendor(15419,	L["Kania"],				BZ["Silithus"],			52.0, 39.6, NEUTRAL)
-	AddVendor(15471,	BB["Lieutenant General Andorov"],	BZ["Ruins of Ahn'Qiraj"],	   0,	 0, NEUTRAL)
-	AddVendor(15909,	L["Fariel Starsong"],			BZ["Moonglade"],		54.0, 35.4, NEUTRAL)
-	AddVendor(16224,	L["Rathis Tomber"],			BZ["Ghostlands"],		47.2, 28.7, HORDE)
-	AddVendor(16253,	L["Master Chef Mouldier"],		BZ["Ghostlands"],		48.3, 30.9, HORDE)
-	AddVendor(16262,	L["Landraelanis"],			BZ["Eversong Woods"],		49.0, 47.0, HORDE)
-	AddVendor(16388,	L["Koren"],				BZ["Karazhan"],			   0,	 0, NEUTRAL)
-	AddVendor(16583,	L["Rohok"],				BZ["Hellfire Peninsula"],	53.2, 38.2, HORDE)
-	AddVendor(16585,	L["Cookie One-Eye"],			BZ["Hellfire Peninsula"],	54.6, 41.1, HORDE)
-	AddVendor(16588,	L["Apothecary Antonivich"],		BZ["Hellfire Peninsula"],	52.4, 36.5, HORDE)
-	AddVendor(16624,	L["Gelanthis"],				BZ["Silvermoon City"],		90.8, 73.6, HORDE)
-	AddVendor(16635,	L["Lyna"],				BZ["Silvermoon City"],		69.1, 24.4, HORDE)
-	AddVendor(16638,	L["Deynna"],				BZ["Silvermoon City"],		55.8, 51.0, HORDE)
-	AddVendor(16641,	L["Melaris"],				BZ["Silvermoon City"],		66.0, 20.6, HORDE)
-	AddVendor(16657,	L["Feera"],				BZ["The Exodar"],		54.0, 90.5, ALLIANCE)
-	AddVendor(16670,	L["Eriden"],				BZ["Silvermoon City"],		79.5, 36.2, HORDE)
-	AddVendor(16677,	L["Quelis"],				BZ["Silvermoon City"],		69.3, 70.7, HORDE)
-	AddVendor(16689,	L["Zaralda"],				BZ["Silvermoon City"],		84.0, 78.8, HORDE)
-	AddVendor(16705,	L["Altaa"],				BZ["The Exodar"],		27.5, 62.1, ALLIANCE)
-	AddVendor(16713,	L["Arras"],				BZ["The Exodar"],		60.0, 89.5, ALLIANCE)
-	AddVendor(16718,	L["Phea"],				BZ["The Exodar"],		54.7, 26.5, ALLIANCE)
-	AddVendor(16722,	L["Egomis"],				BZ["The Exodar"],		39.1, 39.4, ALLIANCE)
-	AddVendor(16748,	L["Haferet"],				BZ["The Exodar"],		66.0, 74.6, ALLIANCE)
-	AddVendor(16767,	L["Neii"],				BZ["The Exodar"],		64.5, 68.5, ALLIANCE)
-	AddVendor(16782,	L["Yatheon"],				BZ["Silvermoon City"],		76.0, 37.7, HORDE)
-	AddVendor(16826,	L["Sid Limbardi"],			BZ["Hellfire Peninsula"],	54.3, 63.6, ALLIANCE)
-	AddVendor(17246,	L["\"Cookie\" McWeaksauce"],		BZ["Azuremyst Isle"],		46.7, 70.5, ALLIANCE)
-	AddVendor(17512,	L["Arred"],				BZ["The Exodar"],		45.0, 26.0, ALLIANCE)
-	AddVendor(17518,	L["Ythyar"],				BZ["Karazhan"],			   0,	 0, NEUTRAL)
-	AddVendor(17585,	L["Quartermaster Urgronn"],		BZ["Hellfire Peninsula"],	54.9, 37.9, HORDE)
-	AddVendor(17657,	L["Logistics Officer Ulrike"],		BZ["Hellfire Peninsula"],	56.7, 62.6, ALLIANCE)
-	AddVendor(17904,	L["Fedryen Swiftspear"],		BZ["Zangarmarsh"],		79.3, 63.8, NEUTRAL)
-	AddVendor(18005,	L["Haalrun"],				BZ["Zangarmarsh"],		67.8, 48.0, ALLIANCE)
-	AddVendor(18011,	L["Zurai"],				BZ["Zangarmarsh"],		85.2, 54.7, HORDE)
-	AddVendor(18015,	L["Gambarinka"],			BZ["Zangarmarsh"],		31.7, 49.3, HORDE)
-	AddVendor(18017,	L["Seer Janidi"],			BZ["Zangarmarsh"],		32.4, 51.9, HORDE)
-	AddVendor(18255,	L["Apprentice Darius"],			BZ["Deadwind Pass"],		47.0, 75.3, NEUTRAL)
-	AddVendor(18382,	L["Mycah"],				BZ["Zangarmarsh"],		17.9, 51.2, NEUTRAL)
-	AddVendor(18427,	L["Fazu"],				BZ["Bloodmyst Isle"],		53.5, 56.5, ALLIANCE)
-	AddVendor(18484,	L["Wind Trader Lathrai"],		BZ["Shattrath City"],		72.3, 31.0, NEUTRAL)
-	AddVendor(18664,	L["Aged Dalaran Wizard"],		BZ["Old Hillsbrad Foothills"],	   0,	 0, NEUTRAL)
-	AddVendor(18672,	L["Thomas Yance"],			BZ["Old Hillsbrad Foothills"],	   0,	 0, NEUTRAL)
-	AddVendor(18753,	L["Felannia"],				BZ["Hellfire Peninsula"],	52.3, 36.1, HORDE)
-	AddVendor(18773,	L["Johan Barnes"],			BZ["Hellfire Peninsula"],	53.7, 66.1, ALLIANCE)
-	AddVendor(18775,	L["Lebowski"],				BZ["Hellfire Peninsula"],	55.7, 65.5, ALLIANCE)
-	AddVendor(18802,	L["Alchemist Gribble"],			BZ["Hellfire Peninsula"],	53.8, 65.8, ALLIANCE)
-	AddVendor(18821,	L["Quartermaster Jaffrey Noreliqe"],	BZ["Nagrand"],			41.2, 44.3, HORDE)
-	AddVendor(18822,	L["Quartermaster Davian Vaclav"],	BZ["Nagrand"],			41.2, 44.3, ALLIANCE)
-	AddVendor(18911,	L["Juno Dufrain"],			BZ["Zangarmarsh"],		78.0, 66.1, NEUTRAL)
-	AddVendor(18951,	L["Erilia"],				BZ["Eversong Woods"],		55.5, 54.0, HORDE)
-	AddVendor(18957,	L["Innkeeper Grilka"],			BZ["Terokkar Forest"],		48.8, 45.1, HORDE)
-	AddVendor(18960,	L["Rungor"],				BZ["Terokkar Forest"],		48.8, 46.1, HORDE)
-	AddVendor(19004,	L["Vodesiin"],				BZ["Hellfire Peninsula"],	24.4, 38.8, ALLIANCE)
-	AddVendor(19015,	L["Mathar G'ochar"],			BZ["Nagrand"],			57.0, 39.6, HORDE)
-	AddVendor(19017,	L["Borto"],				BZ["Nagrand"],			53.3, 71.9, ALLIANCE)
-	AddVendor(19038,	L["Supply Officer Mills"],		BZ["Terokkar Forest"],		55.7, 53.1, ALLIANCE)
-	AddVendor(19042,	L["Leeli Longhaggle"],			BZ["Terokkar Forest"],		57.7, 53.4, ALLIANCE)
-	AddVendor(19065,	L["Inessera"],				BZ["Shattrath City"],		34.5, 20.2, NEUTRAL)
-	AddVendor(19074,	L["Skreah"],				BZ["Shattrath City"],		46.0, 20.1, NEUTRAL)
-	AddVendor(19195,	L["Jim Saltit"],			BZ["Shattrath City"],		63.6, 68.6, NEUTRAL)
-	AddVendor(19213,	L["Eiin"],				BZ["Shattrath City"],		66.2, 68.7, NEUTRAL)
-	AddVendor(19234,	L["Yurial Soulwater"],			BZ["Shattrath City"],		43.5, 96.9, NEUTRAL)
-	AddVendor(19296,	L["Innkeeper Biribi"],			BZ["Terokkar Forest"],		56.7, 53.3, ALLIANCE)
-	AddVendor(19321,	L["Quartermaster Endarin"],		BZ["Shattrath City"],		47.9, 26.1, NEUTRAL)
-	AddVendor(19331,	L["Quartermaster Enuril"],		BZ["Shattrath City"],		60.5, 64.2, NEUTRAL)
-	AddVendor(19342,	L["Krek Cragcrush"],			BZ["Shadowmoon Valley"],	28.9, 30.8, HORDE)
-	AddVendor(19351,	L["Daggle Ironshaper"],			BZ["Shadowmoon Valley"],	36.8, 54.4, ALLIANCE)
-	AddVendor(19373,	L["Mari Stonehand"],			BZ["Shadowmoon Valley"],	36.8, 55.1, ALLIANCE)
-	AddVendor(19383,	L["Captured Gnome"],			BZ["Zangarmarsh"],		32.5, 48.1, HORDE)
-	AddVendor(19521,	L["Arrond"],				BZ["Shadowmoon Valley"],	55.9, 58.2, NEUTRAL)
-	AddVendor(19537,	L["Dealer Malij"],			BZ["Netherstorm"],		44.2, 34.0, NEUTRAL)
-	AddVendor(19540,	L["Asarnan"],				BZ["Netherstorm"],		44.2, 33.7, NEUTRAL)
-	AddVendor(19661,	L["Viggz Shinesparked"],		BZ["Shattrath City"],		64.9, 69.1, NEUTRAL)
-	AddVendor(19662,	L["Aaron Hollman"],			BZ["Shattrath City"],		63.1, 71.1, NEUTRAL)
-	AddVendor(19663,	L["Madame Ruby"],			BZ["Shattrath City"],		63.1, 69.3, NEUTRAL)
-	AddVendor(19694,	L["Loolruna"],				BZ["Zangarmarsh"],		68.5, 50.1, ALLIANCE)
-	AddVendor(19722,	L["Muheru the Weaver"],			BZ["Zangarmarsh"],		40.6, 28.2, ALLIANCE)
-	AddVendor(19836,	L["Mixie Farshot"],			BZ["Hellfire Peninsula"],	61.1, 81.5, HORDE)
-	AddVendor(19837,	L["Daga Ramba"],			BZ["Blade's Edge Mountains"],	51.1, 57.7, HORDE)
-	AddVendor(20028,	L["Doba"],				BZ["Zangarmarsh"],		42.3, 27.9, ALLIANCE)
-	AddVendor(20096,	L["Uriku"],				BZ["Nagrand"],			56.2, 73.3, ALLIANCE)
-	AddVendor(20097,	L["Nula the Butcher"],			BZ["Nagrand"],			58.0, 35.7, HORDE)
-	AddVendor(20240,	L["Trader Narasu"],			BZ["Nagrand"],			54.6, 75.2, ALLIANCE)
-	AddVendor(20241,	L["Provisioner Nasela"],		BZ["Nagrand"],			53.5, 36.9, HORDE)
-	AddVendor(20242,	L["Karaaz"],				BZ["Netherstorm"],		43.6, 34.3, NEUTRAL)
-	AddVendor(20916,	L["Xerintha Ravenoak"],			BZ["Blade's Edge Mountains"],	62.5, 40.3, NEUTRAL)
-	AddVendor(21113,	L["Sassa Weldwell"],			BZ["Blade's Edge Mountains"],	61.3, 68.9, ALLIANCE)
-	AddVendor(21432,	L["Almaador"],				BZ["Shattrath City"],		51.0, 41.9, NEUTRAL)
-	AddVendor(21474,	L["Coreiel"],				BZ["Nagrand"],			42.8, 42.6, HORDE)
-	AddVendor(21485,	L["Aldraan"],				BZ["Nagrand"],			42.9, 42.5, ALLIANCE)
-	AddVendor(21643,	L["Alurmi"],				BZ["Tanaris"],			62.99, 57.32, NEUTRAL)
-	AddVendor(21655,	L["Nakodu"],				BZ["Shattrath City"],		62.1, 69.0, NEUTRAL)
-	AddVendor(22208,	L["Nasmara Moonsong"],			BZ["Shattrath City"],		66.0, 69.0, NEUTRAL)
-	AddVendor(22212,	L["Andrion Darkspinner"],		BZ["Shattrath City"],		66.0, 67.8, NEUTRAL)
-	AddVendor(22213,	L["Gidge Spellweaver"],			BZ["Shattrath City"],		66.0, 67.9, NEUTRAL)
-	AddVendor(23007,	L["Paulsta'ats"],			BZ["Nagrand"],			30.6, 57.0, NEUTRAL)
-	AddVendor(23010,	L["Wolgren Jinglepocket"],		BZ["The Exodar"],		54.5, 47.2, ALLIANCE)
-	AddVendor(23012,	L["Hotoppik Copperpinch"],		BZ["Silvermoon City"],		63.5, 79.1, HORDE)
-	AddVendor(23064,	L["Eebee Jinglepocket"],		BZ["Shattrath City"],		51.0, 31.3, NEUTRAL)
-	AddVendor(23159,	L["Okuno"],				BZ["Black Temple"],		   0,	 0, NEUTRAL)
-	AddVendor(23437,	L["Indormi"],				BZ["Hyjal Summit"],		   0,	 0, NEUTRAL)
-	AddVendor(25032,	L["Eldara Dawnrunner"],			BZ["Isle of Quel'Danas"],	47.1, 30.0, NEUTRAL)
-	AddVendor(25950,	L["Shaani"],				BZ["Isle of Quel'Danas"],	51.5, 32.6, NEUTRAL)
-	AddVendor(26081, 	L["High Admiral \"Shelly\" Jorrik"],	BZ["Dun Morogh"], 		10.9, 76.1, NEUTRAL)
-	AddVendor(26569,	L["Alys Vol'tyr"],			BZ["Dragonblight"],		36.3, 46.5, HORDE)
-	AddVendor(26868,	L["Provisioner Lorkran"],		BZ["Grizzly Hills"],		22.6, 66.1, HORDE)
-	AddVendor(27030,	L["Bradley Towns"],			BZ["Dragonblight"],		76.9, 62.2, HORDE)
-	AddVendor(27054,	L["Modoru"],				BZ["Dragonblight"],		28.9, 55.9, ALLIANCE)
-	AddVendor(27147,	L["Librarian Erickson"],		BZ["Borean Tundra"],		46.7, 32.5, NEUTRAL)
-	AddVendor(27666,	L["Ontuvo"],				BZ["Shattrath City"],		48.7, 41.3, NEUTRAL)
-	AddVendor(28701,	L["Timothy Jones"],			BZ["Dalaran"],			40.5, 35.2, NEUTRAL)
-	AddVendor(28714,	L["Ildine Sorrowspear"],		BZ["Dalaran"],			39.1, 41.5, NEUTRAL)
-	AddVendor(28721,	L["Tiffany Cartier"],			BZ["Dalaran"],			40.5, 34.4, NEUTRAL)
-	AddVendor(28722,	L["Bryan Landers"],			BZ["Dalaran"],			39.1, 26.5, NEUTRAL)
-	AddVendor(28723,	L["Larana Drome"],			BZ["Dalaran"],			42.3, 37.5, NEUTRAL)
-	AddVendor(29510,	L["Linna Bruder"],			BZ["Dalaran"],			34.6, 34.5, NEUTRAL)
-	AddVendor(29511,	L["Lalla Brightweave"],			BZ["Dalaran"],			36.5, 33.5, NEUTRAL)
-	AddVendor(29512,	L["Ainderu Summerleaf"],		BZ["Dalaran"],			36.5, 34.0, NEUTRAL)
-	AddVendor(30431,	L["Veteran Crusader Aliocha Segard"],	BZ["Icecrown"],			87.6, 75.6, NEUTRAL)
-	AddVendor(30489,	L["Morgan Day"],			BZ["Wintergrasp"],		49.0, 17.1, ALLIANCE)
-	AddVendor(30734,	L["Jezebel Bican"],			BZ["Hellfire Peninsula"],	53.9, 65.5, ALLIANCE)
-	AddVendor(30735,	L["Kul Inkspiller"],			BZ["Hellfire Peninsula"],	52.5, 36.0, HORDE)
-	AddVendor(31031,	L["Misensi"],				BZ["Dalaran"],			70.1, 38.5, HORDE)
-	AddVendor(31032,	L["Derek Odds"],			BZ["Dalaran"],			41.5, 64.8, ALLIANCE)
-	AddVendor(31910,	L["Geen"],				BZ["Sholazar Basin"],		54.5, 56.2, NEUTRAL)
-	AddVendor(31911,	L["Tanak"],				BZ["Sholazar Basin"],		55.1, 69.1, NEUTRAL)
-	AddVendor(31916,	L["Tanaika"],				BZ["Howling Fjord"],		25.5, 58.7, NEUTRAL)
-	AddVendor(32287,	L["Archmage Alvareaux"],		BZ["Dalaran"],			25.5, 47.4, NEUTRAL)
-	AddVendor(32294,	L["Knight Dameron"],			BZ["Wintergrasp"],		51.7, 17.5, ALLIANCE)
-	AddVendor(32296,	L["Stone Guard Mukar"],			BZ["Wintergrasp"],		51.7, 17.5, HORDE)
-	AddVendor(32514,	L["Vanessa Sellers"],			BZ["Dalaran"],			38.7, 40.8, NEUTRAL)
-	AddVendor(32515,	L["Braeg Stoutbeard"],			BZ["Dalaran"],			37.6, 29.5, NEUTRAL)
-	AddVendor(32533,	L["Cielstrasza"],			BZ["Dragonblight"],		59.9, 53.1, NEUTRAL)
-	AddVendor(32538,	L["Duchess Mynx"],			BZ["Icecrown"],			43.5, 20.6, NEUTRAL)
-	AddVendor(32540,	L["Lillehoff"],				BZ["The Storm Peaks"],		66.2, 61.4, NEUTRAL)
-	AddVendor(32564,	L["Logistics Officer Silverstone"],	BZ["Borean Tundra"],		57.7, 66.5, ALLIANCE)
-	AddVendor(32565,	L["Gara Skullcrush"],			BZ["Borean Tundra"],		41.4, 53.6, HORDE)
-	AddVendor(32763,	L["Sairuk"],				BZ["Dragonblight"],		48.5, 75.7, NEUTRAL)
-	AddVendor(32773,	L["Logistics Officer Brighton"],	BZ["Howling Fjord"],		59.7, 63.9, ALLIANCE)
-	AddVendor(32774,	L["Sebastian Crane"],			BZ["Howling Fjord"],		79.6, 30.7, HORDE)
-	AddVendor(33595,	L["Mera Mistrunner"],			BZ["Icecrown"],			72.4, 20.9, NEUTRAL)
-	AddVendor(33602,	L["Anuur"],				BZ["Icecrown"],			71.4, 20.8, NEUTRAL)
-	AddVendor(33637,	L["Kirembri Silvermane"],		BZ["Shattrath City"],		58.1, 75.0, NEUTRAL)
-	AddVendor(33680,	L["Nemiha"],				BZ["Shattrath City"],		36.1, 47.7, NEUTRAL)
-	AddVendor(34039,	L["Lady Palanseer"],			BZ["Orgrimmar"],		37.0, 64.9, HORDE)
-	AddVendor(34079,	L["Captain O'Neal"],			BZ["Stormwind City"],		75.7, 66.6, ALLIANCE)
-	AddVendor(35826,	L["Kaye Toogie"],		BZ["Dalaran"],			34.0, 35.6, NEUTRAL)
-	AddVendor(37687,	L["Alchemist Finklestein"],		BZ["Icecrown Citadel"],		   0,	 0, NEUTRAL)
-	AddVendor(40160,	L["Frozo the Renowned"],		BZ["Dalaran"],			41.0, 28.5, NEUTRAL)
-	AddVendor(49701,	L["Bario Matalli"],			BZ["Stormwind City"], 		50.9, 71.4, ALLIANCE)
-	AddVendor(49703,	L["Casandra Downs"],			BZ["Twilight Highlands"],	78.6, 76.2, ALLIANCE)
-	AddVendor(49737,	L["Shazdar"],				BZ["Orgrimmar"],		57.2, 62.0, HORDE)
-	AddVendor(50134,	L["Senthii"],				BZ["Twilight Highlands"],	78.7, 77.0, ALLIANCE)
-	AddVendor(50146,	L["Agatian Fallanos"],			BZ["Twilight Highlands"],	76.7, 49.5, HORDE)
-	AddVendor(50172,	L["Threm Blackscalp"],			BZ["Twilight Highlands"],	75.2, 50.1, HORDE)
-	AddVendor(50248,	L["Una Kobuna"],			BZ["Twilight Highlands"],	76.6, 49.4, HORDE)
-	AddVendor(50375,	L["Kuldar Steeltooth"],			BZ["Twilight Highlands"],	77.3, 53.1, HORDE)
-	AddVendor(50381,	L["Misty Merriweather"],			BZ["Twilight Highlands"],	78.8, 76.2, ALLIANCE)
-	AddVendor(50382,	L["Brundall Chiselgut"],			BZ["Twilight Highlands"],	79.1, 76.5, ALLIANCE)
-	AddVendor(50386,	L["Sal Ferraga"],			BZ["Twilight Highlands"],	78.6, 76.9, ALLIANCE)
-	AddVendor(50433,	L["Aristaleon Sunweaver"],			BZ["Twilight Highlands"],	75.2, 50.1, HORDE)
-	AddVendor(50480,	L["Isabel Jones"],			BZ["Stormwind City"],	63.7, 61.3, ALLIANCE)
-	AddVendor(50482,	L["Marith Lazuria"],			BZ["Orgrimmar"],	72.5, 36.2, HORDE)
+	AddVendor(3005,		L["Mahu"],				BZ["Thunder Bluff"],			43.8, 44.6, HORDE)
+	AddVendor(3012,		L["Nata Dawnstrider"],			BZ["Thunder Bluff"],			46.5, 38.8, HORDE)
+	AddVendor(3027,		L["Naal Mistrunner"],			BZ["Thunder Bluff"],			51.1, 52.2, HORDE)
+	AddVendor(3029,		L["Sewa Mistrunner"],			BZ["Thunder Bluff"],			56.0, 47.1, HORDE)
+	AddVendor(3081,		L["Wunna Darkmane"],			BZ["Mulgore"],				46.1, 58.2, HORDE)
+	AddVendor(3085,		L["Gloria Femmel"],			BZ["Redridge Mountains"],		26.7, 43.5, ALLIANCE)
+	AddVendor(3134,		L["Kzixx"],				BZ["Duskwood"],				81.9, 19.9, NEUTRAL)
+	AddVendor(3178,		L["Stuart Fleming"],			BZ["Wetlands"],				 8.1, 58.4, ALLIANCE)
+	AddVendor(3333,		L["Shankys"],				BZ["Orgrimmar"],			66.74, 41.86, HORDE) -- UPDATED
+	AddVendor(3335,		L["Hagrus"],				BZ["Orgrimmar"],			46.0, 45.9, HORDE)
+	AddVendor(3346,		L["Kithas"],				BZ["Orgrimmar"],			53.7, 38.0, HORDE)
+	AddVendor(3348,		L["Kor'geld"],				BZ["Orgrimmar"],			55.23, 45.83, HORDE) -- UPDATED
+	AddVendor(3364,		L["Borya"],				BZ["Orgrimmar"],			63.0, 51.2, HORDE)
+	AddVendor(3366,		L["Tamar"],				BZ["Orgrimmar"],			63.0, 45.3, HORDE)
+	AddVendor(3367,		L["Felika"],				BZ["Orgrimmar"],			60.5, 50.7, HORDE)
+	AddVendor(3400,		L["Xen'to"],				BZ["Orgrimmar"],			32.6, 68.6, HORDE) -- UPDATED
+	AddVendor(3413,		L["Sovik"],				BZ["Orgrimmar"],			75.6, 25.2, HORDE)
+	AddVendor(3482,		L["Tari'qa"],				BZ["Northern Barrens"],			49.0, 58.2, HORDE)   -- UPDATED
+	AddVendor(3485,		L["Wrahk"],				BZ["Northern Barrens"],			50.0, 61.1, HORDE)   -- UPDATED
+	AddVendor(3489,		L["Zargh"],				BZ["Northern Barrens"],			50.6, 57.8, HORDE)   -- UPDATED
+	AddVendor(3490,		L["Hula'mahi"],				BZ["Northern Barrens"],			48.6, 58.4, HORDE)   -- UPDATED
+	AddVendor(3495,		L["Gagsprocket"],			BZ["Northern Barrens"],			68.4, 69.2, NEUTRAL)   -- UPDATED
+	AddVendor(3497,		L["Kilxx"],				BZ["Northern Barrens"],			68.6, 72.5, NEUTRAL)   -- UPDATED
+	AddVendor(3499,		L["Ranik"],				BZ["Northern Barrens"],			67.1, 73.5, NEUTRAL)   -- UPDATED
+	AddVendor(3522,		L["Constance Brisboise"],		BZ["Tirisfal Glades"],			52.6, 55.7, HORDE)
+	AddVendor(3537,		L["Zixil"],				BZ["Hillsbrad Foothills"],		53.5, 38.3, NEUTRAL)
+	AddVendor(3550,		L["Martine Tramblay"],			BZ["Tirisfal Glades"],			65.8, 59.6, HORDE) -- UPDATED
+	AddVendor(3556,		L["Andrew Hilbert"],			BZ["Silverpine Forest"],		43.2, 40.7, HORDE)
+	AddVendor(3881,		L["Grimtak"],				BZ["Durotar"],				51.2, 42.6, HORDE)
+	AddVendor(3954,		L["Dalria"],				BZ["Ashenvale"],			35.1, 52.1, ALLIANCE)
+	AddVendor(3956,		L["Harklan Moongrove"],			BZ["Ashenvale"],			50.8, 67.0, ALLIANCE)
+	AddVendor(3958,		L["Lardan"],				BZ["Ashenvale"],			34.8, 49.8, ALLIANCE)
+	AddVendor(4083,		L["Jeeda"],				BZ["Stonetalon Mountains"],		47.6, 61.7, HORDE)
+	AddVendor(4086,		L["Veenix"],				BZ["Stonetalon Mountains"],		58.3, 51.7, NEUTRAL)
+	AddVendor(4168,		L["Elynna"],				BZ["Darnassus"],			64.4, 21.6, ALLIANCE)
+	AddVendor(4186,		L["Mavralyn"],				BZ["Darkshore"],			37.0, 41.2, ALLIANCE)
+	AddVendor(4189,		L["Valdaron"],				BZ["Darkshore"],			38.1, 40.6, ALLIANCE)
+	AddVendor(4223,		L["Fyldan"],				BZ["Darnassus"],			49.0, 37.0, ALLIANCE) -- UPDATED
+	AddVendor(4225,		L["Saenorion"],				BZ["Darnassus"],			63.8, 22.1, ALLIANCE)
+	AddVendor(4226,		L["Ulthir"],				BZ["Darnassus"],			56.0, 24.6, ALLIANCE)
+	AddVendor(4228,		L["Vaean"],				BZ["Darnassus"],			58.5, 14.4, ALLIANCE)
+	AddVendor(4229,		L["Mythrin'dir"],			BZ["Darnassus"],			60.0, 19.1, ALLIANCE)
+	AddVendor(4265,		L["Nyoma"],				BZ["Teldrassil"],			57.2, 61.2, ALLIANCE)
+	AddVendor(4305,		L["Kriggon Talsone"],			BZ["Westfall"],				36.2, 90.1, ALLIANCE)
+	AddVendor(4553,		L["Ronald Burch"],			BZ["Undercity"],			62.4, 43.4, HORDE)
+	AddVendor(4561,		L["Daniel Bartlett"],			BZ["Undercity"],			64.2, 37.7, HORDE)
+	AddVendor(4574,		L["Lizbeth Cromwell"],			BZ["Undercity"],			81.2, 31.0, HORDE)
+	AddVendor(4577,		L["Millie Gregorian"],			BZ["Undercity"],			70.8, 29.6, HORDE)
+	AddVendor(4589,		L["Joseph Moore"],			BZ["Undercity"],			70.2, 57.8, HORDE)
+	AddVendor(4610,		L["Algernon"],				BZ["Undercity"],			51.9, 74.4, HORDE)
+	AddVendor(4617,		L["Thaddeus Webb"],			BZ["Undercity"],			62.0, 60.7, HORDE)
+	AddVendor(4775,		L["Felicia Doan"],			BZ["Undercity"],			64.3, 50.2, HORDE)
+	AddVendor(4782,		L["Truk Wildbeard"],			BZ["The Hinterlands"],			14.4, 42.5, ALLIANCE)
+	AddVendor(4877,		L["Jandia"],				BZ["Thousand Needles"],			46.1, 51.5, HORDE)
+	AddVendor(4878,		L["Montarr"],				BZ["Thousand Needles"],			45.2, 50.7, HORDE)
+	AddVendor(4879,		L["Ogg'marr"],				BZ["Dustwallow Marsh"],			36.7, 31.0, HORDE)
+	AddVendor(4897,		L["Helenia Olden"],			BZ["Dustwallow Marsh"],			66.4, 51.5, ALLIANCE)
+	AddVendor(5128,		L["Bombus Finespindle"],		BZ["Ironforge"],			39.6, 34.1, ALLIANCE)
+	AddVendor(5158,		L["Tilli Thistlefuzz"],			BZ["Ironforge"],			60.7, 44.2, ALLIANCE)
+	AddVendor(5160,		L["Emrul Riknussun"],			BZ["Ironforge"],			59.9, 37.7, ALLIANCE)
+	AddVendor(5162,		L["Tansy Puddlefizz"],			BZ["Ironforge"],			48.0,  6.3, ALLIANCE)
+	AddVendor(5163,		L["Burbik Gearspanner"],		BZ["Ironforge"],			46.5, 27.1, ALLIANCE)
+	AddVendor(5175,		L["Gearcutter Cogspinner"],		BZ["Ironforge"],			68.0, 43.1, ALLIANCE)
+	AddVendor(5178,		L["Soolie Berryfizz"],			BZ["Ironforge"],			66.6, 54.5, ALLIANCE)
+	AddVendor(5411,		L["Krinkle Goodsteel"],			BZ["Tanaris"],				51.5, 28.8, NEUTRAL)
+	AddVendor(5483,		L["Erika Tate"],			BZ["Stormwind City"],			78.5, 53.0, ALLIANCE)
+	AddVendor(5494,		L["Catherine Leland"],			BZ["Stormwind City"],			55.1, 69.5, ALLIANCE)
+	AddVendor(5512,		L["Kaita Deepforge"],			BZ["Stormwind City"],			63.5, 37.6, ALLIANCE)
+	AddVendor(5594,		L["Alchemist Pestlezugg"],		BZ["Tanaris"],				50.9, 27.0, NEUTRAL)
+	AddVendor(5748,		L["Killian Sanatha"],			BZ["Silverpine Forest"],		33.0, 17.8, HORDE)
+	AddVendor(5757,		L["Lilly"],				BZ["Silverpine Forest"],		43.1, 50.8, HORDE)
+	AddVendor(5758,		L["Leo Sarn"],				BZ["Silverpine Forest"],		53.9, 82.3, HORDE)
+	AddVendor(5940,		L["Harn Longcast"],			BZ["Mulgore"],				47.5, 55.1, HORDE)
+	AddVendor(5942,		L["Zansoa"],				BZ["Durotar"],				56.1, 73.4, HORDE)
+	AddVendor(6568,		L["Vizzklick"],				BZ["Tanaris"],				51.0, 27.4, NEUTRAL)
+	AddVendor(6567,		L["Ghok'kah"],				BZ["Dustwallow Marsh"],			35.2, 30.8, HORDE)
+	AddVendor(6574,		L["Jun'ha"],				BZ["Arathi Highlands"],			72.7, 36.5, HORDE)
+	AddVendor(6576,		L["Brienna Starglow"],			BZ["Feralas"],				89.0, 45.9, ALLIANCE)
+	AddVendor(6730,		L["Jinky Twizzlefixxit"],		BZ["Thousand Needles"],			77.7, 77.8, NEUTRAL)
+	AddVendor(6731,		L["Harlown Darkweave"],			BZ["Ashenvale"],			18.2, 60.0, ALLIANCE)
+	AddVendor(6777,		L["Zan Shivsproket"],			BZ["Hillsbrad Foothills"],		71.5, 45.5, NEUTRAL)
+	AddVendor(6779,		L["Smudge Thunderwood"],		BZ["Hillsbrad Foothills"],		71.5, 45.5, NEUTRAL)
+	AddVendor(7733,		L["Innkeeper Fizzgrimble"],		BZ["Tanaris"],				52.6, 27.0, NEUTRAL) -- UPDATED
+	AddVendor(7852,		L["Pratt McGrubben"],			BZ["Feralas"],				30.6, 42.7, ALLIANCE)
+	AddVendor(7854,		L["Jangdor Swiftstrider"],		BZ["Feralas"],				74.5, 42.9, HORDE)
+	AddVendor(7940,		L["Darnall"],				BZ["Moonglade"],			51.6, 33.3, NEUTRAL)
+	AddVendor(7947,		L["Vivianna"],				BZ["Feralas"],				31.3, 43.5, ALLIANCE)
+	AddVendor(8125,		L["Dirge Quikcleave"],			BZ["Tanaris"],				52.6, 28.0, NEUTRAL) -- UPDATED
+	AddVendor(8131,		L["Blizrik Buckshot"],			BZ["Tanaris"],				50.8, 27.6, NEUTRAL)
+	AddVendor(8145,		L["Sheendra Tallgrass"],		BZ["Feralas"],				74.5, 42.8, HORDE)
+	AddVendor(8150,		L["Janet Hommers"],			BZ["Desolace"],				66.2,  6.7, ALLIANCE)
+	AddVendor(8157,		L["Logannas"],				BZ["Feralas"],				32.7, 44.0, ALLIANCE)
+	AddVendor(8158,		L["Bronk"],				BZ["Feralas"],				76.1, 43.3, HORDE)
+	AddVendor(8160,		L["Nioma"],				BZ["The Hinterlands"],			13.4, 43.3, ALLIANCE)
+	AddVendor(8161,		L["Harggan"],				BZ["The Hinterlands"],			13.4, 44.0, ALLIANCE)
+	AddVendor(8176,		L["Gharash"],				BZ["Swamp of Sorrows"],			45.5, 51.6, HORDE)
+	AddVendor(8177,		L["Rartar"],				BZ["Swamp of Sorrows"],			45.4, 57.0, HORDE)
+	AddVendor(8178,		L["Nina Lightbrew"],			BZ["Blasted Lands"],			66.9, 18.3, ALLIANCE)
+	AddVendor(8307,		L["Tarban Hearthgrain"],		BZ["Northern Barrens"],			55.1, 61.7, HORDE)  -- UPDATED
+	AddVendor(8363,		L["Shadi Mistrunner"],			BZ["Thunder Bluff"],			40.4, 63.6, HORDE)
+	AddVendor(8508,		L["Gretta Ganter"],			BZ["Dun Morogh"],			31.5, 44.7, ALLIANCE)
+	AddVendor(8679,		L["Knaz Blunderflame"],			BZ["Northern Stranglethorn"],		67.7, 61.1, NEUTRAL)   -- UPDATED
+	AddVendor(8681,		L["Outfitter Eric"],			BZ["Ironforge"],			43.2, 29.2, ALLIANCE)
+	AddVendor(8878,		L["Muuran"],				BZ["Desolace"],				55.6, 56.5, HORDE)
+	AddVendor(9179,		L["Jazzrik"],				BZ["Badlands"],				42.5, 52.6, HORDE)
+	AddVendor(9499,		BB["Plugger Spazzring"],		BZ["Blackrock Depths"],			   0,	 0, NEUTRAL)
+	AddVendor(9544,		L["Yuka Screwspigot"],			BZ["Burning Steppes"],			66.0, 22.0, NEUTRAL)
+	AddVendor(9636,		L["Kireena"],				BZ["Desolace"],				51.0, 53.5, HORDE)
+	AddVendor(10118,	L["Nessa Shadowsong"],			BZ["Teldrassil"],			56.3, 92.4, ALLIANCE)
+	AddVendor(10856,	L["Argent Quartermaster Hasana"],	BZ["Tirisfal Glades"],			83.2, 68.1, NEUTRAL)
+	AddVendor(10857,	L["Argent Quartermaster Lightspark"],	BZ["Western Plaguelands"],		42.8, 83.8, NEUTRAL)
+	AddVendor(11185,	L["Xizzer Fizzbolt"],			BZ["Winterspring"],			60.8, 38.6, NEUTRAL)
+	AddVendor(11187,	L["Himmik"],				BZ["Winterspring"],			59.8, 51.6, NEUTRAL)  -- UPDATED
+	AddVendor(11189,	L["Qia"],				BZ["Winterspring"],			61.2, 37.2, NEUTRAL)
+	AddVendor(11278,	L["Magnus Frostwake"],			BZ["Western Plaguelands"],		68.1, 77.6, NEUTRAL)
+	AddVendor(11536,	L["Quartermaster Miranda Breechlock"],	BZ["Eastern Plaguelands"],		75.8, 54.1, NEUTRAL)
+	AddVendor(11557,	L["Meilosh"],				BZ["Felwood"],				65.7,  2.9, HORDE)
+	AddVendor(11874,	L["Masat T'andr"],			BZ["Swamp of Sorrows"],			26.3, 31.6, NEUTRAL)
+	AddVendor(12022,	L["Lorelae Wintersong"],		BZ["Moonglade"],			48.3, 40.1, NEUTRAL)
+	AddVendor(12033,	L["Wulan"],				BZ["Desolace"],				26.2, 69.7, HORDE)
+	AddVendor(12043,	L["Kulwia"],				BZ["Stonetalon Mountains"],		45.4, 59.4, HORDE)
+	AddVendor(12245,	L["Vendor-Tron 1000"],			BZ["Desolace"],				60.3, 38.1, NEUTRAL)
+	AddVendor(12246,	L["Super-Seller 680"],			BZ["Desolace"],				40.5, 79.3, NEUTRAL)
+	AddVendor(12941,	L["Jase Farlane"],			BZ["Eastern Plaguelands"],		74.8, 51.8, NEUTRAL)
+	AddVendor(12942,	L["Leonard Porter"],			BZ["Western Plaguelands"],		43.0, 84.3, ALLIANCE)
+	AddVendor(12943,	L["Werg Thickblade"],			BZ["Tirisfal Glades"],			83.2, 69.7, HORDE)
+	AddVendor(12944,	L["Lokhtos Darkbargainer"],		BZ["Blackrock Depths"],			   0,	 0, NEUTRAL)
+	AddVendor(12956,	L["Zannok Hidepiercer"],		BZ["Silithus"],				81.9, 17.8, NEUTRAL)
+	AddVendor(12958,	L["Gigget Zipcoil"],			BZ["The Hinterlands"],			34.5, 38.5, NEUTRAL)
+	AddVendor(12959,	L["Nergal"],				BZ["Un'Goro Crater"],			43.3,  7.7, NEUTRAL)
+	AddVendor(12962,	L["Wik'Tar"],				BZ["Ashenvale"],			11.8, 34.1, HORDE)
+	AddVendor(13420,	L["Penney Copperpinch"],		BZ["Orgrimmar"],			53.5, 66.1, NEUTRAL)
+	AddVendor(13429,	L["Nardstrum Copperpinch"],		BZ["Undercity"],			67.5, 38.7, HORDE)
+	AddVendor(13432,	L["Seersa Copperpinch"],		BZ["Thunder Bluff"],			42.0, 55.1, HORDE)
+	AddVendor(13433,	L["Wulmort Jinglepocket"],		BZ["Ironforge"],			33.0, 67.6, NEUTRAL)
+	AddVendor(13435,	L["Khole Jinglepocket"],		BZ["Stormwind City"],			62.2, 70.6, ALLIANCE)
+	AddVendor(14371,	L["Shen'dralar Provisioner"],		BZ["Dire Maul"],			   0,	 0, NEUTRAL)
+	AddVendor(14637,	L["Zorbin Fandazzle"],			BZ["Feralas"],				44.8, 43.4, NEUTRAL)
+	AddVendor(14738,	L["Otho Moji'ko"],			BZ["The Hinterlands"],			79.3, 79.1, HORDE)
+	AddVendor(15165,	L["Haughty Modiste"],			BZ["Tanaris"],				66.5, 22.3, NEUTRAL)
+	AddVendor(15176,	L["Vargus"],				BZ["Silithus"],				51.2, 38.8, NEUTRAL)
+	AddVendor(15179,	L["Mishta"],				BZ["Silithus"],				49.9, 36.5, NEUTRAL)
+	AddVendor(15293,	L["Aendel Windspear"],			BZ["Silithus"],				62.6, 49.8, NEUTRAL)
+	AddVendor(15419,	L["Kania"],				BZ["Silithus"],				52.0, 39.6, NEUTRAL)
+	AddVendor(15471,	BB["Lieutenant General Andorov"],	BZ["Ruins of Ahn'Qiraj"],		   0,	 0, NEUTRAL)
+	AddVendor(15909,	L["Fariel Starsong"],			BZ["Moonglade"],			54.0, 35.4, NEUTRAL)
+	AddVendor(16224,	L["Rathis Tomber"],			BZ["Ghostlands"],			47.2, 28.7, HORDE)
+	AddVendor(16253,	L["Master Chef Mouldier"],		BZ["Ghostlands"],			48.3, 30.9, HORDE)
+	AddVendor(16262,	L["Landraelanis"],			BZ["Eversong Woods"],			49.0, 47.0, HORDE)
+	AddVendor(16388,	L["Koren"],				BZ["Karazhan"],				   0,	 0, NEUTRAL)
+	AddVendor(16583,	L["Rohok"],				BZ["Hellfire Peninsula"],		53.2, 38.2, HORDE)
+	AddVendor(16585,	L["Cookie One-Eye"],			BZ["Hellfire Peninsula"],		54.6, 41.1, HORDE)
+	AddVendor(16588,	L["Apothecary Antonivich"],		BZ["Hellfire Peninsula"],		52.4, 36.5, HORDE)
+	AddVendor(16624,	L["Gelanthis"],				BZ["Silvermoon City"],			90.8, 73.6, HORDE)
+	AddVendor(16635,	L["Lyna"],				BZ["Silvermoon City"],			69.1, 24.4, HORDE)
+	AddVendor(16638,	L["Deynna"],				BZ["Silvermoon City"],			55.8, 51.0, HORDE)
+	AddVendor(16641,	L["Melaris"],				BZ["Silvermoon City"],			66.0, 20.6, HORDE)
+	AddVendor(16657,	L["Feera"],				BZ["The Exodar"],			54.0, 90.5, ALLIANCE)
+	AddVendor(16670,	L["Eriden"],				BZ["Silvermoon City"],			79.5, 36.2, HORDE)
+	AddVendor(16677,	L["Quelis"],				BZ["Silvermoon City"],			69.3, 70.7, HORDE)
+	AddVendor(16689,	L["Zaralda"],				BZ["Silvermoon City"],			84.0, 78.8, HORDE)
+	AddVendor(16705,	L["Altaa"],				BZ["The Exodar"],			27.5, 62.1, ALLIANCE)
+	AddVendor(16713,	L["Arras"],				BZ["The Exodar"],			60.0, 89.5, ALLIANCE)
+	AddVendor(16718,	L["Phea"],				BZ["The Exodar"],			54.7, 26.5, ALLIANCE)
+	AddVendor(16722,	L["Egomis"],				BZ["The Exodar"],			39.1, 39.4, ALLIANCE)
+	AddVendor(16748,	L["Haferet"],				BZ["The Exodar"],			66.0, 74.6, ALLIANCE)
+	AddVendor(16767,	L["Neii"],				BZ["The Exodar"],			64.5, 68.5, ALLIANCE)
+	AddVendor(16782,	L["Yatheon"],				BZ["Silvermoon City"],			76.0, 37.7, HORDE)
+	AddVendor(16826,	L["Sid Limbardi"],			BZ["Hellfire Peninsula"],		54.3, 63.6, ALLIANCE)
+	AddVendor(17246,	L["\"Cookie\" McWeaksauce"],		BZ["Azuremyst Isle"],			46.7, 70.5, ALLIANCE)
+	AddVendor(17512,	L["Arred"],				BZ["The Exodar"],			45.0, 26.0, ALLIANCE)
+	AddVendor(17518,	L["Ythyar"],				BZ["Karazhan"],				   0,	 0, NEUTRAL)
+	AddVendor(17585,	L["Quartermaster Urgronn"],		BZ["Hellfire Peninsula"],		54.9, 37.9, HORDE)
+	AddVendor(17657,	L["Logistics Officer Ulrike"],		BZ["Hellfire Peninsula"],		56.7, 62.6, ALLIANCE)
+	AddVendor(17904,	L["Fedryen Swiftspear"],		BZ["Zangarmarsh"],			79.3, 63.8, NEUTRAL)
+	AddVendor(18005,	L["Haalrun"],				BZ["Zangarmarsh"],			67.8, 48.0, ALLIANCE)
+	AddVendor(18011,	L["Zurai"],				BZ["Zangarmarsh"],			85.2, 54.7, HORDE)
+	AddVendor(18015,	L["Gambarinka"],			BZ["Zangarmarsh"],			31.7, 49.3, HORDE)
+	AddVendor(18017,	L["Seer Janidi"],			BZ["Zangarmarsh"],			32.4, 51.9, HORDE)
+	AddVendor(18255,	L["Apprentice Darius"],			BZ["Deadwind Pass"],			47.0, 75.3, NEUTRAL)
+	AddVendor(18382,	L["Mycah"],				BZ["Zangarmarsh"],			17.9, 51.2, NEUTRAL)
+	AddVendor(18427,	L["Fazu"],				BZ["Bloodmyst Isle"],			53.5, 56.5, ALLIANCE)
+	AddVendor(18484,	L["Wind Trader Lathrai"],		BZ["Shattrath City"],			72.3, 31.0, NEUTRAL)
+	AddVendor(18664,	L["Aged Dalaran Wizard"],		BZ["Old Hillsbrad Foothills"],		   0,	 0, NEUTRAL)
+	AddVendor(18672,	L["Thomas Yance"],			BZ["Old Hillsbrad Foothills"],		   0,	 0, NEUTRAL)
+	AddVendor(18753,	L["Felannia"],				BZ["Hellfire Peninsula"],		52.3, 36.1, HORDE)
+	AddVendor(18773,	L["Johan Barnes"],			BZ["Hellfire Peninsula"],		53.7, 66.1, ALLIANCE)
+	AddVendor(18775,	L["Lebowski"],				BZ["Hellfire Peninsula"],		55.7, 65.5, ALLIANCE)
+	AddVendor(18802,	L["Alchemist Gribble"],			BZ["Hellfire Peninsula"],		53.8, 65.8, ALLIANCE)
+	AddVendor(18821,	L["Quartermaster Jaffrey Noreliqe"],	BZ["Nagrand"],				41.2, 44.3, HORDE)
+	AddVendor(18822,	L["Quartermaster Davian Vaclav"],	BZ["Nagrand"],				41.2, 44.3, ALLIANCE)
+	AddVendor(18911,	L["Juno Dufrain"],			BZ["Zangarmarsh"],			78.0, 66.1, NEUTRAL)
+	AddVendor(18951,	L["Erilia"],				BZ["Eversong Woods"],			55.5, 54.0, HORDE)
+	AddVendor(18957,	L["Innkeeper Grilka"],			BZ["Terokkar Forest"],			48.8, 45.1, HORDE)
+	AddVendor(18960,	L["Rungor"],				BZ["Terokkar Forest"],			48.8, 46.1, HORDE)
+	AddVendor(19004,	L["Vodesiin"],				BZ["Hellfire Peninsula"],		24.4, 38.8, ALLIANCE)
+	AddVendor(19015,	L["Mathar G'ochar"],			BZ["Nagrand"],				57.0, 39.6, HORDE)
+	AddVendor(19017,	L["Borto"],				BZ["Nagrand"],				53.3, 71.9, ALLIANCE)
+	AddVendor(19038,	L["Supply Officer Mills"],		BZ["Terokkar Forest"],			55.7, 53.1, ALLIANCE)
+	AddVendor(19042,	L["Leeli Longhaggle"],			BZ["Terokkar Forest"],			57.7, 53.4, ALLIANCE)
+	AddVendor(19065,	L["Inessera"],				BZ["Shattrath City"],			34.5, 20.2, NEUTRAL)
+	AddVendor(19074,	L["Skreah"],				BZ["Shattrath City"],			46.0, 20.1, NEUTRAL)
+	AddVendor(19195,	L["Jim Saltit"],			BZ["Shattrath City"],			63.6, 68.6, NEUTRAL)
+	AddVendor(19213,	L["Eiin"],				BZ["Shattrath City"],			66.2, 68.7, NEUTRAL)
+	AddVendor(19234,	L["Yurial Soulwater"],			BZ["Shattrath City"],			43.5, 96.9, NEUTRAL)
+	AddVendor(19296,	L["Innkeeper Biribi"],			BZ["Terokkar Forest"],			56.7, 53.3, ALLIANCE)
+	AddVendor(19321,	L["Quartermaster Endarin"],		BZ["Shattrath City"],			47.9, 26.1, NEUTRAL)
+	AddVendor(19331,	L["Quartermaster Enuril"],		BZ["Shattrath City"],			60.5, 64.2, NEUTRAL)
+	AddVendor(19342,	L["Krek Cragcrush"],			BZ["Shadowmoon Valley"],		28.9, 30.8, HORDE)
+	AddVendor(19351,	L["Daggle Ironshaper"],			BZ["Shadowmoon Valley"],		36.8, 54.4, ALLIANCE)
+	AddVendor(19373,	L["Mari Stonehand"],			BZ["Shadowmoon Valley"],		36.8, 55.1, ALLIANCE)
+	AddVendor(19383,	L["Captured Gnome"],			BZ["Zangarmarsh"],			32.5, 48.1, HORDE)
+	AddVendor(19521,	L["Arrond"],				BZ["Shadowmoon Valley"],		55.9, 58.2, NEUTRAL)
+	AddVendor(19537,	L["Dealer Malij"],			BZ["Netherstorm"],			44.2, 34.0, NEUTRAL)
+	AddVendor(19540,	L["Asarnan"],				BZ["Netherstorm"],			44.2, 33.7, NEUTRAL)
+	AddVendor(19661,	L["Viggz Shinesparked"],		BZ["Shattrath City"],			64.9, 69.1, NEUTRAL)
+	AddVendor(19662,	L["Aaron Hollman"],			BZ["Shattrath City"],			63.1, 71.1, NEUTRAL)
+	AddVendor(19663,	L["Madame Ruby"],			BZ["Shattrath City"],			63.1, 69.3, NEUTRAL)
+	AddVendor(19694,	L["Loolruna"],				BZ["Zangarmarsh"],			68.5, 50.1, ALLIANCE)
+	AddVendor(19722,	L["Muheru the Weaver"],			BZ["Zangarmarsh"],			40.6, 28.2, ALLIANCE)
+	AddVendor(19836,	L["Mixie Farshot"],			BZ["Hellfire Peninsula"],		61.1, 81.5, HORDE)
+	AddVendor(19837,	L["Daga Ramba"],			BZ["Blade's Edge Mountains"],		51.1, 57.7, HORDE)
+	AddVendor(20028,	L["Doba"],				BZ["Zangarmarsh"],			42.3, 27.9, ALLIANCE)
+	AddVendor(20096,	L["Uriku"],				BZ["Nagrand"],				56.2, 73.3, ALLIANCE)
+	AddVendor(20097,	L["Nula the Butcher"],			BZ["Nagrand"],				58.0, 35.7, HORDE)
+	AddVendor(20240,	L["Trader Narasu"],			BZ["Nagrand"],				54.6, 75.2, ALLIANCE)
+	AddVendor(20241,	L["Provisioner Nasela"],		BZ["Nagrand"],				53.5, 36.9, HORDE)
+	AddVendor(20242,	L["Karaaz"],				BZ["Netherstorm"],			43.6, 34.3, NEUTRAL)
+	AddVendor(20916,	L["Xerintha Ravenoak"],			BZ["Blade's Edge Mountains"],		62.5, 40.3, NEUTRAL)
+	AddVendor(21113,	L["Sassa Weldwell"],			BZ["Blade's Edge Mountains"],		61.3, 68.9, ALLIANCE)
+	AddVendor(21432,	L["Almaador"],				BZ["Shattrath City"],			51.0, 41.9, NEUTRAL)
+	AddVendor(21474,	L["Coreiel"],				BZ["Nagrand"],				42.8, 42.6, HORDE)
+	AddVendor(21485,	L["Aldraan"],				BZ["Nagrand"],				42.9, 42.5, ALLIANCE)
+	AddVendor(21643,	L["Alurmi"],				BZ["Tanaris"],				62.99, 57.32, NEUTRAL)
+	AddVendor(21655,	L["Nakodu"],				BZ["Shattrath City"],			62.1, 69.0, NEUTRAL)
+	AddVendor(22208,	L["Nasmara Moonsong"],			BZ["Shattrath City"],			66.0, 69.0, NEUTRAL)
+	AddVendor(22212,	L["Andrion Darkspinner"],		BZ["Shattrath City"],			66.0, 67.8, NEUTRAL)
+	AddVendor(22213,	L["Gidge Spellweaver"],			BZ["Shattrath City"],			66.0, 67.9, NEUTRAL)
+	AddVendor(23007,	L["Paulsta'ats"],			BZ["Nagrand"],				30.6, 57.0, NEUTRAL)
+	AddVendor(23010,	L["Wolgren Jinglepocket"],		BZ["The Exodar"],			54.5, 47.2, ALLIANCE)
+	AddVendor(23012,	L["Hotoppik Copperpinch"],		BZ["Silvermoon City"],			63.5, 79.1, HORDE)
+	AddVendor(23064,	L["Eebee Jinglepocket"],		BZ["Shattrath City"],			51.0, 31.3, NEUTRAL)
+	AddVendor(23159,	L["Okuno"],				BZ["Black Temple"],			   0,	 0, NEUTRAL)
+	AddVendor(23437,	L["Indormi"],				BZ["Hyjal Summit"],			   0,	 0, NEUTRAL)
+	AddVendor(25032,	L["Eldara Dawnrunner"],			BZ["Isle of Quel'Danas"],		47.1, 30.0, NEUTRAL)
+	AddVendor(25950,	L["Shaani"],				BZ["Isle of Quel'Danas"],		51.5, 32.6, NEUTRAL)
+	AddVendor(26081, 	L["High Admiral \"Shelly\" Jorrik"],	BZ["Dun Morogh"], 			10.9, 76.1, NEUTRAL)
+	AddVendor(26569,	L["Alys Vol'tyr"],			BZ["Dragonblight"],			36.3, 46.5, HORDE)
+	AddVendor(26868,	L["Provisioner Lorkran"],		BZ["Grizzly Hills"],			22.6, 66.1, HORDE)
+	AddVendor(27030,	L["Bradley Towns"],			BZ["Dragonblight"],			76.9, 62.2, HORDE)
+	AddVendor(27054,	L["Modoru"],				BZ["Dragonblight"],			28.9, 55.9, ALLIANCE)
+	AddVendor(27147,	L["Librarian Erickson"],		BZ["Borean Tundra"],			46.7, 32.5, NEUTRAL)
+	AddVendor(27666,	L["Ontuvo"],				BZ["Shattrath City"],			48.7, 41.3, NEUTRAL)
+	AddVendor(28701,	L["Timothy Jones"],			BZ["Dalaran"],				40.5, 35.2, NEUTRAL)
+	AddVendor(28714,	L["Ildine Sorrowspear"],		BZ["Dalaran"],				39.1, 41.5, NEUTRAL)
+	AddVendor(28721,	L["Tiffany Cartier"],			BZ["Dalaran"],				40.5, 34.4, NEUTRAL)
+	AddVendor(28722,	L["Bryan Landers"],			BZ["Dalaran"],				39.1, 26.5, NEUTRAL)
+	AddVendor(28723,	L["Larana Drome"],			BZ["Dalaran"],				42.3, 37.5, NEUTRAL)
+	AddVendor(29510,	L["Linna Bruder"],			BZ["Dalaran"],				34.6, 34.5, NEUTRAL)
+	AddVendor(29511,	L["Lalla Brightweave"],			BZ["Dalaran"],				36.5, 33.5, NEUTRAL)
+	AddVendor(29512,	L["Ainderu Summerleaf"],		BZ["Dalaran"],				36.5, 34.0, NEUTRAL)
+	AddVendor(30431,	L["Veteran Crusader Aliocha Segard"],	BZ["Icecrown"],				87.6, 75.6, NEUTRAL)
+	AddVendor(30489,	L["Morgan Day"],			BZ["Wintergrasp"],			49.0, 17.1, ALLIANCE)
+	AddVendor(30734,	L["Jezebel Bican"],			BZ["Hellfire Peninsula"],		53.9, 65.5, ALLIANCE)
+	AddVendor(30735,	L["Kul Inkspiller"],			BZ["Hellfire Peninsula"],		52.5, 36.0, HORDE)
+	AddVendor(31031,	L["Misensi"],				BZ["Dalaran"],				70.1, 38.5, HORDE)
+	AddVendor(31032,	L["Derek Odds"],			BZ["Dalaran"],				41.5, 64.8, ALLIANCE)
+	AddVendor(31910,	L["Geen"],				BZ["Sholazar Basin"],			54.5, 56.2, NEUTRAL)
+	AddVendor(31911,	L["Tanak"],				BZ["Sholazar Basin"],			55.1, 69.1, NEUTRAL)
+	AddVendor(31916,	L["Tanaika"],				BZ["Howling Fjord"],			25.5, 58.7, NEUTRAL)
+	AddVendor(32287,	L["Archmage Alvareaux"],		BZ["Dalaran"],				25.5, 47.4, NEUTRAL)
+	AddVendor(32294,	L["Knight Dameron"],			BZ["Wintergrasp"],			51.7, 17.5, ALLIANCE)
+	AddVendor(32296,	L["Stone Guard Mukar"],			BZ["Wintergrasp"],			51.7, 17.5, HORDE)
+	AddVendor(32514,	L["Vanessa Sellers"],			BZ["Dalaran"],				38.7, 40.8, NEUTRAL)
+	AddVendor(32515,	L["Braeg Stoutbeard"],			BZ["Dalaran"],				37.6, 29.5, NEUTRAL)
+	AddVendor(32533,	L["Cielstrasza"],			BZ["Dragonblight"],			59.9, 53.1, NEUTRAL)
+	AddVendor(32538,	L["Duchess Mynx"],			BZ["Icecrown"],				43.5, 20.6, NEUTRAL)
+	AddVendor(32540,	L["Lillehoff"],				BZ["The Storm Peaks"],			66.2, 61.4, NEUTRAL)
+	AddVendor(32564,	L["Logistics Officer Silverstone"],	BZ["Borean Tundra"],			57.7, 66.5, ALLIANCE)
+	AddVendor(32565,	L["Gara Skullcrush"],			BZ["Borean Tundra"],			41.4, 53.6, HORDE)
+	AddVendor(32763,	L["Sairuk"],				BZ["Dragonblight"],			48.5, 75.7, NEUTRAL)
+	AddVendor(32773,	L["Logistics Officer Brighton"],	BZ["Howling Fjord"],			59.7, 63.9, ALLIANCE)
+	AddVendor(32774,	L["Sebastian Crane"],			BZ["Howling Fjord"],			79.6, 30.7, HORDE)
+	AddVendor(33595,	L["Mera Mistrunner"],			BZ["Icecrown"],				72.4, 20.9, NEUTRAL)
+	AddVendor(33602,	L["Anuur"],				BZ["Icecrown"],				71.4, 20.8, NEUTRAL)
+	AddVendor(33637,	L["Kirembri Silvermane"],		BZ["Shattrath City"],			58.1, 75.0, NEUTRAL)
+	AddVendor(33680,	L["Nemiha"],				BZ["Shattrath City"],			36.1, 47.7, NEUTRAL)
+	AddVendor(34039,	L["Lady Palanseer"],			BZ["Orgrimmar"],			37.0, 64.9, HORDE)
+	AddVendor(34079,	L["Captain O'Neal"],			BZ["Stormwind City"],			75.7, 66.6, ALLIANCE)
+	AddVendor(35826,	L["Kaye Toogie"],			BZ["Dalaran"],				34.0, 35.6, NEUTRAL)
+	AddVendor(37687,	L["Alchemist Finklestein"],		BZ["Icecrown Citadel"],			   0,	 0, NEUTRAL)
+	AddVendor(40160,	L["Frozo the Renowned"],		BZ["Dalaran"],				41.0, 28.5, NEUTRAL)
+	AddVendor(49701,	L["Bario Matalli"],			BZ["Stormwind City"], 			50.9, 71.4, ALLIANCE)
+	AddVendor(49703,	L["Casandra Downs"],			BZ["Twilight Highlands"],		78.6, 76.2, ALLIANCE)
+	AddVendor(49737,	L["Shazdar"],				BZ["Orgrimmar"],			57.2, 62.0, HORDE)
+	AddVendor(50134,	L["Senthii"],				BZ["Twilight Highlands"],		78.7, 77.0, ALLIANCE)
+	AddVendor(50146,	L["Agatian Fallanos"],			BZ["Twilight Highlands"],		76.7, 49.5, HORDE)
+	AddVendor(50172,	L["Threm Blackscalp"],			BZ["Twilight Highlands"],		75.2, 50.1, HORDE)
+	AddVendor(50248,	L["Una Kobuna"],			BZ["Twilight Highlands"],		76.6, 49.4, HORDE)
+	AddVendor(50375,	L["Kuldar Steeltooth"],			BZ["Twilight Highlands"],		77.3, 53.1, HORDE)
+	AddVendor(50381,	L["Misty Merriweather"],		BZ["Twilight Highlands"],		78.8, 76.2, ALLIANCE)
+	AddVendor(50382,	L["Brundall Chiselgut"],		BZ["Twilight Highlands"],		79.1, 76.5, ALLIANCE)
+	AddVendor(50386,	L["Sal Ferraga"],			BZ["Twilight Highlands"],		78.6, 76.9, ALLIANCE)
+	AddVendor(50433,	L["Aristaleon Sunweaver"],		BZ["Twilight Highlands"],		75.2, 50.1, HORDE)
+	AddVendor(50480,	L["Isabel Jones"],			BZ["Stormwind City"],			63.7, 61.3, ALLIANCE)
+	AddVendor(50482,	L["Marith Lazuria"],			BZ["Orgrimmar"],			72.5, 36.2, HORDE)

+	self.InitVendor = nil
 end
diff --git a/core.lua b/core.lua
index 284cdfc..c3828d8 100644
--- a/core.lua
+++ b/core.lua
@@ -852,8 +852,8 @@ do
 	}

 	--- Adds an item to a specific database listing (ie: vendor, mob, etc)
-	-- @name AckisRecipeList:addLookupList
-	-- @usage AckisRecipeList:addLookupList(DB,NPC ID, NPC Name, NPC Location, X Coord, Y Coord, Faction)
+	-- @name AckisRecipeList:AddListEntry
+	-- @usage AckisRecipeList:AddListEntry(DB,NPC ID, NPC Name, NPC Location, X Coord, Y Coord, Faction)
 	-- @param DB Database which the entry will be stored
 	-- @param ID Unique identified for the entry
 	-- @param name Name of the entry
@@ -863,30 +863,31 @@ do
 	-- @param faction Faction identifier for the entry
 	-- @return None, array is passed as a reference
 	-- For individual database structures, see Documentation.lua
-	function addon:addLookupList(DB, ID, name, location, coord_x, coord_y, faction)
-		if DB[ID] then
-			self:Debug("Duplicate lookup: %d - %s.", ID, name)
+	function addon:AddListEntry(lookup_list, identifier, name, location, coord_x, coord_y, faction)
+		if lookup_list[identifier] then
+			self:Debug("Duplicate lookup: %s - %s.", identifier, name)
 			return
 		end

-		DB[ID] = {
+		local entry = {
 			["name"]	= name,
 			["location"]	= location,
 			["faction"]	= faction and FACTION_NAMES[faction + 1] or FACTION_NAMES[1]
 		}
+		lookup_list[identifier] = entry

 		if coord_x and coord_y then
-			DB[ID]["coord_x"] = coord_x
-			DB[ID]["coord_y"] = coord_y
+			lookup_list[identifier]["coord_x"] = coord_x
+			lookup_list[identifier]["coord_y"] = coord_y
 		end

 		--@alpha@
-		if not location and DB ~= private.custom_list then
-			self:Debug("Lookup ID: %d (%s) has an unknown location.", ID, DB[ID].name or _G.UNKNOWN)
+		if not location and lookup_list ~= private.custom_list and lookup_list ~= private.reputation_list then
+			self:Debug("Lookup ID: %s (%s) has an unknown location.", identifier, lookup_list[identifier].name or _G.UNKNOWN)
 		end

-		if faction and DB == private.mob_list then
-			self:Debug("Mob %d (%s) has been assigned to faction %s.", ID, name, DB[ID].faction)
+		if faction and lookup_list == private.mob_list then
+			self:Debug("Mob %d (%s) has been assigned to faction %s.", identifier, name, lookup_list[identifier].faction)
 		end
 		--@end-alpha@
 	end