More progress on storing group_id on new inserts.