The Tower could only display a small fraction of the Armouries' collection. They had an idea of moving the bulk of the arms and armour collection to a purpose-built facility. That came to fruition in 1996, when, under the direction of Guy Wilson (Master of the Armouries 1988-2002), the Royal Armouries Museum was opened in Leeds. Wilson and Waller had been good friends since before the planning stage, and the new museum incorporated many of Waller's ideas for demonstration areas, where visitors could see craftsmen at work or watch displays of martial prowess. In 1994, after the project has been given the go-ahead, Waller was appointed Head of Interpretation at the Royal Armouries. He recruited and trained the actor demonstrators, and worked with the curators to research and develop scripts and fight sequences. He worked with the Armouries on several short films and also TV documentaries under the general title "Arms in Action". In 2000, he founded the European Historical Combat Guild, which studies and practices HEMA. Also in 2000, he organised the first of what became an annual event - a competitive (not demonstration) jousting team tournament held over the Easter weekend in the Museum Tiltyard, for a trophy called the Sword of Honour. He retired in 2007, but maintained a connection as a part-time consultant. He acted as adviser to major archaeological investigations, including the Towton battlefield (1461) in Yorkshire and the "Mary Rose", King Henry VIII's flagship, which had sunk in the Solent off the south coast of England in 1545.