the last few are done
Merge pull request #19 from jeffreylunt/JeffBranch

the last few are done