More progress on add_data.