diff --git a/main.tex b/main.tex
index df1ad6e..0623204 100644
--- a/main.tex
+++ b/main.tex
@@ -19,6 +19,14 @@
 \setlength{\parskip}{0.35em} % Define length between paragrahps
 \renewcommand{\baselinestretch}{1.15} % Define lineheight
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                    %
+% BEGIN define acronyms                              %
+%                                                    %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\include{acronyms}
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                    %
 % BEGIN chapters                                     %
@@ -53,7 +61,7 @@
 
 % <!-- VRRP, GLBP, HSRP -->
 
-\chapter{1st hop failure/failover/redundancy}
+\chapter{FHRP}
 
 \section{VRRP}
 
@@ -83,12 +91,12 @@
         \item Have defined levels of allowed operations/tasks divided into groups,
         \item Validate user-to-groups relations,
         \item Allow/Disallow user actions.
-        \item On network gear the Allow/Disallowed actions can be stored on either the central AAA server or locally\footnote{May not apply to all network gear} in the network node.
+        \item On network gear the Allow/Disallowed actions can be stored on either the central \acrshort{aaa} server or locally\footnote{May not apply to all network gear} in the network node.
     \end{enumerate}
     \item \textbf{Accounting:}
     \begin{enumerate}
         \item Network nodes collect user and session information from start to end when connecting to a node,
-        \item All information is transferred back to AAA server,
+        \item All information is transferred back to \acrshort{aaa} server,
         \item Transferred info can be leveraged for several purposes. Typically logged info is:
         \begin{itemize}
             \item session duration,
@@ -100,7 +108,7 @@
 
 \bigskip
 
-\textbf{Obvious} benefits by using the \texttt{triple a\tsq{s}} is scalability, increased flexibility and granularity of assigned rights, standardization, having failover by using multiple triple a\tsq{s} server\footnote{Cisco devices uses the descending order in which AAA servers are configured on the node}.
+\textbf{Obvious} benefits by using the \acrshort{aaa} is scalability, increased flexibility and granularity of assigned rights, standardization, having failover by using multiple triple a\tsq{s} server\footnote{Cisco devices uses the descending order in which \acrshort{aaa} servers are configured on the node}.
 
 \newpage
 
@@ -114,7 +122,7 @@
             \multicolumn{1}{|c|}{\textbf{Feature}} & \multicolumn{1}{c|}{\textbf{RADIUS}} & \multicolumn{1}{c|}{\textbf{TACACS+}} \\ \hline
             Developer & \begin{tabular}[c]{@{}l@{}}Livington Enterprise\\ (now industry standard)\end{tabular} & \begin{tabular}[c]{@{}l@{}}Cisco\\ (proprietary)\end{tabular} \\ \hline
             Transport protocol & UDP ports 1812-1813 & TCP port 49 \\ \hline
-            AAA support & \begin{tabular}[c]{@{}l@{}}Combines authentication\\ and authorization and \\ separate accounting\end{tabular} & \begin{tabular}[c]{@{}l@{}}Uses the AAA\\ model and sep-\\ arates all three\\ services\end{tabular} \\ \hline
+            \acrshort{aaa} support & \begin{tabular}[c]{@{}l@{}}Combines authentication\\ and authorization and \\ separate accounting\end{tabular} & \begin{tabular}[c]{@{}l@{}}Uses the \acrshort{aaa}\\ model and sep-\\ arates all three\\ services\end{tabular} \\ \hline
             Challange response & \begin{tabular}[c]{@{}l@{}}One-way, unidirectional\\ (single challenge response)\end{tabular} & \begin{tabular}[c]{@{}l@{}}Two-way, bidirec-\\ tional (multiple\\ challenge responses)\end{tabular} \\ \hline
             Security & \begin{tabular}[c]{@{}l@{}}Encrypts only the password\\ in the packet\end{tabular} & \begin{tabular}[c]{@{}l@{}}Encrypt the entire\\ packet body\end{tabular} \\ \hline
         \end{tabular}%
@@ -182,33 +190,6 @@ aaa session-id common
 !
 tacacs-server host 10.21.0.45
 tacacs-server unkn0wn!unicAst
-
-\end{txt}
-
-\begin{txt}
-tacacs server DK-TACACS-SERVER
- address ipv4 tacacsplus.example.com
- port 49
- key unkn0wn!unicAst
-!
-aaa new-model
-aaa group server tacacs+ TACACS
- server name DK-TACACS-SERVER
-!
-aaa authentication login default group TACACS local enable
-aaa authentication enable default group TACACS local enable
-aaa authorization exec default group TACACS local enable
-aaa accounting exec default start-stop group TACACS
-aaa accounting commands 1 default start-stop group TACACS
-aaa accounting commands 5 default start-stop group TACACS
-aaa accounting commands 15 default start-stop group TACACS
-!
-aaa session-id common
-!
-line vty 0-4
- login authentication TACACS
-line vty 5-15
- login authentication TACACS
 \end{txt}
 
 % <!-- NTP -->
@@ -253,7 +234,19 @@ line vty 5-15
 
 \section{BGP}
 
-\section{eVPN}
+\section{EVPN}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                    %
+% BEGIN list of acronyms                             %
+%                                                    %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\clearpage
+
+\section*{Section with acronyms}
+
+\printglossary[type=\acronymtype,title=Special Terms,toctitle=List of terms]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                    %
diff --git a/structure.tex b/structure.tex
index d7d50b8..2964659 100644
--- a/structure.tex
+++ b/structure.tex
@@ -39,6 +39,7 @@
 \usepackage{expdlist} 
 \usepackage{epigraph} % used to style quotes
 \usepackage{titling} % makes available \thetitle \theauthor \thedate
+\usepackage[toc,acronym,footnote]{glossaries} % Load the package with the acronym option
 
 
 \bibliographystyle{unsrtnat} %styles list https://www.sharelatex.com/learn/Natbib_bibliography_styles
@@ -213,3 +214,9 @@
 \def\tsq#1{\textquotesingle{#1}}
 \def\bsq#1{%both single quotes
     \lq{#1}\rq}
+
+
+\makeglossaries % Generate the glossary
+
+
+\renewcommand{\gls}[1]{ \acrshort{##1} }
\ No newline at end of file