Refactor to data_service to save groups in progress