Initial import of Glaurung 2.1