I would say both, but I wouldn't think till June. He has to have some game time pitching behind him. That can't be replicated via BP sessions or simulated games.
I guess it makes it easier if the big league rotation is holding it's own. Wright back today and Fried in a couple of weeks should straightened things out.