Huge commit, refined groups and stuff