Dev-dm Merge, added final NPCs