It seems like the Classic deserves an upgrade considering that the last refresh was more of a downgrade. It'd be great to see one before the iPod event in September, but I'm not expecting anything. I have a really large library of both music and video, so I'd like to get something larger than what I currently have. However I don't want to buy right before the refresh. I did check the buyers guide, but the cycle is at a point where things aren't predictable.