According to Deadline, the latest actor to join the as-yet-untitled Edward Snowden film is Timothy Olyphant. The Justified star – taking up another law enforcement role – is joining Joseph Gordon-Levitt and others who will play out the events of the NSA leak orchestrated by Snowden.

Olyphant is currently in the final stages of negotiation for this film, in which he’ll play a CIA friend of Snowden’s before the leak occurred. This casting news continues the hype the story is experiencing even now, years after the actual leak: the documentary Citizenfour that shows the real-life leak and its repercussions is up for an Oscar this weekend.

Oliver Stone is directing and co-wrote the script, pulling from sources which include a book by Snowden’s Russian lawyer Anatoly Kucherena called Time of the Octopus. Stone and Moritz Borman also acquired the film rights to The Snowden Files: The Inside Story Of The World’s Most Wanted Man, by the Guardian journalist Luke Harding. There’s no word yet on if the film rights for this book will simply find their way into this untitled film along with Kucherena’s book or whether Stone will instead be producing two separate films.

The untitled movie is set for release in 2016 and is currently beginning production in Munich.