Quantcast

General cleanup and removed unnecessary uses of LibBabble-Faction.

James D. Callahan III [04-03-11 - 09:57]
General cleanup and removed unnecessary uses of LibBabble-Faction.
Filename
Database/Mob.lua
Database/Quest.lua
Database/Reputation.lua
Database/Seasonal.lua
Database/Trainer.lua
Database/Vendor.lua
Utilities.lua
Waypoint.lua
diff --git a/Database/Mob.lua b/Database/Mob.lua
index d2e68b3..64fc6a1 100644
--- a/Database/Mob.lua
+++ b/Database/Mob.lua
@@ -12,6 +12,10 @@ Please see http://www.wowace.com/addons/arl/ for more information.
 This source code is released under All Rights Reserved.
 ************************************************************************
 ]]--
+
+-----------------------------------------------------------------------
+-- AddOn namespace.
+-----------------------------------------------------------------------
 local FOLDER_NAME, private = ...

 local addon		= LibStub("AceAddon-3.0"):GetAddon(private.addon_name)
diff --git a/Database/Quest.lua b/Database/Quest.lua
index 36a8aea..046b2b3 100644
--- a/Database/Quest.lua
+++ b/Database/Quest.lua
@@ -26,17 +26,9 @@ local FOLDER_NAME, private	= ...
 local LibStub = _G.LibStub

 local addon	= LibStub("AceAddon-3.0"):GetAddon(private.addon_name)
-local L		= LibStub("AceLocale-3.0"):GetLocale(private.addon_name)
 local BZ	= LibStub("LibBabble-Zone-3.0"):GetLookupTable()

 -----------------------------------------------------------------------
--- Constants.
------------------------------------------------------------------------
-local NEUTRAL	= 0
-local ALLIANCE	= 1
-local HORDE	= 2
-
------------------------------------------------------------------------
 -- Memoizing table for quest names.
 -----------------------------------------------------------------------
 private.quest_names = _G.setmetatable({}, {
@@ -57,69 +49,69 @@ private.quest_names = _G.setmetatable({}, {

 function addon:InitQuest(DB)
 	local function AddQuest(quest_id, location, coord_x, coord_y, faction)
-		private:AddListEntry(DB, quest_id, nil, location, coord_x, coord_y, faction)
+		private:AddListEntry(DB, quest_id, nil, BZ[location], coord_x, coord_y, faction)
 	end

-	AddQuest(384,	BZ["Dun Morogh"],		46.8,	52.5,	ALLIANCE)
-	AddQuest(769,	BZ["Thunder Bluff"],		44.1,	44.6,	HORDE)
-	AddQuest(1578,	BZ["Ironforge"],		48.5,	43.0,	ALLIANCE)
-	AddQuest(1582,	BZ["Darnassus"],		64.3,	21.9,	ALLIANCE)
-	AddQuest(1618,	BZ["Ironforge"],		48.5,	43.0,	ALLIANCE)
-	AddQuest(2751,	BZ["Orgrimmar"],		78.0,	21.4,	HORDE)
-	AddQuest(2752,	BZ["Orgrimmar"],		78.0,	21.4,	HORDE)
-	AddQuest(2753,	BZ["Orgrimmar"],		78.0,	21.4,	HORDE)
-	AddQuest(2754,	BZ["Orgrimmar"],		78.0,	21.4,	HORDE)
-	AddQuest(2755,	BZ["Orgrimmar"],		78.0,	21.4,	HORDE)
-	AddQuest(4083,	BZ["Blackrock Depths"],		0,	0,	NEUTRAL)
-	AddQuest(5518,	BZ["Dire Maul"],		0,	0,	NEUTRAL)
-	AddQuest(6032,	BZ["Felwood"],			65.7,	2.9,	NEUTRAL)
-	AddQuest(6610,	BZ["Tanaris"],			52.6,	29.0,	NEUTRAL)
-	AddQuest(6622,	BZ["Arathi Highlands"],		73.4,	36.8,	HORDE)
-	AddQuest(6624,	BZ["Dustwallow Marsh"],		67.7,	48.9,	ALLIANCE)
-	AddQuest(7493,	BZ["Orgrimmar"],		51.0,	76.5,	HORDE)
-	AddQuest(7497,	BZ["Stormwind City"],		67.2,	85.5,	ALLIANCE)
-	AddQuest(7604,	BZ["Blackrock Depths"],		0,	0,	NEUTRAL)
-	AddQuest(7649,	BZ["Dire Maul"],		0,	0,	NEUTRAL)
-	AddQuest(7650,	BZ["Dire Maul"],		0,	0,	NEUTRAL)
-	AddQuest(7651,	BZ["Dire Maul"],		0,	0,	NEUTRAL)
-	AddQuest(8313,	BZ["Silithus"],			43.6, 42.0,	NEUTRAL)
-	AddQuest(8323,	BZ["Silithus"],			67.1,	69.7,	NEUTRAL)
-	AddQuest(8798,	BZ["Winterspring"],		60.9,	37.7,	NEUTRAL)
-	AddQuest(9171,	BZ["Ghostlands"],		48.3,	30.9,	HORDE)
-	AddQuest(9249,	BZ["Darkmoon Faire"],		0,	0,	NEUTRAL)
-	AddQuest(9356,	BZ["Hellfire Peninsula"],	49.2,	74.8,	NEUTRAL)
-	AddQuest(9454,	BZ["Azuremyst Isle"],		49.8,	51.9,	ALLIANCE)
-	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(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)
-	AddQuest(13088,	BZ["Borean Tundra"],		57.9,	71.5,	ALLIANCE)
-	AddQuest(13089,	BZ["Howling Fjord"],		78.7,	29.5,	HORDE)
-	AddQuest(13090,	BZ["Borean Tundra"],		42.0,	54.2,	HORDE)
-	AddQuest(13100,	BZ["Dalaran"],			40.5, 65.8,	ALLIANCE)
-	AddQuest(13101,	BZ["Dalaran"],			40.5, 65.8,	ALLIANCE)
-	AddQuest(13102,	BZ["Dalaran"],			40.5, 65.8,	ALLIANCE)
-	AddQuest(13103,	BZ["Dalaran"],			40.5, 65.8,	ALLIANCE)
-	AddQuest(13107,	BZ["Dalaran"],			40.5, 65.8,	ALLIANCE)
-	AddQuest(13112,	BZ["Dalaran"],			70.0, 38.6,	HORDE)
-	AddQuest(13113,	BZ["Dalaran"],			70.0, 38.6,	HORDE)
-	AddQuest(13114,	BZ["Dalaran"],			70.0, 38.6,	HORDE)
-	AddQuest(13115,	BZ["Dalaran"],			70.0, 38.6,	HORDE)
-	AddQuest(13116,	BZ["Dalaran"],			70.0, 38.6,	HORDE)
-	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(384,	"Dun Morogh",			46.8,	52.5,	"Alliance")
+	AddQuest(769,	"Thunder Bluff",		44.1,	44.6,	"Horde")
+	AddQuest(1578,	"Ironforge",			48.5,	43.0,	"Alliance")
+	AddQuest(1582,	"Darnassus",			64.3,	21.9,	"Alliance")
+	AddQuest(1618,	"Ironforge",			48.5,	43.0,	"Alliance")
+	AddQuest(2751,	"Orgrimmar",			78.0,	21.4,	"Horde")
+	AddQuest(2752,	"Orgrimmar",			78.0,	21.4,	"Horde")
+	AddQuest(2753,	"Orgrimmar",			78.0,	21.4,	"Horde")
+	AddQuest(2754,	"Orgrimmar",			78.0,	21.4,	"Horde")
+	AddQuest(2755,	"Orgrimmar",			78.0,	21.4,	"Horde")
+	AddQuest(4083,	"Blackrock Depths",		0,	0,	"Neutral")
+	AddQuest(5518,	"Dire Maul",			0,	0,	"Neutral")
+	AddQuest(6032,	"Felwood",			65.7,	2.9,	"Neutral")
+	AddQuest(6610,	"Tanaris",			52.6,	29.0,	"Neutral")
+	AddQuest(6622,	"Arathi Highlands",		73.4,	36.8,	"Horde")
+	AddQuest(6624,	"Dustwallow Marsh",		67.7,	48.9,	"Alliance")
+	AddQuest(7493,	"Orgrimmar",			51.0,	76.5,	"Horde")
+	AddQuest(7497,	"Stormwind City",		67.2,	85.5,	"Alliance")
+	AddQuest(7604,	"Blackrock Depths",		0,	0,	"Neutral")
+	AddQuest(7649,	"Dire Maul",			0,	0,	"Neutral")
+	AddQuest(7650,	"Dire Maul",			0,	0,	"Neutral")
+	AddQuest(7651,	"Dire Maul",			0,	0,	"Neutral")
+	AddQuest(8313,	"Silithus",			43.6, 42.0,	"Neutral")
+	AddQuest(8323,	"Silithus",			67.1,	69.7,	"Neutral")
+	AddQuest(8798,	"Winterspring",			60.9,	37.7,	"Neutral")
+	AddQuest(9171,	"Ghostlands",			48.3,	30.9,	"Horde")
+	AddQuest(9249,	"Darkmoon Faire",		0,	0,	"Neutral")
+	AddQuest(9356,	"Hellfire Peninsula",		49.2,	74.8,	"Neutral")
+	AddQuest(9454,	"Azuremyst Isle",		49.8,	51.9,	"Alliance")
+	AddQuest(9635,	"Zangarmarsh",			33.7,	50.2,	"Horde")
+	AddQuest(9636,	"Zangarmarsh",			68.6,	50.2,	"Alliance")
+	AddQuest(10860,	"Blade's Edge Mountains",	76.1,	60.3,	"Horde")
+	AddQuest(11377,	"Shattrath City",		61.6,	16.5,	"Neutral")
+	AddQuest(11379,	"Shattrath City",		61.6,	16.5,	"Neutral")
+	AddQuest(11380,	"Shattrath City",		61.6,	16.5,	"Neutral")
+	AddQuest(11381,	"Shattrath City",		61.6,	16.5,	"Neutral")
+	AddQuest(11666,	"Terokkar Forest",		38.7,	12.8,	"Neutral")
+	AddQuest(11667,	"Terokkar Forest",		38.7,	12.8,	"Neutral")
+	AddQuest(11668,	"Terokkar Forest",		38.7,	12.8,	"Neutral")
+	AddQuest(11669,	"Terokkar Forest",		38.7,	12.8,	"Neutral")
+	AddQuest(12889,	"The Storm Peaks",		37.7,	46.5,	"Neutral")
+	AddQuest(13571,	"Dalaran",			0,	0,	"Neutral")
+	AddQuest(13087,	"Howling Fjord",		58.2,	62.1,	"Alliance")
+	AddQuest(13088,	"Borean Tundra",		57.9,	71.5,	"Alliance")
+	AddQuest(13089,	"Howling Fjord",		78.7,	29.5,	"Horde")
+	AddQuest(13090,	"Borean Tundra",		42.0,	54.2,	"Horde")
+	AddQuest(13100,	"Dalaran",			40.5,	65.8,	"Alliance")
+	AddQuest(13101,	"Dalaran",			40.5,	65.8,	"Alliance")
+	AddQuest(13102,	"Dalaran",			40.5,	65.8,	"Alliance")
+	AddQuest(13103,	"Dalaran",			40.5,	65.8,	"Alliance")
+	AddQuest(13107,	"Dalaran",			40.5,	65.8,	"Alliance")
+	AddQuest(13112,	"Dalaran",			70.0,	38.6,	"Horde")
+	AddQuest(13113,	"Dalaran",			70.0,	38.6,	"Horde")
+	AddQuest(13114,	"Dalaran",			70.0,	38.6,	"Horde")
+	AddQuest(13115,	"Dalaran",			70.0,	38.6,	"Horde")
+	AddQuest(13116,	"Dalaran",			70.0,	38.6,	"Horde")
+	AddQuest(14151,	"Dalaran",			42.5,	32.1,	"Neutral")
+	AddQuest(26620,	"Duskwood",			73.8,	43.6,	"Alliance")
+	AddQuest(26623,	"Duskwood",			73.8,	43.6,	"Alliance")
+	AddQuest(26860,	"Loch Modan",			34.9,	49.1,	"Alliance")

 	self.InitQuest = nil
 end
diff --git a/Database/Reputation.lua b/Database/Reputation.lua
index ab3a269..0d996ab 100644
--- a/Database/Reputation.lua
+++ b/Database/Reputation.lua
@@ -31,45 +31,45 @@ local BFAC	= LibStub("LibBabble-Faction-3.0"):GetLookupTable()

 function addon:InitReputation(DB)
 	local function AddReputation(rep_id, name)
-		private:AddListEntry(DB, rep_id, name, nil, nil, nil, nil)
+		private:AddListEntry(DB, rep_id, BFAC[name])
 	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"])
+	AddReputation(59, "Thorium Brotherhood")
+	AddReputation(270, "Zandalar Tribe")
+	AddReputation(529, "Argent Dawn")
+	AddReputation(576, "Timbermaw Hold")
+	AddReputation(609, "Cenarion Circle")
+	AddReputation(932, "The Aldor")
+	AddReputation(933, "The Consortium")
+	AddReputation(934, "The Scryers")
+	AddReputation(935, "The Sha'tar")
+	AddReputation(941, "The Mag'har")
+	AddReputation(942, "Cenarion Expedition")
+	AddReputation(946, "Honor Hold")
+	AddReputation(947, "Thrallmar")
+	AddReputation(967, "The Violet Eye")
+	AddReputation(970, "Sporeggar")
+	AddReputation(978, "Kurenai")
+	AddReputation(989, "Keepers of Time")
+	AddReputation(990, "The Scale of the Sands")
+	AddReputation(1011, "Lower City")
+	AddReputation(1012, "Ashtongue Deathsworn")
+	AddReputation(1037, "Alliance Vanguard")
+	AddReputation(1050, "Valiance Expedition")
+	AddReputation(1052, "Horde Expedition")
+	AddReputation(1064, "The Taunka")
+	AddReputation(1067, "The Hand of Vengeance")
+	AddReputation(1068, "Explorers' League")
+	AddReputation(1073, "The Kalu'ak")
+	AddReputation(1077, "Shattered Sun Offensive")
+	AddReputation(1085, "Warsong Offensive")
+	AddReputation(1090, "Kirin Tor")
+	AddReputation(1091, "The Wyrmrest Accord")
+	AddReputation(1098, "Knights of the Ebon Blade")
+	AddReputation(1104, "Frenzyheart Tribe")
+	AddReputation(1105, "The Oracles")
+	AddReputation(1106, "Argent Crusade")
+	AddReputation(1119, "The Sons of Hodir")
+	AddReputation(1156, "The Ashen Verdict")

 	self.InitReputation = nil
 end
diff --git a/Database/Seasonal.lua b/Database/Seasonal.lua
index a833221..d5b72d4 100644
--- a/Database/Seasonal.lua
+++ b/Database/Seasonal.lua
@@ -30,16 +30,16 @@ local LibStub = _G.LibStub
 local addon = LibStub("AceAddon-3.0"):GetAddon(private.addon_name)
 local L = LibStub("AceLocale-3.0"):GetLocale(private.addon_name)

-local GetCategoryInfo = _G.GetCategoryInfo
-
 function addon:InitSeasons(DB)
 	local function AddSeason(identifier, name)
-		private:AddListEntry(DB, identifier, name, GetCategoryInfo(155))
+		private:AddListEntry(DB, identifier, name, _G.GetCategoryInfo(155))
 	end

-	AddSeason("WINTER_VEIL", GetCategoryInfo(156))
-	AddSeason("LUNAR_FESTIVAL", GetCategoryInfo(160))
-	AddSeason("MIDSUMMER", GetCategoryInfo(161))
-	AddSeason("PILGRIMS_BOUNTY", GetCategoryInfo(14981))
+	AddSeason("WINTER_VEIL", _G.GetCategoryInfo(156))
+	AddSeason("LUNAR_FESTIVAL", _G.GetCategoryInfo(160))
+	AddSeason("MIDSUMMER", _G.GetCategoryInfo(161))
+	AddSeason("PILGRIMS_BOUNTY", _G.GetCategoryInfo(14981))
 	AddSeason("DAY_OF_THE_DEAD", L["Day of the Dead"])
+
+	self.InitSeasons = nil
 end
diff --git a/Database/Trainer.lua b/Database/Trainer.lua
index 09aefb0..41622f5 100644
--- a/Database/Trainer.lua
+++ b/Database/Trainer.lua
@@ -24,17 +24,7 @@ local _G = getfenv(0)
 local FOLDER_NAME, private = ...

 local LibStub = _G.LibStub
-
 local addon = LibStub("AceAddon-3.0"):GetAddon(private.addon_name)
-local L = LibStub("AceLocale-3.0"):GetLocale(private.addon_name)
-local BZ = LibStub("LibBabble-Zone-3.0"):GetLookupTable()
-
------------------------------------------------------------------------
--- Constants.
------------------------------------------------------------------------
-local NEUTRAL = 0
-local ALLIANCE = 1
-local HORDE = 2

 function addon:InitTrainer(DB)
 	local function AddTrainer(id_num, name, location, coord_x, coord_y, faction)
diff --git a/Database/Vendor.lua b/Database/Vendor.lua
index 8beea6a..21adbe4 100644
--- a/Database/Vendor.lua
+++ b/Database/Vendor.lua
@@ -30,375 +30,368 @@ local L		= LibStub("AceLocale-3.0"):GetLocale(private.addon_name)
 local BZ	= LibStub("LibBabble-Zone-3.0"):GetLookupTable()
 local BB	= LibStub("LibBabble-Boss-3.0"):GetLookupTable()

------------------------------------------------------------------------
--- Constants.
------------------------------------------------------------------------
-local NEUTRAL	= 0
-local ALLIANCE	= 1
-local HORDE	= 2
-
 function addon:InitVendor(DB)
 	local function AddVendor(id_num, name, zone, x, y, faction)
 		private: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"],			46.6, 56.9, HORDE) -- COMPLETELY UPDATED
-	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"],				11.8, 52.6, 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(2393,		L["Christoph Jeffcoat"],		BZ["Hillsbrad Foothills"],		57.5, 47.8, HORDE) -- COMPLETELY UPDATED
-	AddVendor(2394,		L["Mallen Swain"],			BZ["Hillsbrad Foothills"],		58.1, 47.9, HORDE) -- COMPLETELY UPDATED
-	AddVendor(2397,		L["Derak Nightfall"],			BZ["Hillsbrad Foothills"],		57.7, 45.2, HORDE) -- COMPLETELY UPDATED
-	AddVendor(2480,		L["Bro'kin"],				BZ["Hillsbrad Foothills"],		44.0, 21.8, NEUTRAL) -- COMPLETELY UPDATED
-	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(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(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(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"],		76.7, 58.5, HORDE) -- COMPLETELY UPDATED
-	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(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, 45.1, HORDE) -- COMPLETELY UPDATED
-	AddVendor(3012,		L["Nata Dawnstrider"],			BZ["Thunder Bluff"],			44.9, 37.7, HORDE) -- COMPLETELY UPDATED
-	AddVendor(3027,		L["Naal Mistrunner"],			BZ["Thunder Bluff"],			51.0, 52.5, HORDE) -- COMPLETELY UPDATED
-	AddVendor(3029,		L["Sewa Mistrunner"],			BZ["Thunder Bluff"],			55.8, 47.0, HORDE) -- COMPLETELY UPDATED
-	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"],		49.8, 60.8, NEUTRAL) -- COMPLETELY UPDATED
-	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"],			60.6, 36.9, ALLIANCE) -- COMPLETELY UPDATED
-	AddVendor(4223,		L["Fyldan"],				BZ["Darnassus"],			49.5, 36.9, ALLIANCE) -- COMPLETELY UPDATED
-	AddVendor(4225,		L["Saenorion"],				BZ["Darnassus"],			60.0, 37.3, ALLIANCE) -- COMPLETELY UPDATED
-	AddVendor(4226,		L["Ulthir"],				BZ["Darnassus"],			54.6, 38.9, ALLIANCE) -- COMPLETELY UPDATED
-	AddVendor(4228,		L["Vaean"],				BZ["Darnassus"],			56.4, 32.2, ALLIANCE) -- COMPLETELY UPDATED
-	AddVendor(4229,		L["Mythrin'dir"],			BZ["Darnassus"],			58.1, 34.2, ALLIANCE) -- COMPLETELY UPDATED
-	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.3, 43.1, HORDE) -- COMPLETELY UPDATED
-	AddVendor(4561,		L["Daniel Bartlett"],			BZ["Undercity"],			64.1, 37.4, HORDE) -- COMPLETELY UPDATED
-	AddVendor(4574,		L["Lizbeth Cromwell"],			BZ["Undercity"],			81.0, 30.7, HORDE) -- COMPLETELY UPDATED
-	AddVendor(4577,		L["Millie Gregorian"],			BZ["Undercity"],			70.6, 30.1, HORDE) -- COMPLETELY UPDATED
-	AddVendor(4589,		L["Joseph Moore"],			BZ["Undercity"],			70.0, 58.5, HORDE) -- COMPLETELY UPDATED
-	AddVendor(4610,		L["Algernon"],				BZ["Undercity"],			51.7, 74.7, HORDE) -- COMPLETELY UPDATED
-	AddVendor(4617,		L["Thaddeus Webb"],			BZ["Undercity"],			62.4, 61.0, HORDE) -- COMPLETELY UPDATED
-	AddVendor(4775,		L["Felicia Doan"],			BZ["Undercity"],			64.1, 50.6, HORDE) -- COMPLETELY UPDATED
-	AddVendor(4782,		L["Truk Wildbeard"],			BZ["The Hinterlands"],			14.4, 42.5, ALLIANCE)
-	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.2, 30.4, NEUTRAL) -- COMPLETELY UPDATED
-	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.8, 28.0, NEUTRAL) -- COMPLETELY UPDATED
-	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"],				50.7, 28.7, NEUTRAL) -- COMPLETELY UPDATED
-	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) -- COMPLETELY UPDATED
-	AddVendor(6779,		L["Smudge Thunderwood"],		BZ["Hillsbrad Foothills"],		71.5, 45.5, NEUTRAL) -- COMPLETELY UPDATED
-	AddVendor(7733,		L["Innkeeper Fizzgrimble"],		BZ["Tanaris"],				52.6, 27.0, NEUTRAL) -- COMPLETELY 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(8131,		L["Blizrik Buckshot"],			BZ["Tanaris"],				50.7, 28.5, NEUTRAL) -- COMPLETELY UPDATED
-	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"],			47.2, 52.1, HORDE) -- COMPLETELY UPDATED
-	AddVendor(8177,		L["Rartar"],				BZ["Swamp of Sorrows"],			47.2, 57.1, HORDE) -- COMPLETELY UPDATED
-	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.6, 64.0, HORDE) -- COMPLETELY UPDATED
-	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) -- COMPLETELY UPDATED
-	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) -- COMPLETELY UPDATED
-	AddVendor(13432,	L["Seersa Copperpinch"],		BZ["Thunder Bluff"],			42.0, 55.1, HORDE) -- COMPLETELY UPDATED
-	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(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.9, 73.3, HORDE) -- COMPLETELY UPDATED
-	AddVendor(16635,	L["Lyna"],				BZ["Silvermoon City"],			70.3, 24.9, HORDE) -- COMPLETELY UPDATED
-	AddVendor(16638,	L["Deynna"],				BZ["Silvermoon City"],			55.6, 51.0, HORDE) -- COMPLETELY UPDATED
-	AddVendor(16641,	L["Melaris"],				BZ["Silvermoon City"],			67.1, 19.5, HORDE) -- COMPLETELY UPDATED
-	AddVendor(16657,	L["Feera"],				BZ["The Exodar"],			54.0, 90.5, ALLIANCE)
-	AddVendor(16670,	L["Eriden"],				BZ["Silvermoon City"],			80.3, 36.1, HORDE) -- COMPLETELY UPDATED
-	AddVendor(16677,	L["Quelis"],				BZ["Silvermoon City"],			69.3, 70.4, HORDE) -- COMPLETELY UPDATED
-	AddVendor(16689,	L["Zaralda"],				BZ["Silvermoon City"],			84.8, 78.6, HORDE) -- COMPLETELY UPDATED
-	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"],			75.6, 40.7, HORDE) -- COMPLETELY UPDATED
-	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) -- COMPLETELY UPDATED
-	AddVendor(18005,	L["Haalrun"],				BZ["Zangarmarsh"],			67.8, 48.0, ALLIANCE)
-	AddVendor(18011,	L["Zurai"],				BZ["Zangarmarsh"],			85.3, 54.8, HORDE) -- COMPLETELY UPDATED
-	AddVendor(18015,	L["Gambarinka"],			BZ["Zangarmarsh"],			31.7, 49.3, HORDE) -- COMPLETELY UPDATED
-	AddVendor(18017,	L["Seer Janidi"],			BZ["Zangarmarsh"],			32.4, 51.9, HORDE) -- COMPLETELY UPDATED
-	AddVendor(18255,	L["Apprentice Darius"],			BZ["Deadwind Pass"],			47.0, 75.3, NEUTRAL)
-	AddVendor(18382,	L["Mycah"],				BZ["Zangarmarsh"],			17.9, 51.2, NEUTRAL) -- COMPLETELY UPDATED
-	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) -- COMPLETELY UPDATED
-	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) -- COMPLETELY UPDATED
-	AddVendor(19521,	L["Arrond"],				BZ["Shadowmoon Valley"],		55.9, 58.2, NEUTRAL)
-	AddVendor(19537,	L["Dealer Malij"],			BZ["Netherstorm"],			44.2, 34.0, NEUTRAL) -- COMPLETELY UPDATED
-	AddVendor(19540,	L["Asarnan"],				BZ["Netherstorm"],			44.2, 33.7, NEUTRAL) -- COMPLETELY UPDATED
-	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) -- COMPLETELY UPDATED
-	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) -- COMPLETELY UPDATED
-	AddVendor(20916,	L["Xerintha Ravenoak"],			BZ["Blade's Edge Mountains"],		62.5, 40.3, NEUTRAL) -- COMPLETELY UPDATED
-	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"],				63.0, 57.3, NEUTRAL) -- COMPLETELY UPDATED
-	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) -- COMPLETELY UPDATED
-	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(33594,	L["Fizzix Blastbolt"],			BZ["Icecrown"],				72.2, 20.9, NEUTRAL)
-	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(40572,	L["Haughty Modiste"],			BZ["Tanaris"],				50.7, 28.6, NEUTRAL) -- COMPLETELY UPDATED
-	AddVendor(40589,	L["Dirge Quikcleave"],			BZ["Tanaris"],				52.6, 29.1, NEUTRAL) -- COMPLETELY UPDATED
-	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(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"],			46.6, 56.9, "Horde") -- COMPLETELY UPDATED
+	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"],				11.8, 52.6, "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(2393,		L["Christoph Jeffcoat"],		BZ["Hillsbrad Foothills"],		57.5, 47.8, "Horde") -- COMPLETELY UPDATED
+	AddVendor(2394,		L["Mallen Swain"],			BZ["Hillsbrad Foothills"],		58.1, 47.9, "Horde") -- COMPLETELY UPDATED
+	AddVendor(2397,		L["Derak Nightfall"],			BZ["Hillsbrad Foothills"],		57.7, 45.2, "Horde") -- COMPLETELY UPDATED
+	AddVendor(2480,		L["Bro'kin"],				BZ["Hillsbrad Foothills"],		44.0, 21.8, "Neutral") -- COMPLETELY UPDATED
+	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(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(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(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"],		76.7, 58.5, "Horde") -- COMPLETELY UPDATED
+	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(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, 45.1, "Horde") -- COMPLETELY UPDATED
+	AddVendor(3012,		L["Nata Dawnstrider"],			BZ["Thunder Bluff"],			44.9, 37.7, "Horde") -- COMPLETELY UPDATED
+	AddVendor(3027,		L["Naal Mistrunner"],			BZ["Thunder Bluff"],			51.0, 52.5, "Horde") -- COMPLETELY UPDATED
+	AddVendor(3029,		L["Sewa Mistrunner"],			BZ["Thunder Bluff"],			55.8, 47.0, "Horde") -- COMPLETELY UPDATED
+	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"],		49.8, 60.8, "Neutral") -- COMPLETELY UPDATED
+	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"],			60.6, 36.9, "Alliance") -- COMPLETELY UPDATED
+	AddVendor(4223,		L["Fyldan"],				BZ["Darnassus"],			49.5, 36.9, "Alliance") -- COMPLETELY UPDATED
+	AddVendor(4225,		L["Saenorion"],				BZ["Darnassus"],			60.0, 37.3, "Alliance") -- COMPLETELY UPDATED
+	AddVendor(4226,		L["Ulthir"],				BZ["Darnassus"],			54.6, 38.9, "Alliance") -- COMPLETELY UPDATED
+	AddVendor(4228,		L["Vaean"],				BZ["Darnassus"],			56.4, 32.2, "Alliance") -- COMPLETELY UPDATED
+	AddVendor(4229,		L["Mythrin'dir"],			BZ["Darnassus"],			58.1, 34.2, "Alliance") -- COMPLETELY UPDATED
+	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.3, 43.1, "Horde") -- COMPLETELY UPDATED
+	AddVendor(4561,		L["Daniel Bartlett"],			BZ["Undercity"],			64.1, 37.4, "Horde") -- COMPLETELY UPDATED
+	AddVendor(4574,		L["Lizbeth Cromwell"],			BZ["Undercity"],			81.0, 30.7, "Horde") -- COMPLETELY UPDATED
+	AddVendor(4577,		L["Millie Gregorian"],			BZ["Undercity"],			70.6, 30.1, "Horde") -- COMPLETELY UPDATED
+	AddVendor(4589,		L["Joseph Moore"],			BZ["Undercity"],			70.0, 58.5, "Horde") -- COMPLETELY UPDATED
+	AddVendor(4610,		L["Algernon"],				BZ["Undercity"],			51.7, 74.7, "Horde") -- COMPLETELY UPDATED
+	AddVendor(4617,		L["Thaddeus Webb"],			BZ["Undercity"],			62.4, 61.0, "Horde") -- COMPLETELY UPDATED
+	AddVendor(4775,		L["Felicia Doan"],			BZ["Undercity"],			64.1, 50.6, "Horde") -- COMPLETELY UPDATED
+	AddVendor(4782,		L["Truk Wildbeard"],			BZ["The Hinterlands"],			14.4, 42.5, "Alliance")
+	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.2, 30.4, "Neutral") -- COMPLETELY UPDATED
+	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.8, 28.0, "Neutral") -- COMPLETELY UPDATED
+	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"],				50.7, 28.7, "Neutral") -- COMPLETELY UPDATED
+	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") -- COMPLETELY UPDATED
+	AddVendor(6779,		L["Smudge Thunderwood"],		BZ["Hillsbrad Foothills"],		71.5, 45.5, "Neutral") -- COMPLETELY UPDATED
+	AddVendor(7733,		L["Innkeeper Fizzgrimble"],		BZ["Tanaris"],				52.6, 27.0, "Neutral") -- COMPLETELY 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(8131,		L["Blizrik Buckshot"],			BZ["Tanaris"],				50.7, 28.5, "Neutral") -- COMPLETELY UPDATED
+	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"],			47.2, 52.1, "Horde") -- COMPLETELY UPDATED
+	AddVendor(8177,		L["Rartar"],				BZ["Swamp of Sorrows"],			47.2, 57.1, "Horde") -- COMPLETELY UPDATED
+	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.6, 64.0, "Horde") -- COMPLETELY UPDATED
+	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") -- COMPLETELY UPDATED
+	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") -- COMPLETELY UPDATED
+	AddVendor(13432,	L["Seersa Copperpinch"],		BZ["Thunder Bluff"],			42.0, 55.1, "Horde") -- COMPLETELY UPDATED
+	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(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.9, 73.3, "Horde") -- COMPLETELY UPDATED
+	AddVendor(16635,	L["Lyna"],				BZ["Silvermoon City"],			70.3, 24.9, "Horde") -- COMPLETELY UPDATED
+	AddVendor(16638,	L["Deynna"],				BZ["Silvermoon City"],			55.6, 51.0, "Horde") -- COMPLETELY UPDATED
+	AddVendor(16641,	L["Melaris"],				BZ["Silvermoon City"],			67.1, 19.5, "Horde") -- COMPLETELY UPDATED
+	AddVendor(16657,	L["Feera"],				BZ["The Exodar"],			54.0, 90.5, "Alliance")
+	AddVendor(16670,	L["Eriden"],				BZ["Silvermoon City"],			80.3, 36.1, "Horde") -- COMPLETELY UPDATED
+	AddVendor(16677,	L["Quelis"],				BZ["Silvermoon City"],			69.3, 70.4, "Horde") -- COMPLETELY UPDATED
+	AddVendor(16689,	L["Zaralda"],				BZ["Silvermoon City"],			84.8, 78.6, "Horde") -- COMPLETELY UPDATED
+	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"],			75.6, 40.7, "Horde") -- COMPLETELY UPDATED
+	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") -- COMPLETELY UPDATED
+	AddVendor(18005,	L["Haalrun"],				BZ["Zangarmarsh"],			67.8, 48.0, "Alliance")
+	AddVendor(18011,	L["Zurai"],				BZ["Zangarmarsh"],			85.3, 54.8, "Horde") -- COMPLETELY UPDATED
+	AddVendor(18015,	L["Gambarinka"],			BZ["Zangarmarsh"],			31.7, 49.3, "Horde") -- COMPLETELY UPDATED
+	AddVendor(18017,	L["Seer Janidi"],			BZ["Zangarmarsh"],			32.4, 51.9, "Horde") -- COMPLETELY UPDATED
+	AddVendor(18255,	L["Apprentice Darius"],			BZ["Deadwind Pass"],			47.0, 75.3, "Neutral")
+	AddVendor(18382,	L["Mycah"],				BZ["Zangarmarsh"],			17.9, 51.2, "Neutral") -- COMPLETELY UPDATED
+	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") -- COMPLETELY UPDATED
+	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") -- COMPLETELY UPDATED
+	AddVendor(19521,	L["Arrond"],				BZ["Shadowmoon Valley"],		55.9, 58.2, "Neutral")
+	AddVendor(19537,	L["Dealer Malij"],			BZ["Netherstorm"],			44.2, 34.0, "Neutral") -- COMPLETELY UPDATED
+	AddVendor(19540,	L["Asarnan"],				BZ["Netherstorm"],			44.2, 33.7, "Neutral") -- COMPLETELY UPDATED
+	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") -- COMPLETELY UPDATED
+	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") -- COMPLETELY UPDATED
+	AddVendor(20916,	L["Xerintha Ravenoak"],			BZ["Blade's Edge Mountains"],		62.5, 40.3, "Neutral") -- COMPLETELY UPDATED
+	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"],				63.0, 57.3, "Neutral") -- COMPLETELY UPDATED
+	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") -- COMPLETELY UPDATED
+	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(33594,	L["Fizzix Blastbolt"],			BZ["Icecrown"],				72.2, 20.9, "Neutral")
+	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(40572,	L["Haughty Modiste"],			BZ["Tanaris"],				50.7, 28.6, "Neutral") -- COMPLETELY UPDATED
+	AddVendor(40589,	L["Dirge Quikcleave"],			BZ["Tanaris"],				52.6, 29.1, "Neutral") -- COMPLETELY UPDATED
+	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/Utilities.lua b/Utilities.lua
index ccc6434..f170636 100644
--- a/Utilities.lua
+++ b/Utilities.lua
@@ -20,50 +20,35 @@ local L = LibStub("AceLocale-3.0"):GetLocale(private.addon_name, true)
 -----------------------------------------------------------------------
 -- Methods.
 -----------------------------------------------------------------------
-do
-	local FACTION_NAMES = {
-		[1] = "Neutral",
-		[2] = "Alliance",
-		[3] = "Horde"
-	}
-
-	function private:AddListEntry(lookup_list, identifier, name, location, coord_x, coord_y, faction)
-		if lookup_list[identifier] then
-			addon:Debug("Duplicate lookup: %s - %s.", identifier, name)
-			return
-		end
-
-		local entry = {
-			name = name,
-			location = location,
-		}
-		lookup_list[identifier] = entry
+function private:AddListEntry(lookup_list, identifier, name, location, coord_x, coord_y, faction)
+	if lookup_list[identifier] then
+		addon:Debug("Duplicate lookup: %s - %s.", identifier, name)
+		return
+	end

-		if faction then
-			if _G.type(faction) == "string" then
-				entry.faction = faction
-			else
-				entry.faction = FACTION_NAMES[faction + 1]
-			end
-		end
+	local entry = {
+		name = name,
+		location = location,
+		faction = faction,
+	}
+	lookup_list[identifier] = entry

-		if coord_x and coord_y then
-			lookup_list[identifier].coord_x = coord_x
-			lookup_list[identifier].coord_y = coord_y
-		end
+	if coord_x and coord_y then
+		lookup_list[identifier].coord_x = coord_x
+		lookup_list[identifier].coord_y = coord_y
+	end

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

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

 function private:AddTrainer(id_num, trainer_name, location, coord_x, coord_y, faction)
 	if _G.type(trainer_name) == "number" then
diff --git a/Waypoint.lua b/Waypoint.lua
index f9a8da1..8622adf 100644
--- a/Waypoint.lua
+++ b/Waypoint.lua
@@ -42,8 +42,6 @@ local F = private.filter_flags
 -------------------------------------------------------------------------------
 -- Constants.
 -------------------------------------------------------------------------------
-local FACTION_NEUTRAL		= BFAC["Neutral"]
-
 local KALIMDOR_NAMES = {}
 local EASTERN_KINGDOMS_NAMES = {}
 local OUTLAND_NAMES = {}
@@ -326,7 +324,7 @@ local WAYPOINT_FUNCS = {
 		local trainer = private.trainer_list[id_num]
 		local trainer_faction = trainer.faction

-		if trainer_faction == BFAC[private.Player.faction] or trainer_faction == FACTION_NEUTRAL then
+		if trainer_faction == private.Player.faction or trainer_faction == "Neutral" then
 			return trainer
 		end
 	end,
@@ -337,7 +335,7 @@ local WAYPOINT_FUNCS = {
 		local vendor = private.vendor_list[id_num]
 		local vendor_faction = vendor.faction

-		if vendor_faction == BFAC[private.Player.faction] or vendor_faction == FACTION_NEUTRAL then
+		if vendor_faction == private.Player.faction or vendor_faction == "Neutral" then
 			return vendor
 		end
 	end,
@@ -348,7 +346,7 @@ local WAYPOINT_FUNCS = {
 		local vendor = private.vendor_list[id_num]
 		local vendor_faction = vendor.faction

-		if vendor_faction == BFAC[private.Player.faction] or vendor_faction == FACTION_NEUTRAL then
+		if vendor_faction == private.Player.faction or vendor_faction == "Neutral" then
 			return vendor
 		end
 	end,
@@ -362,7 +360,7 @@ local WAYPOINT_FUNCS = {
 		local quest = private.quest_list[id_num]
 		local quest_faction = quest.faction

-		if quest_faction == BFAC[private.Player.faction] or quest_faction == FACTION_NEUTRAL then
+		if quest_faction == private.Player.faction or quest_faction == "Neutral" then
 			return quest
 		end
 	end,