Would love this feature