More progress on file-finding function