Commercial water heater solutions