I think that's a really good idea! Would love to see this upstream