Filled in some parts
Merge pull request #1 from LSheneman/master

Filled in some parts