More Work on factional NPC's