any chance you'd be willing to write a PR for this? We're pretty stretched for time but I think it would be great actually