IFileFinder here instead?