A little more work on the simple store.