functions should just need error checking, etc.
Merge branch 'master' of https://github.com/omnivescence/hw04