perfect is enemy of the good

Closes #90

Needs review.  

Open to DRYness and better approach.