better group execution model working
cleanup refactor