We extend existing theoretical frameworks describing electricity markets where each generator provides a Market Operator (MO) with a supply schedule in advance. The MO combines these with demand forecasts to produce equilibrium prices and instructs firms on their dispatch. We incorporate the...