Code refactoring.
Start to implement grouping functionality.
Code refactoring.
Start to implement grouping functionality.