NPC fail

lol
Revert "Cleaned up NPC code"

This reverts commit b4b5516b7fd2a828a0dbfb47a09a276512f573a7.
Revert 88795a9..a55d23c

This rolls back to commit 88795a9ce046f81554752ab23cf0857730fb7ca9.
Revert "Revert 88795a9..a55d23c"

This reverts commit a786fa300ae65b173cff90f334116a29c3608fc7.