iPod touch Do you think the iPod touch is the most likely to receive a capacity upgrade?

Once all of Apple's 'non-touchscreen' devices are finally killed off, do you think the iPod touch is the most likely iPod to receive a capacity upgrade to compete with what the Classic currently offers, or could it be the Nano?

I'd be really interested to hear people's opinions on this. Do you even think that Apple will kill-off their 'non-tochscreen' devices yet? If they do, which do you think will go first, the Shuffle or the Classic?

That's interesting, I didn't really know a great deal about the Shuffle so I've just looked at it on Apple's website. I was quite surprised that it only has 2GB capacity, no wonder people aren't buying it anymore!