Added a bunch of NPC stuff!