diff --git a/Writerside/strumenta.tree b/Writerside/strumenta.tree
index ba14d2b..08c642a 100644
--- a/Writerside/strumenta.tree
+++ b/Writerside/strumenta.tree
@@ -29,6 +29,7 @@
         <toc-element topic="ASTRepresentation.md"/>
         <toc-element topic="Validation.md"/>
         <toc-element topic="SymbolResolution.md"/>
+        <toc-element topic="TypeChecking.md"/>
     </toc-element>
     <toc-element topic="Methods.md">
         <toc-element topic="ChiselMethod.md"/>
diff --git a/Writerside/topics/TypeChecking.md b/Writerside/topics/TypeChecking.md
new file mode 100644
index 0000000..54b47c9
--- /dev/null
+++ b/Writerside/topics/TypeChecking.md
@@ -0,0 +1,3 @@
+# Type Checking
+
+_To be written_.
\ No newline at end of file
diff --git a/Writerside/topics/usecases/building-parser.md b/Writerside/topics/usecases/building-parser.md
index f674d8d..4fd3575 100644
--- a/Writerside/topics/usecases/building-parser.md
+++ b/Writerside/topics/usecases/building-parser.md
@@ -12,10 +12,10 @@ An initial version may also be generated from the ANTLR grammar, by using StarLa
 
 We then organize the parser into a pipeline:
 1. First-stage parsing using ANTLR. We obtain a parse tree and, possibly, a series of errors.
-2. Second-stage parsing. [The parse tree is mapped into the AST](../parsetree_to_ast.md)
+2. Second-stage parsing. [The parse tree is mapped into the AST](ParseTreeToASTMapping.md)
 3. Potentially, for some parsers, we perform additional steps, such as:
-   1. [Symbol resolution](../symbol_resolution.md)
-   2. [Type checking](../typesystem.md)
+   1. [Symbol resolution](SymbolResolution.md)
+   2. [Type checking](TypeChecking.md)
    3. Advanced calculations such as lineage, data flow analysis, linting, etc.
 
 The StarLasu ASTs provide a more convenient API with respect to the ANTLR APIs for parse trees. In fact, StarLasu comes