Added JimWest's NPC support, not wired up yet.