Please note: there are spoilers in the post below! Don’t say we didn’t warn you.

Director Jon Watts is drawing from the earliest years of Spider-Man‘s comic book history in the upcoming Spider-Man: Homecoming film. The Vulture has already been confirmed, and now another one of Spidey’s first villains appears to be set!

According to Deadline, Michael Chernus has signed on to Spider-Man: Homecoming as Phineas Mason, a character comic fans know better as the Tinkerer. Within the film, Chernus’ character will reportedly be playing off of Michael Keaton‘s lead villain, whom Marvel and Sony have yet to officially call Adrian Toomes/the Vulture.

Nerdist reached out for confirmation, but Sony had no comment.

Chernus is best known for his role in Orange is the New Black, as well as his appearances in Aloha, the short-lived (but beloved) TV series Manhattan, Captain Phillips, The Bourne Legacy, and Love & Other Drugs. He’s also quite a bit younger than Marvel’s traditional depiction of the Tinkerer, which you can see below.

In the Marvel Universe, the Tinkerer dates back to the second issue of Amazing Spider-Man by Stan Lee and Steve Ditko in 1962. Although his initial appearance teased that the Tinkerer may have been an alien, he was later revealed to simply be an ordinary man with an extraordinary gift for technology. He frequently supplies supervillains with their armor and tech, and he has rarely been captured.

Tom Holland made his debut as Spider-Man earlier this year during Captain America: Civil War, and he will headline Spider-Man: Homecoming alongside Zendaya and Marissa Tomei, with Robert Downey Jr. appearing in a small role as Tony Stark/Iron Man. The film will be released on July 7, 2017.

Are you excited to see Chernus potentially play the Tinkerer? Let us know in the comment section below!

Images: 20th Century Fox; Marvel