adjusted the functions to accept all the data
Merge branch 'master' of https://github.com/macdermottt/thesis

just getting things set up