unfinished iteration
Merge pull request #6 from cmhbenjamin/master

unfinished iteration