The master branch is the place to refactor more daringly, just test it for new/existing group.