Adding NPC framework pt2