@mcgeachie: Group
@mcgeachie: Missed stuff from group stages commit