working thru bugs in filestore