Group Workouts - Expansion

Is there any plan to expand the available workouts in Group Workout mode? With only a very limited number of workouts available, I am hoping there is a plan to expand it to take in all the workouts available individually?

I setup group workouts for my Club, but would like greater flexibility on the workouts to choose, even being able to do custom created workouts would be good! please!