UncleSamtoshi

> I think the PersistentState is still a direct mapping to something that has been stored locally. The difference now is that we are using two storage methods, one secure...

Changes look good, thanks for making the state more explicit! Looks like check code and tests are still failing and need to be fixed however. You should be able to...