I think you're right Biff. In fact, wasn't Contador thinking about leaving Astana and Lance talked him out of it explaining his reasons for returning and telling him that he's the team leader for the Tour. This would give Lance the freedom to try and win the Giro and write a new chapter to his legacy and be domestique in the tour.
__________________
