[Naval/Neil] Putting the group question order model into place