Group rework #4

Hierarchical view.