diff --git a/chapter/aaa/radius.tex b/chapter/aaa/radius.tex
new file mode 100644
index 0000000..de90ecb
--- /dev/null
+++ b/chapter/aaa/radius.tex
@@ -0,0 +1 @@
+\section{RADIUS}
\ No newline at end of file
diff --git a/chapter/aaa/tacacsplus.tex b/chapter/aaa/tacacsplus.tex
new file mode 100644
index 0000000..d7820a4
--- /dev/null
+++ b/chapter/aaa/tacacsplus.tex
@@ -0,0 +1 @@
+\section{TACACS+}
diff --git a/chapter/internet.tex b/chapter/internet.tex
deleted file mode 100644
index 35c4ad7..0000000
--- a/chapter/internet.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\chapter{The Internet {\footnotesize "Post cold-war modern times"}}
-
-\section{Service Providers}
-
-\section{IXP}
-
-\section{MPLS}
-
-\section{BGP}
-
-\section{eVPN}
\ No newline at end of file
diff --git a/chapter/layer2protocols.tex b/chapter/layer2protocols.tex
deleted file mode 100644
index a10c235..0000000
--- a/chapter/layer2protocols.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-\chapter{Protocols Layer 2}
-
-\input{chapter/section/switchednetwork}
-
-\newpage
-
-\input{chapter/section/spanningtree}
diff --git a/chapter/layer3protocols.tex b/chapter/layer3protocols.tex
deleted file mode 100644
index a000aec..0000000
--- a/chapter/layer3protocols.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\chapter{Layer-2-to-Layer-3}
-
-\input{chapter/section/intervlanrouting}
-
-\chapter{DHCP}
-
-\input{chapter/section/dhcp}
-
-\chapter{Protocols Layer 3}
-
-\input{chapter/section/routednetwork}
diff --git a/commands.tex b/commands.tex
index f7685d0..8014080 100644
--- a/commands.tex
+++ b/commands.tex
@@ -16,6 +16,9 @@
 \end{figure}
 }
 
+\newcommand{\xkcd}[2]{\fig{xkcd/#1}{#1}{#2\\%
+        {\tiny\MakeUppercase{https://imgs.xkcd.com/comics/#1.png}}}}
+
 % Usage: \svg{<path-to-file>}{<label>}{<caption>}
 \newcommand{\svg}[3]{
     \begin{figure}[h]
diff --git a/img/coffee.png b/img/coffee.png
new file mode 100644
index 0000000..24863ca
Binary files /dev/null and b/img/coffee.png differ
diff --git a/img/coffee2.jpg b/img/coffee2.jpg
new file mode 100644
index 0000000..f3e02a9
Binary files /dev/null and b/img/coffee2.jpg differ
diff --git a/img/coffee3.jpg b/img/coffee3.jpg
new file mode 100644
index 0000000..7c42cbc
Binary files /dev/null and b/img/coffee3.jpg differ
diff --git a/img/coffee4.png b/img/coffee4.png
new file mode 100644
index 0000000..021548a
Binary files /dev/null and b/img/coffee4.png differ
diff --git a/img/coffee5.jpg b/img/coffee5.jpg
new file mode 100644
index 0000000..26bc5bc
Binary files /dev/null and b/img/coffee5.jpg differ
diff --git a/img/coffee6.jpg b/img/coffee6.jpg
new file mode 100644
index 0000000..83e611a
Binary files /dev/null and b/img/coffee6.jpg differ
diff --git a/img/coffee7.jpg b/img/coffee7.jpg
new file mode 100644
index 0000000..bfbb81a
Binary files /dev/null and b/img/coffee7.jpg differ
diff --git a/img/coffee8.jpg b/img/coffee8.jpg
new file mode 100644
index 0000000..84c0229
Binary files /dev/null and b/img/coffee8.jpg differ
diff --git a/img/coffeereligion.gif b/img/coffeereligion.gif
new file mode 100644
index 0000000..19d6fdf
Binary files /dev/null and b/img/coffeereligion.gif differ
diff --git a/img/starbucks.jpg b/img/starbucks.jpg
new file mode 100644
index 0000000..96e7180
Binary files /dev/null and b/img/starbucks.jpg differ
diff --git a/img/xkcd/11th_grade.png b/img/xkcd/11th_grade.png
new file mode 100644
index 0000000..3cbbb1e
Binary files /dev/null and b/img/xkcd/11th_grade.png differ
diff --git a/img/xkcd/alternate_currency.png b/img/xkcd/alternate_currency.png
new file mode 100644
index 0000000..154fb3b
Binary files /dev/null and b/img/xkcd/alternate_currency.png differ
diff --git a/img/xkcd/api.png b/img/xkcd/api.png
new file mode 100644
index 0000000..034bbde
Binary files /dev/null and b/img/xkcd/api.png differ
diff --git a/img/xkcd/background_screens.png b/img/xkcd/background_screens.png
new file mode 100644
index 0000000..2dbe341
Binary files /dev/null and b/img/xkcd/background_screens.png differ
diff --git a/img/xkcd/brakes.png b/img/xkcd/brakes.png
new file mode 100644
index 0000000..3cb4a8f
Binary files /dev/null and b/img/xkcd/brakes.png differ
diff --git a/img/xkcd/converting_to_metric.png b/img/xkcd/converting_to_metric.png
new file mode 100644
index 0000000..0356c1f
Binary files /dev/null and b/img/xkcd/converting_to_metric.png differ
diff --git a/img/xkcd/depth.png b/img/xkcd/depth.png
new file mode 100644
index 0000000..b5e8e99
Binary files /dev/null and b/img/xkcd/depth.png differ
diff --git a/img/xkcd/frustration.png b/img/xkcd/frustration.png
new file mode 100644
index 0000000..469a69a
Binary files /dev/null and b/img/xkcd/frustration.png differ
diff --git a/img/xkcd/genetic_algorithms.png b/img/xkcd/genetic_algorithms.png
new file mode 100644
index 0000000..c876647
Binary files /dev/null and b/img/xkcd/genetic_algorithms.png differ
diff --git a/img/xkcd/hard_reboot.png b/img/xkcd/hard_reboot.png
new file mode 100644
index 0000000..6827d67
Binary files /dev/null and b/img/xkcd/hard_reboot.png differ
diff --git a/img/xkcd/hats.png b/img/xkcd/hats.png
new file mode 100644
index 0000000..f979087
Binary files /dev/null and b/img/xkcd/hats.png differ
diff --git a/img/xkcd/insurance.png b/img/xkcd/insurance.png
new file mode 100644
index 0000000..144ff31
Binary files /dev/null and b/img/xkcd/insurance.png differ
diff --git a/img/xkcd/latitude.png b/img/xkcd/latitude.png
new file mode 100644
index 0000000..8a400cf
Binary files /dev/null and b/img/xkcd/latitude.png differ
diff --git a/img/xkcd/legal_hacks.png b/img/xkcd/legal_hacks.png
new file mode 100644
index 0000000..e6aa89b
Binary files /dev/null and b/img/xkcd/legal_hacks.png differ
diff --git a/img/xkcd/listen_to_yourself.png b/img/xkcd/listen_to_yourself.png
new file mode 100644
index 0000000..672ae86
Binary files /dev/null and b/img/xkcd/listen_to_yourself.png differ
diff --git a/img/xkcd/operating_systems.png b/img/xkcd/operating_systems.png
new file mode 100644
index 0000000..d3d816e
Binary files /dev/null and b/img/xkcd/operating_systems.png differ
diff --git a/img/xkcd/packages.png b/img/xkcd/packages.png
new file mode 100644
index 0000000..3f73517
Binary files /dev/null and b/img/xkcd/packages.png differ
diff --git a/img/xkcd/parking.png b/img/xkcd/parking.png
new file mode 100644
index 0000000..1328914
Binary files /dev/null and b/img/xkcd/parking.png differ
diff --git a/img/xkcd/simultaneous.png b/img/xkcd/simultaneous.png
new file mode 100644
index 0000000..06449bc
Binary files /dev/null and b/img/xkcd/simultaneous.png differ
diff --git a/img/xkcd/smfw.png b/img/xkcd/smfw.png
new file mode 100644
index 0000000..bd04656
Binary files /dev/null and b/img/xkcd/smfw.png differ
diff --git a/img/xkcd/terminology.png b/img/xkcd/terminology.png
new file mode 100644
index 0000000..7e4f72c
Binary files /dev/null and b/img/xkcd/terminology.png differ
diff --git a/img/xkcd/twitter.png b/img/xkcd/twitter.png
new file mode 100644
index 0000000..4c1f6f0
Binary files /dev/null and b/img/xkcd/twitter.png differ
diff --git a/img/xkcd/typewriter.png b/img/xkcd/typewriter.png
new file mode 100644
index 0000000..a394380
Binary files /dev/null and b/img/xkcd/typewriter.png differ
diff --git a/main.tex b/main.tex
index fdc9c6a..11522b0 100644
--- a/main.tex
+++ b/main.tex
@@ -27,11 +27,67 @@
 	
 \include{chapter/baseconf}
 
-\include{chapter/layer2protocols}
+\chapter{Layer 2}
 
-\include{chapter/layer3protocols}
+\input{chapter/section/switchednetwork}
 
-\include{chapter/internet}
+\newpage
+
+\input{chapter/section/spanningtree}
+
+\chapter{L2 to L3}
+
+\input{chapter/section/intervlanrouting}
+
+\chapter{DHCP}
+
+\input{chapter/section/dhcp}
+
+\chapter{Triple A\tsq{s}}
+
+\myquote{}{Remember to log the details, too.}
+
+\xkcd{latitude}{Remember logging when necessary}
+
+\input{chapter/aaa/radius}
+
+\input{chapter/aaa/tacacsplus}
+
+\chapter{Network Time Protocol}
+
+\section{The old NTP from \tsq{85}}
+
+\section{Secure NTP}
+
+\chapter{Managemnt}
+
+\section{Network management}
+
+\subsection{Routers}
+
+\subsection{Switches}
+
+\subsection{Firewall}
+
+\section{Out-of-band management}
+
+\subsection{Console server}
+
+\chapter{Protocols Layer 3}
+
+\input{chapter/section/routednetwork}
+
+\chapter{The Internet {\footnotesize "Post cold-war modern times"}}
+
+\section{Service Providers}
+
+\section{IXP}
+
+\section{MPLS}
+
+\section{BGP}
+
+\section{eVPN}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                    %