OK - cheating a bit with the title as this is just a general NAS-based query for ALL my music.

I want to have some kind of network storage set up to play (mainly) music & also work as a repository for films / pictures to view. What would you recommend?
In fact, what would people recommend as an entire setup -> NAS / amp / speakers?
I already have some nice speakers (Q Acoustic Concept 20's) but with our baby charging about the place I have sadly had to store them & any new speakers will be bookshelf - probably on bracket mounts too

Any tips music lovers?
