Framework for the Incorporation of Demand-Side in a Competitive Electricity Market IEE Proceedings