My leak was in fact the water heater. I pulled the water tank, pump, accumulator and water heater today. If your water heater is old like mine, 16 years, you can bet a leak will be coming your way. It took about 3 actual hours to get everything out and now I can dress up the bay while waiting for parts.

IMG_3349_1..JPG
Original Heater
IMG_3350_1..JPG
Water Tank - 135 Gal
IMG_3352_1..JPG
Leaky Heater Bottom
IMG_3354_1..JPG
Empty Water Bay