More NPC Work