Major progress towards completing question groupings functionality