Ok cheers, been playing a little over the last couple of hours with Gallery2, seems to do what I said above with a bit of work.

will look into the Flickr too.

Not that I'm doing anything too major but if Flickr goes down, does that affect your gallery ?