wip, UDP, refactoring group support