Actually, store and fetch using just filenames now