Grouper improvements resurrect

Pull request that didn't get merged before moving