The first trailer for Season 7 of Arrow arrived via the panel at Comic-Con International in San Diego, and as teased at the end of the sixth season, Oliver Queen has indeed found himself in prison with the same criminals he helped apprehend.

And as promised, one intense shower fight scene appears to be the epic fight scene Stephen Amell teased only a few days ago.

RELATED: SDCC LIVE: Arrow Cast & Crew Declassify Season 7

Now referred to as Prisoner 4587, Oliver is counting down the days by leaving marks on his prison wall, while also keeping his body in fighting shape. One quick scene also shows Oliver with The Count of Monte Cristo, along with a photo of Felicity and his son, William.

Thanks to Diggle, we find out Oliver has been locked up for five months with the likes of Derek Sampson (independent wrestler Cody Rhodes). Being among criminals looking for revenge leads to an epic beatdown delivered by Oliver --right in the middle of the shower stalls. From there, we learn Star City has implemented a zero tolerance policy on all vigilantism. However, someone is dressing up as the Green Arrow. But with Oliver in jail, who could it be?

RELATED: Arrow's Stephen Amell Teases a 'Treat' For SDCC

Returning this fall to The CW, Arrow stars Stephen Amell as Oliver Queen, David Ramsey as John Diggle, Emily Bett Rickards as Felicity Smoak, Rick Gonzalez as Wild Dog, Echo Kellum as Mr. Terrific, Juliana Harkavy as Black Canary and Katie Cassidy as Black Siren.