Issues/1

I think this branch is in pretty good shape.  Please review.  Thank you Matt.