The implementation of these new technologies has had a great impact on all current water infra- structures in residential and commercial plumbing systems. However the design of the standard upright water heater has not kept up with these changes. Current water heater design does not address thermal expansion within a closed system. Nor is the issue of the burner height requirement imposed by municipal and state codes addressed, which require installation of a stand to raise the water heater to a safer height away from any errant heavier-than-air explosive vapors. Another fault of the current common design is that the equipment offers no leak collection protection. Subsequently requiring the installation of a pan beneath the unit. Finally, the current faulty design is wasteful due to common repeated loss of water through the temperature and pressure relief valve (T&P valve).