One of my strongest memories of Edinburgh from when I was a child was the museum. I remember being terrified of walking under the whale skeleton hanging from the ceiling.
I vaguely remember the swords, it's good to see them again.