This would be great to have!