Merge pull request #1 from cjcoopersc/master

cooper update
this is the scaffolding
Merge pull request #2 from kevincol54/master

this is the scaffolding