Added to NPC and added NPC to makefile