Would love to have this be added as a feature.