issue #29 (wip)