refactoring for grouping.  Seems to have created a problem.
refactoring for grouping.  Seems to have created a problem.
refactoring for grouping.  Seems to have created a problem.
refactoring for grouping.  Seems to have created a problem.
Merge remote-tracking branch 'origin/master'
corrected some errors in the refactoring.
adding ignore to grouping feature