Oh, we passed each other. Your column_mapping idea looks good!