I think I got the right edits staged
more rework
Merge branch 'rework-'
finally merged upstream pull requests

and further along in the saga