Sounds good, in a future PR.