Some more work on letting the Store/Extract functionality work. Not yet.