@dget, are you game to include that in this PR or would you prefer it to be a separate one?