After two solid seasons of building the relationship between Oliver Queen and Felicity Smoak on Arrow, the show's acclaimed fifth season -- which ended in the spring -- saw the writers not just pump the brakes, but slam on them. What's to come in season six? We asked executive producer Marc Guggenheim during an interview at Comic Con International in San Diego this weekend.

While he evoked a pair of fan-favorite (and Olicity-favored) episodes from season 5, Guggenheim doesn't expect everyone to get what they want right away in season 6.

“I’m going to give a very unsatisfying answer to the Olicity fans,” Guggenheim admitted, “which is that we sort of set Oliver and Felicity on a certain trajectory starting with 520, and you saw a little bit of it in 523. We’re continuing it. I will say that the events of the finale did throw a little bit of a wrench into their slow rekindling of their relationship.”

That wrench, based on the trailer shown at Comic Con, appears to be William, Oliver's son, who is becoming a much bigger part of his father's life in season 6 -- something that may put the whole dating game on hold for a little while.

Not everyone -- even somebody as loving as Felicity -- is eager to jump into a complicated, baggage-filled relationship with a single dad and his eleven-year-old.

Fans can get more details when Arrow returns in October.

After a violent shipwreck, billionaire playboy Oliver Queen (Stephen Amell) was missing and presumed dead for five years before being discovered alive on a remote island in the North China Sea. He returned home to Star City, bent on righting the wrongs done by his family and fighting injustice. As the Green Arrow, he protects his city with the help of former soldier John Diggle (David Ramsey), computer-science expert Felicity Smoak (Emily Bett Rickards), his vigilante-trained sister Thea Queen (Willa Holland), Deputy Mayor Quentin Lance (Paul Blackthorne), brilliant inventor Curtis Holt (Echo Kellum), and his new recruits, street-savvy Rene Ramirez (Rick Gonzalez) and meta-human Dinah Drake (Juliana Harkavy).

Oliver has finally solidified and strengthened his crime-fighting team only to have it threatened when unexpected enemies from his past return to Star City, forcing Oliver to rethink his relationship with each member of his “family”.

Based on the characters from DC, ARROW is from Bonanza Productions Inc. in association with Berlanti Productions and Warner Bros. Television, with executive producers Greg Berlanti (“The Flash,” “Supergirl”), Marc Guggenheim (“DC’s Legends of Tomorrow,” “Eli Stone”), Wendy Mericle (“Desperate Housewives,” “Eli Stone”), Andrew Kreisberg (“The Flash,” “Eli Stone,” “Warehouse 13”) and Sarah Schechter (“The Flash,” “DC’s Legends of Tomorrow”).

More Arrow news: