Sure, I'll add this to this PR as a separate commit.