wip, refactoring group support, not working, use master branch instead