Electricity supply and energy storage systems