Connecting All of the Modes of the Major Scale

I think I've finally figured this out, but if I'm wrong someone let me know.

The Major Scale - 1, 2, 3, 4, 5, 6, 7

1 - Major (Ionian)
2 - Dorian
3 - Phrygian
4 - Lydian
5 - Mixolydian
6 - Aeolian (Melodic Minor)
7 - Locrian

For example, E Major would be:

1 - E Major (Ionian)
2 - F# Dorian
3 - G# Phrygian
4 - A Lydian
5 - B Mixolydian
6 - C# Aeolian
7 - D# Locrian

Am I pretty close?

That's it except Aeolian is NOT Melodic Minor it's Natural Minor.
Aeolian = 1,2,b3,4,5,b6,b7
Melodic = 1,2,b3,4,5,6,7

Le sigh...

Maybe one of these days I'll get that last part right.