add some things
Merge pull request #1 from ChrisJTaylor/chris-branch

add some things