Broken commit, but simplifies group relationships