diff --git a/README.md b/README.md
index 7b5025a..a35a2c0 100644
--- a/README.md
+++ b/README.md
@@ -67,9 +67,9 @@ Here you can find slides for Clean Code conversations or classes.
 
 |  # | Session Type | Name                                                                             |
 |---:|--------------|----------------------------------------------------------------------------------|
-|  1 | Discussion   | Advanced TDD                                                                     |
+|  1 | Discussion   | [Advanced TDD](advanced-tdd/01-advanced-tdd.md)                                  |
 |  2 | Coding Dojo  | Roman Numerals Kata ([Python][roman-numerals-python], [C++][roman-numerals-cpp]) |
-|  3 | Discussion   | Clean Tests                                                                      |
+|  3 | Discussion   | [Clean Tests](advanced-tdd/03-clean-tests.md)                                    |
 |  4 | Coding Dojo  |                                                                                  |
 |  5 | Discussion   | Test Design                                                                      |
 |  6 | Coding Dojo  |                                                                                  |
diff --git a/_site/index.html b/_site/index.html
index 7cac22d..c6f8951 100644
--- a/_site/index.html
+++ b/_site/index.html
@@ -236,7 +236,7 @@ <h3>Advanced TDD (Green Belt)</h3>
           <tr>
             <td>1</td>
             <td>Discussion</td>
-            <td>Advanced TDD</td>
+            <td><a href="advanced-tdd/01-advanced-tdd.pdf">Advanced TDD</a></td>
           </tr>
           <tr>
             <td>2</td>
@@ -249,7 +249,7 @@ <h3>Advanced TDD (Green Belt)</h3>
           <tr>
             <td>3</td>
             <td>Discussion</td>
-            <td>Clean Tests</td>
+            <td><a href="advanced-tdd/03-clean-tests.pdf">Clean Tests</a></td>
           </tr>
           <tr>
             <td>4</td>
diff --git a/advanced-tdd/01-advanced-tdd.md b/advanced-tdd/01-advanced-tdd.md
new file mode 100644
index 0000000..f82c658
--- /dev/null
+++ b/advanced-tdd/01-advanced-tdd.md
@@ -0,0 +1,74 @@
+---
+title: Clean Code Advanced TDD
+subtitle: Advanced TDD
+...
+
+# Pre-work
+
+* Videos
+    * <https://cleancoders.com/episode/clean-code-episode-19-p1>
+    * <https://cleancoders.com/episode/clean-code-episode-19-p2>
+* Exams
+    * <https://cleancoders.com/episode/clean-code-episode-19-p1/exam>
+    * <https://cleancoders.com/episode/clean-code-episode-19-p2/exam>
+
+# Chapters
+
+::: columns
+
+:::: column
+
+| Chapter                    | Time     |
+|----------------------------|----------|
+| Welcome                    | 00:00:47 |
+| Core Collaps Supernova     | 00:03:48 |
+| TDD Review: The Three Laws | 00:12:49 |
+| The Single Assert Rule     | 00:32:12 |
+
+::::
+
+:::: column
+
+| Chapter                    | Time     |
+|----------------------------|----------|
+| Incremental Algorithmics   | 00:01:10 |
+| Getting Stuck              | 00:24:57 |
+| Getting Unstuck            | 00:36:02 |
+| Conclusion                 | 00:49:24 |
+
+::::
+
+:::
+
+# Timetable
+
+| Activity                   | Time   |
+|----------------------------|--------|
+| Warmup                     | 5 min  |
+| Excercise 1                | 10 min |
+| Wrap up                    | 5 min  |
+
+# Warmup
+
+* What ...?
+  * Type in the meeting chat
+
+# Exercise 1
+
+* Prompt
+  * ...
+* Time limit: ...
+
+# Wrap up
+
+* ...
+
+# What is next?
+
+* Expect an e-mail with instructions for upcoming coding dojo
+
+# Final words
+
+> Always leave the code better than you found it.
+>
+> -- <cite>The Software Craftsmanship Rule</cite>
diff --git a/advanced-tdd/02-clean-tests.md b/advanced-tdd/02-clean-tests.md
new file mode 100644
index 0000000..7bb96dd
--- /dev/null
+++ b/advanced-tdd/02-clean-tests.md
@@ -0,0 +1,56 @@
+---
+title: Clean Code Advanced TDD
+subtitle: Clean Tests
+...
+
+# Pre-work
+
+* Video: <https://cleancoders.com/episode/clean-code-episode-20>
+* Exam: <https://cleancoders.com/episode/clean-code-episode-20/exam>
+
+# Chapters
+
+| Chapter                    | Time     |
+|----------------------------|----------|
+| Overview                   | 00:05:52 |
+| History of the Earth       | 00:08:31 |
+| Anatomy of a Test          | 00:20:50 |
+| The Arrange                | 00:29:50 |
+| Setup Struggles            | 00:40:56 |
+| Test Hierarchy             | 00:52:57 |
+| Clean Composition          | 01:06:04 |
+| The Assertion              | 01:10:30 |
+| Conclusion                 | 01:20:58 |
+
+# Timetable
+
+| Activity                   | Time   |
+|----------------------------|--------|
+| Warmup                     | 5 min  |
+| Excercise 1                | 10 min |
+| Wrap up                    | 5 min  |
+
+# Warmup
+
+* What ...?
+  * Type in the meeting chat
+
+# Exercise 1
+
+* Prompt
+  * ...
+* Time limit: ...
+
+# Wrap up
+
+* ...
+
+# What is next?
+
+* Expect an e-mail with instructions for upcoming coding dojo
+
+# Final words
+
+> Always leave the code better than you found it.
+>
+> -- <cite>The Software Craftsmanship Rule</cite>
diff --git a/fundamentals/02-names.md b/fundamentals/02-names.md
index 4e76062..100aabb 100644
--- a/fundamentals/02-names.md
+++ b/fundamentals/02-names.md
@@ -1,6 +1,6 @@
 ---
 title: Clean Code Fundamentals
-subtitle: Names
+subtitle: Names++
 ...
 
 # Pre-work
@@ -8,6 +8,20 @@ subtitle: Names
 * Video: <https://cleancoders.com/episode/clean-code-episode-2>
 * Exam: <https://cleancoders.com/episode/clean-code-episode-2/exam>
 
+# Chapters
+
+| Chapter                    | Time     |
+|----------------------------|----------|
+| Reveal Your Intent         | 00:00:42 |
+| Describe the Problem       | 00:04:24 |
+| Avoid Disinformation       | 00:08:19 |
+| Pronouncable Names         | 00:13:24 |
+| Avoid Encodings            | 00:16:36 |
+| Parts of Speech            | 00:20:01 |
+| The Scope Lengh Rule       | 00:25:06 |
+| Recap & Conclusion         | 00:31:39 |
+| Distance to the Sun        | 00:36:07 |
+
 # Timetable
 
 | Activity                   | Time   |
diff --git a/solid/02-srp.md b/solid/02-srp.md
index 626d850..2fc44cf 100644
--- a/solid/02-srp.md
+++ b/solid/02-srp.md
@@ -177,7 +177,7 @@ subtitle: The Single Responsibility Principle
 
 * Time limit: 10 minutes
 
-# Definitions 
+# Definitions
 
 * Actor - single source of change
     * Roles