work in progress: groups panel, refactoring