MAJOR progress on file retrieval