WIP on issue #28