Now using the new API for the NPCs, and also bugfixed the issue with
moving over NPCs.