Issue #46 wip.