Issue #204 wip