Trying to do this properly
Merge pull request #2 from Team610/kempbranch

Trying to do this properly