WIP #17.