I'm thinking of upgrading hard drive to compensate for my 'ever growing' Itunes library with movies and TV shows. However, also take my ATV2 over to my mates place to watch on his HD display, as well as watching at my place when i'm not there. In though of this, i thought of the following: 1.Getting a NAS server for home use only. fill it with 1TB (or larger) drive just for Itunes library, my thinking is, hopefully while i'm on my local network, i can stream via the NAS over my wireless router. However, if I must use external drive connected to the mac, then so be it. 2. Get a 1TB (or larger) external just for itunes, so when i'm out of my home network i can connect stream via external storage from the mac. Any better ideas? or would this be good enough ?