So Sunday's final will be between two former champions, Juan Martin del Potro and Novak Djokovic.
Del Potro is through after Rafael Nadal retired when two sets down in their semi-final due to injury.
Djokovic has dispatched Kei Nishikori.
This is what Nadal had to say about his future following his semi-final retirement.
That's all from us tonight. We'll be back at at 17:00 BST for the mixed doubles final featuring Jamie Murray and then it's the women's singles final between Serena Williams and Naomi Osaka at 21:00 BST.
See you then.