More huge changes towards the group world refactor.