wip, refactoring group support