I've been thinking about adding a second water heater as a water storage device. Just hook the water in before the real heater and don't hook up the gas. The water gets cycled everytime you run hot water. Easy 50 to 75 gallons.