issue #62 - WIP