Adding calorie counts to main macros