Added some npc stuff, some script testing