But will he be managed by Heenan?