Almost forgot, moved the water heater supply lines higher and built a platform for the tank to get it off the ground!
I'll sneak some plywood behind those legs next week, maybe, but the hard part was done.
One thing I wish I did, that I didn't catch until I filled it up with 350lb of water...