Fixes relational problem between pdict and params
Adds data folder
Adds SAF support
Merge pull request #2 from lukecampbell/v2

Adds SAF Support