What's the Villain Count for Batman Arkham City ?

The last time I counted , there were at least 14 villains for Arkham City . Now yesterday I just found out that "Dead Shot" will be in the game . So can anyone guess how many more villains will be announced before the game comes out ?What's the Villain Count for Batman Arkham City ?
Joker

Harley Quinn

Catwoman

Two-Face

Penguin

Riddler

Bane

Deadshot

Talia Al Ghul

Soloman Grundy

Mr. Freeze

Poison Ivy

Victor Zsasz

Calendar Man

Black Mask

Dr. Hugo Strange

Killer Croc

Scarecrow

Maxie Zeus

Ra's al Ghul

Calendar Man

Deadshot: http://www.gametrailers.com/episode/game鈥?/a>

New gadgets: smoke ray, remote electrical charge, freeze blast, mr freeze's technology, grapnel gun, cryptographic sensor v2

About 21 Villians. They're saying they are putting all the old villians from arkham asylum into arkham city.What's the Villain Count for Batman Arkham City ?
Yip DeadShot is in and RockSteady will announce a few more.. There are rumors Calendar Man could appear somewhere over the course of the game, and Black Mask, the Ratcatcher and Maxie Zeus could also stop by to raise some havoc as well. Scarecrow could easily show up again in the sequeal, causing just as many nightmares as he did in "Arkham Asylum." There is a misterious playable character to be announced also.. I can't wait!! The more the better!!What's the Villain Count for Batman Arkham City ?
Joker
Harley Quinn
Catwoman
Two-Face
Penguin
Riddler
Bane
Deadshot
Talia Al Ghul
Soloman Grundy
Mr. Freeze
Poison Ivy
Victor Zsasz
Calendar Man
Black Mask
Dr. Hugo Strange
A total of 16 villains has been confirmed so far to appear in the game


Possible villains rumored to appear:
Killer Croc
Scarecrow
Maxie Zeus
Ra's al Ghul

On the official website, there are 4 characters listed as "Character Revealed Soon!"
http://community.batmanarkhamcity.com/ga鈥?/a>