Adding PWF and calling_filepath... for real this time.