merge from git
Merge branch 'int_pfs'
refector config class
start integrating fs stuff
before start with messy fs stuff