Issues #204 and #192 wip