Updated
Refactoring of flexstore
refactored resultset in flexstore and psr2 issues
Updated for scrutinizer issues
Updated unit tests and scrutinizer
Updated save with switch instead of if