CONTRACT DESIGN FOR STORAGE IN HYBRID ELECTRICITY MARKETS