If you do settle on a neat implementation we'd really appreciate a PR into the main project