diff --git a/assets/images/edstem/additional-features.png b/assets/images/edstem/additional-features.png
new file mode 100644
index 0000000..934e372
Binary files /dev/null and b/assets/images/edstem/additional-features.png differ
diff --git a/assets/images/edstem/at-mention.png b/assets/images/edstem/at-mention.png
new file mode 100644
index 0000000..8b67b29
Binary files /dev/null and b/assets/images/edstem/at-mention.png differ
diff --git a/assets/images/edstem/bots.png b/assets/images/edstem/bots.png
new file mode 100644
index 0000000..8e5e4bd
Binary files /dev/null and b/assets/images/edstem/bots.png differ
diff --git a/assets/images/edstem/callout.png b/assets/images/edstem/callout.png
new file mode 100644
index 0000000..889528a
Binary files /dev/null and b/assets/images/edstem/callout.png differ
diff --git a/assets/images/edstem/decline-template.png b/assets/images/edstem/decline-template.png
new file mode 100644
index 0000000..63f65aa
Binary files /dev/null and b/assets/images/edstem/decline-template.png differ
diff --git a/assets/images/edstem/duplicate-decline-lock.png b/assets/images/edstem/duplicate-decline-lock.png
new file mode 100644
index 0000000..523b75a
Binary files /dev/null and b/assets/images/edstem/duplicate-decline-lock.png differ
diff --git a/assets/images/edstem/latex-posted.png b/assets/images/edstem/latex-posted.png
new file mode 100644
index 0000000..5084f08
Binary files /dev/null and b/assets/images/edstem/latex-posted.png differ
diff --git a/assets/images/edstem/latex-usage.png b/assets/images/edstem/latex-usage.png
new file mode 100644
index 0000000..e342fa0
Binary files /dev/null and b/assets/images/edstem/latex-usage.png differ
diff --git a/assets/images/edstem/runnable-code.png b/assets/images/edstem/runnable-code.png
new file mode 100644
index 0000000..f8bc390
Binary files /dev/null and b/assets/images/edstem/runnable-code.png differ
diff --git a/assets/images/edstem/saved-replies-setup.png b/assets/images/edstem/saved-replies-setup.png
new file mode 100644
index 0000000..caff441
Binary files /dev/null and b/assets/images/edstem/saved-replies-setup.png differ
diff --git a/assets/images/edstem/saved-replies-usage.png b/assets/images/edstem/saved-replies-usage.png
new file mode 100644
index 0000000..90dedec
Binary files /dev/null and b/assets/images/edstem/saved-replies-usage.png differ
diff --git a/assets/images/edstem/spoiler-posted.png b/assets/images/edstem/spoiler-posted.png
new file mode 100644
index 0000000..b22114b
Binary files /dev/null and b/assets/images/edstem/spoiler-posted.png differ
diff --git a/assets/images/edstem/spoiler-usage.png b/assets/images/edstem/spoiler-usage.png
new file mode 100644
index 0000000..610fb44
Binary files /dev/null and b/assets/images/edstem/spoiler-usage.png differ
diff --git a/assets/images/edstem/visible-to-staff.png b/assets/images/edstem/visible-to-staff.png
new file mode 100644
index 0000000..bd54c8f
Binary files /dev/null and b/assets/images/edstem/visible-to-staff.png differ
diff --git a/ed.md b/ed.md
new file mode 100644
index 0000000..83f2246
--- /dev/null
+++ b/ed.md
@@ -0,0 +1,90 @@
+---
+layout: page
+title: EdStem
+nav_order: 5
+published: true
+---
+
+# EdStem Tips and Tricks
+
+[EdStem](https://edstem.org), or Ed for short, is the online course Q&A forum used at UC Berkeley.
+Many TAs know the basic functionality of Ed posts, but here are some lesser known tips and tricks.
+
+## Additional Features
+
+Ed will often have additional (beta) features you can optionally turn on. For example, the Chats feature
+sets up a Slack-like interface with channels so students, TAs, and instructors can talk to each other.
+
+
+
+## Ping other staff
+
+Ping other staff using @ mentions.
+
+
+
+## Bots
+
+Create Ed bots to perform actions in an automated way. For example, you can validate that threads are formatted a certain way, automatically track Ed engagement by students, remind students to follow post guidelines,
+or use AI to answer questions (e.g. [Edison](https://dl.acm.org/doi/abs/10.1145/3641554.3701965)).
+
+
+
+
+## Callouts
+
+Add callouts when you want to emphasize certain text (e.g. give a warning/danger note).
+
+
+
+## Mark threads as duplicate, decline threads, or lock threads
+
+- Mark threads as duplicate to redirect student to a post that already has the answer they're looking for
+- Decline threads if they don't follow your template
+- Lock threads if the discussion gets heated or if you have a post you don't want comments on (e.g. a course index post)
+
+
+
+You can write a template message for declining threads in your course settings:
+
+
+
+## Latex
+
+You can write Latex if you need to write mathematical symbols:
+
+
+
+
+
+## Runnable Code Blocks
+
+You can post runnable code blocks with line numbers by clicking the icon circled in red (looks like `< >`):
+
+
+
+## Saved Replies
+
+Find yourself saying the same thing to students over and over again? Use Saved Replies! Set them up in your course settings:
+
+
+
+And then use them when responding:
+
+
+
+## Visible to staff only
+
+Want to talk amongst staff members on Ed without students seeing? Check the "Visible to staff only" box:
+
+
+
+## Mark as spoiler
+
+Want to hide some information from students unless they click to open the dropdown menu? Use the Spoiler feature:
+
+
+
+This is what they'll see:
+
+
\ No newline at end of file
diff --git a/otter/index.md b/otter/index.md
index b5abe79..4c8341e 100644
--- a/otter/index.md
+++ b/otter/index.md
@@ -1,7 +1,7 @@
---
layout: page
title: Otter Grader
-nav_order: 6
+nav_order: 7
has_toc: true
has_children: true
---
diff --git a/using-github/index.md b/using-github/index.md
index 9bd15e5..38b5a60 100644
--- a/using-github/index.md
+++ b/using-github/index.md
@@ -1,7 +1,7 @@
---
layout: page
title: Using GitHub
-nav_order: 5
+nav_order: 6
has_children: true
---