Issue #34: first draft