More NPC work.