Future-Proof Water Systems