Design: Implements #23

implements #23
Merge pull request #24 from aheld84/master

Implements #23