superseded by !406 (merged)
context
- this needs a LOT of git cleanup. opening this as draft, and will open another MR to supersede it with squashed fixups, elimination of not-for-merge commits, and some attempt to sort 37659eaf into the appropriate "part" commits