everting some stuff, adding more
Merge pull request #6 from jhoeltzel/feature/josh-6

Looks good