Going to merge this now, but happy to continue the conversation in a separate PR.