General

Working on group number availability bug (ironically case number is 16)