More work on new local file storage