Yes I can indeed do that as part of this PR.