things coming together
graphs added
looking good
Merge branch 'dev_josh'