TEMP: plan for runtime comm restructuring