More NPC Work

Fixed with next commit