More work on Faction NPC's