Macro-Economic Outlook to 2024 Energy Demand and Transport Infrastructure