testing group class and refactoring https://app.asana.com/0/15839240245092/16220272163651