Fleshing out the NPC system