diff --git a/knowledge-base/moneropedia/eepsite.md b/knowledge-base/moneropedia/eepsite.md
new file mode 100644
index 00000000..d07173d6
--- /dev/null
+++ b/knowledge-base/moneropedia/eepsite.md
@@ -0,0 +1,30 @@
+---
+layout: moneropedia
+entry: "Eepsite"
+tags: ["kovri"]
+terms: ["eepsite", "hidden-service", "garlic-site", "garlic-service"]
+summary: "A website or service hosted within the I2P network"
+---
+
+### The Basics
+
+Is it [**EEP!** *(in response to the site's content)*](https://en.wikipedia.org/wiki/Onomatopoeia), or **end-to-end protocol**, or something else entirely different?
+
+While the original definition of eepsite has been lost with time, its use-case remains: a website or service that is hosted within (and only accessible by) the @I2P network.
+
+### In-depth Information
+
+Alternate names include:
+
+1. *Hidden Service*
+  - because the site/service is *hidden* within the @I2P network and can only be visited within the network
+2. *Garlic Site*
+  - because the website utilizes @I2P's @garlic-routing technology as a means of communicating with a client
+  - because the service is hosted as a website and not any other type of service
+3. *Garlic Service*
+  - because the service utilizes @I2P's @garlic-routing technology as a means of communicating with a client
+  - because the service is specific to services like IRC, email, or a Monero peer (but may also include websites)
+
+### Notes
+
+To learn how to setup an Eeepsite (Hidden Service, Garlic Site, Garlic Service) visit the @Kovri [user-guide](https://github.com/monero-project/kovri/blob/master/doc/USER_GUIDE.md).
diff --git a/knowledge-base/moneropedia/garlic-routing.md b/knowledge-base/moneropedia/garlic-routing.md
new file mode 100644
index 00000000..bc2fe510
--- /dev/null
+++ b/knowledge-base/moneropedia/garlic-routing.md
@@ -0,0 +1,41 @@
+---
+layout: moneropedia
+entry: "Garlic Routing"
+tags: ["kovri"]
+terms: ["garlic-routing"]
+summary: "Routing technology as implemented in Kovri/I2P"
+---
+
+### The Basics
+
+The term *Garlic Routing* has a diverse history with various interpretations.
+
+As it currently stands, Monero defines *Garlic Routing* as the way @Kovri and @I2P create a message-based anonymous overlay network of internet peers.
+
+### History
+
+I written form, the term *Garlic Routing* can be seen as early as June of 2000 in Roger Dingledine's [Free Haven Master's thesis](http://www.freehaven.net/papers.html) (Section 8.1.1) as derived from [Onion Routing](http://www.onion-router.net/).
+
+As recent as October of 2016, [#tor-dev](https://oftc.net/WebChat/) has offered insight into the creation of the term:
+
+Nick Mathewson:
+>[I think that there was some attempt to come up with a plant whose structure resembled the 'leaky-pipe' topology of tor, but I don't believe we ever settled on one.]
+
+Roger Dingledine:
+>during the free haven brainstorming, there was a moment where we described a routing mechanism, and somebody said "garlic routing!", and everybody laughed.
+so we for sure thought we had invented the name, at the time.
+
+### In-depth Information
+
+In technical terms, for @Kovri and @I2P, *Garlic Routing* translates to any/all of the following:
+
+1. Layered Encryption
+2. Bundling multiple messages together (garlic cloves)
+3. ElGamal/AES Encryption
+
+Note: as seen in [Tor](https://torproject.org/), *Onion Routing* also uses layered encryption but does not use ElGamal and is not message-based.
+
+### Notes
+
+- Permission received from Nick Mathewson and Roger Dingledine for historical quotes
+- For more technical details, read [Garlic Routing](https://geti2p.net/en/docs/how/garlic-routing).
diff --git a/knowledge-base/moneropedia/kovri.md b/knowledge-base/moneropedia/kovri.md
index 622102dc..bd9cb5ef 100644
--- a/knowledge-base/moneropedia/kovri.md
+++ b/knowledge-base/moneropedia/kovri.md
@@ -14,9 +14,10 @@ TODO(anonimal): finish
 
 TODO(anonimal): finish
 
-@Kovri @address-book
+@address-book
+
+@eepsite (@hidden-service, @garlic-site, @garlic-service)
 
-- Kovri Eepsite (hidden-service, garlic-site, garlic-service)
 - Kovri Clearnet
 - Kovri Cryptography (encryption, signatures, etc.)
 - Kovri Network Database (RI, lease-sets, floodfill, etc.)