Anyone following Arrow star Stephen Amell over the last year likely caught his jokey “feud” with WWE’s Stardust, to the point where the emerald archer even took to the ring for a match. Now, after leaving his wrestling persona behind, Cody Rhodes will return the favor by appearing in the fifth season. Three guesses who he ends up fighting!

Amell himself revealed the news during a “Wrestling Rivals” appearance at the New Jersey Heroes & Villains FanFest, specifically that the erstwhile Stardust (having left the WWE in May) will appear in the third episode of Season 5. Details on the role itself aren’t out just yet, though Rhodes confirmed the two would end up coming to blows.

In addition to The Wire star Chad Coleman taking the role of new baddie Tobias Church, wayward vigilantism appears to be a major theme for Arrow Season 5, following the return of Madison McLaughlin as a new Artemis, as well additions of Rick Gonzalez’s Wild Dog, and Josh Segarra’s “Vigilante.” Carly Pope has also joined in a recurring role as a Coast City reporter, with a comic attachment to Green Lantern.

Elsewhere of Season 5, we know Stephen Amell has also downplayed the likelihood of The Flash’s time-turning twist affecting any Arrow chronology, also teasing both a new suit and “vicious” premiere one-take. We’ll also have Echo Kellum elevated to series regular as Curtis Holt, and Colton Haynes reportedly returning as Roy Harper for a number of episodes.

We’ll likely hear more of Arrow Season 5 on the road to Comic-Con 2016, but what other surprises should we expect?

Check Out 100 TV Facts You May Not Know!

More From ScreenCrush