added papi functionality to files
Merge remote-tracking branch 'origin/master' into Kyle's-Branch