Fans of Joss Whedon’s vision of the Marvel Universe, as seen in the recent Avengers (Assemble) movie, will be delighted by the news that the creator of the TV series Buffy, Angel, Firefly and Dollhouse has signed up for three years with Marvel.

“Joss Whedon has signed an exclusive deal with Marvel Studios for film and television through the end of June 2015. As part of that deal, Whedon will write and direct Marvel’s The Avengers 2 as well as help develop a new live action series for Marvel Television at ABC. He will also contribute creatively to the next phase of Marvel’s cinematic universe,” Marvel said in a statement.

It is unclear whether the live-action series will be linked to the Avengers movie franchise, or feature a different set of characters.