Model refactor, Initial NPC implementation.