adding more forensics code
adding Persistance Scaffolding
Merge remote-tracking branch 'upstream/master'