issue #38 (wip)