Almost have all the ordered parts, still waiting on the pipe , valves and a few extra fittings so I decided to do some exploring. Since I am changing out the sanitation hoses there was a consensual opinion between me, myself, and I, that I would remove part of the galley floor to expose the entire holding tank. I must say, to my surprise it is larger than I thought. Based on my measurements it appears to be a 22 gallon tank, I assumed it was 10 gal, or less.
After a frustratingly long trip to Lowes I still ended up removing the ice maker (new water heater location) capped water lines, drained and disconnected current water heater, tried to remove the water heater from under the cockpit (it's much heavier than I thought and is literally falling apart), Installed electrical outlet where old water heater is (future air surface supply system). Measured and planned for additional water tank