Add macronutrient calculations for phases 3 & 4