Implement CR specific PFS changes as its own source
Merge pull request #150 from mjmeans/PFS

Implement CRB specific PFS changes as its own source