Wi-Fi ipod coming soon?

There has been much talk about Apple revealing an ipod with Wi-Fi capabilities. This means that if people owning it can share music with other owners, and providing there's you're in a hotspot, you can log on to Apple's music service, itunes, and download music. As long as it doesn't cost too much, I would definitely consider getting it over a computer or a Sony PSP, both of which I am considering purchasing. As soon as I get enough money, which will be soon, I'll have to make the decision, though right now I'm leaning towards a computer.