The supply function model of the English electricity spot market is extended to include a contract market and contestable entry, both of which have dramatic effects on the determination of equilibrium. I present an analytically tractable model that can be solved with contracts, variable numbers...