New NPC stuff

I guess...