Trying again on the file store logic.