finishes taking out gathering fields
Merge branch 'master' into kellybranch