Buffy the Vampire Slayer creator Joss Whedon is headed back to the small screen.

According to Variety, Whedon will executive produce a new half-hour comedy titled Pippa Smith: Grown-Up Detective for Freeform. Series creators Siobhan Thompson and Rebecca Drysdale will work alongside Whedon to produce the comedy. The series, which is still in development and has not received a series order, will center around a 20-something "as she deals with relationships, addiction and being too dang old for the detecting game."

RELATED: Shadowhunters Canceled By Freeform With Season 3

This marks a surprise return for Whedon, as the writer/director has turned his focus towards the big screen in recent years with films such as Justice League and The Avengers. Although he is still credited as an executive producer on Marvel's Agents of S.H.I.E.L.D., Whedon hasn't been involved with the series since the pilot, which he wrote and directed. Instead, his brother Jed Whedon and sister-in-law Maurissa Tancharoen have served as the showrunners on the program for the past five seasons and will continue to do so in the show's shortened sixth season.

Thompson (College Humor Originals) and Drysdale (Key and Peele, Baskets) will pen the script for the Pippa Smith: Grown-Up Detective pilot. The series joins fellow comedy pilot hopefuls Misfits, a new take on the fan-favorite E4 series, and the Paul Feig-produced Girls Code.