To the water heater, we put a new expansion tank along with a flood stop to protect from possible leakage near or around the water heater. Also cut out a needle valve and a leaking joint on the hot side of the water heater. Provided a floor drain that goes to the crawlspace. At least water in the crawlspace is better than water on the subfloor that could create a whole lot more damage. Also put in a new hose Bibb on the front side of the house, and made a minor repair on the backflow which was leaking out of the blowout ports. Wishing you the best of luck as work away on your new home. Mark, with Southside Plumbing.