Supergirl got Season 2 off to a flying start with this week’s CW premiere, but at least some fans had to question where Mehcad Brook’s Jimmy James Olsen might go next. Producers have officially answered the call, revealing that James will take on a superheroic persona of his very own, suiting up as DC hero Guardian.

You’re warned of spoilers through “The Adventures of Supergirl” premiere, but Season 2 made the surprising choice to walk back Kara and James’ relationship, despite the majority of Season 1 gearing up for a romantic pairing. The episode also welcomed Winn (Jeremy Jordan) into a more proactive role at the DEO, while it seems James will follow a similar path outside of CatCo.

As revealed by Supergirl bosses at a recent screening, Season 2 will see James taking on his own vigilante career, complete with costume to match (via TVGuide):

James is going to decide that he can no longer sit back and be a sidekick. He’s going to decide to become a vigilante. He’s going to become Guardian, complete with the shield.

Original comic Guardian James Harper emerged in comics as a Metropolis police officer taking down criminals by night, relying on his wits, strength and indestructible shield. The character actually appeared in Season 1, albeit as a colonel in the United States Marine Corps. Kara naturally won’t approve of James’ choice, but perhaps more surprising is his own choice of sidekick:

[James has] recruited Winn to help him. Winn is his man in the van. He takes this job at the DEO and then is lying to everyone about how he’s spending his nights because he’s going out with James. [He's lying] about why he’s exhausted and coming in with a black eye. He says he walked into a door. That’s sort of the fun and excitement of filming these first 10 episodes.

Promoting James to Guardian makes a lot of sense, especially as the character often provided backup beyond his relationship with Kara. Certainly The CW has some experience with more stunt-heavy vigilantism as well; a way of upping the action without breaking the bank.

In the meantime, Supergirl will return with “The Last Children of Krypton” next week, and with Lynda Carter beyond that.