Electricity Demand and Implications of Electric Vehicle and Battery Storage Adoption