Issue #64: initial work