Leader Picking, or an Exercise in Creativity

[The Almighty dF]

I see a lot of people angry/concerned over the leader choices of Civ5, and that there might only be 1 leader per civ.
So.

New exercise.
Take all of the confirmed civs for Civ5, then add in as many leaders as you want.
HOWEVER.
1. No new traits, we go by Civ4 traits.
2. No using one trait pairing twice.
3. Make sure the traits make sense.

For the civ slots that aren't confirmed (there's 18 total, I think only maybe 16 have been revealed), you're free to add in a civ.

Arabia
Harun al-Rashid (Spi/Cre)
Saladin (Spi/Cha)
Ibn Saud (Fin/Spi)

America
Jefferson (Exp/Phi)
JFK (Cha/Org)
Washington (Cha/Agg)

Aztec
Montezuma II (Agg/Spi)
Itzcoatl (Exp/Agg)

China
Taizong (Phi/Fin)
Qin Shi Huang (Imp/Ind)
Mao (Phi/Org)

Egypt
Rameses (Ind/Spi)
Amenhotep I (Spi/Imp)

England
Elizabeth I (Fin/Exp)
Victoria (Imp/Exp)
Richard I (Imp/Spi)

France
Napoleon (Cha/Imp)
Louis XIV (Cre/Ind)
DeGaulle (Ind/Cha)

Germany
Bismark (Exp/Ind)
Frederick (Ind/Phi)

Greece
Alexander (Imp/Exp)
Leonidas (Pro/Spi)

Inca
Pacachuti (Imp/Cre)
Hyuana Capac (Fin/Cre)

India
Nehru (Org/Ind)
Asoka (Phi/Spi)

Japan
Oda Nobunaga (Agg/Org)
Meiji (Fin/Ind)
Hirohito (Fin/Imp)

Mongolia
Genghis (Imp/Agg)
Kublai (Exp/Cre)

Ottoman
Suleiman the Great (Phi/Imp)
Mehmed II (Exp/Spi)

Persia
Cyrus (Exp/Org)
Darius I (Fin/Org)

Rome
Augustus Caesar (Imp/Org)
Julius Caesar (Cha/Exp)
Marcus Aurelius (Phi/Org)

Russia
Catherine the Great (Exp/Cre)
Lenin (Phi/Cha)

Songhai
Askia Muhammed (Phi/Agg)
Sonni Ali (Exp/Pro)

I think that's a pretty good list. Every civ gets at least 2 leaders, and a few of the big names get 3 leaders.