A draft of what we need for #17