WIP for #22.