I'll only have time to work on it later, so see how you want to proceed to make it easier for you to do the work you want. If you prefer to merge both my PRs now, I'll just make a new one for this later. Otherwise if it's still unmerged when I write it, I'll add to this branch.