hopefully got all of temp_dir converted to self.temp_dir...