Completed first version of the glossary feature