Illuminate groups separately

Be sure to set the new GroupCount variable