Also, the skipping now uses filepath instead of filename, so that we may skip entire folders