Added persistent data to go with transient data.
Fixed persistent data, added unit tests.