diff --git a/ARLDataminer.rb b/ARLDataminer.rb
index 023d630..14c2678 100644
--- a/ARLDataminer.rb
+++ b/ARLDataminer.rb
@@ -2566,111 +2566,245 @@ $bosszonemap = {
# Manual mapping of npc/quests to their factions
$factionmap = {
- "Georgio Bolero" => 1,
- "Wild Hearts" => 2,
-
- # Unknown faction
- "40 Tickets - Schematic: Steam Tonk Controller" => 0,
- "Alanna Raveneye" => 1,
- "Alchemist Gribble" => 1,
- "Alys Vol'tyr" => 2,
- "Amy Davenport" => 1,
- #"Ancient Female Vrykul" => ,
- "Andrew Hilbert" => 2,
- "Apothecary Antonivich" => 2,
- "Artificer Daelo" => 1,
- "Bale" => 2,
- "Banalash" => 2,
- "Barim Spilthoof" => 2,
- "Baxter" => 2,
- "Borto" => 1,
- "Bowen Brisboise" => 2,
- "Bradley Towns" => 2,
- "Bronk Guzzlegear" => 1,
- "Burko" => 1, # ???
- "Byancie" => 1,
- "Captured Gnome" => 2, # ???
- "Celie Steelwing" => 1,
- "Cluster Launcher" => 0,
- "Cyndra Kindwhisper" => 1,
- "Daga Ramba" => 2,
- "Daggle Ironshaper" => 1,
- "Dalinna" => 2,
- "Derek Odds" => 1,
- "Doba" => 1, #???
- "Drakk Stonehand" => 1,
- "Elixir of Pain" => 2, #???
- "Felannia" => 2,
- "Festive Recipes" => 0,
- "Firework Launcher" => 0,
- "Flash Bomb Recipe" => 0,
- "Gambarinka" => 2,
- "Gara Skullcrush" => 2,
- "Gaston" => 1, # ???
- #"Ghak Healtouch" => ,
- #"Gorgolon the All-seeing" => ,
- "Great-father Winter" => 0,
- #"Gremlock Pilsnor" => ,
- #"Grutah" => ,
- #"Guillaume Sorouy" => ,
- #"Haalrun" => ,
- #"Hahrana Ironhide" => ,
- #"Hama" => ,
- #"Hurnak Grimmord" => ,
- "Imperial Plate Belt" => 0,
- "Imperial Plate Boots" => 0,
- "Imperial Plate Bracer" => 0,
- "Imperial Plate Chest" => 0,
- "Imperial Plate Helm" => 0,
- "Imperial Plate Leggings" => 0,
- "Imperial Plate Shoulders" => 0,
- #"Jangdor Swiftstrider" => ,
- #"Johan Focht" => ,
- #"K. Lee Smallfry" => ,
- #"Kalaen" => ,
- #"Knight Dameron" => ,
- #"Krek Cragcrush" => ,
- #"Krugosh" => ,
- #"Kylanna Windwhisper" => ,
- #"Leeli Longhaggle" => ,
- #"Linna Bruder" => ,
- #"Logannas" => ,
- "Logistics Officer Brighton" => 1,
- "Logistics Officer Silverstone" => 1,
- #"Loolruna" => ,
- #"Mari Stonehand" => ,
- #"Misensi" => ,
- #"Muheru the Weaver" => ,
- #"Nadyia Maneweaver" => ,
- #"Nula the Butcher" => ,
- "Nurse Neela" => 2,
- #"Nyoma" => ,
- #"Pratt McGrubben" => ,
- #"Provisioner Lorkran" => ,
- #"Quartermaster Urgronn" => ,
- #"Rogvar" => ,
- #"Rohok" => ,
- #"Rungor" => ,
- #"Sassa Weldwell" => ,
- "Sebastian Crane" => 2,
- #"Seer Janidi" => ,
- #"Sid Limbardi" => ,
- #"Skeletal Fiend (Enraged Form)" => ,
- #"Stone Guard Mukar" => ,
- #"Supplying the Front" => ,
- #"Tatiana" => ,
- "Thamner Pol" => 1,
- #"Tognus Flintfire" => ,
- #"Truk Wildbeard" => ,
- #"Uthok" => ,
- #"Vance Undergloom" => ,
- #"Victor Ward" => ,
- "Vix Chromeblaster" => 2,
- #"Wulan" => ,
- #"Xylinnia Starshine" => ,
- #"Yarr Hammerstone" => ,
- #"Zarrin" => ,
- #"Zurai" => ,
+ "40 Tickets - Schematic: Steam Tonk Controller" => "0", #
+ "Ainethil" => "1", # 1657
+ "Alanna Raveneye" => "1", # N/A
+ "Alchemist Gribble" => "1", # N/A
+ "Alegorn" => "1", # 1657
+ "Aleinia" => "2", # 3430
+ "Alexandra Bolero" => "1", # 1519
+ "Alys Vol'tyr" => "2", # N/A
+ "Amin" => "2", # 3487
+ "Amy Davenport" => "1", # N/A
+ #"Ancient Female Vrykul" => "Unknown", # 495
+ "Andrew Hilbert" => "2", # N/A
+ "Apothecary Antonivich" => "2", # N/A
+ "Arnok" => "2", # 1637
+ "Arras" => "1", # 3557
+ "Arred" => "1", # 3557
+ "Artificer Daelo" => "1", # N/A
+ "Bale" => "2", # N/A
+ "Banalash" => "2", # N/A
+ "Barim Spilthoof" => "2", # N/A
+ "Baxter" => "2", # N/A
+ "Belil" => "2", # 3487
+ "Bemarrin" => "2", # 3487
+ "Betty Quin" => "1", # 1519
+ "Borgosh Corebender" => "2", # 1637
+ "Borgus Steelhand" => "1", # 1519
+ "Borto" => "1", # N/A
+ "Borya" => "2", # 1637
+ "Bowen Brisboise" => "2", # N/A
+ "Bradley Towns" => "2", # N/A
+ "Brek Stonehoof" => "2", # 1638
+ "Bronk Guzzlegear" => "1", # N/A
+ "Burbik Gearspanner" => "1", # 1537
+ "Burko" => "1", # N/A
+ "Byancie" => "1", # N/A
+ "Camberon" => "2", # 3487
+ "Captured Gnome" => "2", # N/A
+ "Celie Steelwing" => "1", # N/A
+ "Cluster Launcher" => "0", #
+ "Cyndra Kindwhisper" => "1", # N/A
+ "Daga Ramba" => "2", # N/A
+ "Daggle Ironshaper" => "1", # N/A
+ "Dalinna" => "2", # N/A
+ "Dane Lindgren" => "1", # 1519
+ "Daniel Bartlett" => "2", # 1497
+ "Dannelor" => "1", # 1657
+ "Danwe" => "2", # 3487
+ "Darianna" => "1", # 1657
+ "Derek Odds" => "1", # N/A
+ "Deynna" => "2", # 3487
+ "Doba" => "1", # N/A
+ "Doctor Herbert Halsey" => "2", # 1497
+ "Doctor Marsh" => "2", # 1497
+ "Dolothos" => "2", # 3487
+ "Drakk Stonehand" => "1", # N/A
+ "Edrem" => "1", # 3557
+ "Egomis" => "1", # 3557
+ "Elynna" => "1", # 1657
+ "Emrul Riknussun" => "1", # 1537
+ "Erika Tate" => "1", # 1519
+ "Faldron" => "1", # 1657
+ "Farii" => "1", # 3557
+ "Feera" => "1", # 3557
+ "Felannia" => "2", # N/A
+ "Felicia Doan" => "2", # 1497
+ "Felika" => "2", # 1637
+ "Feruul" => "1", # 3557
+ "Festive Recipes" => "0", #
+ "Fimble Finespindle" => "1", # 1537
+ "Firework Launcher" => "0", #
+ "Flash Bomb Recipe" => "0", #
+ "Franklin Lloyd" => "2", # 1497
+ "Fyldan" => "1", # 1657
+ "Gambarinka" => "2", # N/A
+ "Gara Skullcrush" => "2", # N/A
+ "Gaston" => "1", # N/A
+ "Gearcutter Cogspinner" => "1", # 1537
+ "Gelanthis" => "2", # 3487
+ "Gelman Stonehand" => "1", # 1519
+ "Georgio Bolero" => "1", # N/A
+ "Ghak Healtouch" => "1", # 38
+ "Ghermas" => "1", # 3557
+ "Gimble Thistlefuzz" => "1", # 1537
+ "Gloresse" => "2", # 3487
+ "Godan" => "2", # 1637
+ #"Gorgolon the All-seeing" => "None", # Unknown
+ "Graham Van Talen" => "2", # 1497
+ "Great-father Winter" => "0", # N/A
+ "Gremlock Pilsnor" => "1", # 1
+ "Grutah" => "2", # 3520
+ "Guillaume Sorouy" => "2", # 130
+ "Haalrun" => "1", # 3521
+ "Haferet" => "1", # 3557
+ "Hagrus" => "2", # 1637
+ "Hahrana Ironhide" => "3", # 357
+ "Hama" => "1", # 3483
+ "Hurnak Grimmord" => "1", # 3483
+ "Imperial Plate Belt" => "0", #
+ "Imperial Plate Boots" => "0", #
+ "Imperial Plate Bracer" => "0", #
+ "Imperial Plate Chest" => "0", #
+ "Imperial Plate Helm" => "0", #
+ "Imperial Plate Leggings" => "0", #
+ "Imperial Plate Shoulders" => "0", #
+ "Innkeeper Grilka" => "2", # 14
+ "James Van Brunt" => "2", # 1497
+ "Jessara Cordell" => "1", # 1519
+ "Jhag" => "2", # 1637
+ "Johan Focht" => "2", # 130
+ "Josef Gregorian" => "2", # 1497
+ "Josephine Lister" => "2", # 1497
+ "K. Lee Smallfry" => "1", # 3521
+ "Kalaen" => "2", # 85
+ "Kalinda" => "2", # 3487
+ "Kamari" => "2", # 1637
+ "Karolek" => "2", # 1637
+ "Kayaart" => "1", # 3557
+ "Keelen Sheets" => "2", # 3487
+ "Kelgruk Bloodaxe" => "2", # 1637
+ "Kendor Kabonka" => "1", # 1519
+ "Kithas" => "2", # 1637
+ "Knight Dameron" => "1", # 4197
+ "Kor'geld" => "2", # 1637
+ "Krek Cragcrush" => "2", # 3520
+ "Krugosh" => "2", # 3483
+ "Kudrii" => "1", # 3557
+ "Kylanna Windwhisper" => "1", # 357
+ "Landraelanis" => "2", # 3430
+ "Lavinia Crowe" => "2", # 1497
+ "Lawrence Schneider" => "1", # 1519
+ "Leeli Longhaggle" => "1", # 3519
+ "Lilyssia Nightbreeze" => "1", # 1519
+ "Linna Bruder" => "1", # 4395
+ "Logannas" => "1", # 357
+ "Logistics Officer Brighton" => "1", # N/A
+ "Logistics Officer Silverstone" => "1", # N/A
+ "Loolruna" => "1", # 3521
+ "Lucan Cordell" => "1", # 1519
+ "Lyna" => "2", # 3487
+ "Lynalis" => "2", # 3487
+ "Magar" => "2", # 1637
+ "Mahu" => "2", # 1638
+ "Makaru" => "2", # 1637
+ "Malcomb Wynn" => "2", # 1497
+ "Mari Stonehand" => "1", # 3520
+ "Maria Lumere" => "1", # 1519
+ "Mary Edras" => "2", # 1497
+ "Master Chef Mouldier" => "2", # 3433
+ "Me'lynn" => "1", # 1657
+ "Miall" => "1", # 3557
+ "Miao'zan" => "2", # 14
+ "Milla Fairancora" => "1", # 1657
+ "Millie Gregorian" => "2", # 1497
+ "Mirvedon" => "2", # 3487
+ "Misensi" => "2", # 65
+ "Muaat" => "1", # 3557
+ "Muheru the Weaver" => "1", # 3521
+ "Mythrin'dir" => "1", # 1657
+ "Nadyia Maneweaver" => "1", # 141
+ "Nahogg" => "1", # 3557
+ "Neii" => "1", # 3557
+ "Nissa Firestone" => "1", # 1537
+ "Nogg" => "2", # 1637
+ "Nula the Butcher" => "2", # 3518
+ "Nurse Neela" => "2", # N/A
+ "Nus" => "1", # 3557
+ "Nyoma" => "1", # 141
+ "Okothos Ironrager" => "2", # 1637
+ "Outfitter Eric" => "1", # 1537
+ "Padaar" => "1", # 3557
+ "Phea" => "1", # 3557
+ "Provisioner Lorkran" => "2", # 394
+ "Quartermaster Urgronn" => "2", # 3483
+ "Randal Worth" => "1", # 1519
+ "Rartar" => "2", # 8
+ "Rawrk" => "2", # 14
+ "Razia" => "2", # 3487
+ "Refik" => "1", # 3557
+ "Rhiannon Davis" => "2", # 1497
+ "Rogvar" => "2", # 8
+ "Rohok" => "2", # 3483
+ "Ronald Burch" => "2", # 1497
+ "Roxxik" => "2", # 1637
+ "Rungor" => "2", # 3519
+ "Saenorion" => "1", # 1657
+ "Saru Steelfury" => "2", # 1637
+ "Sassa Weldwell" => "1", # 3522
+ "Sebastian Crane" => "2", # N/A
+ "Sedana" => "2", # 3487
+ "Seer Janidi" => "2", # 3521
+ "Sellandus" => "1", # 1519
+ "Sewa Mistrunner" => "2", # 1638
+ "Shankys" => "2", # 1637
+ "Shayis Steelfury" => "2", # 1637
+ "Sid Limbardi" => "1", # 1
+ "Simon Tanner" => "1", # 1519
+ "Snang" => "2", # 1637
+ "Snarl" => "2", # 1637
+ "Sovik" => "2", # 1637
+ "Sprite Jumpsprocket" => "1", # 1519
+ "Stephen Ryback" => "1", # 1519
+ "Stone Guard Mukar" => "2", # 4197
+ "Sylvanna Forestmoon" => "1", # 1657
+ "Taladan" => "1", # 1657
+ "Talmar" => "2", # 3487
+ "Tamar" => "2", # 1637
+ "Tansy Puddlefizz" => "1", # 1537
+ "Tarn" => "2", # 1638
+ "Tatiana" => "1", # 139
+ "Tel'Athir" => "1", # 1519
+ "Telonis" => "1", # 1657
+ "Thaddeus Webb" => "2", # 1497
+ "Thamner Pol" => "1", # N/A
+ "Thonys Pillarstone" => "1", # 1537
+ "Thund" => "2", # 1637
+ "Tilli Thistlefuzz" => "1", # 1537
+ "Tognus Flintfire" => "1", # 1
+ "Trianna" => "1", # 1657
+ "Truk Wildbeard" => "1", # 47
+ "Ug'thok" => "2", # 1637
+ "Ulthir" => "1", # 1657
+ "Una" => "2", # 1638
+ "Uthok" => "2", # 33
+ "Uthrar Threx" => "1", # 1537
+ "Vaean" => "1", # 1657
+ "Vance Undergloom" => "2", # 85
+ "Vhan" => "2", # 1638
+ "Victor Ward" => "2", # 406
+ "Vix Chromeblaster" => "2", # N/A
+ "Wulan" => "2", # 405
+ "Xen'to" => "2", # 1637
+ "Xylinnia Starshine" => "1", # 357
+ "Yarr Hammerstone" => "1", # 1
+ "Yatheon" => "2", # 3487
+ "Yelmak" => "2", # 1637
+ "Zamja" => "2", # 1637
+ "Zaralda" => "2", # 3487
+ "Zarrin" => "1", # 141
+ "Zurai" => "2", # 3521
}
$hordefactionlist = [