wip, refactoring group support ,preparing support for throttling and load balancing ( don't pull yet)