Maybe this should be a separate task.