Issue #20: partial completion of step one implementation