Lots of work on the filename matching.