working on new file storage strategy