So we're future proofing now?

If that happens won't we likely have to change logic in many other places as well?