Andy matches up favorably against Roger on any surface now.
Novak and Roger will be on opposite sides of every draw until further notice, to allow for the final that would make promoters the most money.
One question I have is, which finals pairing Novak-Rafa, or Rafa-Fed would make promoters the most money?
If Rafa-Fed, Andy would likely reach several finals this year, even after Rafa returned.
Of those, Andy would likely win a few. I am rooting for him you see to grab the number 1 ranking for a short period right at the end of this year, but I don't know if that is even mathematically possible.