Issue #16 step two implementation