Persistent stores working... now to make it robust.