work in progress at implementing Issue #23