Making Competition Work in Electricity