Chug along on importing, up to filestore now
Deal with on-disk filestore export