Issue #4: some progress