Minor update for an Issue #8
Finishing first usable prototype for an Issue #8