WIP SIP-23

WIP PR to centralize discussion, accept improvements/tests/polish/docs/...