Early WIP on issue #22.