finishes taking out gathering fields
Merge branch 'master' into kellybranch
Merge pull request #51 from JBrianGordon/jamesbranch

Jamesbranch
fixes merge conflicts again