A few more functionss done!
Merge pull request #13 from jeffreylunt/TylerBranch

A few more functionss done!