Issue #22 step two implementation.
Issue #22 step two implementation: Resolved error
Issue #22 step three implementation