Added file 2
Added file 4
Merge pull request #1 from tgb2110/master

Merge these 2 and 4