diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 83af2ccb..0b9e59ad 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -19,11 +19,20 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v2
-    - name: Use Rust stable
+    - name: Setup Rust
       uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
-    - name: Build with Cargo
+    - name: Setup npm
+      uses: actions/setup-node@v4
+
+    - name: Build Rust code
       run: cargo build --release --workspace
-    - name: Run tests
-      run: cargo test --verbose
\ No newline at end of file
+    - name: Run Rust tests
+      run: cargo test --verbose
+
+    - name: Check VSCode client
+      working-directory: 'editors/vscode'
+      run: |
+        npm ci
+        npm run check
\ No newline at end of file
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
index 734abff5..c33d89f9 100644
--- a/.github/workflows/draft-release.yml
+++ b/.github/workflows/draft-release.yml
@@ -8,6 +8,9 @@ env:
   CARGO_TERM_COLOR: always
   IS_PRE_RELEASE: ${{ contains(github.ref_name, 'dev') }}
 
+permissions:
+  issues: write
+
 jobs:
   build:
     strategy:
@@ -37,8 +40,10 @@ jobs:
     - name: Build xtask
       run: cargo build --package xtask --release
 
-    - name: Prepare the server executable
+    - name: Prepare the LSP server executable
       run: cargo xtask prep-server --target ${{ matrix.target }} --release
+    - name: Download rw3d_cli
+      run: cargo xtask prep-rw3d
     
     - name: Package the extension (pre-release)
       if: ${{ env.IS_PRE_RELEASE == 'true' }}
@@ -75,6 +80,17 @@ jobs:
         generateReleaseNotes: true
         prerelease: ${{ env.IS_PRE_RELEASE }}
 
+
+    - name: Require manual approval to upload the extension to marketplaces
+      if: ${{ env.IS_PRE_RELEASE == 'false' }}
+      uses: trstringer/manual-approval@v1
+      with:
+        secret: ${{ github.TOKEN }}
+        approvers: SpontanCombust
+        minimum-approvals: 1
+        issue-title: "Deploying ${{ github.ref_name }} to marketplaces from staging"
+        issue-body: "Please approve or deny the deployment of version ${{ github.ref_name }}."
+
     # The VS Marketplace doesn't yet support pre-release semver versions, sigh....
     # https://code.visualstudio.com/api/working-with-extensions/publishing-extension#prerelease-extensions
     # - name: Upload extension to VSCode Marketplace (pre-release)
diff --git a/.gitignore b/.gitignore
index a7a8ad8f..27aa5bb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 
 /editors/vscode/node_modules
 /editors/vscode/out
-/editors/vscode/server
+/editors/vscode/deps/**
 *.vsix
 
 /site
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 686dfb7d..9ecb0f69 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -21,10 +21,10 @@
             "type": "lldb",
             "request": "attach",
             "windows": {
-                "program": "${workspaceFolder}/server/bin/witcherscript-lsp.exe",
+                "program": "${workspaceFolder}/deps/lsp_server/bin/witcherscript-lsp.exe",
             },
             "linux": {
-                "program": "${workspaceFolder}/server/bin/witcherscript-lsp"
+                "program": "${workspaceFolder}/deps/lsp_server/bin/witcherscript-lsp"
             }
         }
     ]
diff --git a/Cargo.lock b/Cargo.lock
index 4413cb2c..6c643178 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "abs-path"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "lsp-types",
  "serde",
@@ -27,6 +27,17 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.2"
@@ -90,6 +101,15 @@ version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
 
+[[package]]
+name = "arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+dependencies = [
+ "derive_arbitrary",
+]
+
 [[package]]
 name = "async-trait"
 version = "0.1.76"
@@ -149,17 +169,63 @@ dependencies = [
  "syn 2.0.48",
 ]
 
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
 [[package]]
 name = "bytes"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
+[[package]]
+name = "bzip2"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
+dependencies = [
+ "bzip2-sys",
+ "libc",
+]
+
+[[package]]
+name = "bzip2-sys"
+version = "0.1.11+1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
 [[package]]
 name = "cc"
 version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+dependencies = [
+ "jobserver",
+ "libc",
+]
 
 [[package]]
 name = "cfg-if"
@@ -167,6 +233,16 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
 [[package]]
 name = "clap"
 version = "4.4.18"
@@ -213,6 +289,45 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
+[[package]]
+name = "constant_time_eq"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc"
+version = "3.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.5"
@@ -234,9 +349,19 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
 
 [[package]]
 name = "dashmap"
@@ -251,6 +376,54 @@ dependencies = [
  "parking_lot_core",
 ]
 
+[[package]]
+name = "deflate64"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b"
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "derive_arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "dyn-clone"
 version = "1.0.16"
@@ -299,6 +472,16 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "flate2"
+version = "1.0.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -385,6 +568,27 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
 [[package]]
 name = "gimli"
 version = "0.28.1"
@@ -409,6 +613,15 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
 [[package]]
 name = "httparse"
 version = "1.8.0"
@@ -435,6 +648,15 @@ dependencies = [
  "hashbrown",
 ]
 
+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "itertools"
 version = "0.8.2"
@@ -450,6 +672,15 @@ version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
+[[package]]
+name = "jobserver"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.153"
@@ -466,6 +697,18 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "lockfree-object-pool"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
 [[package]]
 name = "lsp-types"
 version = "0.94.1"
@@ -479,11 +722,21 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "lzma-rs"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e"
+dependencies = [
+ "byteorder",
+ "crc",
+]
+
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "miniz_oxide"
@@ -494,6 +747,12 @@ dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num_cpus"
 version = "1.16.0"
@@ -532,6 +791,16 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
+[[package]]
+name = "pbkdf2"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
+dependencies = [
+ "digest",
+ "hmac",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -570,6 +839,24 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "pkg-config"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.78"
@@ -594,6 +881,36 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
 [[package]]
 name = "rayon"
 version = "1.9.0"
@@ -746,6 +1063,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
 [[package]]
 name = "shrinkwraprs"
 version = "0.3.0"
@@ -759,6 +1087,12 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -805,6 +1139,12 @@ dependencies = [
  "syn 2.0.48",
 ]
 
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -829,24 +1169,43 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.48",
 ]
 
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -864,9 +1223,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.35.1"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
  "num_cpus",
@@ -876,9 +1235,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1043,6 +1402,12 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.14"
@@ -1082,6 +1447,18 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -1216,7 +1593,7 @@ dependencies = [
 
 [[package]]
 name = "witcherscript"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "abs-path",
  "encoding_rs_io",
@@ -1232,7 +1609,7 @@ dependencies = [
 
 [[package]]
 name = "witcherscript-analysis"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "abs-path",
  "lsp-types",
@@ -1249,7 +1626,7 @@ dependencies = [
 
 [[package]]
 name = "witcherscript-diagnostics"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "abs-path",
  "lsp-types",
@@ -1259,7 +1636,7 @@ dependencies = [
 
 [[package]]
 name = "witcherscript-lsp"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "abs-path",
  "bitmask-enum",
@@ -1268,6 +1645,7 @@ dependencies = [
  "rayon",
  "serde",
  "serde_json",
+ "serde_repr",
  "shrinkwraprs",
  "thiserror",
  "tokio",
@@ -1280,7 +1658,7 @@ dependencies = [
 
 [[package]]
 name = "witcherscript-project"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "abs-path",
  "dyn-clone",
@@ -1313,10 +1691,102 @@ checksum = "7e2c411759b501fb9501aac2b1b2d287a6e93e5bdcf13c25306b23e1b716dd0e"
 
 [[package]]
 name = "xtask"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "clap",
  "project-root",
  "xshell",
+ "zip",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "zip"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39"
+dependencies = [
+ "aes",
+ "arbitrary",
+ "bzip2",
+ "constant_time_eq",
+ "crc32fast",
+ "crossbeam-utils",
+ "deflate64",
+ "displaydoc",
+ "flate2",
+ "hmac",
+ "indexmap",
+ "lzma-rs",
+ "memchr",
+ "pbkdf2",
+ "rand",
+ "sha1",
+ "thiserror",
+ "time",
+ "zeroize",
+ "zopfli",
+ "zstd",
+]
+
+[[package]]
+name = "zopfli"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "lockfree-object-pool",
+ "log",
+ "once_cell",
+ "simd-adler32",
+]
+
+[[package]]
+name = "zstd"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "7.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa"
+dependencies = [
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.12+zstd.1.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13"
+dependencies = [
+ "cc",
+ "pkg-config",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 57b09cb9..44a64013 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ members = ["crates/*", "xtask"]
 resolver = "2"
 
 [workspace.package]
-version = "0.3.2"
+version = "0.4.0"
 edition = "2021"
 authors = ["SpontanCombust"]
 
@@ -21,6 +21,7 @@ clap = {version = "4.4", features = ["derive"]}
 anyhow = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+serde_repr = "0.1"
 toml = "0.8"
 semver = { version = "1.0", features = ["serde"] }
 dyn-clone = "1.0"
diff --git a/README.md b/README.md
index 616b9420..4f5b544c 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,8 @@
 </p>
 
 ![GitHub Release](https://img.shields.io/github/v/release/SpontanCombust/witcherscript-ide)
-![Visual Studio Marketplace Installs](https://img.shields.io/visual-studio-marketplace/i/SpontanCombust.witcherscript-ide)
+![Visual Studio Marketplace Downloads](https://img.shields.io/visual-studio-marketplace/d/SpontanCombust.witcherscript-ide?label=Visual%20Studio%20Marketplace%20Downloads)
+![Open VSX Registry Downloads](https://img.shields.io/open-vsx/dt/SpontanCombust/witcherscript-ide?label=Open%20VSX%20Registry%20Downloads)
 
 ***WIDE*** (**W**itcherScript **I**ntegrated **D**evelopment **E**nvironment) is unofficial Witcher 3 modding tooling aimed at improving developer experience by supplying them with powerful code analysis tools in the form of an editor extension making use of a Language Server.
 
diff --git a/crates/abs-path/src/lib.rs b/crates/abs-path/src/lib.rs
index a963bbd8..cb506424 100644
--- a/crates/abs-path/src/lib.rs
+++ b/crates/abs-path/src/lib.rs
@@ -145,7 +145,14 @@ impl TryFrom<lsp_types::Url> for AbsPath {
         let path = value.to_file_path()?;
         Ok(Self::resolve(path, None).unwrap())
     }
-    
+}
+
+impl TryFrom<PathBuf> for AbsPath {
+    type Error = self::Error;
+
+    fn try_from(value: PathBuf) -> Result<Self, Self::Error> {
+        Self::resolve(value, None)
+    }
 }
 
 impl Into<lsp_types::Url> for AbsPath {
diff --git a/crates/analysis/src/jobs/scan_symbols.rs b/crates/analysis/src/jobs/scan_symbols.rs
index 4693d4ff..3345a75b 100644
--- a/crates/analysis/src/jobs/scan_symbols.rs
+++ b/crates/analysis/src/jobs/scan_symbols.rs
@@ -594,7 +594,7 @@ impl SyntaxNodeVisitor for SymbolScannerVisitor<'_> {
         }
     }
 
-    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, _: DeclarationTraversalContext) -> FunctionDeclarationTraversalPolicy {
+    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, _: &TraversalContextStack) -> FunctionDeclarationTraversalPolicy {
         let mut traverse = false;
 
         let name_node = n.name();
@@ -615,7 +615,7 @@ impl SyntaxNodeVisitor for SymbolScannerVisitor<'_> {
         }
     }
 
-    fn exit_member_func_decl(&mut self, _: &FunctionDeclarationNode, _: DeclarationTraversalContext) {
+    fn exit_member_func_decl(&mut self, _: &FunctionDeclarationNode, _: &TraversalContextStack) {
         // pop only if visit managed to create the symbol
         if self.current_path.components().last().map(|comp| comp.category == SymbolCategory::Callable).unwrap_or(false)  {
             self.current_path.pop();
@@ -623,7 +623,7 @@ impl SyntaxNodeVisitor for SymbolScannerVisitor<'_> {
         }
     }
 
-    fn visit_event_decl(&mut self, n: &EventDeclarationNode, _: DeclarationTraversalContext) -> EventDeclarationTraversalPolicy {
+    fn visit_event_decl(&mut self, n: &EventDeclarationNode, _: &TraversalContextStack) -> EventDeclarationTraversalPolicy {
         let mut traverse = false;
 
         let name_node = n.name();
@@ -649,14 +649,14 @@ impl SyntaxNodeVisitor for SymbolScannerVisitor<'_> {
         }
     }
 
-    fn exit_event_decl(&mut self, _: &EventDeclarationNode, _: DeclarationTraversalContext) {
+    fn exit_event_decl(&mut self, _: &EventDeclarationNode, _: &TraversalContextStack) {
         if self.current_path.components().last().map(|comp| comp.category == SymbolCategory::Callable).unwrap_or(false)  {
             self.current_path.pop();
             self.current_param_ordinal = 0;
         }
     }
 
-    fn visit_func_param_group(&mut self, n: &FunctionParameterGroupNode, _: FunctionTraversalContext) {
+    fn visit_func_param_group(&mut self, n: &FunctionParameterGroupNode, _: &TraversalContextStack) {
         let specifiers: SymbolSpecifiers<_> = n.specifiers()
             .map(|sn| sn.value())
             .filter_map(|s| FunctionParameterSpecifier::try_from(s).ok())
@@ -686,7 +686,7 @@ impl SyntaxNodeVisitor for SymbolScannerVisitor<'_> {
         }
     }
 
-    fn visit_member_var_decl(&mut self, n: &MemberVarDeclarationNode, _: DeclarationTraversalContext) {
+    fn visit_member_var_decl(&mut self, n: &MemberVarDeclarationNode, _: &TraversalContextStack) {
         let specifiers: SymbolSpecifiers<_> = n.specifiers()
             .map(|sn| sn.value())
             .filter_map(|s| MemberVarSpecifier::try_from(s).ok())
@@ -730,7 +730,7 @@ impl SyntaxNodeVisitor for SymbolScannerVisitor<'_> {
         }
     }
 
-    fn visit_autobind_decl(&mut self, n: &AutobindDeclarationNode, _: DeclarationTraversalContext) {
+    fn visit_autobind_decl(&mut self, n: &AutobindDeclarationNode, _: &TraversalContextStack) {
         let name_node = n.name();
         let autobind_name = name_node.value(&self.doc);
         let path = MemberDataSymbolPath::new(&self.current_path, &autobind_name);
@@ -755,7 +755,7 @@ impl SyntaxNodeVisitor for SymbolScannerVisitor<'_> {
 
 
 
-    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, _: StatementTraversalContext) -> VarDeclarationTraversalPolicy {
+    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, _: &TraversalContextStack) -> VarDeclarationTraversalPolicy {
         let type_path = self.check_type_from_type_annot(n.var_type());
     
         for name_node in n.names() {
@@ -779,27 +779,27 @@ impl SyntaxNodeVisitor for SymbolScannerVisitor<'_> {
         }
     }
 
-    fn visit_compound_stmt(&mut self, _: &CompoundStatementNode, _: StatementTraversalContext) -> CompoundStatementTraversalPolicy {
+    fn visit_compound_stmt(&mut self, _: &CompoundStatementNode, _: &TraversalContextStack) -> CompoundStatementTraversalPolicy {
         CompoundStatementTraversalPolicy { traverse: true }
     }
     
-    fn visit_while_stmt(&mut self, _: &WhileLoopNode, _: StatementTraversalContext) -> WhileLoopTraversalPolicy {
+    fn visit_while_stmt(&mut self, _: &WhileLoopNode, _: &TraversalContextStack) -> WhileLoopTraversalPolicy {
         WhileLoopTraversalPolicy { traverse_cond: false, traverse_body: true }
     }
 
-    fn visit_do_while_stmt(&mut self, _: &DoWhileLoopNode, _: StatementTraversalContext) -> DoWhileLoopTraversalPolicy {
+    fn visit_do_while_stmt(&mut self, _: &DoWhileLoopNode, _: &TraversalContextStack) -> DoWhileLoopTraversalPolicy {
         DoWhileLoopTraversalPolicy { traverse_cond: false, traverse_body: true }
     }
 
-    fn visit_for_stmt(&mut self, _: &ForLoopNode, _: StatementTraversalContext) -> ForLoopTraversalPolicy {
+    fn visit_for_stmt(&mut self, _: &ForLoopNode, _: &TraversalContextStack) -> ForLoopTraversalPolicy {
         ForLoopTraversalPolicy { traverse_init: false, traverse_cond: false, traverse_iter: false, traverse_body: true }
     }
 
-    fn visit_if_stmt(&mut self, _: &IfConditionalNode, _: StatementTraversalContext) -> IfConditionalTraversalPolicy {
+    fn visit_if_stmt(&mut self, _: &IfConditionalNode, _: &TraversalContextStack) -> IfConditionalTraversalPolicy {
         IfConditionalTraversalPolicy { traverse_cond: false, traverse_body: true, traverse_else_body: true }
     }
 
-    fn visit_switch_stmt(&mut self, _: &SwitchConditionalNode, _: StatementTraversalContext) -> SwitchConditionalTraversalPolicy {
+    fn visit_switch_stmt(&mut self, _: &SwitchConditionalNode, _: &TraversalContextStack) -> SwitchConditionalTraversalPolicy {
         SwitchConditionalTraversalPolicy { traverse_cond: false, traverse_body: true }
     }
 }
\ No newline at end of file
diff --git a/crates/analysis/src/jobs/syntax_analysis/contextual_analysis.rs b/crates/analysis/src/jobs/syntax_analysis/contextual_analysis.rs
index 85ec90c3..7e3715f2 100644
--- a/crates/analysis/src/jobs/syntax_analysis/contextual_analysis.rs
+++ b/crates/analysis/src/jobs/syntax_analysis/contextual_analysis.rs
@@ -10,7 +10,8 @@ use witcherscript_diagnostics::{Diagnostic, DiagnosticKind};
 pub fn contextual_syntax_analysis(script: &Script, doc: &ScriptDocument, diagnostics: &mut Vec<Diagnostic>) {
     let mut visitor = ContextualSyntaxAnalysis {
         doc,
-        diagnostics
+        diagnostics,
+        visited_non_var_stmt_before: false
     };
 
     script.visit_nodes(&mut visitor);
@@ -18,7 +19,8 @@ pub fn contextual_syntax_analysis(script: &Script, doc: &ScriptDocument, diagnos
 
 struct ContextualSyntaxAnalysis<'a> {
     doc: &'a ScriptDocument,
-    diagnostics: &'a mut Vec<Diagnostic>
+    diagnostics: &'a mut Vec<Diagnostic>,
+    visited_non_var_stmt_before: bool
 }
 
 impl ContextualSyntaxAnalysis<'_> {
@@ -256,10 +258,11 @@ impl SyntaxNodeVisitor for ContextualSyntaxAnalysis<'_> {
             self.check_function_specifiers(n, true);
         }
 
-        FunctionDeclarationTraversalPolicy { 
-            traverse_params: true,
-            traverse_definition: false
-        }   
+        TraversalPolicy::default_to(true)
+    }
+
+    fn exit_global_func_decl(&mut self, _: &FunctionDeclarationNode) {
+        self.visited_non_var_stmt_before = false;
     }
 
     fn visit_global_var_decl(&mut self, n: &MemberVarDeclarationNode) {
@@ -305,7 +308,7 @@ impl SyntaxNodeVisitor for ContextualSyntaxAnalysis<'_> {
         }
     }
 
-    fn visit_member_var_decl(&mut self, n: &MemberVarDeclarationNode, ctx: DeclarationTraversalContext) {
+    fn visit_member_var_decl(&mut self, n: &MemberVarDeclarationNode, ctx: &TraversalContextStack) {
         if let Some(range) = n.annotation().map(|ann| ann.range()) {
             self.diagnostics.push(Diagnostic {
                 range,
@@ -319,7 +322,7 @@ impl SyntaxNodeVisitor for ContextualSyntaxAnalysis<'_> {
         for (spec, range) in n.specifiers().map(|specn| (specn.value(), specn.range())) {
             if let Ok(var_spec) = MemberVarSpecifier::try_from(spec) {
                 if matches!(var_spec, MemberVarSpecifier::AccessModifier(_)) {
-                    if ctx == DeclarationTraversalContext::StructDefinition {
+                    if ctx.contains(TraversalContext::Struct) {
                         let spec_name = Keyword::from(spec).to_string();
                         self.diagnostics.push(Diagnostic {
                             range,
@@ -353,7 +356,7 @@ impl SyntaxNodeVisitor for ContextualSyntaxAnalysis<'_> {
         }
     }
 
-    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, _: DeclarationTraversalContext) -> FunctionDeclarationTraversalPolicy {
+    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, _: &TraversalContextStack) -> FunctionDeclarationTraversalPolicy {
         if let Some(range) = n.annotation().map(|ann| ann.range()) {
             self.diagnostics.push(Diagnostic {
                 range,
@@ -363,13 +366,22 @@ impl SyntaxNodeVisitor for ContextualSyntaxAnalysis<'_> {
 
         self.check_function_specifiers(n, false);
 
-        FunctionDeclarationTraversalPolicy {
-            traverse_params: true,
-            traverse_definition: false
-        }
+        TraversalPolicy::default_to(true)
+    }
+
+    fn exit_member_func_decl(&mut self, _: &FunctionDeclarationNode, _: &TraversalContextStack) {
+        self.visited_non_var_stmt_before = false;
     }
 
-    fn visit_autobind_decl(&mut self, n: &AutobindDeclarationNode, _: DeclarationTraversalContext) {
+    fn visit_event_decl(&mut self, _: &EventDeclarationNode, _: &TraversalContextStack) -> EventDeclarationTraversalPolicy {
+        TraversalPolicy::default_to(true)
+    }
+
+    fn exit_event_decl(&mut self, _: &EventDeclarationNode, _: &TraversalContextStack) {
+        self.visited_non_var_stmt_before = false;
+    }
+
+    fn visit_autobind_decl(&mut self, n: &AutobindDeclarationNode, _: &TraversalContextStack) {
         let mut specifiers = SmallVec::<[AutobindSpecifier; 2]>::new();
         let mut found_access_modif_before = false;
 
@@ -403,7 +415,7 @@ impl SyntaxNodeVisitor for ContextualSyntaxAnalysis<'_> {
         }
     }
 
-    fn visit_func_param_group(&mut self, n: &FunctionParameterGroupNode, _: FunctionTraversalContext) {
+    fn visit_func_param_group(&mut self, n: &FunctionParameterGroupNode, _: &TraversalContextStack) {
         let mut specifiers = SmallVec::<[FunctionParameterSpecifier; 2]>::new();
 
         for (spec, range) in n.specifiers().map(|specn| (specn.value(), specn.range())) {
@@ -425,4 +437,97 @@ impl SyntaxNodeVisitor for ContextualSyntaxAnalysis<'_> {
             } 
         }
     }
+
+    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, _: &TraversalContextStack) -> VarDeclarationTraversalPolicy {
+        if self.visited_non_var_stmt_before {
+            self.diagnostics.push(Diagnostic {
+                range: n.range(),
+                kind: DiagnosticKind::InvalidLocalVarPlacement
+            });
+        }
+
+        VarDeclarationTraversalPolicy {
+            traverse_init_value: false
+        }
+    }
+
+    fn visit_expr_stmt(&mut self, _: &ExpressionStatementNode, _: &TraversalContextStack) -> ExpressionStatementTraversalPolicy {
+        self.visited_non_var_stmt_before = true;
+
+        ExpressionStatementTraversalPolicy {
+            traverse_expr: false
+        }
+    }
+
+    fn visit_if_stmt(&mut self, _: &IfConditionalNode, _: &TraversalContextStack) -> IfConditionalTraversalPolicy {
+        self.visited_non_var_stmt_before = true;
+
+        IfConditionalTraversalPolicy {
+            traverse_cond: false,
+            traverse_body: true,
+            traverse_else_body: true
+        }
+    }
+
+    fn visit_switch_stmt(&mut self, _: &SwitchConditionalNode, _: &TraversalContextStack) -> SwitchConditionalTraversalPolicy {
+        self.visited_non_var_stmt_before = true;
+
+        SwitchConditionalTraversalPolicy {
+            traverse_cond: false,
+            traverse_body: true
+        }
+    }
+
+    fn visit_for_stmt(&mut self, _: &ForLoopNode, _: &TraversalContextStack) -> ForLoopTraversalPolicy {
+        self.visited_non_var_stmt_before = true;
+
+        ForLoopTraversalPolicy {
+            traverse_init: false,
+            traverse_cond: false,
+            traverse_iter: false,
+            traverse_body: true
+        }
+    }
+
+    fn visit_while_stmt(&mut self, _: &WhileLoopNode, _: &TraversalContextStack) -> WhileLoopTraversalPolicy {
+        self.visited_non_var_stmt_before = true;
+
+        WhileLoopTraversalPolicy {
+            traverse_cond: false,
+            traverse_body: true
+        }
+    }
+
+    fn visit_do_while_stmt(&mut self, _: &DoWhileLoopNode, _: &TraversalContextStack) -> DoWhileLoopTraversalPolicy {
+        self.visited_non_var_stmt_before = true;
+
+        DoWhileLoopTraversalPolicy {
+            traverse_cond: false,
+            traverse_body: true
+        }
+    }
+
+    fn visit_delete_stmt(&mut self, _: &DeleteStatementNode, _: &TraversalContextStack) -> DeleteStatementTraversalPolicy {
+        self.visited_non_var_stmt_before = true;
+
+        DeleteStatementTraversalPolicy {
+            traverse_value: false
+        }
+    }
+
+    fn visit_compound_stmt(&mut self, _: &CompoundStatementNode, _: &TraversalContextStack) -> CompoundStatementTraversalPolicy {
+        self.visited_non_var_stmt_before = true;
+
+        CompoundStatementTraversalPolicy {
+            traverse: true
+        }
+    }
+
+    fn visit_return_stmt(&mut self, _: &ReturnStatementNode, _: &TraversalContextStack) -> ReturnStatementTraversalPolicy {
+        self.visited_non_var_stmt_before = true;
+
+        ReturnStatementTraversalPolicy {
+            traverse_value: false
+        }
+    }
 }
\ No newline at end of file
diff --git a/crates/analysis/src/jobs/syntax_analysis/syntax_error_visitor.rs b/crates/analysis/src/jobs/syntax_analysis/syntax_error_visitor.rs
index a661c31e..74eb243c 100644
--- a/crates/analysis/src/jobs/syntax_analysis/syntax_error_visitor.rs
+++ b/crates/analysis/src/jobs/syntax_analysis/syntax_error_visitor.rs
@@ -252,7 +252,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_member_var_decl(&mut self, n: &MemberVarDeclarationNode, _: DeclarationTraversalContext) {
+    fn visit_member_var_decl(&mut self, n: &MemberVarDeclarationNode, _: &TraversalContextStack) {
         if n.has_errors() {
             if let Some(annot) = n.annotation() {
                 self.check_annotation(&annot);
@@ -265,7 +265,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_member_default_val(&mut self, n: &MemberDefaultValueNode, _: DeclarationTraversalContext) -> MemberDefaultValueTraversalPolicy {
+    fn visit_member_default_val(&mut self, n: &MemberDefaultValueNode, _: &TraversalContextStack) -> MemberDefaultValueTraversalPolicy {
         let mut traverse_value = false;
         if n.has_errors() {
             self.check_identifier(&n.member());
@@ -281,7 +281,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_member_hint(&mut self, n: &MemberHintNode, _: DeclarationTraversalContext) {
+    fn visit_member_hint(&mut self, n: &MemberHintNode, _: &TraversalContextStack) {
         if n.has_errors() {
             self.check_identifier(&n.member());
             self.check_missing(&n.value(), "hint string");
@@ -290,7 +290,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_autobind_decl(&mut self, n: &AutobindDeclarationNode, _: DeclarationTraversalContext) {
+    fn visit_autobind_decl(&mut self, n: &AutobindDeclarationNode, _: &TraversalContextStack) {
         if n.has_errors() {
             self.check_identifier(&n.name());
             self.check_type_annot(&n.autobind_type());
@@ -299,7 +299,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_func_param_group(&mut self, n: &FunctionParameterGroupNode, _: FunctionTraversalContext) {
+    fn visit_func_param_group(&mut self, n: &FunctionParameterGroupNode, _: &TraversalContextStack) {
         if n.has_errors() {
             n.names().for_each(|name| { self.check_identifier(&name); } );
             self.check_type_annot(&n.param_type());
@@ -342,7 +342,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, _: DeclarationTraversalContext) -> FunctionDeclarationTraversalPolicy {
+    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, _: &TraversalContextStack) -> FunctionDeclarationTraversalPolicy {
         let mut traverse_params = false;
         let mut traverse_definition = false;
         if n.has_errors() {
@@ -379,7 +379,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_event_decl(&mut self, n: &EventDeclarationNode, _: DeclarationTraversalContext) -> EventDeclarationTraversalPolicy {
+    fn visit_event_decl(&mut self, n: &EventDeclarationNode, _: &TraversalContextStack) -> EventDeclarationTraversalPolicy {
         let mut traverse_params = false;
         let mut traverse_definition = false;
         if n.has_errors() {
@@ -412,7 +412,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_member_defaults_block(&mut self, n: &MemberDefaultsBlockNode, _: DeclarationTraversalContext) -> MemberDefaultsBlockTraversalPolicy {
+    fn visit_member_defaults_block(&mut self, n: &MemberDefaultsBlockNode, _: &TraversalContextStack) -> MemberDefaultsBlockTraversalPolicy {
         let traverse = if n.has_errors() {
             self.check_errors(n);
             true
@@ -425,7 +425,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_member_defaults_block_assignment(&mut self, n: &MemberDefaultsBlockAssignmentNode) -> MemberDefaultValueTraversalPolicy {
+    fn visit_member_defaults_block_assignment(&mut self, n: &MemberDefaultsBlockAssignmentNode, _: &TraversalContextStack) -> MemberDefaultValueTraversalPolicy {
         let mut traverse_value = false;
         if n.has_errors() {
             self.check_identifier(&n.member());
@@ -442,7 +442,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
 
     
     
-    fn visit_compound_stmt(&mut self, n: &CompoundStatementNode, _: StatementTraversalContext) -> CompoundStatementTraversalPolicy {
+    fn visit_compound_stmt(&mut self, n: &CompoundStatementNode, _: &TraversalContextStack) -> CompoundStatementTraversalPolicy {
          let traverse = if n.has_errors() {
             self.check_errors(n);
             true
@@ -455,7 +455,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, _: StatementTraversalContext) -> VarDeclarationTraversalPolicy {
+    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, _: &TraversalContextStack) -> VarDeclarationTraversalPolicy {
         let mut traverse_init_value = false;
         if n.has_errors() {
             n.names().for_each(|name| { self.check_identifier(&name); } );
@@ -470,7 +470,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_expr_stmt(&mut self, n: &ExpressionStatementNode, _: StatementTraversalContext) -> ExpressionStatementTraversalPolicy {
+    fn visit_expr_stmt(&mut self, n: &ExpressionStatementNode, _: &TraversalContextStack) -> ExpressionStatementTraversalPolicy {
         let mut traverse_expr = false;
         if n.has_errors() {
             traverse_expr = !self.check_expression(&n.expr());
@@ -483,7 +483,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_return_stmt(&mut self, n: &ReturnStatementNode, _: StatementTraversalContext) -> ReturnStatementTraversalPolicy {
+    fn visit_return_stmt(&mut self, n: &ReturnStatementNode, _: &TraversalContextStack) -> ReturnStatementTraversalPolicy {
         let mut traverse_value = false;
         if n.has_errors() {
             traverse_value = n.value().map(|value| !self.check_expression(&value)).unwrap_or(false);
@@ -496,19 +496,19 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_break_stmt(&mut self, n: &BreakStatementNode, _: StatementTraversalContext) {
+    fn visit_break_stmt(&mut self, n: &BreakStatementNode, _: &TraversalContextStack) {
         if n.has_errors() {
             self.check_errors(n);
         }
     }
 
-    fn visit_continue_stmt(&mut self, n: &ContinueStatementNode, _: StatementTraversalContext) {
+    fn visit_continue_stmt(&mut self, n: &ContinueStatementNode, _: &TraversalContextStack) {
         if n.has_errors() {
             self.check_errors(n);
         }
     }
 
-    fn visit_delete_stmt(&mut self, n: &DeleteStatementNode, _: StatementTraversalContext) -> DeleteStatementTraversalPolicy {
+    fn visit_delete_stmt(&mut self, n: &DeleteStatementNode, _: &TraversalContextStack) -> DeleteStatementTraversalPolicy {
         let mut traverse_value = false;
         if n.has_errors() {
             traverse_value = !self.check_expression(&n.value());
@@ -521,7 +521,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_for_stmt(&mut self, n: &ForLoopNode, _: StatementTraversalContext) -> ForLoopTraversalPolicy {
+    fn visit_for_stmt(&mut self, n: &ForLoopNode, _: &TraversalContextStack) -> ForLoopTraversalPolicy {
         let mut traverse_init = false;
         let mut traverse_cond = false;
         let mut traverse_iter = false;
@@ -543,7 +543,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_while_stmt(&mut self, n: &WhileLoopNode, _: StatementTraversalContext) -> WhileLoopTraversalPolicy {
+    fn visit_while_stmt(&mut self, n: &WhileLoopNode, _: &TraversalContextStack) -> WhileLoopTraversalPolicy {
         let mut traverse_cond = false;
         let mut traverse_body = false;
         if n.has_errors() {
@@ -559,7 +559,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_do_while_stmt(&mut self, n: &DoWhileLoopNode, _: StatementTraversalContext) -> DoWhileLoopTraversalPolicy {
+    fn visit_do_while_stmt(&mut self, n: &DoWhileLoopNode, _: &TraversalContextStack) -> DoWhileLoopTraversalPolicy {
         let mut traverse_cond = false;
         let mut traverse_body = false;
         if n.has_errors() {
@@ -575,7 +575,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_if_stmt(&mut self, n: &IfConditionalNode, _: StatementTraversalContext) -> IfConditionalTraversalPolicy {
+    fn visit_if_stmt(&mut self, n: &IfConditionalNode, _: &TraversalContextStack) -> IfConditionalTraversalPolicy {
         let mut traverse_cond = false;
         let mut traverse_body = false;
         let mut traverse_else_body = false;
@@ -594,7 +594,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_switch_stmt(&mut self, n: &SwitchConditionalNode, _: StatementTraversalContext) -> SwitchConditionalTraversalPolicy {
+    fn visit_switch_stmt(&mut self, n: &SwitchConditionalNode, _: &TraversalContextStack) -> SwitchConditionalTraversalPolicy {
         let mut traverse_cond = false;
         let mut traverse_body = false;
         if n.has_errors() {
@@ -615,7 +615,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_switch_stmt_case(&mut self, n: &SwitchConditionalCaseLabelNode) -> SwitchConditionalCaseLabelTraversalPolicy {
+    fn visit_switch_stmt_case(&mut self, n: &SwitchConditionalCaseLabelNode, _: &TraversalContextStack) -> SwitchConditionalCaseLabelTraversalPolicy {
         let mut traverse_value = false;
         if n.has_errors() {
             traverse_value = !self.check_expression(&n.value());
@@ -628,7 +628,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_switch_stmt_default(&mut self, n: &SwitchConditionalDefaultLabelNode) {
+    fn visit_switch_stmt_default(&mut self, n: &SwitchConditionalDefaultLabelNode, _: &TraversalContextStack) {
         if n.has_errors() {
             self.check_errors(n);
         }
@@ -637,7 +637,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
 
 
 
-    fn visit_array_expr(&mut self, n: &ArrayExpressionNode, _: ExpressionTraversalContext) -> ArrayExpressionTraversalPolicy {
+    fn visit_array_expr(&mut self, n: &ArrayExpressionNode, _: &TraversalContextStack) -> ArrayExpressionTraversalPolicy {
         let traverse_accessor = !self.check_expression(&n.accessor());
         let traverse_index = !self.check_expression(&n.index());
 
@@ -649,7 +649,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_assign_op_expr(&mut self, n: &AssignmentOperationExpressionNode, _: ExpressionTraversalContext) -> AssignmentOperationExpressionTraversalPolicy {
+    fn visit_assign_op_expr(&mut self, n: &AssignmentOperationExpressionNode, _: &TraversalContextStack) -> AssignmentOperationExpressionTraversalPolicy {
         let traverse_left = !self.check_expression(&n.left());
         let traverse_right = !self.check_expression(&n.right());
 
@@ -661,7 +661,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_binary_op_expr(&mut self, n: &BinaryOperationExpressionNode, _: ExpressionTraversalContext) -> BinaryOperationExpressionTraversalPolicy {
+    fn visit_binary_op_expr(&mut self, n: &BinaryOperationExpressionNode, _: &TraversalContextStack) -> BinaryOperationExpressionTraversalPolicy {
         let traverse_left = !self.check_expression(&n.left());
         let traverse_right = !self.check_expression(&n.right());
 
@@ -673,7 +673,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_unary_op_expr(&mut self, n: &UnaryOperationExpressionNode, _: ExpressionTraversalContext) -> UnaryOperationExpressionTraversalPolicy {
+    fn visit_unary_op_expr(&mut self, n: &UnaryOperationExpressionNode, _: &TraversalContextStack) -> UnaryOperationExpressionTraversalPolicy {
         let traverse_right = !self.check_expression(&n.right());
 
         self.check_errors(n);
@@ -683,7 +683,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_func_call_expr(&mut self, n: &FunctionCallExpressionNode, _: ExpressionTraversalContext) -> FunctionCallExpressionTraversalPolicy {
+    fn visit_func_call_expr(&mut self, n: &FunctionCallExpressionNode, _: &TraversalContextStack) -> FunctionCallExpressionTraversalPolicy {
         let func = n.func();
         let traverse_func = !self.check_missing(&func, "function") || func.has_errors();
 
@@ -703,7 +703,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_new_expr(&mut self, n: &NewExpressionNode, _: ExpressionTraversalContext) -> NewExpressionTraversalPolicy {
+    fn visit_new_expr(&mut self, n: &NewExpressionNode, _: &TraversalContextStack) -> NewExpressionTraversalPolicy {
         self.check_identifier(&n.class());
 
         let mut traverse_lifetime_obj = false;
@@ -718,7 +718,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, _: ExpressionTraversalContext) -> MemberFieldExpressionTraversalPolicy {
+    fn visit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, _: &TraversalContextStack) -> MemberFieldExpressionTraversalPolicy {
         let traverse_accessor = !self.check_expression(&n.accessor());
         self.check_identifier(&n.member());
 
@@ -729,7 +729,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_nested_expr(&mut self, n: &NestedExpressionNode, _: ExpressionTraversalContext) -> NestedExpressionTraversalPolicy {
+    fn visit_nested_expr(&mut self, n: &NestedExpressionNode, _: &TraversalContextStack) -> NestedExpressionTraversalPolicy {
         let traverse_inner = !self.check_expression(&n.inner());
 
         self.check_errors(n);
@@ -739,7 +739,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_ternary_cond_expr(&mut self, n: &TernaryConditionalExpressionNode, _: ExpressionTraversalContext) -> TernaryConditionalExpressionTraversalPolicy {
+    fn visit_ternary_cond_expr(&mut self, n: &TernaryConditionalExpressionNode, _: &TraversalContextStack) -> TernaryConditionalExpressionTraversalPolicy {
         let traverse_cond = !self.check_expression(&n.cond());
         let traverse_conseq = !self.check_expression(&n.conseq());
         let traverse_alt = !self.check_expression(&n.alt());
@@ -753,7 +753,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, _: ExpressionTraversalContext) -> TypeCastExpressionTraversalPolicy {
+    fn visit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, _: &TraversalContextStack) -> TypeCastExpressionTraversalPolicy {
         self.check_identifier(&n.target_type());
         let traverse_value = !self.check_expression(&n.value());
 
@@ -764,7 +764,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
         }
     }
 
-    fn visit_func_call_arg(&mut self, _: &FunctionCallArgument) -> FunctionCallArgumentTraversalPolicy {
+    fn visit_func_call_arg(&mut self, _: &FunctionCallArgument, _: &TraversalContextStack) -> FunctionCallArgumentTraversalPolicy {
         FunctionCallArgumentTraversalPolicy { 
             traverse_expr: true 
         }
diff --git a/crates/analysis/src/symbol_analysis/unqualified_name_lookup.rs b/crates/analysis/src/symbol_analysis/unqualified_name_lookup.rs
index 0c66bb60..e1b23d0c 100644
--- a/crates/analysis/src/symbol_analysis/unqualified_name_lookup.rs
+++ b/crates/analysis/src/symbol_analysis/unqualified_name_lookup.rs
@@ -428,7 +428,7 @@ impl SyntaxNodeVisitor for UnqualifiedNameLookupBuilder<'_> {
         self.payload.borrow_mut().pop_scope();
     }
 
-    fn visit_member_func_decl(&mut self, _: &FunctionDeclarationNode, _: DeclarationTraversalContext) -> FunctionDeclarationTraversalPolicy {
+    fn visit_member_func_decl(&mut self, _: &FunctionDeclarationNode, _: &TraversalContextStack) -> FunctionDeclarationTraversalPolicy {
         let mut unl = self.payload.borrow_mut();
         let sympath_ctx = self.sympath_ctx.borrow();
 
@@ -448,11 +448,11 @@ impl SyntaxNodeVisitor for UnqualifiedNameLookupBuilder<'_> {
         TraversalPolicy::default_to(true)
     }
 
-    fn exit_member_func_decl(&mut self, _: &FunctionDeclarationNode, _: DeclarationTraversalContext) {
+    fn exit_member_func_decl(&mut self, _: &FunctionDeclarationNode, _: &TraversalContextStack) {
         self.payload.borrow_mut().pop_scope();
     }
 
-    fn visit_event_decl(&mut self, _: &EventDeclarationNode, _: DeclarationTraversalContext) -> EventDeclarationTraversalPolicy {
+    fn visit_event_decl(&mut self, _: &EventDeclarationNode, _: &TraversalContextStack) -> EventDeclarationTraversalPolicy {
         let mut unl = self.payload.borrow_mut();
         let sympath_ctx = self.sympath_ctx.borrow();
 
@@ -472,11 +472,11 @@ impl SyntaxNodeVisitor for UnqualifiedNameLookupBuilder<'_> {
         TraversalPolicy::default_to(true)
     }
 
-    fn exit_event_decl(&mut self, _: &EventDeclarationNode, _: DeclarationTraversalContext) {
+    fn exit_event_decl(&mut self, _: &EventDeclarationNode, _: &TraversalContextStack) {
         self.payload.borrow_mut().pop_scope();
     }
 
-    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, _: StatementTraversalContext) -> VarDeclarationTraversalPolicy {
+    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, _: &TraversalContextStack) -> VarDeclarationTraversalPolicy {
         let mut unl = self.payload.borrow_mut();
         let sympath_ctx = self.sympath_ctx.borrow();
 
diff --git a/crates/analysis/src/utils/visitors/expr_evaluator.rs b/crates/analysis/src/utils/visitors/expr_evaluator.rs
index efbf07c0..c612d5ff 100644
--- a/crates/analysis/src/utils/visitors/expr_evaluator.rs
+++ b/crates/analysis/src/utils/visitors/expr_evaluator.rs
@@ -8,14 +8,19 @@ use super::SymbolPathBuilderPayload;
 /// Requires valid for the given context `SymbolPathBuilderPayload` and `UnqualifiedNameLookup` to work.
 pub fn evaluate_expression<'a>(
     n: ExpressionNode,
-    ctx: Option<ExpressionTraversalContext>,
+    ctx: TraversalContext,
     doc: &'a ScriptDocument, 
     symtab_marcher: SymbolTableMarcher<'a>, 
     sympath_payload: Rc<RefCell<SymbolPathBuilderPayload>>,
     unl_payload: Rc<RefCell<UnqualifiedNameLookup>>
 ) -> SymbolPathBuf {
     let mut evaluator = ExpressionEvaluator::new(doc, symtab_marcher, sympath_payload, unl_payload);
-    n.accept(&mut evaluator, ctx.unwrap_or(ExpressionTraversalContext::ExpressionStatement)); // by default it should think it is operating on an izolated statement
+
+    // we don't need information about the exact whereabouts of the expression
+    let mut ctx_stack = TraversalContextStack::new();
+    ctx_stack.push(ctx);
+
+    n.accept(&mut evaluator, &mut ctx_stack); 
     evaluator.finish()
 }
 
@@ -35,7 +40,7 @@ pub struct ExpressionEvaluator<'a> {
 #[derive(Clone)]
 struct TypeStackElement {
     path: SymbolPathBuf,
-    ctx: ExpressionTraversalContext
+    ctx: TraversalContext
 }
 
 impl<'a> ExpressionEvaluator<'a> {
@@ -64,7 +69,7 @@ impl<'a> ExpressionEvaluator<'a> {
 
 
     #[inline]
-    fn push(&mut self, path: SymbolPathBuf, ctx: ExpressionTraversalContext) {
+    fn push(&mut self, path: SymbolPathBuf, ctx: TraversalContext) {
         self.type_stack.push(TypeStackElement { path, ctx })
     }
 
@@ -140,61 +145,61 @@ impl<'a> ExpressionEvaluator<'a> {
 }
 
 impl SyntaxNodeVisitor for ExpressionEvaluator<'_> {
-    fn exit_nested_expr(&mut self, _: &NestedExpressionNode, ctx: ExpressionTraversalContext) {
-        self.top_mut().map(|e| e.ctx = ctx );
+    fn exit_nested_expr(&mut self, _: &NestedExpressionNode, ctx: &TraversalContextStack) {
+        self.top_mut().map(|e| e.ctx = ctx.top() );
     }
 
-    fn visit_literal_expr(&mut self, n: &LiteralNode, ctx: ExpressionTraversalContext) {
+    fn visit_literal_expr(&mut self, n: &LiteralNode, ctx: &TraversalContextStack) {
         match n.clone().value() {
-            Literal::Int(_) => self.push(BasicTypeSymbolPath::new("int").into(), ctx),
-            Literal::Hex(_) => self.push(BasicTypeSymbolPath::new("int").into(), ctx),
-            Literal::Float(_) => self.push(BasicTypeSymbolPath::new("float").into(), ctx),
-            Literal::Bool(_) => self.push(BasicTypeSymbolPath::new("bool").into(), ctx),
-            Literal::String(_) => self.push(BasicTypeSymbolPath::new("string").into(), ctx),
-            Literal::Name(_) => self.push(BasicTypeSymbolPath::new("name").into(), ctx),
-            Literal::Null(_) => self.push(BasicTypeSymbolPath::new("NULL").into(), ctx),
+            Literal::Int(_) => self.push(BasicTypeSymbolPath::new("int").into(), ctx.top()),
+            Literal::Hex(_) => self.push(BasicTypeSymbolPath::new("int").into(), ctx.top()),
+            Literal::Float(_) => self.push(BasicTypeSymbolPath::new("float").into(), ctx.top()),
+            Literal::Bool(_) => self.push(BasicTypeSymbolPath::new("bool").into(), ctx.top()),
+            Literal::String(_) => self.push(BasicTypeSymbolPath::new("string").into(), ctx.top()),
+            Literal::Name(_) => self.push(BasicTypeSymbolPath::new("name").into(), ctx.top()),
+            Literal::Null(_) => self.push(BasicTypeSymbolPath::new("NULL").into(), ctx.top()),
         }
     }
 
-    fn visit_this_expr(&mut self, _: &ThisExpressionNode, ctx: ExpressionTraversalContext) {
+    fn visit_this_expr(&mut self, _: &ThisExpressionNode, ctx: &TraversalContextStack) {
         let sympath_payload = self.sympath_payload.borrow();
         let type_path = sympath_payload.current_sympath.root().unwrap_or_default();
         let this_path = ThisVarSymbolPath::new(type_path);
         drop(sympath_payload);
 
-        self.push(this_path.into(), ctx);
+        self.push(this_path.into(), ctx.top());
     }
 
-    fn visit_super_expr(&mut self, _: &SuperExpressionNode, ctx: ExpressionTraversalContext) {
+    fn visit_super_expr(&mut self, _: &SuperExpressionNode, ctx: &TraversalContextStack) {
         let sympath_payload = self.sympath_payload.borrow();
         let type_path = sympath_payload.current_sympath.root().unwrap_or_default();
         let super_path = SuperVarSymbolPath::new(type_path);
         drop(sympath_payload);
         
-        self.push(super_path.into(), ctx);
+        self.push(super_path.into(), ctx.top());
     }
 
-    fn visit_parent_expr(&mut self, _: &ParentExpressionNode, ctx: ExpressionTraversalContext) {
+    fn visit_parent_expr(&mut self, _: &ParentExpressionNode, ctx: &TraversalContextStack) {
         let sympath_payload = self.sympath_payload.borrow();
         let type_path = sympath_payload.current_sympath.root().unwrap_or_default();
         let parent_path = ParentVarSymbolPath::new(type_path);
         drop(sympath_payload);
         
-        self.push(parent_path.into(), ctx);
+        self.push(parent_path.into(), ctx.top());
     }
 
-    fn visit_virtual_parent_expr(&mut self, _: &VirtualParentExpressionNode, ctx: ExpressionTraversalContext) {
+    fn visit_virtual_parent_expr(&mut self, _: &VirtualParentExpressionNode, ctx: &TraversalContextStack) {
         let sympath_payload = self.sympath_payload.borrow();
         let type_path = sympath_payload.current_sympath.root().unwrap_or_default();
         let virtual_parent_path = VirtualParentVarSymbolPath::new(type_path);
         drop(sympath_payload);
         
-        self.push(virtual_parent_path.into(), ctx);
+        self.push(virtual_parent_path.into(), ctx.top());
     }
 
-    fn visit_identifier_expr(&mut self, n: &IdentifierNode, ctx: ExpressionTraversalContext) {
+    fn visit_identifier_expr(&mut self, n: &IdentifierNode, ctx: &TraversalContextStack) {
         let name = n.value(self.doc);
-        let ident_category = if ctx == ExpressionTraversalContext::FunctionCallExpressionFunc {
+        let ident_category = if ctx.top() == TraversalContext::FunctionCallExpressionFunc {
             SymbolCategory::Callable
         } else {
             SymbolCategory::Data
@@ -205,46 +210,46 @@ impl SyntaxNodeVisitor for ExpressionEvaluator<'_> {
             .map(|p| p.to_owned())
             .unwrap_or(SymbolPathBuf::new(&name, ident_category));
 
-        self.push(ident_path, ctx);
+        self.push(ident_path, ctx.top());
     }
 
-    fn exit_func_call_expr(&mut self, _: &FunctionCallExpressionNode, ctx: ExpressionTraversalContext) {
+    fn exit_func_call_expr(&mut self, _: &FunctionCallExpressionNode, ctx: &TraversalContextStack) {
         // this is a completely explicit language in terms of typeing and there is no function overloading
         // so we don't need argument types to get the return type of a function 
-        while self.top().map(|e| e.ctx == ExpressionTraversalContext::FunctionCallArg).unwrap_or(false) {
+        while self.top().map(|e| e.ctx == TraversalContext::FunctionCallArg).unwrap_or(false) {
             self.pop();
         }
 
-        if self.top().map(|e| e.ctx == ExpressionTraversalContext::FunctionCallExpressionFunc).unwrap_or(false) {
+        if self.top().map(|e| e.ctx == TraversalContext::FunctionCallExpressionFunc).unwrap_or(false) {
             let func_path = self.pop().unwrap().path;
-            self.push(self.produce_type(&func_path), ctx);
+            self.push(self.produce_type(&func_path), ctx.top());
         } else {
-            self.push(SymbolPathBuf::unknown(SymbolCategory::Type), ctx);
+            self.push(SymbolPathBuf::unknown(SymbolCategory::Type), ctx.top());
         }
     }
 
-    fn exit_array_expr(&mut self, _: &ArrayExpressionNode, ctx: ExpressionTraversalContext) {
+    fn exit_array_expr(&mut self, _: &ArrayExpressionNode, ctx: &TraversalContextStack) {
         // type of the index doesn't matter in this case
-        if self.top().map(|e| e.ctx == ExpressionTraversalContext::ArrayExpressionIndex).unwrap_or(false) {
+        if self.top().map(|e| e.ctx == TraversalContext::ArrayExpressionIndex).unwrap_or(false) {
             self.pop();
         }
 
-        if self.top().map(|e| e.ctx == ExpressionTraversalContext::ArrayExpressionAccessor).unwrap_or(false) {
+        if self.top().map(|e| e.ctx == TraversalContext::ArrayExpressionAccessor).unwrap_or(false) {
             let accessor_path = self.pop().unwrap().path;
             let accessor_type = self.produce_type(&accessor_path);
             let op_path = MemberCallableSymbolPath::new(&accessor_type, ArrayTypeSymbol::INDEX_OPERATOR_NAME);
-            self.push(self.produce_type(&op_path), ctx);
+            self.push(self.produce_type(&op_path), ctx.top());
         } else {
-            self.push(SymbolPathBuf::unknown(SymbolCategory::Type), ctx);
+            self.push(SymbolPathBuf::unknown(SymbolCategory::Type), ctx.top());
         }
     }
 
-    fn exit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, ctx: ExpressionTraversalContext) {
-        if self.top().map(|e| e.ctx == ExpressionTraversalContext::MemberAccessExpressionAccessor).unwrap_or(false) {
+    fn exit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, ctx: &TraversalContextStack) {
+        if self.top().map(|e| e.ctx == TraversalContext::MemberAccessExpressionAccessor).unwrap_or(false) {
             let accessor_path = self.pop().unwrap().path;
   
             let member = n.member().value(self.doc);
-            let member_category = if ctx == ExpressionTraversalContext::FunctionCallExpressionFunc {
+            let member_category = if ctx.top() == TraversalContext::FunctionCallExpressionFunc {
                 SymbolCategory::Callable
             } else {
                 SymbolCategory::Data
@@ -299,48 +304,48 @@ impl SyntaxNodeVisitor for ExpressionEvaluator<'_> {
                     _ => SymbolPathBuf::unknown(SymbolCategory::Type)
                 };
 
-                self.push(member_path, ctx);
+                self.push(member_path, ctx.top());
             } else {
-                self.push(SymbolPathBuf::unknown(SymbolCategory::Type), ctx);    
+                self.push(SymbolPathBuf::unknown(SymbolCategory::Type), ctx.top());    
             }
         } else {
-            self.push(SymbolPathBuf::unknown(SymbolCategory::Type), ctx);
+            self.push(SymbolPathBuf::unknown(SymbolCategory::Type), ctx.top());
         }
     }
 
-    fn exit_new_expr(&mut self, n: &NewExpressionNode, ctx: ExpressionTraversalContext) {
+    fn exit_new_expr(&mut self, n: &NewExpressionNode, ctx: &TraversalContextStack) {
         // lifetime object has no bearing on the type of the expression
-        if self.top().map(|e| e.ctx == ExpressionTraversalContext::NewExpressionLifetimeObj).unwrap_or(false) {
+        if self.top().map(|e| e.ctx == TraversalContext::NewExpressionLifetimeObj).unwrap_or(false) {
             self.pop();
         }
 
-        self.push(BasicTypeSymbolPath::new(&n.class().value(self.doc)).into(), ctx);
+        self.push(BasicTypeSymbolPath::new(&n.class().value(self.doc)).into(), ctx.top());
     }
 
-    fn exit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, ctx: ExpressionTraversalContext) {
-        if self.top().map(|e| e.ctx == ExpressionTraversalContext::TypeCastExpressionValue).unwrap_or(false) {
+    fn exit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, ctx: &TraversalContextStack) {
+        if self.top().map(|e| e.ctx == TraversalContext::TypeCastExpressionValue).unwrap_or(false) {
             self.pop();
         }
 
         let target_type = n.target_type().value(self.doc);
-        self.push(BasicTypeSymbolPath::new(&target_type).into(), ctx);
+        self.push(BasicTypeSymbolPath::new(&target_type).into(), ctx.top());
     }
 
-    fn exit_unary_op_expr(&mut self, _: &UnaryOperationExpressionNode, ctx: ExpressionTraversalContext) {
-        if self.top().map(|e| e.ctx == ExpressionTraversalContext::UnaryOperationExpressionRight).unwrap_or(false) {
+    fn exit_unary_op_expr(&mut self, _: &UnaryOperationExpressionNode, ctx: &TraversalContextStack) {
+        if self.top().map(|e| e.ctx == TraversalContext::UnaryOperationExpressionRight).unwrap_or(false) {
             // there is no operator overloading as far as I'm aware, so this propagation is probably ok
-            self.top_mut().map(|e| e.ctx = ctx );
+            self.top_mut().map(|e| e.ctx = ctx.top());
         } else {
-            self.push(SymbolPathBuf::unknown(SymbolCategory::Type), ctx);
+            self.push(SymbolPathBuf::unknown(SymbolCategory::Type), ctx.top());
         }
     }
 
-    fn exit_binary_op_expr(&mut self, n: &BinaryOperationExpressionNode, ctx: ExpressionTraversalContext) {
-        if self.top().map(|e| e.ctx == ExpressionTraversalContext::BinaryOperationExpressionRight).unwrap_or(false) {
+    fn exit_binary_op_expr(&mut self, n: &BinaryOperationExpressionNode, ctx: &TraversalContextStack) {
+        if self.top().map(|e| e.ctx == TraversalContext::BinaryOperationExpressionRight).unwrap_or(false) {
             self.pop();
         }
 
-        let left_path = if self.top().map(|e| e.ctx == ExpressionTraversalContext::BinaryOperationExpressionLeft).unwrap_or(false) {
+        let left_path = if self.top().map(|e| e.ctx == TraversalContext::BinaryOperationExpressionLeft).unwrap_or(false) {
             self.pop().unwrap().path
         } else {
             SymbolPathBuf::unknown(SymbolCategory::Type)
@@ -366,36 +371,36 @@ impl SyntaxNodeVisitor for ExpressionEvaluator<'_> {
             | BinaryOperator::GreaterOrEqual => BasicTypeSymbolPath::new("bool").into(),
         };
 
-        self.push(op_path, ctx);
+        self.push(op_path, ctx.top());
     }
 
-    fn exit_assign_op_expr(&mut self, _: &AssignmentOperationExpressionNode, ctx: ExpressionTraversalContext) {
-        if self.top().map(|e| e.ctx == ExpressionTraversalContext::AssignmentOperationExpressionRight).unwrap_or(false) {
+    fn exit_assign_op_expr(&mut self, _: &AssignmentOperationExpressionNode, ctx: &TraversalContextStack) {
+        if self.top().map(|e| e.ctx == TraversalContext::AssignmentOperationExpressionRight).unwrap_or(false) {
             self.pop();
         }
 
-        if self.top().map(|e| e.ctx == ExpressionTraversalContext::AssignmentOperationExpressionLeft).unwrap_or(false) {
-            self.top_mut().map(|e| e.ctx = ctx );
+        if self.top().map(|e| e.ctx == TraversalContext::AssignmentOperationExpressionLeft).unwrap_or(false) {
+            self.top_mut().map(|e| e.ctx = ctx.top() );
         } else {
-            self.push(SymbolPathBuf::unknown(SymbolCategory::Type), ctx);
+            self.push(SymbolPathBuf::unknown(SymbolCategory::Type), ctx.top());
         }
     }
 
-    fn exit_ternary_cond_expr(&mut self, _: &TernaryConditionalExpressionNode, ctx: ExpressionTraversalContext) {
-        if self.top().map(|e| e.ctx == ExpressionTraversalContext::TernaryConditionalExpressionAlt).unwrap_or(false) {
+    fn exit_ternary_cond_expr(&mut self, _: &TernaryConditionalExpressionNode, ctx: &TraversalContextStack) {
+        if self.top().map(|e| e.ctx == TraversalContext::TernaryConditionalExpressionAlt).unwrap_or(false) {
             self.pop();
         }
 
-        let conseq_path = if self.top().map(|e| e.ctx == ExpressionTraversalContext::TernaryConditionalExpressionConseq).unwrap_or(false) {
+        let conseq_path = if self.top().map(|e| e.ctx == TraversalContext::TernaryConditionalExpressionConseq).unwrap_or(false) {
             self.pop().unwrap().path
         } else {
             SymbolPathBuf::unknown(SymbolCategory::Type)
         };
 
-        if self.top().map(|e| e.ctx == ExpressionTraversalContext::TernaryConditionalExpressionCond).unwrap_or(false) {
+        if self.top().map(|e| e.ctx == TraversalContext::TernaryConditionalExpressionCond).unwrap_or(false) {
             self.pop();
         }
 
-        self.push(conseq_path, ctx);
+        self.push(conseq_path, ctx.top());
     }
 }
diff --git a/crates/analysis/src/utils/visitors/position_filter.rs b/crates/analysis/src/utils/visitors/position_filter.rs
index d13f8028..44c4ad9c 100644
--- a/crates/analysis/src/utils/visitors/position_filter.rs
+++ b/crates/analysis/src/utils/visitors/position_filter.rs
@@ -180,7 +180,7 @@ impl SyntaxNodeVisitor for PositionFilter {
 
 
 
-    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, _: DeclarationTraversalContext) -> FunctionDeclarationTraversalPolicy {
+    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, _: &TraversalContextStack) -> FunctionDeclarationTraversalPolicy {
         let mut tp = FunctionDeclarationTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -200,11 +200,11 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn exit_member_func_decl(&mut self, _: &FunctionDeclarationNode, _: DeclarationTraversalContext) {
+    fn exit_member_func_decl(&mut self, _: &FunctionDeclarationNode, _: &TraversalContextStack) {
         self.currently_in_callable_range = false;
     }
     
-    fn visit_event_decl(&mut self, n: &EventDeclarationNode, _: DeclarationTraversalContext) -> EventDeclarationTraversalPolicy {
+    fn visit_event_decl(&mut self, n: &EventDeclarationNode, _: &TraversalContextStack) -> EventDeclarationTraversalPolicy {
         let mut tp = EventDeclarationTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -224,39 +224,39 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn exit_event_decl(&mut self, _: &EventDeclarationNode, _: DeclarationTraversalContext) {
+    fn exit_event_decl(&mut self, _: &EventDeclarationNode, _: &TraversalContextStack) {
         self.currently_in_callable_range = false;
     }
 
-    fn visit_func_param_group(&mut self, n: &FunctionParameterGroupNode, _: FunctionTraversalContext) {
+    fn visit_func_param_group(&mut self, n: &FunctionParameterGroupNode, _: &TraversalContextStack) {
         self.currently_in_range = n.spans_position(self.pos);
         if self.currently_in_range {
             self.payload.borrow_mut().done = true;
         }
     }
 
-    fn visit_member_var_decl(&mut self, n: &MemberVarDeclarationNode, _: DeclarationTraversalContext) {
+    fn visit_member_var_decl(&mut self, n: &MemberVarDeclarationNode, _: &TraversalContextStack) {
         self.currently_in_range = n.spans_position(self.pos);
         if self.currently_in_range {
             self.payload.borrow_mut().done = true;
         }
     }
 
-    fn visit_autobind_decl(&mut self, n: &AutobindDeclarationNode, _: DeclarationTraversalContext) {
+    fn visit_autobind_decl(&mut self, n: &AutobindDeclarationNode, _: &TraversalContextStack) {
         self.currently_in_range = n.spans_position(self.pos);
         if self.currently_in_range {
             self.payload.borrow_mut().done = true;
         }
     }
 
-    fn visit_member_hint(&mut self, n: &MemberHintNode, _: DeclarationTraversalContext) {
+    fn visit_member_hint(&mut self, n: &MemberHintNode, _: &TraversalContextStack) {
         self.currently_in_range = n.spans_position(self.pos);
         if self.currently_in_range {
             self.payload.borrow_mut().done = true;
         }
     }
 
-    fn visit_member_default_val(&mut self, n: &MemberDefaultValueNode, _: DeclarationTraversalContext) -> MemberDefaultValueTraversalPolicy {
+    fn visit_member_default_val(&mut self, n: &MemberDefaultValueNode, _: &TraversalContextStack) -> MemberDefaultValueTraversalPolicy {
         let mut tp = MemberDefaultValueTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -272,7 +272,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_member_defaults_block(&mut self, n: &MemberDefaultsBlockNode, _: DeclarationTraversalContext) -> MemberDefaultsBlockTraversalPolicy {
+    fn visit_member_defaults_block(&mut self, n: &MemberDefaultsBlockNode, _: &TraversalContextStack) -> MemberDefaultsBlockTraversalPolicy {
         let mut tp = MemberDefaultsBlockTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -283,7 +283,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_member_defaults_block_assignment(&mut self, n: &MemberDefaultsBlockAssignmentNode) -> MemberDefaultValueTraversalPolicy {
+    fn visit_member_defaults_block_assignment(&mut self, n: &MemberDefaultsBlockAssignmentNode, _: &TraversalContextStack) -> MemberDefaultValueTraversalPolicy {
         let mut tp = MemberDefaultValueTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -302,7 +302,7 @@ impl SyntaxNodeVisitor for PositionFilter {
 
 
 
-    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, _: StatementTraversalContext) -> VarDeclarationTraversalPolicy {
+    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, _: &TraversalContextStack) -> VarDeclarationTraversalPolicy {
         let mut tp = VarDeclarationTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -318,7 +318,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_compound_stmt(&mut self, n: &CompoundStatementNode, _: StatementTraversalContext) -> CompoundStatementTraversalPolicy {
+    fn visit_compound_stmt(&mut self, n: &CompoundStatementNode, _: &TraversalContextStack) -> CompoundStatementTraversalPolicy {
         let mut tp = CompoundStatementTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -329,7 +329,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_for_stmt(&mut self, n: &ForLoopNode, _: StatementTraversalContext) -> ForLoopTraversalPolicy {
+    fn visit_for_stmt(&mut self, n: &ForLoopNode, _: &TraversalContextStack) -> ForLoopTraversalPolicy {
         let mut tp = ForLoopTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -354,7 +354,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_while_stmt(&mut self, n: &WhileLoopNode, _: StatementTraversalContext) -> WhileLoopTraversalPolicy {
+    fn visit_while_stmt(&mut self, n: &WhileLoopNode, _: &TraversalContextStack) -> WhileLoopTraversalPolicy {
         let mut tp = WhileLoopTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -373,7 +373,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_do_while_stmt(&mut self, n: &DoWhileLoopNode, _: StatementTraversalContext) -> DoWhileLoopTraversalPolicy {
+    fn visit_do_while_stmt(&mut self, n: &DoWhileLoopNode, _: &TraversalContextStack) -> DoWhileLoopTraversalPolicy {
         let mut tp = DoWhileLoopTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -392,7 +392,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_if_stmt(&mut self, n: &IfConditionalNode, _: StatementTraversalContext) -> IfConditionalTraversalPolicy {
+    fn visit_if_stmt(&mut self, n: &IfConditionalNode, _: &TraversalContextStack) -> IfConditionalTraversalPolicy {
         let mut tp = IfConditionalTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -414,7 +414,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_switch_stmt(&mut self, n: &SwitchConditionalNode, _: StatementTraversalContext) -> SwitchConditionalTraversalPolicy {
+    fn visit_switch_stmt(&mut self, n: &SwitchConditionalNode, _: &TraversalContextStack) -> SwitchConditionalTraversalPolicy {
         let mut tp = SwitchConditionalTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -433,7 +433,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_switch_stmt_case(&mut self, n: &SwitchConditionalCaseLabelNode) -> SwitchConditionalCaseLabelTraversalPolicy {
+    fn visit_switch_stmt_case(&mut self, n: &SwitchConditionalCaseLabelNode, _: &TraversalContextStack) -> SwitchConditionalCaseLabelTraversalPolicy {
         let mut tp = SwitchConditionalCaseLabelTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -449,28 +449,28 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_switch_stmt_default(&mut self, n: &SwitchConditionalDefaultLabelNode) {
+    fn visit_switch_stmt_default(&mut self, n: &SwitchConditionalDefaultLabelNode, _: &TraversalContextStack) {
         self.currently_in_range = n.spans_position(self.pos);
         if self.currently_in_range {
             self.payload.borrow_mut().done = true;
         }
     }
 
-    fn visit_break_stmt(&mut self, n: &BreakStatementNode, _: StatementTraversalContext) {
+    fn visit_break_stmt(&mut self, n: &BreakStatementNode, _: &TraversalContextStack) {
         self.currently_in_range = n.spans_position(self.pos);
         if self.currently_in_range {
             self.payload.borrow_mut().done = true;
         }
     }
 
-    fn visit_continue_stmt(&mut self, n: &ContinueStatementNode, _: StatementTraversalContext) {
+    fn visit_continue_stmt(&mut self, n: &ContinueStatementNode, _: &TraversalContextStack) {
         self.currently_in_range = n.spans_position(self.pos);
         if self.currently_in_range {
             self.payload.borrow_mut().done = true;
         }
     }
 
-    fn visit_delete_stmt(&mut self, n: &DeleteStatementNode, _: StatementTraversalContext) -> DeleteStatementTraversalPolicy {
+    fn visit_delete_stmt(&mut self, n: &DeleteStatementNode, _: &TraversalContextStack) -> DeleteStatementTraversalPolicy {
         let mut tp = DeleteStatementTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -486,7 +486,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_return_stmt(&mut self, n: &ReturnStatementNode, _: StatementTraversalContext) -> ReturnStatementTraversalPolicy {
+    fn visit_return_stmt(&mut self, n: &ReturnStatementNode, _: &TraversalContextStack) -> ReturnStatementTraversalPolicy {
         let mut tp = ReturnStatementTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -502,7 +502,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_expr_stmt(&mut self, n: &ExpressionStatementNode, _: StatementTraversalContext) -> ExpressionStatementTraversalPolicy {
+    fn visit_expr_stmt(&mut self, n: &ExpressionStatementNode, _: &TraversalContextStack) -> ExpressionStatementTraversalPolicy {
         let mut tp = ExpressionStatementTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -518,7 +518,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_nop_stmt(&mut self, n: &NopNode, _: StatementTraversalContext) {
+    fn visit_nop_stmt(&mut self, n: &NopNode, _: &TraversalContextStack) {
         self.currently_in_range = n.spans_position(self.pos);
         if self.currently_in_range {
             self.payload.borrow_mut().done = true;
@@ -528,7 +528,7 @@ impl SyntaxNodeVisitor for PositionFilter {
 
 
 
-    fn visit_nested_expr(&mut self, n: &NestedExpressionNode, _: ExpressionTraversalContext) -> NestedExpressionTraversalPolicy {
+    fn visit_nested_expr(&mut self, n: &NestedExpressionNode, _: &TraversalContextStack) -> NestedExpressionTraversalPolicy {
         let mut tp = NestedExpressionTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -544,7 +544,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_assign_op_expr(&mut self, n: &AssignmentOperationExpressionNode, _: ExpressionTraversalContext) -> AssignmentOperationExpressionTraversalPolicy {
+    fn visit_assign_op_expr(&mut self, n: &AssignmentOperationExpressionNode, _: &TraversalContextStack) -> AssignmentOperationExpressionTraversalPolicy {
         let mut tp = AssignmentOperationExpressionTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -563,7 +563,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_binary_op_expr(&mut self, n: &BinaryOperationExpressionNode, _: ExpressionTraversalContext) -> BinaryOperationExpressionTraversalPolicy {
+    fn visit_binary_op_expr(&mut self, n: &BinaryOperationExpressionNode, _: &TraversalContextStack) -> BinaryOperationExpressionTraversalPolicy {
         let mut tp = BinaryOperationExpressionTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -582,7 +582,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_unary_op_expr(&mut self, n: &UnaryOperationExpressionNode, _: ExpressionTraversalContext) -> UnaryOperationExpressionTraversalPolicy {
+    fn visit_unary_op_expr(&mut self, n: &UnaryOperationExpressionNode, _: &TraversalContextStack) -> UnaryOperationExpressionTraversalPolicy {
         let mut tp = UnaryOperationExpressionTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -598,7 +598,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_new_expr(&mut self, n: &NewExpressionNode, _: ExpressionTraversalContext) -> NewExpressionTraversalPolicy {
+    fn visit_new_expr(&mut self, n: &NewExpressionNode, _: &TraversalContextStack) -> NewExpressionTraversalPolicy {
         let mut tp = NewExpressionTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -614,7 +614,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, _: ExpressionTraversalContext) -> TypeCastExpressionTraversalPolicy {
+    fn visit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, _: &TraversalContextStack) -> TypeCastExpressionTraversalPolicy {
         let mut tp = TypeCastExpressionTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -630,7 +630,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_ternary_cond_expr(&mut self, n: &TernaryConditionalExpressionNode, _: ExpressionTraversalContext) -> TernaryConditionalExpressionTraversalPolicy {
+    fn visit_ternary_cond_expr(&mut self, n: &TernaryConditionalExpressionNode, _: &TraversalContextStack) -> TernaryConditionalExpressionTraversalPolicy {
         let mut tp = TernaryConditionalExpressionTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -652,7 +652,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, _: ExpressionTraversalContext) -> MemberFieldExpressionTraversalPolicy {
+    fn visit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, _: &TraversalContextStack) -> MemberFieldExpressionTraversalPolicy {
         let mut tp = MemberFieldExpressionTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -668,7 +668,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_array_expr(&mut self, n: &ArrayExpressionNode, _: ExpressionTraversalContext) -> ArrayExpressionTraversalPolicy {
+    fn visit_array_expr(&mut self, n: &ArrayExpressionNode, _: &TraversalContextStack) -> ArrayExpressionTraversalPolicy {
         let mut tp = ArrayExpressionTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -687,7 +687,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_func_call_expr(&mut self, n: &FunctionCallExpressionNode, _: ExpressionTraversalContext) -> FunctionCallExpressionTraversalPolicy {
+    fn visit_func_call_expr(&mut self, n: &FunctionCallExpressionNode, _: &TraversalContextStack) -> FunctionCallExpressionTraversalPolicy {
         let mut tp = FunctionCallExpressionTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -706,7 +706,7 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_func_call_arg(&mut self, n: &FunctionCallArgument) -> FunctionCallArgumentTraversalPolicy {
+    fn visit_func_call_arg(&mut self, n: &FunctionCallArgument, _: &TraversalContextStack) -> FunctionCallArgumentTraversalPolicy {
         let mut tp = FunctionCallArgumentTraversalPolicy::default_to(false);
 
         self.currently_in_range = n.spans_position(self.pos);
@@ -724,42 +724,42 @@ impl SyntaxNodeVisitor for PositionFilter {
         tp
     }
 
-    fn visit_identifier_expr(&mut self, n: &IdentifierNode, _: ExpressionTraversalContext) {
+    fn visit_identifier_expr(&mut self, n: &IdentifierNode, _: &TraversalContextStack) {
         self.currently_in_range = n.spans_position(self.pos);
         if self.currently_in_range {
             self.payload.borrow_mut().done = true;
         }
     }
 
-    fn visit_literal_expr(&mut self, n: &LiteralNode, _: ExpressionTraversalContext) {
+    fn visit_literal_expr(&mut self, n: &LiteralNode, _: &TraversalContextStack) {
         self.currently_in_range = n.spans_position(self.pos);
         if self.currently_in_range {
             self.payload.borrow_mut().done = true;
         }
     }
 
-    fn visit_this_expr(&mut self, n: &ThisExpressionNode, _: ExpressionTraversalContext) {
+    fn visit_this_expr(&mut self, n: &ThisExpressionNode, _: &TraversalContextStack) {
         self.currently_in_range = n.spans_position(self.pos);
         if self.currently_in_range {
             self.payload.borrow_mut().done = true;
         }
     }
 
-    fn visit_super_expr(&mut self, n: &SuperExpressionNode, _: ExpressionTraversalContext) {
+    fn visit_super_expr(&mut self, n: &SuperExpressionNode, _: &TraversalContextStack) {
         self.currently_in_range = n.spans_position(self.pos);
         if self.currently_in_range {
             self.payload.borrow_mut().done = true;
         }
     }
 
-    fn visit_parent_expr(&mut self, n: &ParentExpressionNode, _: ExpressionTraversalContext) {
+    fn visit_parent_expr(&mut self, n: &ParentExpressionNode, _: &TraversalContextStack) {
         self.currently_in_range = n.spans_position(self.pos);
         if self.currently_in_range {
             self.payload.borrow_mut().done = true;
         }
     }
 
-    fn visit_virtual_parent_expr(&mut self, n: &VirtualParentExpressionNode, _: ExpressionTraversalContext) {
+    fn visit_virtual_parent_expr(&mut self, n: &VirtualParentExpressionNode, _: &TraversalContextStack) {
         self.currently_in_range = n.spans_position(self.pos);
         if self.currently_in_range {
             self.payload.borrow_mut().done = true;
diff --git a/crates/analysis/src/utils/visitors/sympath_builder.rs b/crates/analysis/src/utils/visitors/sympath_builder.rs
index 062e9f87..764430c5 100644
--- a/crates/analysis/src/utils/visitors/sympath_builder.rs
+++ b/crates/analysis/src/utils/visitors/sympath_builder.rs
@@ -113,23 +113,23 @@ impl SyntaxNodeVisitor for SymbolPathBuilder<'_> {
         self.payload.borrow_mut().current_sympath.pop();
     }
 
-    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, _: DeclarationTraversalContext) -> FunctionDeclarationTraversalPolicy {
+    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, _: &TraversalContextStack) -> FunctionDeclarationTraversalPolicy {
         let name = n.name().value(self.doc);
         self.payload.borrow_mut().current_sympath.push(&name, SymbolCategory::Callable);
         TraversalPolicy::default_to(true)
     }
 
-    fn exit_member_func_decl(&mut self, _: &FunctionDeclarationNode, _: DeclarationTraversalContext) {
+    fn exit_member_func_decl(&mut self, _: &FunctionDeclarationNode, _: &TraversalContextStack) {
         self.payload.borrow_mut().current_sympath.pop();
     }
 
-    fn visit_event_decl(&mut self, n: &EventDeclarationNode, _: DeclarationTraversalContext) -> EventDeclarationTraversalPolicy {
+    fn visit_event_decl(&mut self, n: &EventDeclarationNode, _: &TraversalContextStack) -> EventDeclarationTraversalPolicy {
         let name = n.name().value(self.doc);
         self.payload.borrow_mut().current_sympath.push(&name, SymbolCategory::Callable);
         TraversalPolicy::default_to(true)
     }
 
-    fn exit_event_decl(&mut self, _: &EventDeclarationNode, _: DeclarationTraversalContext) {
+    fn exit_event_decl(&mut self, _: &EventDeclarationNode, _: &TraversalContextStack) {
         self.payload.borrow_mut().current_sympath.pop();
     }
 }
diff --git a/crates/core/src/ast/classes.rs b/crates/core/src/ast/classes.rs
index cc0353f1..4fbbe3d2 100644
--- a/crates/core/src/ast/classes.rs
+++ b/crates/core/src/ast/classes.rs
@@ -59,12 +59,12 @@ impl<'script> TryFrom<AnyNode<'script>> for ClassDeclarationNode<'script> {
 }
 
 impl SyntaxNodeTraversal for ClassDeclarationNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_class_decl(self);
         if tp.traverse_definition {
-            self.definition().accept(visitor, ());
+            ctx.push(TraversalContext::Class);
+            self.definition().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_class_decl(self);
     }
@@ -106,10 +106,8 @@ impl<'script> TryFrom<AnyNode<'script>> for ClassBlockNode<'script> {
 }
 
 impl SyntaxNodeTraversal for ClassBlockNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
-        self.iter().for_each(|s| s.accept(visitor, DeclarationTraversalContext::ClassDefinition));
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
+        self.iter().for_each(|s| s.accept(visitor, ctx));
     }
 }
 
@@ -184,9 +182,7 @@ impl<'script> TryFrom<AnyNode<'script>> for ClassPropertyNode<'script> {
 }
 
 impl SyntaxNodeTraversal for ClassPropertyNode<'_> {
-    type TraversalCtx = DeclarationTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         match self.clone().value() {
             ClassProperty::Var(s) => s.accept(visitor, ctx),
             ClassProperty::Default(s) => s.accept(visitor, ctx),
@@ -256,9 +252,7 @@ impl<'script> TryFrom<AnyNode<'script>> for AutobindDeclarationNode<'script> {
 }
 
 impl SyntaxNodeTraversal for AutobindDeclarationNode<'_> {
-    type TraversalCtx = DeclarationTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         visitor.visit_autobind_decl(self, ctx);
     }
 }
diff --git a/crates/core/src/ast/conditionals.rs b/crates/core/src/ast/conditionals.rs
index 35680eeb..50567429 100644
--- a/crates/core/src/ast/conditionals.rs
+++ b/crates/core/src/ast/conditionals.rs
@@ -55,18 +55,22 @@ impl<'script> TryFrom<AnyNode<'script>> for IfConditionalNode<'script> {
 }
 
 impl SyntaxNodeTraversal for IfConditionalNode<'_> {
-    type TraversalCtx = StatementTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_if_stmt(self, ctx);
         if tp.traverse_cond {
-            self.cond().accept(visitor, ExpressionTraversalContext::IfConditionalCond);
+            ctx.push(TraversalContext::IfConditionalCond);
+            self.cond().accept(visitor, ctx);
+            ctx.pop();
         }
         if tp.traverse_body {
-            self.body().accept(visitor, StatementTraversalContext::IfConditionalBody);
+            ctx.push(TraversalContext::IfConditionalBody);
+            self.body().accept(visitor, ctx);
+            ctx.pop();
         }
         if tp.traverse_else_body {
-            self.else_body().map(|s| s.accept(visitor, StatementTraversalContext::IfConditionalElseBody));
+            ctx.push(TraversalContext::IfConditionalElseBody);
+            self.else_body().map(|s| s.accept(visitor, ctx));
+            ctx.pop();
         }
         visitor.exit_if_stmt(self, ctx);
     }
@@ -112,15 +116,17 @@ impl<'script> TryFrom<AnyNode<'script>> for SwitchConditionalNode<'script> {
 }
 
 impl SyntaxNodeTraversal for SwitchConditionalNode<'_> {
-    type TraversalCtx = StatementTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_switch_stmt(self, ctx);
         if tp.traverse_cond {
-            self.cond().accept(visitor, ExpressionTraversalContext::SwitchConditionalCond);
+            ctx.push(TraversalContext::SwitchConditionalCond);
+            self.cond().accept(visitor, ctx);
+            ctx.pop();
         }
         if tp.traverse_body {
-            self.body().accept(visitor, ());
+            ctx.push(TraversalContext::SwitchConditionalBody);
+            self.body().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_switch_stmt(self, ctx);
     }
@@ -162,10 +168,8 @@ impl<'script> TryFrom<AnyNode<'script>> for SwitchConditionalBlockNode<'script>
 }
 
 impl SyntaxNodeTraversal for SwitchConditionalBlockNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
-        self.sections().for_each(|s| s.accept(visitor, ()));
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
+        self.sections().for_each(|s| s.accept(visitor, ctx));
     }
 }
 
@@ -233,13 +237,11 @@ impl<'script> TryFrom<AnyNode<'script>> for SwitchConditionalSectionNode<'script
 }
 
 impl SyntaxNodeTraversal for SwitchConditionalSectionNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         match self.clone().value() {
-            SwitchConditionalSection::Statement(n) => n.accept(visitor, StatementTraversalContext::SwitchConditionalBody),
-            SwitchConditionalSection::Case(n) => n.accept(visitor, ()),
-            SwitchConditionalSection::Default(n) => n.accept(visitor, ()),
+            SwitchConditionalSection::Statement(n) => n.accept(visitor, ctx),
+            SwitchConditionalSection::Case(n) => n.accept(visitor, ctx),
+            SwitchConditionalSection::Default(n) => n.accept(visitor, ctx),
         }
     }
 }
@@ -279,14 +281,14 @@ impl<'script> TryFrom<AnyNode<'script>> for SwitchConditionalCaseLabelNode<'scri
 }
 
 impl SyntaxNodeTraversal for SwitchConditionalCaseLabelNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
-        let tp = visitor.visit_switch_stmt_case(self);
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
+        let tp = visitor.visit_switch_stmt_case(self, ctx);
         if tp.traverse_value {
-            self.value().accept(visitor, ExpressionTraversalContext::SwitchConditionalCaseLabel);
+            ctx.push(TraversalContext::SwitchConditionalCaseLabel);
+            self.value().accept(visitor, ctx);
+            ctx.pop();
         }
-        visitor.exit_switch_stmt_case(self);
+        visitor.exit_switch_stmt_case(self, ctx);
     }
 }
 
@@ -317,9 +319,7 @@ impl<'script> TryFrom<AnyNode<'script>> for SwitchConditionalDefaultLabelNode<'s
 }
 
 impl SyntaxNodeTraversal for SwitchConditionalDefaultLabelNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
-        visitor.visit_switch_stmt_default(self);
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
+        visitor.visit_switch_stmt_default(self, ctx);
     }
 }
\ No newline at end of file
diff --git a/crates/core/src/ast/enums.rs b/crates/core/src/ast/enums.rs
index 0738c91e..1c93e44c 100644
--- a/crates/core/src/ast/enums.rs
+++ b/crates/core/src/ast/enums.rs
@@ -48,12 +48,12 @@ impl<'script> TryFrom<AnyNode<'script>> for EnumDeclarationNode<'script> {
 }
 
 impl SyntaxNodeTraversal for EnumDeclarationNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_enum_decl(self);
         if tp.traverse_definition {
-            self.definition().accept(visitor, ());
+            ctx.push(TraversalContext::Enum);
+            self.definition().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_enum_decl(self);
     }
@@ -95,10 +95,8 @@ impl<'script> TryFrom<AnyNode<'script>> for EnumBlockNode<'script> {
 }
 
 impl SyntaxNodeTraversal for EnumBlockNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
-        self.iter().for_each(|s| s.accept(visitor, ()));
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
+        self.iter().for_each(|s| s.accept(visitor, ctx));
     }
 }
 
@@ -148,9 +146,7 @@ impl<'script> TryFrom<AnyNode<'script>> for EnumVariantDeclarationNode<'script>
 }
 
 impl SyntaxNodeTraversal for EnumVariantDeclarationNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: &mut TraversalContextStack) {
         visitor.visit_enum_variant_decl(self);
     }
 }
diff --git a/crates/core/src/ast/expressions.rs b/crates/core/src/ast/expressions.rs
index 073e12bc..92ce90c7 100644
--- a/crates/core/src/ast/expressions.rs
+++ b/crates/core/src/ast/expressions.rs
@@ -57,12 +57,12 @@ impl<'script> TryFrom<AnyNode<'script>> for NestedExpressionNode<'script> {
 }
 
 impl SyntaxNodeTraversal for NestedExpressionNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_nested_expr(self, ctx);
         if tp.traverse_inner {
-            self.inner().accept(visitor, ExpressionTraversalContext::NestedExpressionInner);
+            ctx.push(TraversalContext::NestedExpressionInner);
+            self.inner().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_nested_expr(self, ctx);
     }
@@ -97,9 +97,7 @@ impl<'script> TryFrom<AnyNode<'script>> for ThisExpressionNode<'script> {
 }
 
 impl SyntaxNodeTraversal for ThisExpressionNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         visitor.visit_this_expr(self, ctx);
     }
 }
@@ -133,9 +131,7 @@ impl<'script> TryFrom<AnyNode<'script>> for SuperExpressionNode<'script> {
 }
 
 impl SyntaxNodeTraversal for SuperExpressionNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         visitor.visit_super_expr(self, ctx);
     }
 }
@@ -169,9 +165,7 @@ impl<'script> TryFrom<AnyNode<'script>> for ParentExpressionNode<'script> {
 }
 
 impl SyntaxNodeTraversal for ParentExpressionNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         visitor.visit_parent_expr(self, ctx);
     }
 }
@@ -205,9 +199,7 @@ impl<'script> TryFrom<AnyNode<'script>> for VirtualParentExpressionNode<'script>
 }
 
 impl SyntaxNodeTraversal for VirtualParentExpressionNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         visitor.visit_virtual_parent_expr(self, ctx);
     }
 }
@@ -252,15 +244,15 @@ impl<'script> TryFrom<AnyNode<'script>> for FunctionCallExpressionNode<'script>
 }
 
 impl SyntaxNodeTraversal for FunctionCallExpressionNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_func_call_expr(self, ctx);
         if tp.traverse_func {
-            self.func().accept(visitor, ExpressionTraversalContext::FunctionCallExpressionFunc);
+            ctx.push(TraversalContext::FunctionCallExpressionFunc);
+            self.func().accept(visitor, ctx);
+            ctx.pop();
         }
         if tp.traverse_args {
-            self.args().map(|n| n.accept(visitor, ()));
+            self.args().map(|n| n.accept(visitor, ctx));
         }
         visitor.exit_func_call_expr(self, ctx);
     }
@@ -318,10 +310,8 @@ impl<'script> TryFrom<AnyNode<'script>> for FunctionCallArgumentsNode<'script> {
 }
 
 impl SyntaxNodeTraversal for FunctionCallArgumentsNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
-        self.iter().for_each(|n| n.accept(visitor, ()))
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
+        self.iter().for_each(|n| n.accept(visitor, ctx))
     }
 }
 
@@ -364,16 +354,16 @@ impl Debug for FunctionCallArgument<'_> {
 }
 
 impl SyntaxNodeTraversal for FunctionCallArgument<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
-        let tp = visitor.visit_func_call_arg(self);
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
+        let tp = visitor.visit_func_call_arg(self, ctx);
         if tp.traverse_expr {
             if let FunctionCallArgument::Some(n) = self {
-                n.accept(visitor, ExpressionTraversalContext::FunctionCallArg);
+                ctx.push(TraversalContext::FunctionCallArg);
+                n.accept(visitor, ctx);
+                ctx.pop();
             }
         }
-        visitor.exit_func_call_arg(self);
+        visitor.exit_func_call_arg(self, ctx);
     }
 }
 
@@ -417,15 +407,17 @@ impl<'script> TryFrom<AnyNode<'script>> for ArrayExpressionNode<'script> {
 }
 
 impl SyntaxNodeTraversal for ArrayExpressionNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_array_expr(self, ctx);
         if tp.traverse_accessor {
-            self.accessor().accept(visitor, ExpressionTraversalContext::ArrayExpressionAccessor);
+            ctx.push(TraversalContext::ArrayExpressionAccessor);
+            self.accessor().accept(visitor, ctx);
+            ctx.pop();
         }
         if tp.traverse_index {
-            self.index().accept(visitor, ExpressionTraversalContext::ArrayExpressionIndex);
+            ctx.push(TraversalContext::ArrayExpressionIndex);
+            self.index().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_array_expr(self, ctx);
     }
@@ -471,12 +463,12 @@ impl<'script> TryFrom<AnyNode<'script>> for MemberAccessExpressionNode<'script>
 }
 
 impl SyntaxNodeTraversal for MemberAccessExpressionNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_member_access_expr(self, ctx);
         if tp.traverse_accessor {
-            self.accessor().accept(visitor, ExpressionTraversalContext::MemberAccessExpressionAccessor);
+            ctx.push(TraversalContext::MemberAccessExpressionAccessor);
+            self.accessor().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_member_access_expr(self, ctx);
     }
@@ -522,12 +514,12 @@ impl<'script> TryFrom<AnyNode<'script>> for NewExpressionNode<'script> {
 }
 
 impl SyntaxNodeTraversal for NewExpressionNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_new_expr(self, ctx);
         if tp.traverse_lifetime_obj {
-            self.lifetime_obj().map(|n| n.accept(visitor, ExpressionTraversalContext::NewExpressionLifetimeObj));
+            ctx.push(TraversalContext::NewExpressionLifetimeObj);
+            self.lifetime_obj().map(|n| n.accept(visitor, ctx));
+            ctx.pop();
         }
         visitor.exit_new_expr(self, ctx);
     }
@@ -573,12 +565,12 @@ impl<'script> TryFrom<AnyNode<'script>> for TypeCastExpressionNode<'script> {
 }
 
 impl SyntaxNodeTraversal for TypeCastExpressionNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_type_cast_expr(self, ctx);
         if tp.traverse_value {
-            self.value().accept(visitor, ExpressionTraversalContext::TypeCastExpressionValue);
+            ctx.push(TraversalContext::TypeCastExpressionValue);
+            self.value().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_type_cast_expr(self, ctx);
     }
@@ -624,12 +616,12 @@ impl<'script> TryFrom<AnyNode<'script>> for UnaryOperationExpressionNode<'script
 }
 
 impl SyntaxNodeTraversal for UnaryOperationExpressionNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_unary_op_expr(self, ctx);
         if tp.traverse_right {
-            self.right().accept(visitor, ExpressionTraversalContext::UnaryOperationExpressionRight);
+            ctx.push(TraversalContext::UnaryOperationExpressionRight);
+            self.right().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_unary_op_expr(self, ctx);
     }
@@ -680,15 +672,17 @@ impl<'script> TryFrom<AnyNode<'script>> for BinaryOperationExpressionNode<'scrip
 }
 
 impl SyntaxNodeTraversal for BinaryOperationExpressionNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_binary_op_expr(self, ctx);
         if tp.traverse_left {
-            self.left().accept(visitor, ExpressionTraversalContext::BinaryOperationExpressionLeft);
+            ctx.push(TraversalContext::BinaryOperationExpressionLeft);
+            self.left().accept(visitor, ctx);
+            ctx.pop();
         }
         if tp.traverse_right {
-            self.right().accept(visitor, ExpressionTraversalContext::BinaryOperationExpressionRight);
+            ctx.push(TraversalContext::BinaryOperationExpressionRight);
+            self.right().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_binary_op_expr(self, ctx);
     }
@@ -739,15 +733,17 @@ impl<'script> TryFrom<AnyNode<'script>> for AssignmentOperationExpressionNode<'s
 }
 
 impl SyntaxNodeTraversal for AssignmentOperationExpressionNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_assign_op_expr(self, ctx);
         if tp.traverse_left {
-            self.left().accept(visitor, ExpressionTraversalContext::AssignmentOperationExpressionLeft);
+            ctx.push(TraversalContext::AssignmentOperationExpressionLeft);
+            self.left().accept(visitor, ctx);
+            ctx.pop();
         }
         if tp.traverse_right {
-            self.right().accept(visitor, ExpressionTraversalContext::AssignmentOperationExpressionRight);
+            ctx.push(TraversalContext::AssignmentOperationExpressionRight);
+            self.right().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_assign_op_expr(self, ctx);
     }
@@ -798,18 +794,22 @@ impl<'script> TryFrom<AnyNode<'script>> for TernaryConditionalExpressionNode<'sc
 }
 
 impl SyntaxNodeTraversal for TernaryConditionalExpressionNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_ternary_cond_expr(self, ctx);
         if tp.traverse_cond {
-            self.cond().accept(visitor, ExpressionTraversalContext::TernaryConditionalExpressionCond);
+            ctx.push(TraversalContext::TernaryConditionalExpressionCond);
+            self.cond().accept(visitor, ctx);
+            ctx.pop();
         }
         if tp.traverse_conseq {
-            self.conseq().accept(visitor, ExpressionTraversalContext::TernaryConditionalExpressionConseq);
+            ctx.push(TraversalContext::TernaryConditionalExpressionConseq);
+            self.conseq().accept(visitor, ctx);
+            ctx.pop();
         }
         if tp.traverse_alt {
-            self.alt().accept(visitor, ExpressionTraversalContext::TernaryConditionalExpressionAlt);
+            ctx.push(TraversalContext::TernaryConditionalExpressionAlt);
+            self.alt().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_ternary_cond_expr(self, ctx);
     }
@@ -1032,9 +1032,7 @@ impl<'script> From<TernaryConditionalExpressionNode<'script>> for ExpressionNode
 }
 
 impl SyntaxNodeTraversal for ExpressionNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         match self.clone().value() {
             Expression::Nested(n) => n.accept(visitor, ctx),
             Expression::Literal(n) => n.accept(visitor, ctx),
@@ -1091,12 +1089,12 @@ impl<'script> TryFrom<AnyNode<'script>> for ExpressionStatementNode<'script> {
 }
 
 impl SyntaxNodeTraversal for ExpressionStatementNode<'_> {
-    type TraversalCtx = StatementTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_expr_stmt(self, ctx);
         if tp.traverse_expr {
-            self.expr().accept(visitor, ExpressionTraversalContext::ExpressionStatement);
+            ctx.push(TraversalContext::ExpressionStatement);
+            self.expr().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_expr_stmt(self, ctx);
     }
diff --git a/crates/core/src/ast/functions.rs b/crates/core/src/ast/functions.rs
index f8626164..d49501c7 100644
--- a/crates/core/src/ast/functions.rs
+++ b/crates/core/src/ast/functions.rs
@@ -65,16 +65,18 @@ impl<'script> TryFrom<AnyNode<'script>> for EventDeclarationNode<'script> {
 }
 
 impl SyntaxNodeTraversal for EventDeclarationNode<'_> {
-    type TraversalCtx = DeclarationTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_event_decl(self, ctx);
+
+        ctx.push(TraversalContext::Event);
         if tp.traverse_params {
-            self.params().accept(visitor, FunctionTraversalContext::Event);
+            self.params().accept(visitor, ctx);
         }
         if tp.traverse_definition {
-            self.definition().accept(visitor, FunctionTraversalContext::Event);
+            self.definition().accept(visitor, ctx);
         }
+        ctx.pop();
+        
         visitor.exit_event_decl(self, ctx);
     }
 }
@@ -144,29 +146,31 @@ impl<'script> TryFrom<AnyNode<'script>> for FunctionDeclarationNode<'script> {
 }
 
 impl SyntaxNodeTraversal for FunctionDeclarationNode<'_> {
-    type TraversalCtx = DeclarationTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
-        if ctx == DeclarationTraversalContext::Global {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
+        if ctx.top() == TraversalContext::Global {
             let tp = visitor.visit_global_func_decl(self);
     
+            ctx.push(TraversalContext::GlobalFunction);
             if tp.traverse_params {
-                self.params().accept(visitor, FunctionTraversalContext::GlobalFunction);
+                self.params().accept(visitor, ctx);
             }
             if tp.traverse_definition {
-                self.definition().accept(visitor, FunctionTraversalContext::GlobalFunction);
+                self.definition().accept(visitor, ctx);
             }
+            ctx.pop();
 
             visitor.exit_global_func_decl(self);
         } else {
             let tp = visitor.visit_member_func_decl(self, ctx);
     
+            ctx.push(TraversalContext::MemberFunction);
             if tp.traverse_params {
-                self.params().accept(visitor, FunctionTraversalContext::MemberFunction);
+                self.params().accept(visitor, ctx);
             }
             if tp.traverse_definition {
-                self.definition().accept(visitor, FunctionTraversalContext::MemberFunction);
+                self.definition().accept(visitor, ctx);
             }
+            ctx.pop();
 
             visitor.exit_member_func_decl(self, ctx);
         }
@@ -225,9 +229,7 @@ impl<'script> TryFrom<AnyNode<'script>> for FunctionDefinitionNode<'script> {
 }
 
 impl SyntaxNodeTraversal for FunctionDefinitionNode<'_> {
-    type TraversalCtx = FunctionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         if let FunctionDefinition::Some(block) = self.clone().value() {
             block.accept(visitor, ctx);
         }
@@ -270,16 +272,8 @@ impl<'script> TryFrom<AnyNode<'script>> for FunctionBlockNode<'script> {
 }
 
 impl SyntaxNodeTraversal for FunctionBlockNode<'_> {
-    type TraversalCtx = FunctionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
-        let iter_ctx = match ctx {
-            FunctionTraversalContext::GlobalFunction => StatementTraversalContext::GlobalFunctionDefinition,
-            FunctionTraversalContext::MemberFunction => StatementTraversalContext::MemberFunctionDefinition,
-            FunctionTraversalContext::Event => StatementTraversalContext::EventDefinition,
-        };
-
-        self.iter().for_each(|s| s.accept(visitor, iter_ctx));
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
+        self.iter().for_each(|s| s.accept(visitor, ctx));
     }
 }
 
@@ -319,9 +313,7 @@ impl<'script> TryFrom<AnyNode<'script>> for FunctionParametersNode<'script> {
 }
 
 impl SyntaxNodeTraversal for FunctionParametersNode<'_> {
-    type TraversalCtx = FunctionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         self.iter().for_each(|s| s.accept(visitor, ctx));
     }
 }
@@ -371,9 +363,7 @@ impl<'script> TryFrom<AnyNode<'script>> for FunctionParameterGroupNode<'script>
 }
 
 impl SyntaxNodeTraversal for FunctionParameterGroupNode<'_> {
-    type TraversalCtx = FunctionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         visitor.visit_func_param_group(self, ctx);
     }
 }
@@ -474,9 +464,7 @@ impl<'script> TryFrom<AnyNode<'script>> for FunctionStatementNode<'script> {
 }
 
 impl SyntaxNodeTraversal for FunctionStatementNode<'_> {
-    type TraversalCtx = StatementTraversalContext;
-    
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         match self.clone().value() {
             FunctionStatement::Var(s) => s.accept(visitor, ctx),
             FunctionStatement::Expr(s) => s.accept(visitor, ctx),
@@ -524,9 +512,7 @@ impl<'script> TryFrom<AnyNode<'script>> for BreakStatementNode<'script> {
 }
 
 impl SyntaxNodeTraversal for BreakStatementNode<'_> {
-    type TraversalCtx = StatementTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         visitor.visit_break_stmt(self, ctx);
     }
 }
@@ -560,9 +546,7 @@ impl<'script> TryFrom<AnyNode<'script>> for ContinueStatementNode<'script> {
 }
 
 impl SyntaxNodeTraversal for ContinueStatementNode<'_> {
-    type TraversalCtx = StatementTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         visitor.visit_continue_stmt(self, ctx);
     }
 }
@@ -602,12 +586,12 @@ impl<'script> TryFrom<AnyNode<'script>> for ReturnStatementNode<'script> {
 }
 
 impl SyntaxNodeTraversal for ReturnStatementNode<'_> {
-    type TraversalCtx = StatementTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_return_stmt(self, ctx);
         if tp.traverse_value {
-            self.value().map(|expr| expr.accept(visitor, ExpressionTraversalContext::ReturnStatement));
+            ctx.push(TraversalContext::ReturnStatement);
+            self.value().map(|expr| expr.accept(visitor, ctx));
+            ctx.pop();
         }
         visitor.exit_return_stmt(self, ctx);
     }
@@ -648,12 +632,12 @@ impl<'script> TryFrom<AnyNode<'script>> for DeleteStatementNode<'script> {
 }
 
 impl SyntaxNodeTraversal for DeleteStatementNode<'_> {
-    type TraversalCtx = StatementTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_delete_stmt(self, ctx);
         if tp.traverse_value {
-            self.value().accept(visitor, ExpressionTraversalContext::DeleteStatement);
+            ctx.push(TraversalContext::DeleteStatement);
+            self.value().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_delete_stmt(self, ctx);
     }
@@ -695,12 +679,12 @@ impl<'script> TryFrom<AnyNode<'script>> for CompoundStatementNode<'script> {
 }
 
 impl SyntaxNodeTraversal for CompoundStatementNode<'_> {
-    type TraversalCtx = StatementTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_compound_stmt(self, ctx);
         if tp.traverse {
-            self.iter().for_each(|s| s.accept(visitor, StatementTraversalContext::InCompoundStatement));
+            ctx.push(TraversalContext::CompoundStatement);
+            self.iter().for_each(|s| s.accept(visitor, ctx));
+            ctx.pop();
         }
         visitor.exit_compound_stmt(self, ctx);
     }
diff --git a/crates/core/src/ast/loops.rs b/crates/core/src/ast/loops.rs
index 7e804535..e850a256 100644
--- a/crates/core/src/ast/loops.rs
+++ b/crates/core/src/ast/loops.rs
@@ -58,21 +58,27 @@ impl<'script> TryFrom<AnyNode<'script>> for ForLoopNode<'script> {
 }
 
 impl SyntaxNodeTraversal for ForLoopNode<'_> {
-    type TraversalCtx = StatementTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_for_stmt(self, ctx);
         if tp.traverse_init {
-            self.init().map(|init| init.accept(visitor, ExpressionTraversalContext::ForLoopInit));
+            ctx.push(TraversalContext::ForLoopInit);
+            self.init().map(|init| init.accept(visitor, ctx));
+            ctx.pop();
         }
         if tp.traverse_cond {
-            self.cond().map(|cond| cond.accept(visitor, ExpressionTraversalContext::ForLoopCond));
+            ctx.push(TraversalContext::ForLoopCond);
+            self.cond().map(|cond| cond.accept(visitor, ctx));
+            ctx.pop();
         }
         if tp.traverse_iter {
-            self.iter().map(|iter| iter.accept(visitor, ExpressionTraversalContext::ForLoopIter));
+            ctx.push(TraversalContext::ForLoopIter);
+            self.iter().map(|iter| iter.accept(visitor, ctx));
+            ctx.pop();
         }
         if tp.traverse_body {
-            self.body().accept(visitor, StatementTraversalContext::ForLoopBody);
+            ctx.push(TraversalContext::ForLoopBody);
+            self.body().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_for_stmt(self, ctx);
     }
@@ -118,15 +124,17 @@ impl<'script> TryFrom<AnyNode<'script>> for WhileLoopNode<'script> {
 }
 
 impl SyntaxNodeTraversal for WhileLoopNode<'_> {
-    type TraversalCtx = StatementTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_while_stmt(self, ctx);
         if tp.traverse_cond {
-            self.cond().accept(visitor, ExpressionTraversalContext::WhileLoopCond);
+            ctx.push(TraversalContext::WhileLoopCond);
+            self.cond().accept(visitor, ctx);
+            ctx.pop();
         }
         if tp.traverse_body {
-            self.body().accept(visitor, StatementTraversalContext::WhileLoopBody);
+            ctx.push(TraversalContext::WhileLoopBody);
+            self.body().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_while_stmt(self, ctx);
     }
@@ -172,15 +180,17 @@ impl<'script> TryFrom<AnyNode<'script>> for DoWhileLoopNode<'script> {
 }
 
 impl SyntaxNodeTraversal for DoWhileLoopNode<'_> {
-    type TraversalCtx = StatementTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_do_while_stmt(self, ctx);
         if tp.traverse_cond {
-            self.cond().accept(visitor, ExpressionTraversalContext::DoWhileLoopCond);
+            ctx.push(TraversalContext::DoWhileLoopCond);
+            self.cond().accept(visitor, ctx);
+            ctx.pop();
         }
         if tp.traverse_body {
-            self.body().accept(visitor, StatementTraversalContext::DoWhileLoopBody);
+            ctx.push(TraversalContext::DoWhileLoopBody);
+            self.body().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_do_while_stmt(self, ctx);
     }
diff --git a/crates/core/src/ast/nop.rs b/crates/core/src/ast/nop.rs
index 4cb30ec2..6929aa8c 100644
--- a/crates/core/src/ast/nop.rs
+++ b/crates/core/src/ast/nop.rs
@@ -36,9 +36,7 @@ impl<'script> TryFrom<AnyNode<'script>> for NopNode<'script> {
 }
 
 impl SyntaxNodeTraversal for NopNode<'_> {
-    type TraversalCtx = StatementTraversalContext;
-
-    fn accept<V: super::SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: super::SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         visitor.visit_nop_stmt(self, ctx);
     }
 }
\ No newline at end of file
diff --git a/crates/core/src/ast/root.rs b/crates/core/src/ast/root.rs
index 87b76e2c..262e441c 100644
--- a/crates/core/src/ast/root.rs
+++ b/crates/core/src/ast/root.rs
@@ -79,16 +79,14 @@ impl<'script> TryFrom<AnyNode<'script>> for RootStatementNode<'script> {
 }
 
 impl SyntaxNodeTraversal for RootStatementNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         match self.clone().value() {
-            RootStatement::Function(s) => s.accept(visitor, DeclarationTraversalContext::Global),
-            RootStatement::Class(s) => s.accept(visitor, ()),
-            RootStatement::State(s) => s.accept(visitor, ()),
-            RootStatement::Struct(s) => s.accept(visitor, ()),
-            RootStatement::Enum(s) => s.accept(visitor, ()),
-            RootStatement::Var(s) => s.accept(visitor, DeclarationTraversalContext::Global),
+            RootStatement::Function(s) => s.accept(visitor, ctx),
+            RootStatement::Class(s) => s.accept(visitor, ctx),
+            RootStatement::State(s) => s.accept(visitor, ctx),
+            RootStatement::Struct(s) => s.accept(visitor, ctx),
+            RootStatement::Enum(s) => s.accept(visitor, ctx),
+            RootStatement::Var(s) => s.accept(visitor, ctx),
             RootStatement::Nop(_) => {},
         }
     }
@@ -130,12 +128,12 @@ impl<'script> TryFrom<AnyNode<'script>> for RootNode<'script> {
 }
 
 impl SyntaxNodeTraversal for RootNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_root(self);
         if tp.traverse {
-            self.iter().for_each(|s| s.accept(visitor, ()));
+            ctx.push(TraversalContext::Global);
+            self.iter().for_each(|s| s.accept(visitor, ctx));
+            ctx.pop();
         }
     }
 }
\ No newline at end of file
diff --git a/crates/core/src/ast/states.rs b/crates/core/src/ast/states.rs
index ace3641a..78ec5f19 100644
--- a/crates/core/src/ast/states.rs
+++ b/crates/core/src/ast/states.rs
@@ -62,12 +62,12 @@ impl<'script> TryFrom<AnyNode<'script>> for StateDeclarationNode<'script> {
 }
 
 impl SyntaxNodeTraversal for StateDeclarationNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_state_decl(self);
         if tp.traverse_definition {
-            self.definition().accept(visitor, ());
+            ctx.push(TraversalContext::State);
+            self.definition().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_state_decl(self);
     }
@@ -108,9 +108,7 @@ impl<'script> TryFrom<AnyNode<'script>> for StateBlockNode<'script> {
 }
 
 impl SyntaxNodeTraversal for StateBlockNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
-        self.iter().for_each(|s| s.accept(visitor, DeclarationTraversalContext::StateDefinition));
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
+        self.iter().for_each(|s| s.accept(visitor, ctx));
     }
 }
\ No newline at end of file
diff --git a/crates/core/src/ast/structs.rs b/crates/core/src/ast/structs.rs
index 45b3836c..4bcdac33 100644
--- a/crates/core/src/ast/structs.rs
+++ b/crates/core/src/ast/structs.rs
@@ -56,12 +56,12 @@ impl<'script> TryFrom<AnyNode<'script>> for StructDeclarationNode<'script> {
 }
 
 impl SyntaxNodeTraversal for StructDeclarationNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_struct_decl(self);
         if tp.traverse_definition {
-            self.definition().accept(visitor, ());
+            ctx.push(TraversalContext::Struct);
+            self.definition().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_struct_decl(self);
     }
@@ -103,10 +103,8 @@ impl<'script> TryFrom<AnyNode<'script>> for StructBlockNode<'script> {
 }
 
 impl SyntaxNodeTraversal for StructBlockNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
-        self.iter().for_each(|s| s.accept(visitor, DeclarationTraversalContext::StructDefinition));
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
+        self.iter().for_each(|s| s.accept(visitor, ctx));
     }
 }
 
@@ -174,9 +172,7 @@ impl<'script> TryFrom<AnyNode<'script>> for StructPropertyNode<'script> {
 }
 
 impl SyntaxNodeTraversal for StructPropertyNode<'_> {
-    type TraversalCtx = DeclarationTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         match self.clone().value() {
             StructProperty::Var(s) => s.accept(visitor, ctx),
             StructProperty::Default(s) => s.accept(visitor, ctx),
@@ -223,12 +219,10 @@ impl<'script> TryFrom<AnyNode<'script>> for MemberDefaultsBlockNode<'script> {
 }
 
 impl SyntaxNodeTraversal for MemberDefaultsBlockNode<'_> {
-    type TraversalCtx = DeclarationTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_member_defaults_block(self, ctx);
         if tp.traverse {
-            self.iter().for_each(|n| n.accept(visitor, ()));
+            self.iter().for_each(|n| n.accept(visitor, ctx));
         }
         visitor.exit_member_defaults_block(self, ctx);
     }
@@ -274,14 +268,14 @@ impl<'script> TryFrom<AnyNode<'script>> for MemberDefaultsBlockAssignmentNode<'s
 }
 
 impl SyntaxNodeTraversal for MemberDefaultsBlockAssignmentNode<'_> {
-    type TraversalCtx = ();
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, _: Self::TraversalCtx) {
-        let tp = visitor.visit_member_defaults_block_assignment(self);
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
+        let tp = visitor.visit_member_defaults_block_assignment(self, ctx);
         if tp.traverse_value {
-            self.value().accept(visitor, ExpressionTraversalContext::MemberDefaultValue);
+            ctx.push(TraversalContext::MemberDefaultValue);
+            self.value().accept(visitor, ctx);
+            ctx.pop();
         }
-        visitor.exit_member_defaults_block_assignment(self);
+        visitor.exit_member_defaults_block_assignment(self, ctx);
     }
 }
 
@@ -325,12 +319,12 @@ impl<'script> TryFrom<AnyNode<'script>> for MemberDefaultValueNode<'script> {
 }
 
 impl SyntaxNodeTraversal for MemberDefaultValueNode<'_> {
-    type TraversalCtx = DeclarationTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_member_default_val(self, ctx);
         if tp.traverse_value {
-            self.value().accept(visitor, ExpressionTraversalContext::MemberDefaultValue);
+            ctx.push(TraversalContext::MemberDefaultValue);
+            self.value().accept(visitor, ctx);
+            ctx.pop();
         }
         visitor.exit_member_default_val(self, ctx);
     }
@@ -376,9 +370,7 @@ impl<'script> TryFrom<AnyNode<'script>> for MemberHintNode<'script> {
 }
 
 impl SyntaxNodeTraversal for MemberHintNode<'_> {
-    type TraversalCtx = DeclarationTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         visitor.visit_member_hint(self, ctx);
     }
 }
diff --git a/crates/core/src/ast/traversal/contexts.rs b/crates/core/src/ast/traversal/contexts.rs
index c1f69563..7e670c77 100644
--- a/crates/core/src/ast/traversal/contexts.rs
+++ b/crates/core/src/ast/traversal/contexts.rs
@@ -3,23 +3,45 @@
 //! a class, a state or a struct.
 
 
-//TODO maybe replace separate enums with just one, but pass around a stack of these contexts
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum ExpressionTraversalContext {
+pub enum TraversalContext {
+    Global,
+
+    Class,
+    State,
+    Struct,
+    Enum,
+    GlobalFunction,
+
+    MemberFunction,
+    Event,
     MemberDefaultValue,
-    
+
+    LocalVarDeclarationInitValue,
+
     ExpressionStatement,
+    CompoundStatement,
     ReturnStatement,
     DeleteStatement,
+
+    IfConditionalCond,
+    IfConditionalBody,
+    IfConditionalElseBody,
+
+    SwitchConditionalCond,
+    SwitchConditionalBody,
+    SwitchConditionalCaseLabel,
+
     ForLoopInit,
     ForLoopCond,
     ForLoopIter,
+    ForLoopBody,
+
     WhileLoopCond,
+    WhileLoopBody,
+
     DoWhileLoopCond,
-    IfConditionalCond,
-    SwitchConditionalCond,
-    SwitchConditionalCaseLabel,
-    LocalVarDeclarationInitValue,
+    DoWhileLoopBody, 
 
     NestedExpressionInner,
     FunctionCallExpressionFunc,
@@ -39,33 +61,55 @@ pub enum ExpressionTraversalContext {
     TernaryConditionalExpressionAlt,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum DeclarationTraversalContext {
-    Global,
-    ClassDefinition,
-    StateDefinition,
-    StructDefinition
+impl Default for TraversalContext {
+    fn default() -> Self {
+        Self::Global
+    }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum FunctionTraversalContext {
-    GlobalFunction,
-    MemberFunction,
-    Event
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct TraversalContextStack {
+    stack: Vec<TraversalContext>
 }
 
+impl TraversalContextStack {
+    #[inline]
+    pub fn new() -> Self {
+        Self {
+            stack: Vec::with_capacity(8)
+        }
+    }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum StatementTraversalContext {
-    GlobalFunctionDefinition,
-    MemberFunctionDefinition,
-    EventDefinition,
+    #[inline]
+    pub fn push(&mut self, ctx: TraversalContext) {
+        self.stack.push(ctx);
+    }
 
-    IfConditionalBody,
-    IfConditionalElseBody,
-    SwitchConditionalBody,
-    ForLoopBody,
-    WhileLoopBody,
-    DoWhileLoopBody,
-    InCompoundStatement
+    #[inline]
+    pub fn pop(&mut self) {
+        self.stack.pop();
+    }
+
+    #[inline]
+    pub fn top(&self) -> TraversalContext {
+        self.stack.last().map(|ctx| *ctx).unwrap_or_default()
+    }
+
+    #[inline]
+    pub fn contains(&self, ctx: TraversalContext) -> bool {
+        self.stack.contains(&ctx)
+    }
+
+    /// Iterate the stack top-to-bottom
+    #[inline]
+    pub fn iter<'a>(&'a self) -> impl Iterator<Item = TraversalContext> + 'a {
+        self.stack.iter().rev().cloned()
+    }
+}
+
+impl Default for TraversalContextStack {
+    fn default() -> Self {
+        Self::new()
+    }
 }
diff --git a/crates/core/src/ast/traversal/mod.rs b/crates/core/src/ast/traversal/mod.rs
index 562232f2..b73bc2ab 100644
--- a/crates/core/src/ast/traversal/mod.rs
+++ b/crates/core/src/ast/traversal/mod.rs
@@ -11,7 +11,5 @@ pub use visitor_chain::*;
 
 /// Traverse an syntax node using left-recursion.
 pub trait SyntaxNodeTraversal {
-    type TraversalCtx;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx);
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack);
 }
diff --git a/crates/core/src/ast/traversal/visitor.rs b/crates/core/src/ast/traversal/visitor.rs
index d0c6fa91..04a7ec93 100644
--- a/crates/core/src/ast/traversal/visitor.rs
+++ b/crates/core/src/ast/traversal/visitor.rs
@@ -16,78 +16,78 @@ pub trait SyntaxNodeVisitor {
 
 
     /// Called when visiting a parenthesized expression node.
-    fn visit_nested_expr(&mut self, n: &NestedExpressionNode, ctx: ExpressionTraversalContext) -> NestedExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_nested_expr(&mut self, n: &NestedExpressionNode, ctx: &TraversalContextStack) -> NestedExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting the nested expression node and possibly also children nodes specified in traversal policy.
-    fn exit_nested_expr(&mut self, n: &NestedExpressionNode, ctx: ExpressionTraversalContext) {}
+    fn exit_nested_expr(&mut self, n: &NestedExpressionNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a node representing any literal.
-    fn visit_literal_expr(&mut self, n: &LiteralNode, ctx: ExpressionTraversalContext) {}
+    fn visit_literal_expr(&mut self, n: &LiteralNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a node representing a `this` expression.
-    fn visit_this_expr(&mut self, n: &ThisExpressionNode, ctx: ExpressionTraversalContext) {}
+    fn visit_this_expr(&mut self, n: &ThisExpressionNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a node representing a `super` expression.
-    fn visit_super_expr(&mut self, n: &SuperExpressionNode, ctx: ExpressionTraversalContext) {}
+    fn visit_super_expr(&mut self, n: &SuperExpressionNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a node representing a `parent` expression.
-    fn visit_parent_expr(&mut self, n: &ParentExpressionNode, ctx: ExpressionTraversalContext) {}
+    fn visit_parent_expr(&mut self, n: &ParentExpressionNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a node representing a `virtual_parent` expression.
-    fn visit_virtual_parent_expr(&mut self, n: &VirtualParentExpressionNode, ctx: ExpressionTraversalContext) {}
+    fn visit_virtual_parent_expr(&mut self, n: &VirtualParentExpressionNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a node representing an identifier in code (not a keyword).
-    fn visit_identifier_expr(&mut self, n: &IdentifierNode, ctx: ExpressionTraversalContext) {}
+    fn visit_identifier_expr(&mut self, n: &IdentifierNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a function call node.
-    fn visit_func_call_expr(&mut self, n: &FunctionCallExpressionNode, ctx: ExpressionTraversalContext) -> FunctionCallExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_func_call_expr(&mut self, n: &FunctionCallExpressionNode, ctx: &TraversalContextStack) -> FunctionCallExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting function call expression node and possibly also children nodes specified in traversal policy.
-    fn exit_func_call_expr(&mut self, n: &FunctionCallExpressionNode, ctx: ExpressionTraversalContext) {}
+    fn exit_func_call_expr(&mut self, n: &FunctionCallExpressionNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a function call argument.
     /// Node may be None due to it referring to an optional function parameter.
-    fn visit_func_call_arg(&mut self, n: &FunctionCallArgument) -> FunctionCallArgumentTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_func_call_arg(&mut self, n: &FunctionCallArgument, ctx: &TraversalContextStack) -> FunctionCallArgumentTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting function call argument and possibly also children nodes specified in traversal policy.
-    fn exit_func_call_arg(&mut self, n: &FunctionCallArgument) {}
+    fn exit_func_call_arg(&mut self, n: &FunctionCallArgument, ctx: &TraversalContextStack) {}
 
     /// Called when visiting an indexing expression.
-    fn visit_array_expr(&mut self, n: &ArrayExpressionNode, ctx: ExpressionTraversalContext) -> ArrayExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_array_expr(&mut self, n: &ArrayExpressionNode, ctx: &TraversalContextStack) -> ArrayExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting an indexing expression and possibly also children nodes specified in traversal policy.
-    fn exit_array_expr(&mut self, n: &ArrayExpressionNode, ctx: ExpressionTraversalContext) {}
+    fn exit_array_expr(&mut self, n: &ArrayExpressionNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting an expression of accessing a field in an object.
-    fn visit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, ctx: ExpressionTraversalContext) -> MemberFieldExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, ctx: &TraversalContextStack) -> MemberFieldExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting an expression of accessing a field in an object and possibly also children nodes specified in traversal policy.
-    fn exit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, ctx: ExpressionTraversalContext) {}
+    fn exit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting an instantiation expression.
-    fn visit_new_expr(&mut self, n: &NewExpressionNode, ctx: ExpressionTraversalContext) -> NewExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_new_expr(&mut self, n: &NewExpressionNode, ctx: &TraversalContextStack) -> NewExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting an instantiation expression and possibly also children nodes specified in traversal policy.
-    fn exit_new_expr(&mut self, n: &NewExpressionNode, ctx: ExpressionTraversalContext) {}
+    fn exit_new_expr(&mut self, n: &NewExpressionNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a type-casting expression.
-    fn visit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, ctx: ExpressionTraversalContext) -> TypeCastExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, ctx: &TraversalContextStack) -> TypeCastExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting a type-casting expression and possibly also child node specified in traversal policy.
-    fn exit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, ctx: ExpressionTraversalContext) {}
+    fn exit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting an unary operation expression.
-    fn visit_unary_op_expr(&mut self, n: &UnaryOperationExpressionNode, ctx: ExpressionTraversalContext) -> UnaryOperationExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_unary_op_expr(&mut self, n: &UnaryOperationExpressionNode, ctx: &TraversalContextStack) -> UnaryOperationExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting an unary operation expression and possibly also children nodes specified in traversal policy.
-    fn exit_unary_op_expr(&mut self, n: &UnaryOperationExpressionNode, ctx: ExpressionTraversalContext) {}
+    fn exit_unary_op_expr(&mut self, n: &UnaryOperationExpressionNode, ctx: &TraversalContextStack) {}
     
     /// Called when visiting a binary operation expression.
-    fn visit_binary_op_expr(&mut self, n: &BinaryOperationExpressionNode, ctx: ExpressionTraversalContext) -> BinaryOperationExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_binary_op_expr(&mut self, n: &BinaryOperationExpressionNode, ctx: &TraversalContextStack) -> BinaryOperationExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting a binary operation expression and possibly also children nodes specified in traversal policy.
-    fn exit_binary_op_expr(&mut self, n: &BinaryOperationExpressionNode, ctx: ExpressionTraversalContext) {}
+    fn exit_binary_op_expr(&mut self, n: &BinaryOperationExpressionNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting an assignment operation expression.
-    fn visit_assign_op_expr(&mut self, n: &AssignmentOperationExpressionNode, ctx: ExpressionTraversalContext) -> AssignmentOperationExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_assign_op_expr(&mut self, n: &AssignmentOperationExpressionNode, ctx: &TraversalContextStack) -> AssignmentOperationExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting an assignment operation expression and possibly also children nodes specified in traversal policy.
-    fn exit_assign_op_expr(&mut self, n: &AssignmentOperationExpressionNode, ctx: ExpressionTraversalContext) {}
+    fn exit_assign_op_expr(&mut self, n: &AssignmentOperationExpressionNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a ternary conditional expression (expr1 ? expr2 : expr3).
-    fn visit_ternary_cond_expr(&mut self, n: &TernaryConditionalExpressionNode, ctx: ExpressionTraversalContext) -> TernaryConditionalExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_ternary_cond_expr(&mut self, n: &TernaryConditionalExpressionNode, ctx: &TraversalContextStack) -> TernaryConditionalExpressionTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting a ternary conditional expression and possibly also children nodes specified in traversal policy.
-    fn exit_ternary_cond_expr(&mut self, n: &TernaryConditionalExpressionNode, ctx: ExpressionTraversalContext) {}
+    fn exit_ternary_cond_expr(&mut self, n: &TernaryConditionalExpressionNode, ctx: &TraversalContextStack) {}
 
 
 
@@ -123,31 +123,31 @@ pub trait SyntaxNodeVisitor {
     fn visit_global_var_decl(&mut self, n: &MemberVarDeclarationNode) {}
 
     /// Called when visiting member variable (i.e. field) declaration.
-    fn visit_member_var_decl(&mut self, n: &MemberVarDeclarationNode, ctx: DeclarationTraversalContext) {}
+    fn visit_member_var_decl(&mut self, n: &MemberVarDeclarationNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a statement assigning a default value to a field.
-    fn visit_member_default_val(&mut self, n: &MemberDefaultValueNode, ctx: DeclarationTraversalContext) -> MemberDefaultValueTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_member_default_val(&mut self, n: &MemberDefaultValueNode, ctx: &TraversalContextStack) -> MemberDefaultValueTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting a statement assigning a default value to a field and possibly also children nodes specified in traversal policy.
-    fn exit_member_default_val(&mut self, n: &MemberDefaultValueNode, ctx: DeclarationTraversalContext) {}
+    fn exit_member_default_val(&mut self, n: &MemberDefaultValueNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a `defaults` block.
-    fn visit_member_defaults_block(&mut self, n: &MemberDefaultsBlockNode, ctx: DeclarationTraversalContext) -> MemberDefaultsBlockTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_member_defaults_block(&mut self, n: &MemberDefaultsBlockNode, ctx: &TraversalContextStack) -> MemberDefaultsBlockTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visitng a `defaults` block and possibly also children nodes specified in traversal policy.
-    fn exit_member_defaults_block(&mut self, n: &MemberDefaultsBlockNode, ctx: DeclarationTraversalContext) {}
+    fn exit_member_defaults_block(&mut self, n: &MemberDefaultsBlockNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a default value assignment inside a `defaults` block.
-    fn visit_member_defaults_block_assignment(&mut self, n: &MemberDefaultsBlockAssignmentNode) -> MemberDefaultValueTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_member_defaults_block_assignment(&mut self, n: &MemberDefaultsBlockAssignmentNode, ctx: &TraversalContextStack) -> MemberDefaultValueTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting a default value assignment inside a `defaults` block and possibly also children nodes specified in traversal policy.
-    fn exit_member_defaults_block_assignment(&mut self, n: &MemberDefaultsBlockAssignmentNode) {}
+    fn exit_member_defaults_block_assignment(&mut self, n: &MemberDefaultsBlockAssignmentNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a statement noting some information about a perticular type field.
-    fn visit_member_hint(&mut self, n: &MemberHintNode, ctx: DeclarationTraversalContext) {}
+    fn visit_member_hint(&mut self, n: &MemberHintNode, ctx: &TraversalContextStack) {}
     
     /// Called when visiting an autobind variable declaration.
-    fn visit_autobind_decl(&mut self, n: &AutobindDeclarationNode, ctx: DeclarationTraversalContext) {}
+    fn visit_autobind_decl(&mut self, n: &AutobindDeclarationNode, ctx: &TraversalContextStack) {}
     
     /// Called when visiting a group of function parameters. This may mean a single parameter or multiple delimited names with common specifiers and a type.
-    fn visit_func_param_group(&mut self, n: &FunctionParameterGroupNode, ctx: FunctionTraversalContext) {}
+    fn visit_func_param_group(&mut self, n: &FunctionParameterGroupNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a global function declaration.
     fn visit_global_func_decl(&mut self, n: &FunctionDeclarationNode) -> FunctionDeclarationTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
@@ -155,85 +155,85 @@ pub trait SyntaxNodeVisitor {
     fn exit_global_func_decl(&mut self, n: &FunctionDeclarationNode) {}
 
     /// Called when visiting a member function declaration (i.e. a method).
-    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, ctx: DeclarationTraversalContext) -> FunctionDeclarationTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, ctx: &TraversalContextStack) -> FunctionDeclarationTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting member function declaration and possibly also children nodes specified in traversal policy.
-    fn exit_member_func_decl(&mut self, n: &FunctionDeclarationNode, ctx: DeclarationTraversalContext) {}
+    fn exit_member_func_decl(&mut self, n: &FunctionDeclarationNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting an event function declaration.
-    fn visit_event_decl(&mut self, n: &EventDeclarationNode, ctx: DeclarationTraversalContext) -> EventDeclarationTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_event_decl(&mut self, n: &EventDeclarationNode, ctx: &TraversalContextStack) -> EventDeclarationTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting member function declaration and possibly also children nodes specified in traversal policy.
-    fn exit_event_decl(&mut self, n: &EventDeclarationNode, ctx: DeclarationTraversalContext) {}
+    fn exit_event_decl(&mut self, n: &EventDeclarationNode, ctx: &TraversalContextStack) {}
 
 
 
 
     /// Called when visiting a local variable declaration inside a function.
-    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, ctx: StatementTraversalContext) -> VarDeclarationTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, ctx: &TraversalContextStack) -> VarDeclarationTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting a local variable declaration and possibly also children nodes specified in traversal policy.
-    fn exit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, ctx: StatementTraversalContext) {}
+    fn exit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting an expression statement inside a function.
-    fn visit_expr_stmt(&mut self, n: &ExpressionStatementNode, ctx: StatementTraversalContext) -> ExpressionStatementTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_expr_stmt(&mut self, n: &ExpressionStatementNode, ctx: &TraversalContextStack) -> ExpressionStatementTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting an expression statement and possibly also children nodes specified in traversal policy.
-    fn exit_expr_stmt(&mut self, n: &ExpressionStatementNode, ctx: StatementTraversalContext) {}
+    fn exit_expr_stmt(&mut self, n: &ExpressionStatementNode, ctx: &TraversalContextStack) {}
     
     /// Called when visiting a `for` loop.
-    fn visit_for_stmt(&mut self, n: &ForLoopNode, ctx: StatementTraversalContext) -> ForLoopTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_for_stmt(&mut self, n: &ForLoopNode, ctx: &TraversalContextStack) -> ForLoopTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting a `for` loop and possibly also children nodes specified in traversal policy.
-    fn exit_for_stmt(&mut self, n: &ForLoopNode, ctx: StatementTraversalContext) {}
+    fn exit_for_stmt(&mut self, n: &ForLoopNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a `while` loop.
-    fn visit_while_stmt(&mut self, n: &WhileLoopNode, ctx: StatementTraversalContext) -> WhileLoopTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_while_stmt(&mut self, n: &WhileLoopNode, ctx: &TraversalContextStack) -> WhileLoopTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting a `while` loop and possibly also children nodes specified in traversal policy.
-    fn exit_while_stmt(&mut self, n: &WhileLoopNode, ctx: StatementTraversalContext) {}
+    fn exit_while_stmt(&mut self, n: &WhileLoopNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a `do-while` loop.
-    fn visit_do_while_stmt(&mut self, n: &DoWhileLoopNode, ctx: StatementTraversalContext) -> DoWhileLoopTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_do_while_stmt(&mut self, n: &DoWhileLoopNode, ctx: &TraversalContextStack) -> DoWhileLoopTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting a `do-while` loop and possibly also children nodes specified in traversal policy.
-    fn exit_do_while_stmt(&mut self, n: &DoWhileLoopNode, ctx: StatementTraversalContext) {}
+    fn exit_do_while_stmt(&mut self, n: &DoWhileLoopNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting an `if` condition.
-    fn visit_if_stmt(&mut self, n: &IfConditionalNode, ctx: StatementTraversalContext) -> IfConditionalTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_if_stmt(&mut self, n: &IfConditionalNode, ctx: &TraversalContextStack) -> IfConditionalTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting an `if` condition and possibly also children nodes specified in traversal policy.
-    fn exit_if_stmt(&mut self, n: &IfConditionalNode, ctx: StatementTraversalContext) {}
+    fn exit_if_stmt(&mut self, n: &IfConditionalNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a `switch` statement.
-    fn visit_switch_stmt(&mut self, n: &SwitchConditionalNode, ctx: StatementTraversalContext) -> SwitchConditionalTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_switch_stmt(&mut self, n: &SwitchConditionalNode, ctx: &TraversalContextStack) -> SwitchConditionalTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting a `switch` statement and possibly also children nodes specified in traversal policy.
-    fn exit_switch_stmt(&mut self, n: &SwitchConditionalNode, ctx: StatementTraversalContext) {}
+    fn exit_switch_stmt(&mut self, n: &SwitchConditionalNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a `case` label inside a `switch` statement.
-    fn visit_switch_stmt_case(&mut self, n: &SwitchConditionalCaseLabelNode) -> SwitchConditionalCaseLabelTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_switch_stmt_case(&mut self, n: &SwitchConditionalCaseLabelNode, ctx: &TraversalContextStack) -> SwitchConditionalCaseLabelTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting a `case` label inside a `switch` statement and possibly also children nodes specified in traversal policy.
-    fn exit_switch_stmt_case(&mut self, n: &SwitchConditionalCaseLabelNode) {}
+    fn exit_switch_stmt_case(&mut self, n: &SwitchConditionalCaseLabelNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a `default` label inside a `switch` statement.
-    fn visit_switch_stmt_default(&mut self, n: &SwitchConditionalDefaultLabelNode) {}
+    fn visit_switch_stmt_default(&mut self, n: &SwitchConditionalDefaultLabelNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a `break` statement.
-    fn visit_break_stmt(&mut self, n: &BreakStatementNode, ctx: StatementTraversalContext) {}
+    fn visit_break_stmt(&mut self, n: &BreakStatementNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a `continue` statement.
-    fn visit_continue_stmt(&mut self, n: &ContinueStatementNode, ctx: StatementTraversalContext) {}
+    fn visit_continue_stmt(&mut self, n: &ContinueStatementNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a `return` statement.
-    fn visit_return_stmt(&mut self, n: &ReturnStatementNode, ctx: StatementTraversalContext) -> ReturnStatementTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_return_stmt(&mut self, n: &ReturnStatementNode, ctx: &TraversalContextStack) -> ReturnStatementTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting a `return` statement and possibly also children nodes specified in traversal policy.
-    fn exit_return_stmt(&mut self, n: &ReturnStatementNode, ctx: StatementTraversalContext) {}
+    fn exit_return_stmt(&mut self, n: &ReturnStatementNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a `delete` statement.
-    fn visit_delete_stmt(&mut self, n: &DeleteStatementNode, ctx: StatementTraversalContext) -> DeleteStatementTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_delete_stmt(&mut self, n: &DeleteStatementNode, ctx: &TraversalContextStack) -> DeleteStatementTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting a `delete` statement and possibly also children nodes specified in traversal policy.
-    fn exit_delete_stmt(&mut self, n: &DeleteStatementNode, ctx: StatementTraversalContext) {}
+    fn exit_delete_stmt(&mut self, n: &DeleteStatementNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a scope block statement in a function.
-    fn visit_compound_stmt(&mut self, n: &CompoundStatementNode, ctx: StatementTraversalContext) -> CompoundStatementTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
+    fn visit_compound_stmt(&mut self, n: &CompoundStatementNode, ctx: &TraversalContextStack) -> CompoundStatementTraversalPolicy { TraversalPolicy::default_to(self.traversal_policy_default()) }
     /// Called after visiting a scope block statement in a function and possibly also children nodes specified in traversal policy.
-    fn exit_compound_stmt(&mut self, n: &CompoundStatementNode, ctx: StatementTraversalContext) {}
+    fn exit_compound_stmt(&mut self, n: &CompoundStatementNode, ctx: &TraversalContextStack) {}
 
     /// Called when visiting a NOP statement. 
     /// It most notably means:
     /// 1. A trailing "orphan" semicolon somewhere in code
     /// 2. Indicating absence of action, e.g. `while(!AreWeThereYet());`
-    fn visit_nop_stmt(&mut self, n: &NopNode, ctx: StatementTraversalContext) {}
+    fn visit_nop_stmt(&mut self, n: &NopNode, ctx: &TraversalContextStack) {}
 }
diff --git a/crates/core/src/ast/traversal/visitor_chain.rs b/crates/core/src/ast/traversal/visitor_chain.rs
index e8f2cafa..d554b9bd 100644
--- a/crates/core/src/ast/traversal/visitor_chain.rs
+++ b/crates/core/src/ast/traversal/visitor_chain.rs
@@ -146,279 +146,279 @@ impl<'a> SyntaxNodeVisitor for SyntaxNodeVisitorChain<'a> {
 
 
 
-    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, ctx: DeclarationTraversalContext) -> FunctionDeclarationTraversalPolicy {
+    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, ctx: &TraversalContextStack) -> FunctionDeclarationTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_member_func_decl(n, ctx))
     }
 
-    fn exit_member_func_decl(&mut self, n: &FunctionDeclarationNode, ctx: DeclarationTraversalContext) {
+    fn exit_member_func_decl(&mut self, n: &FunctionDeclarationNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_member_func_decl(n, ctx))
     }
 
-    fn visit_event_decl(&mut self, n: &EventDeclarationNode, ctx: DeclarationTraversalContext) -> EventDeclarationTraversalPolicy {
+    fn visit_event_decl(&mut self, n: &EventDeclarationNode, ctx: &TraversalContextStack) -> EventDeclarationTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_event_decl(n, ctx))
     }
 
-    fn exit_event_decl(&mut self, n: &EventDeclarationNode, ctx: DeclarationTraversalContext) {
+    fn exit_event_decl(&mut self, n: &EventDeclarationNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_event_decl(n, ctx))
     }
 
-    fn visit_func_param_group(&mut self, n: &FunctionParameterGroupNode, ctx: FunctionTraversalContext) {
+    fn visit_func_param_group(&mut self, n: &FunctionParameterGroupNode, ctx: &TraversalContextStack) {
         self.chain_visit(move |link| link.visit_func_param_group(n, ctx))
     }
 
-    fn visit_member_var_decl(&mut self, n: &MemberVarDeclarationNode, ctx: DeclarationTraversalContext) {
+    fn visit_member_var_decl(&mut self, n: &MemberVarDeclarationNode, ctx: &TraversalContextStack) {
         self.chain_visit(move |link| link.visit_member_var_decl(n, ctx))
     }
 
-    fn visit_autobind_decl(&mut self, n: &AutobindDeclarationNode, ctx: DeclarationTraversalContext) {
+    fn visit_autobind_decl(&mut self, n: &AutobindDeclarationNode, ctx: &TraversalContextStack) {
         self.chain_visit(move |link| link.visit_autobind_decl(n, ctx))
     }
 
-    fn visit_member_default_val(&mut self, n: &MemberDefaultValueNode, ctx: DeclarationTraversalContext) -> MemberDefaultValueTraversalPolicy {
+    fn visit_member_default_val(&mut self, n: &MemberDefaultValueNode, ctx: &TraversalContextStack) -> MemberDefaultValueTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_member_default_val(n, ctx))
     }
 
-    fn exit_member_default_val(&mut self, n: &MemberDefaultValueNode, ctx: DeclarationTraversalContext) {
+    fn exit_member_default_val(&mut self, n: &MemberDefaultValueNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_member_default_val(n, ctx))
     }
 
-    fn visit_member_hint(&mut self, n: &MemberHintNode, ctx: DeclarationTraversalContext) {
+    fn visit_member_hint(&mut self, n: &MemberHintNode, ctx: &TraversalContextStack) {
         self.chain_visit(move |link| link.visit_member_hint(n, ctx))
     }
 
-    fn visit_member_defaults_block(&mut self, n: &MemberDefaultsBlockNode, ctx: DeclarationTraversalContext) -> MemberDefaultsBlockTraversalPolicy {
+    fn visit_member_defaults_block(&mut self, n: &MemberDefaultsBlockNode, ctx: &TraversalContextStack) -> MemberDefaultsBlockTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_member_defaults_block(n, ctx))
     }
 
-    fn exit_member_defaults_block(&mut self, n: &MemberDefaultsBlockNode, ctx: DeclarationTraversalContext) {
+    fn exit_member_defaults_block(&mut self, n: &MemberDefaultsBlockNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_member_defaults_block(n, ctx))
     }
 
-    fn visit_member_defaults_block_assignment(&mut self, n: &MemberDefaultsBlockAssignmentNode) -> MemberDefaultValueTraversalPolicy {
-        self.chain_visit_traversable(move |link| link.visit_member_defaults_block_assignment(n))
+    fn visit_member_defaults_block_assignment(&mut self, n: &MemberDefaultsBlockAssignmentNode, ctx: &TraversalContextStack) -> MemberDefaultValueTraversalPolicy {
+        self.chain_visit_traversable(move |link| link.visit_member_defaults_block_assignment(n, ctx))
     }
 
-    fn exit_member_defaults_block_assignment(&mut self, n: &MemberDefaultsBlockAssignmentNode) {
-        self.chain_exit(move |link| link.exit_member_defaults_block_assignment(n))
+    fn exit_member_defaults_block_assignment(&mut self, n: &MemberDefaultsBlockAssignmentNode, ctx: &TraversalContextStack) {
+        self.chain_exit(move |link| link.exit_member_defaults_block_assignment(n, ctx))
     }
 
 
 
-    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, ctx: StatementTraversalContext) -> VarDeclarationTraversalPolicy {
+    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, ctx: &TraversalContextStack) -> VarDeclarationTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_local_var_decl_stmt(n, ctx))
     }
 
-    fn exit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, ctx: StatementTraversalContext) {
+    fn exit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_local_var_decl_stmt(n, ctx))
     }
 
-    fn visit_compound_stmt(&mut self, n: &CompoundStatementNode, ctx: StatementTraversalContext) -> CompoundStatementTraversalPolicy {
+    fn visit_compound_stmt(&mut self, n: &CompoundStatementNode, ctx: &TraversalContextStack) -> CompoundStatementTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_compound_stmt(n, ctx))
     }
 
-    fn exit_compound_stmt(&mut self, n: &CompoundStatementNode, ctx: StatementTraversalContext) {
+    fn exit_compound_stmt(&mut self, n: &CompoundStatementNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_compound_stmt(n, ctx))
     }
 
-    fn visit_while_stmt(&mut self, n: &WhileLoopNode, ctx: StatementTraversalContext) -> WhileLoopTraversalPolicy {
+    fn visit_while_stmt(&mut self, n: &WhileLoopNode, ctx: &TraversalContextStack) -> WhileLoopTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_while_stmt(n, ctx))
     }
 
-    fn exit_while_stmt(&mut self, n: &WhileLoopNode, ctx: StatementTraversalContext) {
+    fn exit_while_stmt(&mut self, n: &WhileLoopNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_while_stmt(n, ctx))
     }
 
-    fn visit_do_while_stmt(&mut self, n: &DoWhileLoopNode, ctx: StatementTraversalContext) -> DoWhileLoopTraversalPolicy {
+    fn visit_do_while_stmt(&mut self, n: &DoWhileLoopNode, ctx: &TraversalContextStack) -> DoWhileLoopTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_do_while_stmt(n, ctx))
     }
 
-    fn exit_do_while_stmt(&mut self, n: &DoWhileLoopNode, ctx: StatementTraversalContext) {
+    fn exit_do_while_stmt(&mut self, n: &DoWhileLoopNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_do_while_stmt(n, ctx))
     }
 
-    fn visit_for_stmt(&mut self, n: &ForLoopNode, ctx: StatementTraversalContext) -> ForLoopTraversalPolicy {
+    fn visit_for_stmt(&mut self, n: &ForLoopNode, ctx: &TraversalContextStack) -> ForLoopTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_for_stmt(n, ctx))
     }
 
-    fn exit_for_stmt(&mut self, n: &ForLoopNode, ctx: StatementTraversalContext) {
+    fn exit_for_stmt(&mut self, n: &ForLoopNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_for_stmt(n, ctx))
     }
 
-    fn visit_if_stmt(&mut self, n: &IfConditionalNode, ctx: StatementTraversalContext) -> IfConditionalTraversalPolicy {
+    fn visit_if_stmt(&mut self, n: &IfConditionalNode, ctx: &TraversalContextStack) -> IfConditionalTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_if_stmt(n, ctx))
     }
 
-    fn exit_if_stmt(&mut self, n: &IfConditionalNode, ctx: StatementTraversalContext) {
+    fn exit_if_stmt(&mut self, n: &IfConditionalNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_if_stmt(n, ctx))
     }
 
-    fn visit_switch_stmt(&mut self, n: &SwitchConditionalNode, ctx: StatementTraversalContext) -> SwitchConditionalTraversalPolicy {
+    fn visit_switch_stmt(&mut self, n: &SwitchConditionalNode, ctx: &TraversalContextStack) -> SwitchConditionalTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_switch_stmt(n, ctx))
     }
 
-    fn exit_switch_stmt(&mut self, n: &SwitchConditionalNode, ctx: StatementTraversalContext) {
+    fn exit_switch_stmt(&mut self, n: &SwitchConditionalNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_switch_stmt(n, ctx))
     }
 
-    fn visit_switch_stmt_case(&mut self, n: &SwitchConditionalCaseLabelNode) -> SwitchConditionalCaseLabelTraversalPolicy {
-        self.chain_visit_traversable(move |link| link.visit_switch_stmt_case(n))
+    fn visit_switch_stmt_case(&mut self, n: &SwitchConditionalCaseLabelNode, ctx: &TraversalContextStack) -> SwitchConditionalCaseLabelTraversalPolicy {
+        self.chain_visit_traversable(move |link| link.visit_switch_stmt_case(n, ctx))
     }
 
-    fn exit_switch_stmt_case(&mut self, n: &SwitchConditionalCaseLabelNode) {
-        self.chain_exit(move |link| link.exit_switch_stmt_case(n))
+    fn exit_switch_stmt_case(&mut self, n: &SwitchConditionalCaseLabelNode, ctx: &TraversalContextStack) {
+        self.chain_exit(move |link| link.exit_switch_stmt_case(n, ctx))
     }
 
-    fn visit_switch_stmt_default(&mut self, n: &SwitchConditionalDefaultLabelNode) {
-        self.chain_visit(move |link| link.visit_switch_stmt_default(n))
+    fn visit_switch_stmt_default(&mut self, n: &SwitchConditionalDefaultLabelNode, ctx: &TraversalContextStack) {
+        self.chain_visit(move |link| link.visit_switch_stmt_default(n, ctx))
     }
 
-    fn visit_expr_stmt(&mut self, n: &ExpressionStatementNode, ctx: StatementTraversalContext) -> ExpressionStatementTraversalPolicy {
+    fn visit_expr_stmt(&mut self, n: &ExpressionStatementNode, ctx: &TraversalContextStack) -> ExpressionStatementTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_expr_stmt(n, ctx))
     }
 
-    fn exit_expr_stmt(&mut self, n: &ExpressionStatementNode, ctx: StatementTraversalContext) {
+    fn exit_expr_stmt(&mut self, n: &ExpressionStatementNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_expr_stmt(n, ctx))
     }
 
-    fn visit_return_stmt(&mut self, n: &ReturnStatementNode, ctx: StatementTraversalContext) -> ReturnStatementTraversalPolicy {
+    fn visit_return_stmt(&mut self, n: &ReturnStatementNode, ctx: &TraversalContextStack) -> ReturnStatementTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_return_stmt(n, ctx))
     }
 
-    fn exit_return_stmt(&mut self, n: &ReturnStatementNode, ctx: StatementTraversalContext) {
+    fn exit_return_stmt(&mut self, n: &ReturnStatementNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_return_stmt(n, ctx))
     }
 
-    fn visit_delete_stmt(&mut self, n: &DeleteStatementNode, ctx: StatementTraversalContext) -> DeleteStatementTraversalPolicy {
+    fn visit_delete_stmt(&mut self, n: &DeleteStatementNode, ctx: &TraversalContextStack) -> DeleteStatementTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_delete_stmt(n, ctx))
     }
 
-    fn exit_delete_stmt(&mut self, n: &DeleteStatementNode, ctx: StatementTraversalContext) {
+    fn exit_delete_stmt(&mut self, n: &DeleteStatementNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_delete_stmt(n, ctx))
     }
 
-    fn visit_break_stmt(&mut self, n: &BreakStatementNode, ctx: StatementTraversalContext) {
+    fn visit_break_stmt(&mut self, n: &BreakStatementNode, ctx: &TraversalContextStack) {
         self.chain_visit(move |link| link.visit_break_stmt(n, ctx))
     }
 
-    fn visit_continue_stmt(&mut self, n: &ContinueStatementNode, ctx: StatementTraversalContext) {
+    fn visit_continue_stmt(&mut self, n: &ContinueStatementNode, ctx: &TraversalContextStack) {
         self.chain_visit(move |link| link.visit_continue_stmt(n, ctx))
     }
 
-    fn visit_nop_stmt(&mut self, n: &NopNode, ctx: StatementTraversalContext) {
+    fn visit_nop_stmt(&mut self, n: &NopNode, ctx: &TraversalContextStack) {
         self.chain_visit(move |link| link.visit_nop_stmt(n, ctx))
     }
 
 
 
-    fn visit_nested_expr(&mut self, n: &NestedExpressionNode, ctx: ExpressionTraversalContext) -> NestedExpressionTraversalPolicy {
+    fn visit_nested_expr(&mut self, n: &NestedExpressionNode, ctx: &TraversalContextStack) -> NestedExpressionTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_nested_expr(n, ctx))
     }
 
-    fn exit_nested_expr(&mut self, n: &NestedExpressionNode, ctx: ExpressionTraversalContext) {
+    fn exit_nested_expr(&mut self, n: &NestedExpressionNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_nested_expr(n, ctx))
     }
 
-    fn visit_assign_op_expr(&mut self, n: &AssignmentOperationExpressionNode, ctx: ExpressionTraversalContext) -> AssignmentOperationExpressionTraversalPolicy {
+    fn visit_assign_op_expr(&mut self, n: &AssignmentOperationExpressionNode, ctx: &TraversalContextStack) -> AssignmentOperationExpressionTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_assign_op_expr(n, ctx))
     }
 
-    fn exit_assign_op_expr(&mut self, n: &AssignmentOperationExpressionNode, ctx: ExpressionTraversalContext) {
+    fn exit_assign_op_expr(&mut self, n: &AssignmentOperationExpressionNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_assign_op_expr(n, ctx))
     }
 
-    fn visit_binary_op_expr(&mut self, n: &BinaryOperationExpressionNode, ctx: ExpressionTraversalContext) -> BinaryOperationExpressionTraversalPolicy {
+    fn visit_binary_op_expr(&mut self, n: &BinaryOperationExpressionNode, ctx: &TraversalContextStack) -> BinaryOperationExpressionTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_binary_op_expr(n, ctx))
     }
 
-    fn exit_binary_op_expr(&mut self, n: &BinaryOperationExpressionNode, ctx: ExpressionTraversalContext) {
+    fn exit_binary_op_expr(&mut self, n: &BinaryOperationExpressionNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_binary_op_expr(n, ctx))
     }
 
-    fn visit_unary_op_expr(&mut self, n: &UnaryOperationExpressionNode, ctx: ExpressionTraversalContext) -> UnaryOperationExpressionTraversalPolicy {
+    fn visit_unary_op_expr(&mut self, n: &UnaryOperationExpressionNode, ctx: &TraversalContextStack) -> UnaryOperationExpressionTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_unary_op_expr(n, ctx))
     }
 
-    fn exit_unary_op_expr(&mut self, n: &UnaryOperationExpressionNode, ctx: ExpressionTraversalContext) {
+    fn exit_unary_op_expr(&mut self, n: &UnaryOperationExpressionNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_unary_op_expr(n, ctx))
     }
 
-    fn visit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, ctx: ExpressionTraversalContext) -> MemberFieldExpressionTraversalPolicy {
+    fn visit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, ctx: &TraversalContextStack) -> MemberFieldExpressionTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_member_access_expr(n, ctx))
     }
 
-    fn exit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, ctx: ExpressionTraversalContext) {
+    fn exit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_member_access_expr(n, ctx))
     }
 
-    fn visit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, ctx: ExpressionTraversalContext) -> TypeCastExpressionTraversalPolicy {
+    fn visit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, ctx: &TraversalContextStack) -> TypeCastExpressionTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_type_cast_expr(n, ctx))
     }
 
-    fn exit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, ctx: ExpressionTraversalContext) {
+    fn exit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_type_cast_expr(n, ctx))
     }
 
-    fn visit_ternary_cond_expr(&mut self, n: &TernaryConditionalExpressionNode, ctx: ExpressionTraversalContext) -> TernaryConditionalExpressionTraversalPolicy {
+    fn visit_ternary_cond_expr(&mut self, n: &TernaryConditionalExpressionNode, ctx: &TraversalContextStack) -> TernaryConditionalExpressionTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_ternary_cond_expr(n, ctx))
     }
 
-    fn exit_ternary_cond_expr(&mut self, n: &TernaryConditionalExpressionNode, ctx: ExpressionTraversalContext) {
+    fn exit_ternary_cond_expr(&mut self, n: &TernaryConditionalExpressionNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_ternary_cond_expr(n, ctx))
     }
 
-    fn visit_new_expr(&mut self, n: &NewExpressionNode, ctx: ExpressionTraversalContext) -> NewExpressionTraversalPolicy {
+    fn visit_new_expr(&mut self, n: &NewExpressionNode, ctx: &TraversalContextStack) -> NewExpressionTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_new_expr(n, ctx))
     }
 
-    fn exit_new_expr(&mut self, n: &NewExpressionNode, ctx: ExpressionTraversalContext) {
+    fn exit_new_expr(&mut self, n: &NewExpressionNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_new_expr(n, ctx))
     }
 
-    fn visit_array_expr(&mut self, n: &ArrayExpressionNode, ctx: ExpressionTraversalContext) -> ArrayExpressionTraversalPolicy {
+    fn visit_array_expr(&mut self, n: &ArrayExpressionNode, ctx: &TraversalContextStack) -> ArrayExpressionTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_array_expr(n, ctx))
     }
 
-    fn exit_array_expr(&mut self, n: &ArrayExpressionNode, ctx: ExpressionTraversalContext) {
+    fn exit_array_expr(&mut self, n: &ArrayExpressionNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_array_expr(n, ctx))
     }
 
-    fn visit_func_call_expr(&mut self, n: &FunctionCallExpressionNode, ctx: ExpressionTraversalContext) -> FunctionCallExpressionTraversalPolicy {
+    fn visit_func_call_expr(&mut self, n: &FunctionCallExpressionNode, ctx: &TraversalContextStack) -> FunctionCallExpressionTraversalPolicy {
         self.chain_visit_traversable(move |link| link.visit_func_call_expr(n, ctx))
     }
 
-    fn exit_func_call_expr(&mut self, n: &FunctionCallExpressionNode, ctx: ExpressionTraversalContext) {
+    fn exit_func_call_expr(&mut self, n: &FunctionCallExpressionNode, ctx: &TraversalContextStack) {
         self.chain_exit(move |link| link.exit_func_call_expr(n, ctx))
     }
 
-    fn visit_func_call_arg(&mut self, n: &FunctionCallArgument) -> FunctionCallArgumentTraversalPolicy {
-        self.chain_visit_traversable(move |link| link.visit_func_call_arg(n))
+    fn visit_func_call_arg(&mut self, n: &FunctionCallArgument, ctx: &TraversalContextStack) -> FunctionCallArgumentTraversalPolicy {
+        self.chain_visit_traversable(move |link| link.visit_func_call_arg(n, ctx))
     }
 
-    fn exit_func_call_arg(&mut self, n: &FunctionCallArgument) {
-        self.chain_exit(move |link| link.exit_func_call_arg(n))
+    fn exit_func_call_arg(&mut self, n: &FunctionCallArgument, ctx: &TraversalContextStack) {
+        self.chain_exit(move |link| link.exit_func_call_arg(n, ctx))
     }
 
-    fn visit_identifier_expr(&mut self, n: &IdentifierNode, ctx: ExpressionTraversalContext) {
+    fn visit_identifier_expr(&mut self, n: &IdentifierNode, ctx: &TraversalContextStack) {
         self.chain_visit(move |link| link.visit_identifier_expr(n, ctx))
     }
 
-    fn visit_literal_expr(&mut self, n: &LiteralNode, ctx: ExpressionTraversalContext) {
+    fn visit_literal_expr(&mut self, n: &LiteralNode, ctx: &TraversalContextStack) {
         self.chain_visit(move |link| link.visit_literal_expr(n, ctx))
     }
 
-    fn visit_this_expr(&mut self, n: &ThisExpressionNode, ctx: ExpressionTraversalContext) {
+    fn visit_this_expr(&mut self, n: &ThisExpressionNode, ctx: &TraversalContextStack) {
         self.chain_visit(move |link| link.visit_this_expr(n, ctx))
     }
 
-    fn visit_super_expr(&mut self, n: &SuperExpressionNode, ctx: ExpressionTraversalContext) {
+    fn visit_super_expr(&mut self, n: &SuperExpressionNode, ctx: &TraversalContextStack) {
         self.chain_visit(move |link| link.visit_super_expr(n, ctx))
     }
 
-    fn visit_parent_expr(&mut self, n: &ParentExpressionNode, ctx: ExpressionTraversalContext) {
+    fn visit_parent_expr(&mut self, n: &ParentExpressionNode, ctx: &TraversalContextStack) {
         self.chain_visit(move |link| link.visit_parent_expr(n, ctx))
     }
 
-    fn visit_virtual_parent_expr(&mut self, n: &VirtualParentExpressionNode, ctx: ExpressionTraversalContext) {
+    fn visit_virtual_parent_expr(&mut self, n: &VirtualParentExpressionNode, ctx: &TraversalContextStack) {
         self.chain_visit(move |link| link.visit_virtual_parent_expr(n, ctx))
     }
 }
\ No newline at end of file
diff --git a/crates/core/src/ast/vars.rs b/crates/core/src/ast/vars.rs
index c4f4a518..8733bcc1 100644
--- a/crates/core/src/ast/vars.rs
+++ b/crates/core/src/ast/vars.rs
@@ -92,12 +92,12 @@ impl<'script> TryFrom<AnyNode<'script>> for LocalVarDeclarationNode<'script> {
 }
 
 impl SyntaxNodeTraversal for LocalVarDeclarationNode<'_> {
-    type TraversalCtx = StatementTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         let tp = visitor.visit_local_var_decl_stmt(self, ctx);
         if tp.traverse_init_value {
-            self.init_value().map(|init_value| init_value.accept(visitor, ExpressionTraversalContext::LocalVarDeclarationInitValue));
+            ctx.push(TraversalContext::LocalVarDeclarationInitValue);
+            self.init_value().map(|init_value| init_value.accept(visitor, ctx));
+            ctx.pop();
         }
         visitor.exit_local_var_decl_stmt(self, ctx);
     }
@@ -153,10 +153,8 @@ impl<'script> TryFrom<AnyNode<'script>> for MemberVarDeclarationNode<'script> {
 }
 
 impl SyntaxNodeTraversal for MemberVarDeclarationNode<'_> {
-    type TraversalCtx = DeclarationTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
-        if ctx == DeclarationTraversalContext::Global {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
+        if ctx.top() == TraversalContext::Global {
             visitor.visit_global_var_decl(self);
         } else {
             visitor.visit_member_var_decl(self, ctx);
diff --git a/crates/core/src/script.rs b/crates/core/src/script.rs
index 0eefc93b..55d668d6 100644
--- a/crates/core/src/script.rs
+++ b/crates/core/src/script.rs
@@ -2,7 +2,7 @@ use std::io;
 use ropey::Rope;
 use thiserror::Error;
 use tree_sitter::{Parser, Tree, LanguageError};
-use crate::{ast::{RootNode, SyntaxNodeTraversal, SyntaxNodeVisitor}, script_document::ScriptDocument};
+use crate::{ast::{RootNode, SyntaxNodeTraversal, SyntaxNodeVisitor, TraversalContextStack}, script_document::ScriptDocument};
 
 
 #[derive(Debug, Clone)]
@@ -80,6 +80,7 @@ impl Script {
     }
 
     pub fn visit_nodes<V: SyntaxNodeVisitor>(&self, visitor: &mut V) {
-        self.root_node().accept(visitor, ());
+        let mut ctx = TraversalContextStack::new();
+        self.root_node().accept(visitor, &mut ctx);
     }
 }
\ No newline at end of file
diff --git a/crates/core/src/tokens/identifier.rs b/crates/core/src/tokens/identifier.rs
index 06012bf9..7c3c3f16 100644
--- a/crates/core/src/tokens/identifier.rs
+++ b/crates/core/src/tokens/identifier.rs
@@ -2,7 +2,7 @@ use std::borrow::Cow;
 use std::fmt::Debug;
 use shrinkwraprs::Shrinkwrap;
 use crate::{script_document::ScriptDocument, AnyNode, DebugRange, NamedSyntaxNode, SyntaxNode};
-use crate::ast::{SyntaxNodeTraversal, ExpressionTraversalContext, SyntaxNodeVisitor};
+use crate::ast::{SyntaxNodeTraversal, TraversalContextStack, SyntaxNodeVisitor};
 
 
 #[derive(Shrinkwrap, Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
@@ -43,9 +43,7 @@ impl Debug for IdentifierNode<'_> {
 }
 
 impl SyntaxNodeTraversal for IdentifierNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         visitor.visit_identifier_expr(self, ctx);
     }
 }
diff --git a/crates/core/src/tokens/literals.rs b/crates/core/src/tokens/literals.rs
index babc2e52..50762be0 100644
--- a/crates/core/src/tokens/literals.rs
+++ b/crates/core/src/tokens/literals.rs
@@ -5,7 +5,7 @@ use shrinkwraprs::Shrinkwrap;
 use thiserror::Error;
 use crate::MISSING_TEXT;
 use crate::{AnyNode, NamedSyntaxNode, SyntaxNode, DebugMaybeAlternate, DebugRange, script_document::ScriptDocument};
-use crate::ast::{SyntaxNodeTraversal, SyntaxNodeVisitor, ExpressionTraversalContext};
+use crate::ast::{SyntaxNodeTraversal, SyntaxNodeVisitor, TraversalContextStack};
 
 
 #[derive(Debug, Clone, Error)]
@@ -377,9 +377,7 @@ impl<'script> TryFrom<AnyNode<'script>> for LiteralNode<'script> {
 }
 
 impl SyntaxNodeTraversal for LiteralNode<'_> {
-    type TraversalCtx = ExpressionTraversalContext;
-
-    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: Self::TraversalCtx) {
+    fn accept<V: SyntaxNodeVisitor>(&self, visitor: &mut V, ctx: &mut TraversalContextStack) {
         visitor.visit_literal_expr(self, ctx);
     }
 }
\ No newline at end of file
diff --git a/crates/diagnostics/src/lib.rs b/crates/diagnostics/src/lib.rs
index 2f5afcd4..7c47769e 100644
--- a/crates/diagnostics/src/lib.rs
+++ b/crates/diagnostics/src/lib.rs
@@ -91,6 +91,7 @@ pub enum DiagnosticKind {
         expected_text: String
     },
     GlobalScopeVarDecl,
+    InvalidLocalVarPlacement,
 
     // symbol anaysis
     SymbolNameTaken {
@@ -143,7 +144,8 @@ impl DiagnosticKind {
             | InvalidAnnotationPlacement 
             | MissingAnnotationArgument { .. }
             | IncompatibleAnnotation { .. } 
-            | GlobalScopeVarDecl => DiagnosticDomain::ContextualSyntaxAnalysis,
+            | GlobalScopeVarDecl 
+            | InvalidLocalVarPlacement => DiagnosticDomain::ContextualSyntaxAnalysis,
             SymbolNameTaken { .. }
             | MissingTypeArg
             | UnnecessaryTypeArg 
@@ -178,6 +180,7 @@ impl DiagnosticKind {
             MissingAnnotationArgument { .. } => lsp::DiagnosticSeverity::ERROR,
             IncompatibleAnnotation { .. } => lsp::DiagnosticSeverity::ERROR,
             GlobalScopeVarDecl => lsp::DiagnosticSeverity::ERROR,
+            InvalidLocalVarPlacement => lsp::DiagnosticSeverity::ERROR,
 
             SymbolNameTaken { .. } => lsp::DiagnosticSeverity::ERROR,
             MissingTypeArg => lsp::DiagnosticSeverity::ERROR,
@@ -213,6 +216,7 @@ impl DiagnosticKind {
             MissingAnnotationArgument { missing } => format!("This annotation requires {missing} argument"),
             IncompatibleAnnotation { annotation_name, expected_text } => format!("{} may only be used for {}", annotation_name, expected_text),
             GlobalScopeVarDecl => "Syntax error: variable declarations in the global scope are not allowed unless you intend to use the @addField annotation.".into(),
+            InvalidLocalVarPlacement => "Local variables can only be declared at the start of the function before all other statements".into(),
 
             SymbolNameTaken { name, .. } => format!("The name \"{}\" is defined multiple times", name),
             MissingTypeArg => "Missing type argument".into(),
diff --git a/crates/lsp/Cargo.toml b/crates/lsp/Cargo.toml
index 7180d02c..e3b52e08 100644
--- a/crates/lsp/Cargo.toml
+++ b/crates/lsp/Cargo.toml
@@ -14,10 +14,11 @@ abs-path = { path = "../abs-path" }
 dashmap.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+serde_repr.workspace = true
 thiserror.workspace = true
 rayon.workspace = true
 bitmask-enum.workspace = true
 shrinkwraprs.workspace = true
 filetime.workspace = true
 tower-lsp = "0.20.0"
-tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread", "io-std", "time"] }
\ No newline at end of file
+tokio = { version = "1.38", features = ["macros", "rt", "rt-multi-thread", "io-std", "time"] }
\ No newline at end of file
diff --git a/crates/lsp/src/main.rs b/crates/lsp/src/main.rs
index 3d8437de..7a8a226b 100644
--- a/crates/lsp/src/main.rs
+++ b/crates/lsp/src/main.rs
@@ -13,6 +13,7 @@ mod reporting;
 mod tasks;
 mod requests;
 mod notifications;
+mod model;
 
 
 #[tower_lsp::async_trait]
@@ -106,6 +107,8 @@ async fn main() {
         .custom_method(requests::projects::create::METHOD, Backend::create_project)
         .custom_method(requests::projects::list::METHOD, Backend::project_list)
         .custom_method(requests::projects::vanilla_dependency_content::METHOD, Backend::vanilla_dependency_content)
+        .custom_method(requests::projects::vanilla_content::METHOD, Backend::vanilla_content)
+        .custom_method(requests::projects::source_tree::METHOD, Backend::source_tree)
         .custom_method(requests::scripts::parent_content::METHOD, Backend::parent_content)
         .custom_method(requests::debug::script_ast::METHOD, Backend::script_ast)
         .custom_method(requests::debug::script_cst::METHOD, Backend::script_cst)
diff --git a/crates/lsp/src/model.rs b/crates/lsp/src/model.rs
new file mode 100644
index 00000000..30734299
--- /dev/null
+++ b/crates/lsp/src/model.rs
@@ -0,0 +1,57 @@
+//! Common types for communication between the server and client
+
+use serde::{Deserialize, Serialize};
+use serde_repr::{Deserialize_repr, Serialize_repr};
+use tower_lsp::lsp_types as lsp;
+use witcherscript_project::{content_graph::GraphNode, content::*};
+
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ContentInfo {
+    pub content_uri: lsp::Url,
+    pub content_kind: ContentKind,
+    pub content_name: String,
+    pub scripts_root_uri: lsp::Url,
+    pub is_in_workspace: bool,
+    pub is_in_repository: bool,
+    pub is_native: bool
+}
+
+impl From<&GraphNode> for ContentInfo {
+    fn from(n: &GraphNode) -> Self {
+        Self {
+            content_uri: n.content.path().to_uri(),
+            content_kind: n.content.as_ref().into(),
+            content_name: n.content.content_name().to_string(),
+            scripts_root_uri: n.content.source_tree_root().to_uri(),
+            is_in_workspace: n.in_workspace,
+            is_in_repository: n.in_repository,
+            is_native: n.is_native
+        }
+    }
+}
+
+#[derive(Debug, Serialize_repr, Deserialize_repr)]
+#[repr(i32)]
+pub enum ContentKind {
+    Raw = 0,
+    WideProject = 1,
+    RedkitProject = 2
+}
+
+impl From<&dyn Content> for ContentKind {
+    fn from(value: &dyn Content) -> Self {
+        let any = value.as_any();
+
+        if any.is::<ProjectDirectory>() {
+            ContentKind::WideProject
+        } 
+        else if any.is::<RedkitProjectDirectory>() {
+            ContentKind::RedkitProject
+        }
+        else {
+            ContentKind::Raw
+        }
+    }
+}
\ No newline at end of file
diff --git a/crates/lsp/src/notifications.rs b/crates/lsp/src/notifications.rs
index a7e02c93..5b4a67f2 100644
--- a/crates/lsp/src/notifications.rs
+++ b/crates/lsp/src/notifications.rs
@@ -36,4 +36,73 @@ pub mod projects {
 
         pub const METHOD: &'static str = "witcherscript-ide/projects/didImportScripts";
     }
+
+    // Sent after making changes to the content graph and performing tasks associated with that
+    pub mod did_change_content_graph {
+        use super::*;
+
+        pub const METHOD: &'static str = "witcherscript-ide/projects/didChangeContentGraph";
+
+        pub struct Type;
+        impl lsp::notification::Notification for Type {
+            type Params = ();
+        
+            const METHOD: &'static str = METHOD;
+        }
+    }
+}
+
+pub mod scripts {
+    use super::*;
+
+    pub mod did_finish_initial_indexing {
+        use super::*;
+
+        pub const METHOD: &'static str = "witcherscript-ide/scripts/didFinishInitialIndexing";
+
+        pub struct Type;
+        impl lsp::notification::Notification for Type {
+            type Params = ();
+        
+            const METHOD: &'static str = METHOD;
+        }
+    }
+    
+    pub mod did_start_script_parsing {
+        use super::*;
+
+        #[derive(Debug, Serialize, Deserialize)]
+        #[serde(rename_all = "camelCase")]
+        pub struct Parameters {
+            pub content_name: String,
+        }
+
+        pub const METHOD: &'static str = "witcherscript-ide/scripts/didStartScriptParsing";
+
+        pub struct Type;
+        impl lsp::notification::Notification for Type {
+            type Params = Parameters;
+        
+            const METHOD: &'static str = METHOD;
+        }
+    }
+
+    pub mod did_finish_script_parsing {
+        use super::*;
+
+        #[derive(Debug, Serialize, Deserialize)]
+        #[serde(rename_all = "camelCase")]
+        pub struct Parameters {
+            pub content_name: String,
+        }
+
+        pub const METHOD: &'static str = "witcherscript-ide/scripts/didFinishScriptParsing";
+
+        pub struct Type;
+        impl lsp::notification::Notification for Type {
+            type Params = Parameters;
+        
+            const METHOD: &'static str = METHOD;
+        }
+    }
 }
\ No newline at end of file
diff --git a/crates/lsp/src/providers/common.rs b/crates/lsp/src/providers/common.rs
index 698a49ac..4ae86186 100644
--- a/crates/lsp/src/providers/common.rs
+++ b/crates/lsp/src/providers/common.rs
@@ -177,7 +177,7 @@ impl<'a> TextDocumentPositionResolver<'a> {
         });
     }
 
-    fn found_expression_ident(&mut self, n: &IdentifierNode, expr: ExpressionNode, ctx: Option<ExpressionTraversalContext>) {
+    fn found_expression_ident(&mut self, n: &IdentifierNode, expr: ExpressionNode, ctx: TraversalContext) {
         let expr_typ = evaluate_expression(
             expr, ctx,
             self.doc, 
@@ -345,7 +345,7 @@ impl SyntaxNodeVisitor for TextDocumentPositionResolver<'_> {
         }
     }
 
-    fn visit_member_var_decl(&mut self, n: &MemberVarDeclarationNode, _: DeclarationTraversalContext) {
+    fn visit_member_var_decl(&mut self, n: &MemberVarDeclarationNode, _: &TraversalContextStack) {
         let var_type = n.var_type();
         
         // not checking the annotation, because it'll be erroneous anyways
@@ -357,7 +357,7 @@ impl SyntaxNodeVisitor for TextDocumentPositionResolver<'_> {
         }
     }
 
-    fn visit_autobind_decl(&mut self, n: &AutobindDeclarationNode, _: DeclarationTraversalContext) {
+    fn visit_autobind_decl(&mut self, n: &AutobindDeclarationNode, _: &TraversalContextStack) {
         let name = n.name();
         let autobind_type = n.autobind_type();
 
@@ -369,35 +369,35 @@ impl SyntaxNodeVisitor for TextDocumentPositionResolver<'_> {
         }
     }
 
-    fn visit_member_default_val(&mut self, n: &MemberDefaultValueNode, _: DeclarationTraversalContext) -> MemberDefaultValueTraversalPolicy {
+    fn visit_member_default_val(&mut self, n: &MemberDefaultValueNode, ctx: &TraversalContextStack) -> MemberDefaultValueTraversalPolicy {
         if self.pos_filter_payload.borrow().done {
             let member = n.member();
 
             if member.spans_position(self.pos) {
-                self.found_expression_ident(&member, member.clone().into(), None);
+                self.found_expression_ident(&member, member.clone().into(), ctx.top());
             }
         }
 
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_member_defaults_block_assignment(&mut self, n: &MemberDefaultsBlockAssignmentNode) -> MemberDefaultValueTraversalPolicy {
+    fn visit_member_defaults_block_assignment(&mut self, n: &MemberDefaultsBlockAssignmentNode, ctx: &TraversalContextStack) -> MemberDefaultValueTraversalPolicy {
         if self.pos_filter_payload.borrow().done {
             let member = n.member();
 
             if member.spans_position(self.pos) {
-                self.found_expression_ident(&member, member.clone().into(), None);
+                self.found_expression_ident(&member, member.clone().into(), ctx.top());
             }
         }
 
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_member_hint(&mut self, n: &MemberHintNode, _: DeclarationTraversalContext) {
+    fn visit_member_hint(&mut self, n: &MemberHintNode, ctx: &TraversalContextStack) {
         let member = n.member();
 
         if member.spans_position(self.pos) {
-            self.found_expression_ident(&member, member.clone().into(), None);
+            self.found_expression_ident(&member, member.clone().into(), ctx.top());
         }
     }
 
@@ -420,7 +420,7 @@ impl SyntaxNodeVisitor for TextDocumentPositionResolver<'_> {
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, _: DeclarationTraversalContext) -> FunctionDeclarationTraversalPolicy {
+    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, _: &TraversalContextStack) -> FunctionDeclarationTraversalPolicy {
         if self.pos_filter_payload.borrow().done {
             let name = n.name();
 
@@ -436,7 +436,7 @@ impl SyntaxNodeVisitor for TextDocumentPositionResolver<'_> {
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_event_decl(&mut self, n: &EventDeclarationNode, _: DeclarationTraversalContext) -> EventDeclarationTraversalPolicy {
+    fn visit_event_decl(&mut self, n: &EventDeclarationNode, _: &TraversalContextStack) -> EventDeclarationTraversalPolicy {
         if self.pos_filter_payload.borrow().done {
             let name = n.name();
 
@@ -451,7 +451,7 @@ impl SyntaxNodeVisitor for TextDocumentPositionResolver<'_> {
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_func_param_group(&mut self, n: &FunctionParameterGroupNode, _: FunctionTraversalContext) {
+    fn visit_func_param_group(&mut self, n: &FunctionParameterGroupNode, _: &TraversalContextStack) {
         let param_type = n.param_type();
 
         if param_type.spans_position(self.pos) {
@@ -463,7 +463,7 @@ impl SyntaxNodeVisitor for TextDocumentPositionResolver<'_> {
     }
 
 
-    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, _: StatementTraversalContext) -> VarDeclarationTraversalPolicy {
+    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, _: &TraversalContextStack) -> VarDeclarationTraversalPolicy {
         if self.pos_filter_payload.borrow().done {
             let var_type = n.var_type();
 
@@ -479,39 +479,39 @@ impl SyntaxNodeVisitor for TextDocumentPositionResolver<'_> {
     }
 
     
-    fn visit_this_expr(&mut self, n: &ThisExpressionNode, _: ExpressionTraversalContext) {
+    fn visit_this_expr(&mut self, n: &ThisExpressionNode, _: &TraversalContextStack) {
         self.found_this_kw(n);
     }
 
-    fn visit_super_expr(&mut self, n: &SuperExpressionNode, _: ExpressionTraversalContext) {
+    fn visit_super_expr(&mut self, n: &SuperExpressionNode, _: &TraversalContextStack) {
         self.found_super_kw(n);
     }
 
-    fn visit_parent_expr(&mut self, n: &ParentExpressionNode, _: ExpressionTraversalContext) {
+    fn visit_parent_expr(&mut self, n: &ParentExpressionNode, _: &TraversalContextStack) {
         self.found_parent_kw(n);
     }
 
-    fn visit_virtual_parent_expr(&mut self, n: &VirtualParentExpressionNode, _: ExpressionTraversalContext) {
+    fn visit_virtual_parent_expr(&mut self, n: &VirtualParentExpressionNode, _: &TraversalContextStack) {
         self.found_virtual_parent_kw(n);
     }
 
-    fn visit_identifier_expr(&mut self, n: &IdentifierNode, cx: ExpressionTraversalContext) {
-        self.found_expression_ident(n, n.clone().into(), Some(cx));
+    fn visit_identifier_expr(&mut self, n: &IdentifierNode, ctx: &TraversalContextStack) {
+        self.found_expression_ident(n, n.clone().into(), ctx.top());
     }
 
-    fn visit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, cx: ExpressionTraversalContext) -> MemberFieldExpressionTraversalPolicy {
+    fn visit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, ctx: &TraversalContextStack) -> MemberFieldExpressionTraversalPolicy {
         if self.pos_filter_payload.borrow().done {
             let member = n.member();
 
             if member.spans_position(self.pos) {
-                self.found_expression_ident(&member, n.clone().into(), Some(cx));
+                self.found_expression_ident(&member, n.clone().into(), ctx.top());
             }
         }
 
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_new_expr(&mut self, n: &NewExpressionNode, _: ExpressionTraversalContext) -> NewExpressionTraversalPolicy {
+    fn visit_new_expr(&mut self, n: &NewExpressionNode, _: &TraversalContextStack) -> NewExpressionTraversalPolicy {
         if self.pos_filter_payload.borrow().done {
             let class = n.class();
 
@@ -523,7 +523,7 @@ impl SyntaxNodeVisitor for TextDocumentPositionResolver<'_> {
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, _: ExpressionTraversalContext) -> TypeCastExpressionTraversalPolicy {
+    fn visit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, _: &TraversalContextStack) -> TypeCastExpressionTraversalPolicy {
         if self.pos_filter_payload.borrow().done {
             let target_type = n.target_type();
 
diff --git a/crates/lsp/src/providers/custom/projects.rs b/crates/lsp/src/providers/custom/projects.rs
index 4edc9639..aa9704e1 100644
--- a/crates/lsp/src/providers/custom/projects.rs
+++ b/crates/lsp/src/providers/custom/projects.rs
@@ -1,9 +1,8 @@
 use std::io::Write;
 use abs_path::AbsPath;
-use tower_lsp::lsp_types as lsp;
 use tower_lsp::jsonrpc::{self, Result};
 use witcherscript_project::{content::VANILLA_CONTENT_NAME, Manifest};
-use crate::{notifications, requests::{self, ContentInfo}, Backend};
+use crate::{notifications, requests, model, Backend};
 
 
 pub trait LangaugeServerCustomProjects {
@@ -11,9 +10,13 @@ pub trait LangaugeServerCustomProjects {
 
     async fn vanilla_dependency_content(&self, params: requests::projects::vanilla_dependency_content::Parameters) -> Result<requests::projects::vanilla_dependency_content::Response>;
 
+    async fn vanilla_content(&self, params: requests::projects::vanilla_content::Parameters) -> Result<requests::projects::vanilla_content::Response>;
+
     async fn project_list(&self, params: requests::projects::list::Parameters) -> Result<requests::projects::list::Response>;
 
     async fn did_import_scripts(&self, params: notifications::projects::did_import_scripts::Parameters);
+
+    async fn source_tree(&self, params: requests::projects::source_tree::Parameters) -> Result<requests::projects::source_tree::Response>;
 }
 
 
@@ -148,13 +151,7 @@ impl LangaugeServerCustomProjects for Backend {
         let mut content0_info = None;
         for n in graph.walk_dependencies(&project_path) {
             if n.content.content_name() == VANILLA_CONTENT_NAME {
-                content0_info = Some(ContentInfo {
-                    content_uri: n.content.path().to_uri(),
-                    scripts_root_uri: n.content.source_tree_root().to_uri(),
-                    content_name: n.content.content_name().to_owned(),
-                    is_in_workspace: n.in_workspace,
-                    is_in_repository: n.in_repository
-                });
+                content0_info = Some(model::ContentInfo::from(n));
             }
         }
 
@@ -171,6 +168,21 @@ impl LangaugeServerCustomProjects for Backend {
         }
     }
 
+    async fn vanilla_content(&self, _: requests::projects::vanilla_content::Parameters) -> Result<requests::projects::vanilla_content::Response> {
+        let graph = self.content_graph.read().await;
+
+        let mut content0_info = None;
+        for n in graph.nodes() {
+            if n.content.content_name() == VANILLA_CONTENT_NAME {
+                content0_info = Some(model::ContentInfo::from(n));
+            }
+        }
+
+        Ok(requests::projects::vanilla_content::Response {
+            content0_info
+        })
+    }
+
     async fn project_list(&self, params: requests::projects::list::Parameters) -> Result<requests::projects::list::Response> {
         let only_from_workspace = params.only_from_workspace.unwrap_or(true);
 
@@ -182,13 +194,7 @@ impl LangaugeServerCustomProjects for Backend {
                 continue;
             }
 
-            project_infos.push(ContentInfo { 
-                content_uri: lsp::Url::from_file_path(n.content.path()).unwrap(), 
-                scripts_root_uri: lsp::Url::from_file_path(n.content.source_tree_root()).unwrap(), 
-                content_name: n.content.content_name().into(), 
-                is_in_workspace: n.in_workspace, 
-                is_in_repository: n.in_repository 
-            })
+            project_infos.push(model::ContentInfo::from(n));
         }
 
         Ok(requests::projects::list::Response {
@@ -213,6 +219,39 @@ impl LangaugeServerCustomProjects for Backend {
             self.reporter.log_error("Imported files do no belong to a known content!").await;
         }
     }
+    
+    async fn source_tree(&self, params: requests::projects::source_tree::Parameters) -> Result<requests::projects::source_tree::Response> {
+        let content_path: AbsPath;
+        if let Ok(abs_path) = AbsPath::try_from(params.content_uri) {
+            content_path = abs_path;
+        } else {
+            return Err(jsonrpc::Error::invalid_params("content_uri parameter is not a valid file URI"));
+        }
+
+        let source_tree = self.source_trees.get(&content_path);
+
+        if source_tree.is_none() {
+            return Err(jsonrpc::Error { 
+                code: jsonrpc::ErrorCode::ServerError(-1070), 
+                message: "The content is absent from the content graph".into(), 
+                data: None
+            })
+        }
+
+        let source_tree = source_tree.unwrap();
+        let scripts_root_path = source_tree.script_root().as_path().to_path_buf();
+        let mut local_script_paths: Vec<_> = source_tree.iter().map(|f| f.path.local().to_path_buf()).collect();
+        local_script_paths.sort();
+
+        let res = requests::projects::source_tree::Response {
+            scripts_root_path,
+            local_script_paths
+        };
+
+        drop(source_tree);
+
+        Ok(res)
+    }
 }
 
 
diff --git a/crates/lsp/src/providers/custom/scripts.rs b/crates/lsp/src/providers/custom/scripts.rs
index d745b23e..989b89d6 100644
--- a/crates/lsp/src/providers/custom/scripts.rs
+++ b/crates/lsp/src/providers/custom/scripts.rs
@@ -1,6 +1,6 @@
 use abs_path::AbsPath;
 use tower_lsp::jsonrpc::{self, Result};
-use crate::{requests::{self, ContentInfo}, Backend};
+use crate::{requests, model, Backend};
 
 
 pub trait LangaugeServerCustomScripts {
@@ -41,13 +41,7 @@ impl LangaugeServerCustomScripts for Backend {
 
         if let Some(n) = self.content_graph.read().await.get_node_by_path(&parent_content_path) {
             Ok(requests::scripts::parent_content::Response {
-                parent_content_info: ContentInfo { 
-                    content_uri: parent_content_path.into(), 
-                    scripts_root_uri: n.content.source_tree_root().to_uri(), 
-                    content_name: n.content.content_name().into(),
-                    is_in_workspace: n.in_workspace,
-                    is_in_repository: n.in_repository
-                }
+                parent_content_info: model::ContentInfo::from(n)
             })
         } else {
             Err(jsonrpc::Error {
diff --git a/crates/lsp/src/providers/initialization.rs b/crates/lsp/src/providers/initialization.rs
index 574afb06..35e672c7 100644
--- a/crates/lsp/src/providers/initialization.rs
+++ b/crates/lsp/src/providers/initialization.rs
@@ -6,50 +6,53 @@ use tower_lsp::lsp_types as lsp;
 use tower_lsp::jsonrpc::Result;
 use witcherscript_project::redkit::RedkitManifest;
 use witcherscript_project::Manifest;
-use crate::Backend;
+use crate::{notifications, Backend};
 
 
-#[derive(Deserialize)]
+#[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct InitializationOptions {
-    native_content_uri: lsp::Url,
+    rayon_threads: i32,
+    native_content_path: PathBuf,
     game_directory: PathBuf,
     content_repositories: Vec<PathBuf>,
     enable_syntax_analysis: bool
 }
 
-impl std::fmt::Debug for InitializationOptions {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("InitializationOptions")
-            .field("native_content_uri", &self.native_content_uri.to_string())
-            .field("game_directory", &self.game_directory)
-            .field("content_repositories", &self.content_repositories)
-            .field("enable_syntax_analysis", &self.enable_syntax_analysis)
-            .finish()
-    }
-}
-
 impl Backend {
     pub async fn initialize_impl(&self, params: lsp::InitializeParams) -> Result<lsp::InitializeResult> {
-        if let Some(workspace_folders) = params.workspace_folders {
-            let mut workspace_roots = self.workspace_roots.write().await;
-            *workspace_roots = workspace_folders.into_iter()
-                .map(|f| AbsPath::try_from(f.uri).unwrap())
-                .collect();
-        }
-    
         if let Some(init_opts) = params.initialization_options {
             match serde_json::from_value::<InitializationOptions>(init_opts) {
                 Ok(val) => {
                     self.reporter.log_info(format!("Initializing server with: {:#?}", val)).await;
+
+
+                    let rayon_threads = if val.rayon_threads > 0 {
+                        val.rayon_threads as usize
+                    } else {
+                        std::thread::available_parallelism()
+                            .expect("Cannot access the number of available threads")
+                            .get()
+                            .checked_sub(2) // make sure rayon doesn't take up all resources
+                            .unwrap_or(1)
+                    };
+
+                    rayon::ThreadPoolBuilder::new()
+                        .num_threads(rayon_threads) 
+                        .build_global()
+                        .expect("rayon::ThreadPoolBuilder panik");
+
+                    self.reporter.log_info(format!("Configured tokio worker threads: {}", tokio::runtime::Handle::current().metrics().num_workers())).await;
+                    self.reporter.log_info(format!("Configured rayon threads: {}", rayon_threads)).await;
+
     
-                    match AbsPath::try_from(val.native_content_uri) {
+                    match AbsPath::try_from(val.native_content_path) {
                         Ok(native_content_path) => {
                             let mut graph = self.content_graph.write().await;
                             graph.set_native_content_path(&native_content_path);
                         },
                         Err(_) => {
-                            self.reporter.log_error("Invalid native_content_path URI").await;
+                            self.reporter.log_error("Invalid native_content_path").await;
                         }
                     }
     
@@ -65,6 +68,13 @@ impl Backend {
         } else {
             self.reporter.log_error("Initialization options missing!").await;
         }
+
+        if let Some(workspace_folders) = params.workspace_folders {
+            let mut workspace_roots = self.workspace_roots.write().await;
+            *workspace_roots = workspace_folders.into_iter()
+                .map(|f| AbsPath::try_from(f.uri).unwrap())
+                .collect();
+        }
     
     
         let file_ops_filter_ws = lsp::FileOperationFilter {
@@ -155,7 +165,9 @@ impl Backend {
         self.setup_workspace_content_scanners().await;
         self.setup_repository_content_scanners().await;
         self.build_content_graph(true).await;
-    
+
+        self.client.send_notification::<notifications::scripts::did_finish_initial_indexing::Type>(()).await;
+
         self.reporter.commit_all_diagnostics().await;
     }
 }
\ No newline at end of file
diff --git a/crates/lsp/src/providers/selection_range.rs b/crates/lsp/src/providers/selection_range.rs
index 0a817584..6b009f66 100644
--- a/crates/lsp/src/providers/selection_range.rs
+++ b/crates/lsp/src/providers/selection_range.rs
@@ -268,7 +268,7 @@ impl SyntaxNodeVisitor for SelectionRangeResolver {
 
 
 
-    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, _: DeclarationTraversalContext) -> FunctionDeclarationTraversalPolicy {
+    fn visit_member_func_decl(&mut self, n: &FunctionDeclarationNode, _: &TraversalContextStack) -> FunctionDeclarationTraversalPolicy {
         self.range_stack.push(n.range());
 
         if self.payload.borrow().done {
@@ -298,7 +298,7 @@ impl SyntaxNodeVisitor for SelectionRangeResolver {
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_event_decl(&mut self, n: &EventDeclarationNode, _: DeclarationTraversalContext) -> EventDeclarationTraversalPolicy {
+    fn visit_event_decl(&mut self, n: &EventDeclarationNode, _: &TraversalContextStack) -> EventDeclarationTraversalPolicy {
         self.range_stack.push(n.range());
 
         if self.payload.borrow().done {
@@ -319,7 +319,7 @@ impl SyntaxNodeVisitor for SelectionRangeResolver {
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_func_param_group(&mut self, n: &FunctionParameterGroupNode, _: FunctionTraversalContext) {
+    fn visit_func_param_group(&mut self, n: &FunctionParameterGroupNode, _: &TraversalContextStack) {
         self.range_stack.push(n.range());
 
         if n.param_type().spans_position(self.pos) {
@@ -333,7 +333,7 @@ impl SyntaxNodeVisitor for SelectionRangeResolver {
         }
     }
 
-    fn visit_member_var_decl(&mut self, n: &MemberVarDeclarationNode, _: DeclarationTraversalContext) {
+    fn visit_member_var_decl(&mut self, n: &MemberVarDeclarationNode, _: &TraversalContextStack) {
         self.range_stack.push(n.range());
 
         if let Some(annot) = n.annotation().filter(|annot| annot.spans_position(self.pos)) {
@@ -350,7 +350,7 @@ impl SyntaxNodeVisitor for SelectionRangeResolver {
         }
     }
 
-    fn visit_autobind_decl(&mut self, n: &AutobindDeclarationNode, _: DeclarationTraversalContext) {
+    fn visit_autobind_decl(&mut self, n: &AutobindDeclarationNode, _: &TraversalContextStack) {
         self.range_stack.push(n.range());
 
         if n.name().spans_position(self.pos) {
@@ -378,7 +378,7 @@ impl SyntaxNodeVisitor for SelectionRangeResolver {
         }
     }
 
-    fn visit_member_default_val(&mut self, n: &MemberDefaultValueNode, _: DeclarationTraversalContext) -> MemberDefaultValueTraversalPolicy {
+    fn visit_member_default_val(&mut self, n: &MemberDefaultValueNode, _: &TraversalContextStack) -> MemberDefaultValueTraversalPolicy {
         self.range_stack.push(n.range());
 
         if self.payload.borrow().done {
@@ -390,13 +390,13 @@ impl SyntaxNodeVisitor for SelectionRangeResolver {
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_member_defaults_block(&mut self, n: &MemberDefaultsBlockNode, _: DeclarationTraversalContext) -> MemberDefaultsBlockTraversalPolicy {
+    fn visit_member_defaults_block(&mut self, n: &MemberDefaultsBlockNode, _: &TraversalContextStack) -> MemberDefaultsBlockTraversalPolicy {
         self.range_stack.push(n.range());
 
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_member_defaults_block_assignment(&mut self, n: &MemberDefaultsBlockAssignmentNode) -> MemberDefaultValueTraversalPolicy {
+    fn visit_member_defaults_block_assignment(&mut self, n: &MemberDefaultsBlockAssignmentNode, _: &TraversalContextStack) -> MemberDefaultValueTraversalPolicy {
         self.range_stack.push(n.range());
 
         if self.payload.borrow().done {
@@ -408,7 +408,7 @@ impl SyntaxNodeVisitor for SelectionRangeResolver {
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_member_hint(&mut self, n: &MemberHintNode, _: DeclarationTraversalContext) {
+    fn visit_member_hint(&mut self, n: &MemberHintNode, _: &TraversalContextStack) {
         self.range_stack.push(n.range());
 
         if n.member().spans_position(self.pos) {
@@ -422,7 +422,7 @@ impl SyntaxNodeVisitor for SelectionRangeResolver {
 
 
 
-    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, _: StatementTraversalContext) -> VarDeclarationTraversalPolicy {
+    fn visit_local_var_decl_stmt(&mut self, n: &LocalVarDeclarationNode, _: &TraversalContextStack) -> VarDeclarationTraversalPolicy {
         self.range_stack.push(n.range());
 
         if self.payload.borrow().done {
@@ -437,13 +437,13 @@ impl SyntaxNodeVisitor for SelectionRangeResolver {
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_if_stmt(&mut self, n: &IfConditionalNode, _: StatementTraversalContext) -> IfConditionalTraversalPolicy {
+    fn visit_if_stmt(&mut self, n: &IfConditionalNode, _: &TraversalContextStack) -> IfConditionalTraversalPolicy {
         self.range_stack.push(n.range());
 
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_switch_stmt(&mut self, n: &SwitchConditionalNode, _: StatementTraversalContext) -> SwitchConditionalTraversalPolicy {
+    fn visit_switch_stmt(&mut self, n: &SwitchConditionalNode, _: &TraversalContextStack) -> SwitchConditionalTraversalPolicy {
         self.range_stack.push(n.range());
 
         if n.body().spans_position(self.pos) {
@@ -453,104 +453,104 @@ impl SyntaxNodeVisitor for SelectionRangeResolver {
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_switch_stmt_case(&mut self, n: &SwitchConditionalCaseLabelNode) -> SwitchConditionalCaseLabelTraversalPolicy {
+    fn visit_switch_stmt_case(&mut self, n: &SwitchConditionalCaseLabelNode, _: &TraversalContextStack) -> SwitchConditionalCaseLabelTraversalPolicy {
         self.range_stack.push(n.range());
 
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_switch_stmt_default(&mut self, n: &SwitchConditionalDefaultLabelNode) {
+    fn visit_switch_stmt_default(&mut self, n: &SwitchConditionalDefaultLabelNode, _: &TraversalContextStack) {
         self.range_stack.push(n.range());
     }
 
-    fn visit_for_stmt(&mut self, n: &ForLoopNode, _: StatementTraversalContext) -> ForLoopTraversalPolicy {
+    fn visit_for_stmt(&mut self, n: &ForLoopNode, _: &TraversalContextStack) -> ForLoopTraversalPolicy {
         self.range_stack.push(n.range());
 
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_while_stmt(&mut self, n: &WhileLoopNode, _: StatementTraversalContext) -> WhileLoopTraversalPolicy {
+    fn visit_while_stmt(&mut self, n: &WhileLoopNode, _: &TraversalContextStack) -> WhileLoopTraversalPolicy {
         self.range_stack.push(n.range());
 
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_do_while_stmt(&mut self, n: &DoWhileLoopNode, _: StatementTraversalContext) -> DoWhileLoopTraversalPolicy {
+    fn visit_do_while_stmt(&mut self, n: &DoWhileLoopNode, _: &TraversalContextStack) -> DoWhileLoopTraversalPolicy {
         self.range_stack.push(n.range());
 
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_compound_stmt(&mut self, n: &CompoundStatementNode, _: StatementTraversalContext) -> CompoundStatementTraversalPolicy {
+    fn visit_compound_stmt(&mut self, n: &CompoundStatementNode, _: &TraversalContextStack) -> CompoundStatementTraversalPolicy {
         self.range_stack.push(n.range());
 
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_expr_stmt(&mut self, n: &ExpressionStatementNode, _: StatementTraversalContext) -> ExpressionStatementTraversalPolicy {
+    fn visit_expr_stmt(&mut self, n: &ExpressionStatementNode, _: &TraversalContextStack) -> ExpressionStatementTraversalPolicy {
         self.range_stack.push(n.range());
 
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_return_stmt(&mut self, n: &ReturnStatementNode, _: StatementTraversalContext) -> ReturnStatementTraversalPolicy {
+    fn visit_return_stmt(&mut self, n: &ReturnStatementNode, _: &TraversalContextStack) -> ReturnStatementTraversalPolicy {
         self.range_stack.push(n.range());
 
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_delete_stmt(&mut self, n: &DeleteStatementNode, _: StatementTraversalContext) -> DeleteStatementTraversalPolicy {
+    fn visit_delete_stmt(&mut self, n: &DeleteStatementNode, _: &TraversalContextStack) -> DeleteStatementTraversalPolicy {
         self.range_stack.push(n.range());
 
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_break_stmt(&mut self, n: &BreakStatementNode, _: StatementTraversalContext) {
+    fn visit_break_stmt(&mut self, n: &BreakStatementNode, _: &TraversalContextStack) {
         self.range_stack.push(n.range());
     }
 
-    fn visit_continue_stmt(&mut self, n: &ContinueStatementNode, _: StatementTraversalContext) {
+    fn visit_continue_stmt(&mut self, n: &ContinueStatementNode, _: &TraversalContextStack) {
         self.range_stack.push(n.range());
     }
 
-    fn visit_nop_stmt(&mut self, n: &NopNode, _: StatementTraversalContext) {
+    fn visit_nop_stmt(&mut self, n: &NopNode, _: &TraversalContextStack) {
         self.range_stack.push(n.range());
     }
 
 
     
 
-    fn visit_nested_expr(&mut self, n: &NestedExpressionNode, _: ExpressionTraversalContext) -> NestedExpressionTraversalPolicy {
+    fn visit_nested_expr(&mut self, n: &NestedExpressionNode, _: &TraversalContextStack) -> NestedExpressionTraversalPolicy {
         self.range_stack.push(n.range());
 
         TraversalPolicy::default_to(true)
     }  
 
-    fn visit_array_expr(&mut self, n: &ArrayExpressionNode, _: ExpressionTraversalContext) -> ArrayExpressionTraversalPolicy {
+    fn visit_array_expr(&mut self, n: &ArrayExpressionNode, _: &TraversalContextStack) -> ArrayExpressionTraversalPolicy {
         self.range_stack.push(n.range());
 
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_assign_op_expr(&mut self, n: &AssignmentOperationExpressionNode, _: ExpressionTraversalContext) -> AssignmentOperationExpressionTraversalPolicy {
+    fn visit_assign_op_expr(&mut self, n: &AssignmentOperationExpressionNode, _: &TraversalContextStack) -> AssignmentOperationExpressionTraversalPolicy {
         self.range_stack.push(n.range());
 
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_binary_op_expr(&mut self, n: &BinaryOperationExpressionNode, _: ExpressionTraversalContext) -> BinaryOperationExpressionTraversalPolicy {
+    fn visit_binary_op_expr(&mut self, n: &BinaryOperationExpressionNode, _: &TraversalContextStack) -> BinaryOperationExpressionTraversalPolicy {
         self.range_stack.push(n.range());
 
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_unary_op_expr(&mut self, n: &UnaryOperationExpressionNode, _: ExpressionTraversalContext) -> UnaryOperationExpressionTraversalPolicy {
+    fn visit_unary_op_expr(&mut self, n: &UnaryOperationExpressionNode, _: &TraversalContextStack) -> UnaryOperationExpressionTraversalPolicy {
         self.range_stack.push(n.range());
         
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, _: ExpressionTraversalContext) -> MemberFieldExpressionTraversalPolicy {
+    fn visit_member_access_expr(&mut self, n: &MemberAccessExpressionNode, _: &TraversalContextStack) -> MemberFieldExpressionTraversalPolicy {
         self.range_stack.push(n.range());
 
         if self.payload.borrow().done {
@@ -562,7 +562,7 @@ impl SyntaxNodeVisitor for SelectionRangeResolver {
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_new_expr(&mut self, n: &NewExpressionNode, _: ExpressionTraversalContext) -> NewExpressionTraversalPolicy {
+    fn visit_new_expr(&mut self, n: &NewExpressionNode, _: &TraversalContextStack) -> NewExpressionTraversalPolicy {
         self.range_stack.push(n.range());
 
         if self.payload.borrow().done {
@@ -574,7 +574,7 @@ impl SyntaxNodeVisitor for SelectionRangeResolver {
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, _: ExpressionTraversalContext) -> TypeCastExpressionTraversalPolicy {
+    fn visit_type_cast_expr(&mut self, n: &TypeCastExpressionNode, _: &TraversalContextStack) -> TypeCastExpressionTraversalPolicy {
         self.range_stack.push(n.range());
 
         if self.payload.borrow().done {
@@ -586,13 +586,13 @@ impl SyntaxNodeVisitor for SelectionRangeResolver {
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_ternary_cond_expr(&mut self, n: &TernaryConditionalExpressionNode, _: ExpressionTraversalContext) -> TernaryConditionalExpressionTraversalPolicy {
+    fn visit_ternary_cond_expr(&mut self, n: &TernaryConditionalExpressionNode, _: &TraversalContextStack) -> TernaryConditionalExpressionTraversalPolicy {
         self.range_stack.push(n.range());
         
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_func_call_expr(&mut self, n: &FunctionCallExpressionNode, _: ExpressionTraversalContext) -> FunctionCallExpressionTraversalPolicy {
+    fn visit_func_call_expr(&mut self, n: &FunctionCallExpressionNode, _: &TraversalContextStack) -> FunctionCallExpressionTraversalPolicy {
         self.range_stack.push(n.range());
 
         if let Some(args) = n.args() {
@@ -604,27 +604,27 @@ impl SyntaxNodeVisitor for SelectionRangeResolver {
         TraversalPolicy::default_to(true)
     }
 
-    fn visit_identifier_expr(&mut self, n: &IdentifierNode, _: ExpressionTraversalContext) {
+    fn visit_identifier_expr(&mut self, n: &IdentifierNode, _: &TraversalContextStack) {
         self.range_stack.push(n.range());
     }
 
-    fn visit_literal_expr(&mut self, n: &LiteralNode, _: ExpressionTraversalContext) {
+    fn visit_literal_expr(&mut self, n: &LiteralNode, _: &TraversalContextStack) {
         self.range_stack.push(n.range());
     }
     
-    fn visit_this_expr(&mut self, n: &ThisExpressionNode, _: ExpressionTraversalContext) {
+    fn visit_this_expr(&mut self, n: &ThisExpressionNode, _: &TraversalContextStack) {
         self.range_stack.push(n.range());
     }
 
-    fn visit_super_expr(&mut self, n: &SuperExpressionNode, _: ExpressionTraversalContext) {
+    fn visit_super_expr(&mut self, n: &SuperExpressionNode, _: &TraversalContextStack) {
         self.range_stack.push(n.range());
     }
 
-    fn visit_parent_expr(&mut self, n: &ParentExpressionNode, _: ExpressionTraversalContext) {
+    fn visit_parent_expr(&mut self, n: &ParentExpressionNode, _: &TraversalContextStack) {
         self.range_stack.push(n.range());
     }
 
-    fn visit_virtual_parent_expr(&mut self, n: &VirtualParentExpressionNode, _: ExpressionTraversalContext) {
+    fn visit_virtual_parent_expr(&mut self, n: &VirtualParentExpressionNode, _: &TraversalContextStack) {
         self.range_stack.push(n.range());
     }
 }
diff --git a/crates/lsp/src/requests.rs b/crates/lsp/src/requests.rs
index 0e6fa5d9..b2d1f98f 100644
--- a/crates/lsp/src/requests.rs
+++ b/crates/lsp/src/requests.rs
@@ -1,17 +1,7 @@
 use serde::Deserialize;
 use serde::Serialize;
 use tower_lsp::lsp_types as lsp;
-
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ContentInfo {
-    pub content_uri: lsp::Url,
-    pub scripts_root_uri: lsp::Url,
-    pub content_name: String,
-    pub is_in_workspace: bool,
-    pub is_in_repository: bool
-}
+use super::model;
 
 
 pub mod projects {
@@ -52,7 +42,7 @@ pub mod projects {
         #[derive(Debug, Serialize, Deserialize)]
         #[serde(rename_all = "camelCase")]
         pub struct Response {
-            pub project_infos: Vec<ContentInfo>
+            pub project_infos: Vec<model::ContentInfo>
         }
 
         pub const METHOD: &'static str = "witcherscript-ide/projects/list";
@@ -71,11 +61,52 @@ pub mod projects {
         #[derive(Debug, Serialize, Deserialize)]
         #[serde(rename_all = "camelCase")]
         pub struct Response {
-            pub content0_info: ContentInfo
+            pub content0_info: model::ContentInfo
         }
 
         pub const METHOD: &'static str = "witcherscript-ide/projects/vanillaDependencyContent";
     }
+
+    /// Returns information about content0 content, doesn't need any source content to check as opposed to [`vanilla_dependency_content`].
+    /// Returns None if doesn't find content0
+    pub mod vanilla_content {
+        use super::*;
+
+        #[derive(Debug, Serialize, Deserialize)]
+        #[serde(rename_all = "camelCase")]
+        pub struct Parameters {
+            
+        }
+
+        #[derive(Debug, Serialize, Deserialize)]
+        #[serde(rename_all = "camelCase")]
+        pub struct Response {
+            pub content0_info: Option<model::ContentInfo>
+        }
+
+        pub const METHOD: &'static str = "witcherscript-ide/projects/vanillaContent";
+    }
+
+    /// Returns a list of source file paths associated with a given content sorted in alphabetical order
+    pub mod source_tree {
+        use std::path::PathBuf;
+        use super::*;
+
+        #[derive(Debug, Serialize, Deserialize)]
+        #[serde(rename_all = "camelCase")]
+        pub struct Parameters {
+            pub content_uri: lsp::Url
+        }
+        
+        #[derive(Debug, Serialize, Deserialize)]
+        #[serde(rename_all = "camelCase")]
+        pub struct Response {
+            pub scripts_root_path: PathBuf,
+            pub local_script_paths: Vec<PathBuf>
+        }
+
+        pub const METHOD: &'static str = "witcherscript-ide/projects/sourceTree";
+    }
 }
 
 pub mod scripts {
@@ -94,7 +125,7 @@ pub mod scripts {
         #[derive(Debug, Serialize, Deserialize)]
         #[serde(rename_all = "camelCase")]
         pub struct Response {
-            pub parent_content_info: ContentInfo
+            pub parent_content_info: model::ContentInfo
         }
     
         pub const METHOD: &'static str = "witcherscript-ide/scripts/parentContent";
diff --git a/crates/lsp/src/tasks/content_indexing_tasks.rs b/crates/lsp/src/tasks/content_indexing_tasks.rs
index c58a3afc..9a3a2b6b 100644
--- a/crates/lsp/src/tasks/content_indexing_tasks.rs
+++ b/crates/lsp/src/tasks/content_indexing_tasks.rs
@@ -9,7 +9,7 @@ use witcherscript_project::content::{ContentScanError, ProjectDirectory, RedkitP
 use witcherscript_project::source_tree::SourceTreeDifference;
 use witcherscript_project::{ContentScanner, FileError};
 use witcherscript_project::content_graph::{ContentGraphDifference, ContentGraphError, GraphEdgeWithContent, GraphNode, ModifiedGraphNode};
-use crate::Backend;
+use crate::{Backend, notifications};
 
 
 impl Backend {
@@ -140,6 +140,8 @@ impl Backend {
             self.on_graph_edges_removed(diff_edges_removed).await;
         }
 
+        self.client.send_notification::<notifications::projects::did_change_content_graph::Type>(()).await;
+
         let duration = Instant::now() - start;
         self.reporter.log_info(format!("Handled content graph related changes in {:.3}s", duration.as_secs_f32())).await;
     }
diff --git a/crates/lsp/src/tasks/script_indexing_tasks.rs b/crates/lsp/src/tasks/script_indexing_tasks.rs
index b6895097..3a871e6d 100644
--- a/crates/lsp/src/tasks/script_indexing_tasks.rs
+++ b/crates/lsp/src/tasks/script_indexing_tasks.rs
@@ -3,7 +3,7 @@ use rayon::prelude::*;
 use abs_path::AbsPath;
 use witcherscript::{script_document::ScriptDocument, Script};
 use witcherscript_project::source_tree::{SourceTreeDifference, SourceTreeFile};
-use crate::{Backend, ScriptState, ScriptStateContentInfo};
+use crate::{Backend, ScriptState, ScriptStateContentInfo, notifications};
 
 
 impl Backend {
@@ -53,6 +53,16 @@ impl Backend {
             .map(|f| f.to_owned())
             .collect::<Vec<_>>();
 
+        let content_name = self.content_graph
+            .read().await
+            .get_node_by_path(content_path)
+            .map(|n| n.content.content_name().to_string())
+            .unwrap_or_default();
+
+        self.client.send_notification::<notifications::scripts::did_start_script_parsing::Type>(notifications::scripts::did_start_script_parsing::Parameters {
+            content_name: content_name.clone()
+        }).await;
+
         if !diff_removed.is_empty() {
             self.on_source_tree_files_removed(diff_removed, content_path).await;
         }
@@ -66,6 +76,10 @@ impl Backend {
             self.on_source_tree_files_added_or_modified(diff_added_or_modified, content_path).await;
         }
 
+        self.client.send_notification::<notifications::scripts::did_finish_script_parsing::Type>(notifications::scripts::did_finish_script_parsing::Parameters {
+            content_name
+        }).await;
+
         let duration = Instant::now() - start;
         self.reporter.log_info(format!("Handled source tree related changes to {} in {:.3}s", content_path.display(), duration.as_secs_f32())).await;
     }
diff --git a/docs/assets/user-manual/editor/contents-view.png b/docs/assets/user-manual/editor/contents-view.png
new file mode 100644
index 00000000..5d4b1ccf
Binary files /dev/null and b/docs/assets/user-manual/editor/contents-view.png differ
diff --git a/docs/assets/user-manual/editor/dashboard-view.png b/docs/assets/user-manual/editor/dashboard-view.png
new file mode 100644
index 00000000..122cde6d
Binary files /dev/null and b/docs/assets/user-manual/editor/dashboard-view.png differ
diff --git a/docs/assets/user-manual/editor/project-creation.mp4 b/docs/assets/user-manual/editor/project-creation.mp4
deleted file mode 100644
index eccfd4d0..00000000
Binary files a/docs/assets/user-manual/editor/project-creation.mp4 and /dev/null differ
diff --git a/docs/assets/user-manual/editor/project-manifest.png b/docs/assets/user-manual/editor/project-manifest.png
new file mode 100644
index 00000000..ee92c2ec
Binary files /dev/null and b/docs/assets/user-manual/editor/project-manifest.png differ
diff --git a/docs/assets/user-manual/editor/script-import.mp4 b/docs/assets/user-manual/editor/script-import.mp4
deleted file mode 100644
index 893fe758..00000000
Binary files a/docs/assets/user-manual/editor/script-import.mp4 and /dev/null differ
diff --git a/docs/assets/user-manual/editor/status-bar.png b/docs/assets/user-manual/editor/status-bar.png
new file mode 100644
index 00000000..cf9451e0
Binary files /dev/null and b/docs/assets/user-manual/editor/status-bar.png differ
diff --git a/docs/assets/user-manual/editor/vanilla-import-diff.mp4 b/docs/assets/user-manual/editor/vanilla-import-diff.mp4
index f0f84888..e72ea9b4 100644
Binary files a/docs/assets/user-manual/editor/vanilla-import-diff.mp4 and b/docs/assets/user-manual/editor/vanilla-import-diff.mp4 differ
diff --git a/docs/assets/user-manual/editor/vanilla-scripts-view.png b/docs/assets/user-manual/editor/vanilla-scripts-view.png
new file mode 100644
index 00000000..93cf565d
Binary files /dev/null and b/docs/assets/user-manual/editor/vanilla-scripts-view.png differ
diff --git a/docs/assets/user-manual/getting-started/getting-started.mp4 b/docs/assets/user-manual/getting-started/getting-started.mp4
index 79371924..7fc6c52c 100644
Binary files a/docs/assets/user-manual/getting-started/getting-started.mp4 and b/docs/assets/user-manual/getting-started/getting-started.mp4 differ
diff --git a/docs/dev-manual.md b/docs/dev-manual.md
index 63fa6fdc..5e9ff507 100644
--- a/docs/dev-manual.md
+++ b/docs/dev-manual.md
@@ -27,12 +27,19 @@ Currently available xtask commands:
 - `prep-client` - build VSCode client
     - `--watch` - whether client should be continuously watched for changes made to it and rebuilt 
     - `--fast` - whether client should be built instantly by skipping `npm ci` step
+- `prep-rw3d` - download the [Rusty Witcher 3 Debugger CLI](https://github.com/SpontanCombust/rusty_witcher_debugger) needed by the client
 - `package` - build and package VSCode extension into a .vsix file
     - `--out` - output path for the .vsix file; default is "./witcherscript-ide.vsix"
     - `--target` - VSCode extension target, e.g. win32-x64
     - `--pre-release` - mark the package as pre-release
 - `install` - build, package and install the VSCode extension locally
 
+The usual procedure is as follows:
+
+1. Run `prep-server` whenever making changing to the LSP server. The executable cannot be updated during an active extension host session.
+2. Run `prep-client` whenever making changes to the VSCode client code. This can be done during extension host session, but changes can be observed only after extension reload.
+3. Run `prep-rw3d` when building the project for the first time or when the desired version of the tool changes.
+4. Run all the above when building the project for the first time.
 
 ## Debugging
 Use VSCode to debug the client and server. The project provides launch configurations for both of them:
diff --git a/docs/user-manual/changelog.md b/docs/user-manual/changelog.md
index 78548ea1..48565aac 100644
--- a/docs/user-manual/changelog.md
+++ b/docs/user-manual/changelog.md
@@ -2,6 +2,50 @@
 
 # Changelog
 
+# v0.4.0
+**UI/UX Improvements and more**
+
+### Features
+
+- Added a welcome message that is shown when using the extension for the first time [#47](https://github.com/SpontanCombust/witcherscript-ide/issues/47)
+- Added a message pointing to the changelog when the extension gets updated
+- Added a short in-editor walkthrough for the extension [#47](https://github.com/SpontanCombust/witcherscript-ide/issues/47)
+- Added a view container that houses all views added by the extension [#45](https://github.com/SpontanCombust/witcherscript-ide/issues/45)
+- Added a "Dashboard" view that shows a list some of the main commands you can execute, so you don't have to look through the command palette [#46](https://github.com/SpontanCombust/witcherscript-ide/issues/46)
+- Integrated the [Rusty Witcher 3 Debugger CLI](https://github.com/SpontanCombust/rusty_witcher_debugger/) tool into the extension client [#4](https://github.com/SpontanCombust/witcherscript-ide/issues/4)
+- Added "Vanilla Scripts" view. It displays the source tree of vanilla scripts (content0) and allows for peeking and importing vanilla scripts from the level of the view. [#42](https://github.com/SpontanCombust/witcherscript-ide/issues/42)
+- Added "Contents" view. It displays script packages known to the content graph - its metadata and files it is associated with. When extension is active, but there are no script projects in the workspace it displays a welcome message with buttons for creating and initializing a project [#22](https://github.com/SpontanCombust/witcherscript-ide/issues/22)
+- Added context menu items for comparing modded script with vanilla to file explorer and editor views
+- Added context status bar item displaying name of the currently worked on script project. Clicking the item shows the command palette of all available WIDE commands [#12](https://github.com/SpontanCombust/witcherscript-ide/issues/12)
+- Added work status bar item displaying the current background work being done on the language server. The item is hidden when there is no work being done currenly [#12](https://github.com/SpontanCombust/witcherscript-ide/issues/12)
+- Added analysis for local var declaration placement
+
+### Fixes
+- Fixed contextual syntax analysis not working for events
+
+### Commands
+- Added "Open extension logs" command
+- Added "Open extension settings" command
+- Added commands to launch the game
+- Added "Recompile game scripts" command
+- Added "Execute console command" command
+
+### Configuration
+- Added a setting to describe a prefered way of launching the game host for testing (standalone with debug args, REDkit, auto)
+- Added a setting for the IP address of the game host
+- Added a setting for the number of threads allocated to Rayon's parallel data processing
+
+### Other changes
+- Error message after failing to import vanilla scripts now points to extension logs
+
+### Documentation
+- Added "UI Elements" section to the "Editor" page
+- Updated some videos on the "Editor" to better reflect modern way of doing things in WIDE
+- Renamed "Editor" page to "Editor Features"
+- Added a disclaimer for using "content0" as the dependency for projects on the "Project System" page
+- Moved the REDkit section closer to the beginning on the "Project System" page
+- Rewrote "Getting started" page to point to and present the new built-in tutorial
+
 
 ## v0.3.2
 **Hotfix**
diff --git a/docs/user-manual/diagnostic-index.md b/docs/user-manual/diagnostic-index.md
index a0e1d902..6d21e600 100644
--- a/docs/user-manual/diagnostic-index.md
+++ b/docs/user-manual/diagnostic-index.md
@@ -326,6 +326,25 @@ var modsInstalled: int; // (1)
 1. Variable declaration not allowed here.
 
 
+---
+
+### `invalid-local-var-placement`
+
+The WitcherScript compiler is not very flexible when it comes to local variable declarations. You are forced to declare all of them at the start of a function before doing anything else, even when it comes to such trivial cases like for loop iterator. This is similar to early C language standards, where declarations could only be done at the beginning of a scope.
+
+```ts linenums="1" hl_lines="3"
+function LogHeldSwordInCombat() {
+    if (thePlayer.IsInCombatState()) {
+        var id: SItemUniqueId; // (1)
+        id = thePlayer.inv.GetCurrentlyHeldSword();
+        LogChannel('TEST', "Sword item name: " + thePlayer.inv.GetItemName(id));
+    }
+}
+```
+
+1. Variable must be done before the "if" statement.
+
+
 ---
 
 
diff --git a/docs/user-manual/editor.md b/docs/user-manual/editor.md
index 867dd232..5a324b23 100644
--- a/docs/user-manual/editor.md
+++ b/docs/user-manual/editor.md
@@ -1,36 +1,67 @@
-# Editor
+# Editor Features
+
+
+## UI Elements
+
+### Dashboard View
+
+The primary view is the dashboard, which lets among other things create a script project and recompile game's scripts.
+
+![Dashboard View](../assets/user-manual/editor/dashboard-view.png)
+
+### Vanilla Scripts View
+
+This view lets you see all available vanilla script files that you can import/checkout into your project.
+
+![Vanilla Scripts View](../assets/user-manual/editor/vanilla-scripts-view.png)
+
+### Contents View
+
+Script "contents" or "packages" are seperate units of code that WIDE can recognize. These include custom WIDE projects, REDkit projects and raw Mod directories. You can learn more about the project system that WIDE uses [here](https://spontancombust.github.io/witcherscript-ide/user-manual/project-system/).
+
+![Contents View](../assets/user-manual/editor/contents-view.png)
+
+### Status Bar
+
+Status bar displays context information about the last worked on project and any processes that might be going on currently in the background.
+
+![Status Bar](../assets/user-manual/editor/status-bar.png)
+
+
+
+<br>
+
+---
 
 ## Features
 
-- creating and initializing [script projects](./project-system.md)
+### Creating and initializing [script projects](./project-system.md)
 
-<video controls muted>
-  <source src="../../assets/user-manual/editor/project-creation.mp4" type="video/mp4">
-</video>
+![Project Manifest](../assets/user-manual/editor/project-manifest.png)
 
 :material-information-outline: Loading REDkit projects is also natively supported with some prior requirements outlined [here](./project-system.md#redkit-project).
 
-- syntax highlighting
+### Syntax highlighting
 
 ![Syntax Highlighting](../assets/user-manual/editor/syntax-highlighting.jpg)
 
-- basic syntax analysis
+### Basic syntax analysis
 
 ![Syntax Analysis](../assets/user-manual/editor/syntax-analysis.jpg)
 
-- importing and comparing scripts with their vanilla counterparts
+### Importing and comparing scripts with their vanilla counterparts
 
 <video controls muted>
-  <source src="../../assets/user-manual/editor/vanilla-import-diff.mp4" type="video/mp4">
+  <source src="../../assets/user-manual/editor/vanilla-import-diff.mp4" type="video/mp4"> 
 </video>
 
-- hover tooltips
+### Hover tooltips
 
 <video controls muted>
   <source src="../../assets/user-manual/editor/hover.mp4" type="video/mp4">
 </video>
 
-- go to definition/declaration
+### Go to definition/declaration
 
 <video controls muted>
   <source src="../../assets/user-manual/editor/goto-definition.mp4" type="video/mp4">
@@ -39,7 +70,12 @@
 **More coming soon!**
 
 
-## Commands
+
+<br>
+
+---
+
+## Command palette
 
 ### `witcherscript-ide.projects.init`
 *"Initialize a WitcherScript project in existing directory..."*  
@@ -50,14 +86,46 @@ Will establish a basic file structure of a WitcherScript project in a given exis
 Will create a new directory and establish a basic file structure of a WitcherScript project inside it.
 
 ### `witcherscript-ide.scripts.importVanilla`
-*"Import scripts from vanilla..."*  
+*"Import scripts from vanilla into project..."*  
 Invokes a file chooser to pick vanilla scripts you want to import into your project. If more than one WitcherScript project exists in the workspace, prompts the user to choose the project.  
 Command requires that the `content0` content is known and is a dependency to a given project.
 
 ### `witcherscript-ide.scripts.diffVanilla`
-*"Compare this script with vanilla counterpart"*  
+*"Compare script with vanilla counterpart"*  
 Shows a difference view between the original vanilla script and the imported, modified script in the project.
 
+### `witcherscript-ide.game.launchDx12`
+*"Launch the game (DX12)"*  
+Launches the DirectX12 version of the game.
+
+### `witcherscript-ide.game.launchDx12Debug`
+*"Launch the game for debugging (DX12)"*  
+Launches the DirectX12 version of the game with arguments to enable debugging it.
+
+### `witcherscript-ide.game.launchDx11`
+*"Launch the game (DX11)"*  
+Launches the DirectX11 version of the game.
+
+### `witcherscript-ide.game.launchDx11Debug`
+*"Launch the game for debugging (DX11)"*  
+Launches the DirectX11 version of the game with arguments to enable debugging it.
+
+### `witcherscript-ide.game.recompileScripts`
+*"Recompile game scripts"*  
+Remotely connects to the game to trigger script recompilation.
+
+### `witcherscript-ide.game.execConsoleCommand`
+*"Execute console command"*  
+Remotely connects to the game to execute a command that would normally be entered in the debug console.
+
+### `witcherscript-ide.misc.openLogs`
+*"Open extension logs"*  
+Open WIDE's language client output view.
+
+### `witcherscript-ide.misc.openSettings`
+*"Open extension settings"*  
+Open the settings page on WIDE's section.
+
 ### `witcherscript-ide.debug.showScriptAst`
 *"Show script AST"*  
 Shows the Abstract Syntax Tree  of the currently focused on script as it is uderstood by the language server.
@@ -81,11 +149,17 @@ Shows code symbols that have been extracted from the currently focused on script
 Requires [debug features](#witcherscript-idedebugenabledebugfeatures) to be enabled.
 
 ### `witcherscript-ide.debug.clearGlobalState`
-*"Clear global cache of the extension"*  
-Clears VSCode extension database entries created by the client. Useful mostly for testing.
+*"Clear global persistent data"*  
+Clears global VSCode extension database entries created by the client. Useful mostly for testing.
 Requires [debug features](#witcherscript-idedebugenabledebugfeatures) to be enabled.
 
 
+
+
+<br>
+
+---
+
 ## Configuration
 
 ### `witcherscript-ide.gameDirectory`
@@ -94,11 +168,24 @@ Path to Witcher 3's root game directory (containing bin, content, Mods folders e
 ### `witcherscript-ide.contentRepositories`
 Paths to custom directories containing WitcherScript contents. Useful when not having Witcher 3 installed on your local machine or when simply storing scripts outside of game directory.
 
+### `witcherscript-ide.gameHost.type`
+What is the method you use to launch and mod the game. Affects remote commands in the dashboard view. Possible values:
+
+- editor - the game launched through the REDkit modding tool,
+- standalone - the game launched on its own with debug arguments,
+- auto - the method gets automatically detected
+
+### `witcherscript-ide.gameHost.ipAddress`
+IPv4 address of the game host. It is used when running remote game commands such as script recompilation. Change this if you're running the game on a different computer from the one you're currently working in VSCode. Defaults to the localhost address.
+
 ### `witcherscript-ide.languageServer.enable`
 Enable the language server. True by default.  You can disable this if you only want syntax highlighting. Change requires extension reload.
 
 ### `witcherscript-ide.languageServer.syntaxAnalysis`
 Enable syntax analysis in the language server. True by default. This may require window reload if there are unresolved syntax analysis related diagnostics present.
 
+### `witcherscript-ide.languageServer.rayonThreads`
+Number of threads allocated to parallel data computation. Leave at 0 for automatic configuration. Change requires extension reload.
+
 ### `witcherscript-ide.debug.enableDebugFeatures`
 Enables debug features used for development. False by default. Change requires extension reload.
diff --git a/docs/user-manual/getting-started.md b/docs/user-manual/getting-started.md
index ccdbde9a..1627b2a8 100644
--- a/docs/user-manual/getting-started.md
+++ b/docs/user-manual/getting-started.md
@@ -1,11 +1,9 @@
 # Getting started
 
-1. Install the extension from the [Visual Studio marketplace](https://marketplace.visualstudio.com/items?itemName=SpontanCombust.witcherscript-ide) or [Open VSX](https://open-vsx.org/extension/SpontanCombust/witcherscript-ide) if you're using other VSCode variants. You can also grab a .vsix file directly from the [releases](https://github.com/SpontanCombust/witcherscript-ide/releases) page.
-2. Configure paths to existing vanilla and mod scripts by going to settings (File > Preferences > Settings). Start typeing "witcherscript" and look for "Game Directory" and "Content Repositories" settings.
-3. Open the command prompt using Ctrl + Shift + P and start typeing "witcherscript". Choose a command to create or initialize a WitcherScript project.
+Install the extension from the [Visual Studio marketplace](https://marketplace.visualstudio.com/items?itemName=SpontanCombust.witcherscript-ide) or [Open VSX](https://open-vsx.org/extension/SpontanCombust/witcherscript-ide) if you're using other VSCode variants. You can also grab a .vsix file directly from the [releases](https://github.com/SpontanCombust/witcherscript-ide/releases) page.
+
+WIDE's VSCode extension comes with a quick walkthrough that will guide you through necessary steps to make it work. If you can't find the walkthrough use the command `"Welcome: Open Walkthrough..."` in the command palette and search for WitcherScript IDE.
 
 <video controls muted>
   <source src="../../assets/user-manual/getting-started/getting-started.mp4" type="video/mp4">
 </video>
-
-You can skip step 3. if you're already working on a mod using the REDKit modding tool. Just open the editor in your project's directory. If you want to use other mods as a dependency for your mod for example you should still check out [WIDE projects](./project-system.md#wide-project) though.
diff --git a/docs/user-manual/project-system.md b/docs/user-manual/project-system.md
index 6feb81a1..0eaa756e 100644
--- a/docs/user-manual/project-system.md
+++ b/docs/user-manual/project-system.md
@@ -1,15 +1,27 @@
 # Project System
 
-The game during script compilation needs to think only about assembling one big blob of code that will be then compiled. Places where it looks for said code are predefined and limited. Aside from the testing stage, developing a script mod often means working in a completely unrelated workspace directory, which can additionally be stored remotely using a version control system like Git. WIDE bridges the gap between those workspaces and scripts in the game directory by introducing a project system.
+The game during script compilation needs to think only about assembling one big blob of code that will be then compiled. Places where it looks for said code are predefined and limited. Aside from the testing stage, developing a script mod often means working in a completely unrelated workspace directory, which can additionally be stored remotely using a version control system like Git. WIDE bridges the gap between those workspaces and scripts in the game directory by introducing a project system. 
+
+The project system does not affect the process of packaging and installing mods to the game. For now that is left to the developer to figure out for themselves, this includes any dependencies that the mod may need. You can either write your own batch scripts or use REDkit built-in packaging functionality.
 
 Projects organize WitcherScript code into seperable packages which can link with each other.
 Recognized content structures are:
 
- - [WIDE projects](#wide-project)
  - [Redkit projects](#redkit-project)
+ - [WIDE projects](#wide-project)
  - [Raw content directories](#raw-content-directory)
 
 
+## REDKit project
+
+WitcherScript IDE is able to detect projects created using the REDKit modding tool. These projects contain a `.w3edit`, which acts as a solution file for the whole project.
+Working with REDKit projects requires you to set the path to the game in extension's settings.
+
+REDKit project naturally can't use any scripts that are not part of it or the vanilla game (*content0*) unless you manually edit the depot. Until REDkit will be able to support script dependencies more easily if you want to get code suggestions from other mods consider initializing [WIDE project](#wide-project) in the workspace directory and filling the `[dependencies]` table.
+
+:material-information-outline: If both `*.w3edit` and `witcherscript.toml` are present in the directory, it will be treated as a WIDE project.
+
+
 ## WIDE Project
 
 The WitcherScript project format that WIDE establishes is comprised of two things: a [manifest file](#manifest-format) and a scripts directory. 
@@ -18,11 +30,8 @@ The scripts directory is a subfolder literally called *"scripts"*, which contain
 
 Creating a manifest for your script mod is mandatory if you want to use more advanced code features like go to definition. Without a manifest you are limited to syntax highlighting and basic syntax analysis.
 
-:material-information-outline: To quickly create a new project or initialize one in an existing project directory use *`"Initialize/Create WitcherScript project..."`* commands in the editor.
+:material-information-outline: To quickly create a new project or initialize one in an existing project directory use *`"Initialize/Create WitcherScript project..."`* commands from the dashboard view.
 
-<video controls muted>
-  <source src="../../assets/user-manual/editor/project-creation.mp4" type="video/mp4">
-</video>
 
 Example of a simple WIDE project setup:
 
@@ -117,14 +126,6 @@ pathDependency = { path = "../dependencies/pathDependency" }
 ``` 
 
 
-## REDKit project
-
-WitcherScript IDE is able to detect projects created using the REDKit modding tool. These projects contain a `.w3edit`, which acts as a solution file for the whole project.
-Working with REDKit projects still requires you to set the path to the game in extension's settings.
-
-REDKit project naturally can't use any scripts that are not part of it or the vanilla game (*content0*). If you want to use other mods as dependencies for the project consider creating a `witcherscript.toml` manifest and filling the `[dependencies]` table instead.
-
-
 ## Raw content directory
 
 "Raw content" is the term by which WIDE refers to directories containing game files, among which are scripts residing in *"scripts"* directory.
@@ -157,4 +158,18 @@ Raw content is recognized by WIDE purely for user convenience to not force anyon
 
 ## Content repositories
 
-"Content repositories" are directories that directly inside them contain raw or project content directories. Commonly used repositories are *"Witcher 3/content"* and *"Witcher 3/Mods"*. Repositories can be configured via [`witcherscript-ide.gameDirectory`](./editor.md#witcherscript-idegamedirectory) and [`witcherscript-ide.contentRepositories`](./editor.md#witcherscript-idecontentrepositories) settings in editor.
\ No newline at end of file
+"Content repositories" are directories that directly inside them contain raw or project content directories. Commonly used repositories are *"Witcher 3/content"* and *"Witcher 3/Mods"*. Repositories can be configured via [`witcherscript-ide.gameDirectory`](./editor.md#witcherscript-idegamedirectory) and [`witcherscript-ide.contentRepositories`](./editor.md#witcherscript-idecontentrepositories) settings in editor.
+
+
+## Vanilla content dependency
+
+When setting vanilla scripts as a dependency for your project make sure that the name of the content they are found in is called exactly "content0". WIDE distinguishes this way the vanilla content from any other modded content. If you configure it to be found in your game directory with `witcherscript-ide.gameDirectory` setting and don't modify it in any way, it should be valid without a need for any further actions.  
+If you however store your vanilla scripts in a seperate folder make sure that either that folder is called "content0" or create a manifest for it with the following content inside it:
+```toml
+[content]
+name = "content0"
+# version etc...
+
+[dependencies]
+# this table should be empty
+```
\ No newline at end of file
diff --git a/editors/vscode/.vscodeignore b/editors/vscode/.vscodeignore
index 943f8fea..29a24e03 100644
--- a/editors/vscode/.vscodeignore
+++ b/editors/vscode/.vscodeignore
@@ -1,7 +1,7 @@
 **
 !media
 !out/main.js
-!server
+!deps
 !syntaxes
 !CHANGELOG.md
 !icon.png
diff --git a/editors/vscode/CHANGELOG.md b/editors/vscode/CHANGELOG.md
index 78548ea1..48565aac 100644
--- a/editors/vscode/CHANGELOG.md
+++ b/editors/vscode/CHANGELOG.md
@@ -2,6 +2,50 @@
 
 # Changelog
 
+# v0.4.0
+**UI/UX Improvements and more**
+
+### Features
+
+- Added a welcome message that is shown when using the extension for the first time [#47](https://github.com/SpontanCombust/witcherscript-ide/issues/47)
+- Added a message pointing to the changelog when the extension gets updated
+- Added a short in-editor walkthrough for the extension [#47](https://github.com/SpontanCombust/witcherscript-ide/issues/47)
+- Added a view container that houses all views added by the extension [#45](https://github.com/SpontanCombust/witcherscript-ide/issues/45)
+- Added a "Dashboard" view that shows a list some of the main commands you can execute, so you don't have to look through the command palette [#46](https://github.com/SpontanCombust/witcherscript-ide/issues/46)
+- Integrated the [Rusty Witcher 3 Debugger CLI](https://github.com/SpontanCombust/rusty_witcher_debugger/) tool into the extension client [#4](https://github.com/SpontanCombust/witcherscript-ide/issues/4)
+- Added "Vanilla Scripts" view. It displays the source tree of vanilla scripts (content0) and allows for peeking and importing vanilla scripts from the level of the view. [#42](https://github.com/SpontanCombust/witcherscript-ide/issues/42)
+- Added "Contents" view. It displays script packages known to the content graph - its metadata and files it is associated with. When extension is active, but there are no script projects in the workspace it displays a welcome message with buttons for creating and initializing a project [#22](https://github.com/SpontanCombust/witcherscript-ide/issues/22)
+- Added context menu items for comparing modded script with vanilla to file explorer and editor views
+- Added context status bar item displaying name of the currently worked on script project. Clicking the item shows the command palette of all available WIDE commands [#12](https://github.com/SpontanCombust/witcherscript-ide/issues/12)
+- Added work status bar item displaying the current background work being done on the language server. The item is hidden when there is no work being done currenly [#12](https://github.com/SpontanCombust/witcherscript-ide/issues/12)
+- Added analysis for local var declaration placement
+
+### Fixes
+- Fixed contextual syntax analysis not working for events
+
+### Commands
+- Added "Open extension logs" command
+- Added "Open extension settings" command
+- Added commands to launch the game
+- Added "Recompile game scripts" command
+- Added "Execute console command" command
+
+### Configuration
+- Added a setting to describe a prefered way of launching the game host for testing (standalone with debug args, REDkit, auto)
+- Added a setting for the IP address of the game host
+- Added a setting for the number of threads allocated to Rayon's parallel data processing
+
+### Other changes
+- Error message after failing to import vanilla scripts now points to extension logs
+
+### Documentation
+- Added "UI Elements" section to the "Editor" page
+- Updated some videos on the "Editor" to better reflect modern way of doing things in WIDE
+- Renamed "Editor" page to "Editor Features"
+- Added a disclaimer for using "content0" as the dependency for projects on the "Project System" page
+- Moved the REDkit section closer to the beginning on the "Project System" page
+- Rewrote "Getting started" page to point to and present the new built-in tutorial
+
 
 ## v0.3.2
 **Hotfix**
diff --git a/editors/vscode/media/view-container-icon.svg b/editors/vscode/media/view-container-icon.svg
new file mode 100644
index 00000000..e03cec7b
--- /dev/null
+++ b/editors/vscode/media/view-container-icon.svg
@@ -0,0 +1,244 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="1000.000000pt" height="1000.000000pt" viewBox="0 0 1000.000000 1000.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,1000.000000) scale(0.100000,-0.100000)" stroke="none">
+<path d="M5087 9923 c-4 -3 -7 -59 -7 -123 0 -92 3 -120 15 -130 12 -10 15
+-49 15 -230 0 -181 3 -220 15 -230 12 -10 15 -45 15 -191 0 -113 4 -179 10
+-179 6 0 10 -53 10 -139 0 -111 3 -141 15 -151 12 -10 15 -36 15 -114 0 -89
+-2 -104 -20 -119 -26 -22 -40 -22 -40 2 0 10 -7 24 -15 31 -8 7 -15 20 -15 30
+0 10 -7 23 -15 30 -11 9 -15 34 -15 96 0 45 -4 86 -10 89 -6 4 -10 71 -10 169
+0 133 -3 166 -15 176 -12 10 -15 40 -15 150 0 110 -3 140 -15 150 -11 9 -15
+33 -15 92 0 97 -16 121 -76 116 -37 -3 -39 -5 -42 -38 -2 -19 -10 -39 -18 -43
+-8 -4 -14 -23 -14 -42 0 -19 -4 -35 -10 -35 -5 0 -10 -23 -10 -50 0 -36 -4
+-52 -15 -56 -11 -5 -15 -23 -15 -79 0 -52 -4 -76 -15 -85 -13 -11 -15 -56 -15
+-296 0 -178 -4 -285 -10 -289 -6 -4 -10 -138 -10 -370 0 -310 -2 -366 -15
+-379 -13 -12 -15 -76 -15 -444 0 -370 -2 -431 -15 -442 -9 -8 -15 -29 -15 -56
+0 -23 -4 -46 -10 -49 -5 -3 -10 -19 -10 -35 0 -16 -7 -35 -15 -44 -10 -9 -15
+-34 -15 -69 0 -36 -5 -59 -15 -67 -11 -9 -15 -34 -15 -96 0 -45 -4 -86 -10
+-89 -6 -4 -10 -80 -10 -195 0 -154 -3 -191 -15 -204 -11 -11 -15 -37 -15 -101
+0 -67 -3 -87 -15 -91 -13 -5 -15 -72 -15 -514 0 -439 2 -509 15 -520 8 -7 15
+-20 15 -29 0 -9 54 -70 120 -136 66 -66 120 -126 120 -134 0 -7 11 -24 25 -37
+16 -14 25 -34 25 -52 0 -16 7 -35 15 -42 8 -7 15 -19 15 -27 0 -8 7 -21 15
+-29 10 -10 15 -35 15 -75 0 -33 4 -59 10 -59 6 0 10 -123 10 -350 0 -304 -2
+-350 -15 -350 -8 0 -15 8 -15 19 0 10 -7 24 -15 31 -11 9 -15 33 -15 86 l0 74
+-58 0 c-57 0 -58 -1 -115 -58 -31 -32 -57 -65 -57 -73 0 -9 -11 -25 -25 -35
+-22 -16 -25 -26 -25 -78 0 -50 4 -62 25 -82 14 -13 25 -27 25 -32 0 -5 11 -30
+25 -56 21 -39 25 -61 25 -125 0 -58 4 -82 15 -91 12 -10 15 -43 15 -175 0
+-132 3 -165 15 -175 20 -17 20 -113 0 -134 -11 -11 -15 -38 -15 -109 0 -72 -4
+-98 -15 -107 -10 -8 -15 -30 -15 -61 0 -27 -4 -49 -10 -49 -13 0 -13 -227 0
+-235 6 -3 10 -19 10 -34 0 -16 7 -34 15 -41 8 -7 15 -20 15 -30 0 -10 7 -23
+15 -30 8 -7 15 -21 15 -31 0 -11 5 -19 10 -19 6 0 10 -28 10 -64 0 -48 4 -65
+15 -70 11 -4 15 -23 15 -79 0 -54 4 -78 15 -87 9 -8 15 -30 15 -56 0 -24 5
+-44 10 -44 6 0 10 -28 10 -64 0 -48 4 -65 15 -70 9 -3 15 -18 15 -39 0 -19 7
+-40 15 -47 9 -8 15 -29 15 -56 0 -23 5 -46 10 -49 6 -3 10 -26 10 -49 0 -27 6
+-48 15 -56 10 -8 15 -31 15 -67 0 -35 5 -60 15 -69 10 -10 15 -35 15 -69 0
+-30 5 -57 10 -60 6 -3 10 -32 10 -64 0 -40 5 -63 15 -71 9 -7 15 -29 15 -55 0
+-26 6 -48 15 -55 9 -8 15 -29 15 -56 0 -23 5 -46 10 -49 6 -3 10 -25 10 -49 0
+-35 6 -48 33 -74 29 -28 39 -32 90 -32 l57 0 0 155 c0 129 3 157 15 161 12 5
+15 27 15 110 0 63 4 104 10 104 6 0 10 35 10 84 0 62 4 89 15 100 11 11 15 37
+15 99 0 66 3 86 15 91 12 4 15 25 15 96 0 53 4 90 10 90 6 0 10 45 10 114 0
+89 3 116 15 126 11 10 15 36 15 112 0 78 3 100 15 104 12 5 15 25 15 94 0 49
+4 92 10 95 6 3 10 51 10 109 0 74 4 107 15 122 10 14 14 48 15 130 0 90 3 113
+15 118 12 4 15 30 15 145 0 82 4 142 10 146 6 4 10 74 10 179 0 136 3 176 15
+192 8 10 15 27 15 37 0 10 7 20 15 23 9 4 15 19 15 39 0 18 7 38 15 45 19 16
+19 41 0 66 -8 10 -15 30 -15 43 0 13 -13 39 -30 58 -16 18 -30 40 -30 47 0 7
+-11 23 -25 36 -14 13 -25 30 -25 38 0 8 -11 25 -25 38 -14 13 -25 29 -25 37 0
+7 -13 26 -30 42 -16 16 -30 37 -30 47 0 15 -8 18 -45 18 -37 0 -45 -3 -45 -19
+0 -10 -7 -24 -15 -31 -11 -9 -15 -32 -15 -81 0 -56 -4 -73 -20 -89 -11 -11
+-22 -20 -25 -20 -12 0 -45 41 -45 56 0 8 -7 22 -15 30 -10 11 -15 36 -15 85 0
+53 4 71 15 75 11 4 15 21 15 55 0 35 4 51 15 55 9 4 15 19 15 39 0 19 5 37 10
+40 6 3 10 37 10 74 0 49 4 72 15 81 9 8 15 30 15 60 0 33 5 50 15 54 9 3 15
+18 15 40 0 19 5 38 10 41 6 3 10 19 10 34 0 16 7 34 15 41 8 7 15 20 15 30 0
+10 7 23 15 30 8 7 15 23 15 36 0 12 11 44 25 70 14 26 25 51 25 56 0 4 18 25
+40 47 22 21 40 45 40 53 0 7 32 45 70 83 39 38 70 77 70 87 0 9 5 20 10 23 6
+3 10 48 10 100 0 52 -4 97 -10 100 -5 3 -10 40 -10 81 0 57 -4 76 -15 80 -12
+5 -15 30 -15 134 0 101 -3 130 -15 140 -12 10 -15 38 -15 135 0 97 -3 125 -15
+135 -12 10 -15 41 -15 161 0 88 -4 150 -10 154 -6 4 -10 69 -10 161 0 128 -3
+156 -15 160 -12 5 -15 31 -15 146 0 111 -3 143 -15 154 -12 13 -15 48 -15 189
+0 105 -4 176 -10 180 -6 4 -10 82 -10 201 0 164 -2 196 -15 200 -13 5 -15 43
+-15 254 0 208 -2 250 -15 260 -13 10 -15 53 -15 271 0 166 -4 259 -10 259 -6
+0 -10 53 -10 139 0 111 -3 141 -15 151 -11 10 -15 35 -15 110 0 75 -4 100 -15
+110 -11 9 -15 32 -15 81 0 37 -4 71 -10 74 -6 3 -10 50 -10 104 0 75 -4 101
+-15 111 -11 9 -15 34 -15 95 0 61 -4 86 -15 95 -12 10 -15 37 -15 126 0 69 -4
+114 -10 114 -6 0 -10 31 -10 74 0 53 -4 77 -15 86 -8 7 -15 19 -15 26 0 37
+-69 72 -93 47z"/>
+<path d="M7712 9118 c-6 -6 -12 -31 -12 -55 0 -24 -4 -43 -10 -43 -5 0 -10
+-23 -10 -50 0 -36 -4 -52 -15 -56 -8 -4 -15 -14 -15 -23 0 -10 -11 -28 -25
+-41 -14 -13 -25 -31 -25 -41 0 -9 -7 -22 -15 -29 -8 -7 -15 -20 -15 -30 0 -10
+-7 -23 -15 -30 -8 -7 -15 -25 -15 -41 0 -15 -4 -31 -10 -34 -5 -3 -10 -19 -10
+-34 0 -16 -7 -34 -15 -41 -8 -7 -15 -20 -15 -30 0 -10 -7 -23 -15 -30 -8 -7
+-15 -28 -15 -46 0 -19 -4 -34 -10 -34 -5 0 -10 -8 -10 -19 0 -10 -7 -24 -15
+-31 -8 -7 -15 -21 -15 -32 0 -10 -7 -21 -15 -24 -9 -4 -15 -19 -15 -39 0 -19
+-4 -37 -10 -40 -5 -3 -10 -19 -10 -34 0 -16 -7 -34 -15 -41 -8 -7 -15 -28 -15
+-47 0 -21 -6 -36 -15 -39 -9 -4 -15 -19 -15 -39 0 -19 -4 -37 -10 -40 -5 -3
+-10 -19 -10 -35 0 -16 -7 -35 -15 -44 -9 -8 -15 -33 -15 -59 0 -31 -5 -47 -15
+-51 -9 -3 -15 -18 -15 -40 0 -19 -4 -38 -10 -41 -5 -3 -10 -26 -10 -51 0 -30
+-5 -46 -15 -50 -9 -4 -15 -19 -15 -39 0 -18 -7 -38 -15 -45 -8 -7 -15 -28 -15
+-46 0 -19 -4 -34 -10 -34 -5 0 -10 -15 -10 -34 0 -18 -7 -39 -15 -46 -9 -7
+-15 -29 -15 -55 0 -26 -6 -48 -15 -55 -9 -8 -15 -29 -15 -56 0 -23 -4 -46 -10
+-49 -5 -3 -10 -19 -10 -34 0 -16 -7 -34 -15 -41 -8 -7 -15 -28 -15 -47 0 -21
+-6 -36 -15 -39 -8 -4 -15 -14 -15 -24 0 -11 -4 -22 -10 -25 -5 -3 -10 -14 -10
+-24 0 -10 -7 -24 -15 -31 -8 -7 -15 -25 -15 -40 0 -15 -7 -33 -15 -40 -10 -8
+-15 -30 -15 -61 0 -27 -4 -49 -10 -49 -5 0 -10 -24 -10 -53 0 -31 -6 -61 -15
+-73 -8 -10 -15 -38 -15 -60 0 -24 -6 -47 -15 -54 -8 -7 -15 -17 -15 -23 0 -18
+-33 -87 -42 -87 -4 0 -8 -15 -8 -34 0 -18 -7 -39 -15 -46 -11 -9 -15 -34 -15
+-96 0 -45 -4 -85 -9 -88 -5 -3 -11 -34 -13 -68 -3 -35 -10 -64 -16 -66 -8 -2
+-12 -30 -12 -78 0 -57 -4 -76 -15 -80 -11 -5 -15 -22 -15 -66 0 -39 -5 -64
+-15 -74 -10 -10 -15 -35 -15 -69 0 -30 -4 -57 -10 -60 -5 -3 -10 -40 -10 -81
+0 -57 -4 -76 -15 -80 -12 -5 -15 -25 -15 -94 0 -66 -4 -91 -15 -100 -10 -8
+-15 -31 -15 -71 0 -34 -4 -59 -10 -59 -7 0 -10 -45 -8 -127 3 -124 4 -128 26
+-131 12 -2 22 -8 22 -13 0 -5 27 -9 60 -9 59 0 60 0 60 29 0 16 7 34 15 41 8
+7 15 28 15 47 0 21 6 36 15 39 8 4 15 14 15 23 0 22 65 85 79 77 17 -11 14
+-91 -4 -106 -8 -7 -15 -21 -15 -31 0 -10 -4 -21 -10 -24 -5 -3 -10 -19 -10
+-34 0 -16 -7 -34 -15 -41 -9 -7 -15 -29 -15 -55 0 -26 -6 -48 -15 -55 -8 -7
+-15 -29 -15 -50 0 -21 7 -43 15 -50 8 -7 15 -26 15 -42 0 -16 7 -36 15 -44 8
+-9 15 -28 15 -44 0 -16 5 -32 10 -35 6 -3 10 -37 10 -74 0 -49 4 -72 15 -81
+10 -9 15 -32 15 -75 0 -47 -4 -64 -15 -69 -8 -3 -15 -14 -15 -24 0 -10 -11
+-29 -25 -42 -14 -13 -25 -31 -25 -41 0 -9 -7 -22 -15 -29 -8 -7 -15 -25 -15
+-41 0 -15 -4 -31 -10 -34 -5 -3 -10 -23 -10 -44 0 -20 -7 -46 -15 -57 -8 -10
+-15 -27 -15 -37 0 -10 -7 -20 -15 -23 -8 -4 -15 -15 -15 -26 0 -10 -11 -29
+-25 -42 -17 -15 -25 -34 -25 -55 0 -19 -6 -34 -15 -37 -8 -4 -15 -15 -15 -25
+0 -11 -18 -37 -40 -58 -22 -21 -40 -45 -40 -53 0 -9 -7 -21 -15 -28 -8 -7 -15
+-28 -15 -46 0 -19 -4 -34 -10 -34 -6 0 -10 -71 -10 -194 0 -160 -3 -196 -15
+-206 -12 -10 -15 -41 -15 -161 l0 -149 60 0 c46 0 60 3 60 15 0 8 14 28 30 45
+17 17 30 40 30 50 0 11 5 20 10 20 6 0 10 8 10 19 0 10 7 24 15 31 8 7 15 21
+15 31 0 10 6 22 14 26 8 4 21 21 30 37 22 43 106 126 127 126 26 0 33 -19 15
+-39 -9 -10 -16 -25 -16 -33 0 -9 -3 -18 -7 -20 -11 -5 -43 -67 -43 -84 0 -8
+-6 -17 -14 -20 -7 -3 -22 -22 -32 -42 -11 -20 -29 -45 -41 -55 -13 -10 -23
+-26 -23 -36 0 -9 -18 -35 -40 -56 -22 -21 -40 -47 -40 -56 0 -9 -11 -25 -25
+-35 -14 -10 -25 -26 -25 -35 0 -8 -13 -29 -30 -45 -16 -16 -30 -37 -30 -46 0
+-9 -5 -20 -10 -23 -6 -3 -10 -19 -10 -34 0 -16 -7 -34 -15 -41 -9 -8 -15 -30
+-15 -60 0 -33 -5 -50 -15 -54 -11 -4 -15 -21 -15 -65 0 -33 -4 -63 -10 -66 -6
+-4 -10 -55 -10 -121 0 -93 -3 -116 -15 -120 -9 -4 -15 -19 -15 -39 0 -18 -7
+-38 -15 -45 -8 -7 -15 -21 -15 -31 0 -11 -4 -19 -10 -19 -5 0 -10 -8 -10 -19
+0 -10 -7 -24 -15 -31 -23 -19 -21 -142 3 -163 10 -10 26 -17 36 -17 9 0 19 -7
+22 -15 10 -26 60 -18 94 15 16 16 30 36 30 43 0 8 7 20 15 27 8 7 15 28 15 47
+0 21 6 36 15 39 10 4 15 21 15 54 0 27 5 52 10 55 6 3 10 19 10 34 0 16 7 34
+15 41 9 7 15 29 15 55 0 26 6 48 15 55 8 7 15 28 15 46 0 19 5 34 10 34 6 0
+10 8 10 19 0 10 7 24 15 31 8 7 15 27 15 45 0 20 6 35 15 39 8 3 15 14 15 25
+0 11 5 23 10 26 6 3 10 19 10 36 0 19 10 38 30 57 17 16 30 34 30 40 0 6 11
+32 25 58 14 26 25 57 25 69 0 13 7 28 15 35 8 7 15 20 15 30 0 10 7 23 15 30
+8 7 15 21 15 31 0 11 5 19 10 19 6 0 10 8 10 19 0 10 7 24 15 31 8 7 15 20 15
+30 0 10 7 23 15 30 8 7 15 21 15 31 0 11 5 19 10 19 6 0 10 8 10 19 0 10 7 24
+15 31 8 7 15 28 15 46 0 19 4 34 8 34 9 0 42 69 42 87 0 6 7 16 15 23 8 7 15
+25 15 40 0 15 7 33 15 40 8 7 15 21 15 31 0 10 5 21 10 24 6 3 10 15 10 26 0
+11 7 22 15 25 9 4 15 19 15 39 0 18 7 38 15 45 8 7 15 21 15 31 0 11 5 19 10
+19 6 0 10 15 10 34 0 18 7 39 15 46 8 7 15 21 15 32 0 10 7 21 15 24 8 4 15
+17 15 30 0 13 5 24 10 24 6 0 10 16 10 35 0 22 6 38 15 41 9 4 15 19 15 39 0
+18 7 38 15 45 8 7 15 28 15 46 0 19 5 34 10 34 6 0 10 8 10 19 0 10 7 24 15
+31 8 7 15 21 15 32 0 10 7 21 15 24 9 4 15 19 15 39 0 19 5 37 10 40 6 3 10
+15 10 26 0 11 7 22 15 25 9 4 15 19 15 39 0 18 7 38 15 45 8 7 15 28 15 46 0
+19 5 34 10 34 6 0 10 8 10 19 0 10 7 24 15 31 8 7 15 27 15 45 0 20 6 35 15
+39 8 3 15 14 15 25 0 11 5 23 10 26 6 3 10 14 10 24 0 10 7 24 15 31 8 7 15
+25 15 40 0 15 7 33 15 40 8 7 15 28 15 46 0 19 5 34 10 34 6 0 10 8 10 19 0
+10 7 24 15 31 8 7 15 20 15 30 0 10 7 23 15 30 8 7 15 21 15 31 0 11 5 19 10
+19 6 0 10 15 10 34 0 18 7 39 15 46 8 7 15 21 15 32 0 10 7 21 15 24 8 4 15
+14 15 23 0 10 11 28 25 41 21 20 25 33 25 82 l0 58 -43 0 c-45 0 -77 -21 -77
+-51 0 -8 -13 -26 -30 -39 -16 -14 -29 -32 -30 -42 0 -20 -277 -298 -297 -298
+-7 0 -35 -22 -62 -50 -27 -27 -55 -50 -63 -50 -7 0 -38 -25 -68 -55 -30 -30
+-62 -55 -71 -55 -10 0 -26 -11 -37 -25 -15 -19 -29 -25 -61 -25 -40 0 -41 1
+-41 36 0 31 9 45 59 95 33 32 66 59 74 59 7 0 26 14 42 30 16 17 35 30 42 30
+8 0 26 11 41 25 15 14 32 25 39 25 7 0 55 43 107 95 51 52 100 95 107 95 7 0
+46 33 86 72 64 63 73 77 73 108 0 27 -8 44 -30 65 -29 27 -30 33 -30 111 0 46
+-4 86 -10 89 -6 4 -10 81 -10 200 0 162 -2 194 -15 199 -13 5 -15 82 -15 614
+0 530 2 611 15 622 12 10 15 38 15 136 0 71 4 125 10 129 6 4 10 77 10 186 l0
+179 -45 0 c-39 0 -45 -3 -45 -20 0 -11 -7 -23 -15 -26 -9 -4 -15 -19 -15 -39
+0 -18 -7 -38 -15 -45 -8 -7 -15 -21 -15 -31 0 -11 -4 -19 -10 -19 -5 0 -10 -8
+-10 -19 0 -10 -7 -24 -15 -31 -8 -7 -15 -28 -15 -47 0 -21 -6 -36 -15 -39 -9
+-4 -15 -19 -15 -39 0 -19 -4 -37 -10 -40 -5 -3 -10 -19 -10 -34 0 -16 -7 -34
+-15 -41 -8 -7 -15 -28 -15 -47 0 -21 -6 -36 -15 -39 -8 -4 -15 -17 -15 -30 0
+-13 -4 -24 -10 -24 -5 0 -10 -8 -10 -18 0 -21 -73 -96 -83 -86 -11 11 -8 102
+3 109 6 3 10 26 10 49 0 27 6 48 15 56 8 7 15 20 15 30 0 10 7 23 15 30 8 7
+15 21 15 31 0 11 5 19 10 19 6 0 10 8 10 19 0 10 7 24 15 31 8 7 15 20 15 30
+0 10 7 23 15 30 8 7 15 28 15 46 0 19 5 34 10 34 6 0 10 8 10 19 0 10 7 24 15
+31 8 7 15 20 15 30 0 10 7 23 15 30 8 7 15 21 15 31 0 11 5 19 10 19 6 0 10
+16 10 35 0 22 6 38 15 41 10 4 15 21 15 54 0 30 6 52 15 60 8 7 15 25 15 41 0
+15 5 31 10 34 6 3 10 26 10 49 0 27 6 48 15 56 8 7 15 27 15 45 0 20 6 35 15
+39 11 4 15 20 15 56 0 27 5 50 10 50 6 0 10 20 10 44 0 26 6 51 15 60 9 9 15
+33 15 61 0 31 5 47 15 51 11 4 15 21 15 55 0 27 5 49 10 49 6 0 10 20 10 44 0
+26 6 51 15 60 9 9 15 33 15 61 0 31 5 47 15 51 11 4 15 21 15 55 0 27 5 49 10
+49 6 0 10 26 10 59 0 40 5 62 15 71 13 11 15 36 13 139 l-3 126 -35 3 c-19 2
+-41 -3 -48 -10z"/>
+<path d="M2467 9093 c-4 -3 -7 -167 -7 -363 0 -306 2 -359 15 -370 12 -10 15
+-37 15 -125 0 -91 3 -114 15 -119 11 -4 15 -20 15 -56 0 -27 5 -50 10 -50 6 0
+10 -15 10 -34 0 -18 7 -39 15 -46 11 -9 15 -34 15 -96 l0 -84 -40 -40 c-40
+-40 -40 -40 -40 -119 0 -58 4 -82 15 -91 8 -7 15 -28 15 -46 0 -19 5 -34 10
+-34 6 0 10 -8 10 -19 0 -10 7 -24 15 -31 8 -7 15 -27 15 -45 0 -20 6 -35 15
+-39 8 -3 15 -14 15 -25 0 -11 5 -23 10 -26 6 -3 10 -15 10 -26 0 -11 7 -22 15
+-25 8 -4 15 -16 15 -29 0 -13 7 -25 15 -29 9 -3 15 -19 15 -41 0 -19 5 -35 10
+-35 6 0 10 -11 10 -24 0 -13 7 -26 15 -30 8 -3 15 -14 15 -24 0 -11 7 -25 15
+-32 8 -7 15 -21 15 -31 0 -10 5 -21 10 -24 6 -3 10 -14 10 -25 0 -10 7 -20 15
+-24 8 -3 15 -14 15 -24 0 -11 7 -25 15 -32 18 -15 22 -155 4 -165 -12 -8 -79
+58 -79 78 0 7 -13 26 -30 42 -22 21 -30 38 -30 62 0 18 -4 33 -10 33 -5 0 -10
+8 -10 18 0 10 -22 39 -48 65 -42 41 -53 47 -90 47 l-42 0 0 -111 c0 -85 3
+-114 15 -125 9 -9 15 -34 15 -60 0 -24 5 -44 10 -44 6 0 10 -23 10 -50 0 -36
+4 -52 15 -56 11 -5 15 -22 15 -69 0 -47 4 -64 15 -69 9 -3 15 -19 15 -41 0
+-19 5 -35 10 -35 6 0 10 -23 10 -50 0 -36 4 -52 15 -56 13 -5 15 -52 15 -334
+0 -279 2 -329 15 -340 13 -11 15 -61 15 -336 0 -204 4 -325 10 -329 6 -3 10
+-13 10 -22 0 -20 412 -433 432 -433 20 0 138 -124 138 -144 0 -9 5 -16 10 -16
+6 0 10 -11 10 -24 0 -13 7 -26 15 -30 8 -3 15 -14 15 -24 0 -48 98 -73 133
+-34 22 24 23 114 2 132 -8 7 -15 20 -15 30 0 10 7 23 15 30 11 10 15 35 15
+110 0 75 4 100 15 110 8 7 15 25 15 41 0 15 5 31 10 34 6 3 10 13 10 22 0 9
+25 40 55 69 30 30 55 61 55 69 0 9 11 26 25 39 14 13 25 30 25 38 0 9 7 21 15
+28 22 18 22 175 0 184 -9 3 -15 18 -15 40 0 19 -4 38 -10 41 -6 4 -10 53 -10
+114 0 84 -3 111 -15 121 -11 9 -15 34 -15 100 0 69 -3 89 -15 94 -10 4 -15 20
+-15 50 0 25 -4 48 -10 51 -5 3 -10 22 -10 41 0 22 -6 37 -15 40 -9 4 -15 19
+-15 39 0 18 -7 38 -15 45 -9 8 -15 29 -15 56 0 23 -4 46 -10 49 -5 3 -10 26
+-10 49 0 27 -6 48 -15 56 -8 7 -15 27 -15 45 0 20 -6 35 -15 39 -11 4 -15 20
+-15 56 0 27 -4 50 -10 50 -5 0 -10 16 -10 35 0 22 -6 38 -15 41 -9 4 -15 19
+-15 39 0 18 -7 38 -15 45 -8 7 -15 28 -15 46 0 19 -4 34 -10 34 -5 0 -10 16
+-10 35 0 22 -6 38 -15 41 -11 5 -15 22 -15 69 0 47 -4 64 -15 69 -8 3 -15 14
+-15 25 0 11 -4 23 -10 26 -5 3 -10 26 -10 49 0 27 -6 48 -15 56 -8 7 -15 27
+-15 45 0 20 -6 35 -15 39 -9 3 -15 18 -15 39 0 19 -7 40 -15 47 -9 8 -15 29
+-15 56 0 23 -4 46 -10 49 -5 3 -10 26 -10 49 0 27 -6 48 -15 56 -8 7 -15 24
+-15 39 0 14 -7 35 -15 45 -8 11 -15 32 -15 48 0 15 -4 28 -10 28 -5 0 -10 15
+-10 34 0 18 -7 39 -15 46 -9 7 -15 29 -15 55 0 26 -6 48 -15 55 -9 8 -15 29
+-15 56 0 23 -4 46 -10 49 -5 3 -10 26 -10 49 0 27 -6 48 -15 56 -8 7 -15 20
+-15 30 0 10 -7 23 -15 30 -9 8 -15 30 -15 56 0 24 -4 44 -10 44 -5 0 -10 15
+-10 34 0 18 -7 39 -15 46 -8 7 -15 26 -15 42 0 16 -7 36 -15 44 -9 9 -15 34
+-15 60 0 24 -4 44 -10 44 -5 0 -10 22 -10 49 0 34 -4 51 -15 55 -9 3 -15 18
+-15 39 0 19 -7 40 -15 47 -8 7 -15 25 -15 41 0 15 -4 31 -10 34 -5 3 -10 26
+-10 49 0 27 -6 48 -15 56 -8 7 -15 26 -15 42 0 16 -7 36 -15 44 -9 9 -15 34
+-15 60 0 24 -4 44 -10 44 -5 0 -10 23 -10 50 0 36 -4 52 -15 56 -9 4 -15 19
+-15 39 0 18 -7 38 -15 45 -8 7 -15 24 -15 39 0 15 -12 40 -29 59 -24 26 -38
+32 -69 32 -21 0 -42 -3 -45 -7z"/>
+<path d="M2490 4666 c0 -56 4 -75 15 -80 8 -3 15 -14 15 -25 0 -11 5 -23 10
+-26 6 -3 10 -14 10 -24 0 -9 14 -30 30 -46 17 -16 30 -37 30 -47 0 -10 5 -18
+10 -18 6 0 10 -8 10 -19 0 -10 7 -24 15 -31 8 -7 15 -20 15 -30 0 -10 7 -23
+15 -30 8 -7 15 -21 15 -31 0 -11 5 -19 10 -19 6 0 10 -8 10 -19 0 -10 7 -24
+15 -31 8 -7 15 -27 15 -45 0 -20 6 -35 15 -39 8 -3 15 -18 15 -32 0 -31 30
+-104 42 -104 4 0 8 -11 8 -24 0 -13 7 -26 15 -30 9 -3 15 -19 15 -41 0 -19 5
+-35 10 -35 6 0 10 -15 10 -34 0 -18 7 -39 15 -46 8 -7 15 -20 15 -30 0 -10 7
+-20 15 -24 9 -3 15 -18 15 -40 0 -19 5 -38 10 -41 6 -3 10 -19 10 -34 0 -16 7
+-34 15 -41 8 -7 15 -20 15 -30 0 -10 7 -23 15 -30 8 -7 15 -21 15 -31 0 -11 5
+-19 10 -19 6 0 10 -15 10 -34 0 -18 7 -39 15 -46 8 -7 15 -27 15 -45 0 -20 6
+-35 15 -39 9 -3 15 -18 15 -40 0 -19 3 -36 8 -38 14 -6 42 -70 42 -98 0 -15 7
+-33 15 -40 8 -7 15 -19 15 -27 0 -8 7 -21 15 -29 8 -9 15 -29 15 -45 0 -16 5
+-29 10 -29 6 0 10 -11 10 -24 0 -13 7 -26 15 -30 9 -3 15 -18 15 -39 0 -19 7
+-40 15 -47 8 -7 15 -21 15 -31 0 -11 5 -19 10 -19 6 0 10 -15 10 -34 0 -18 7
+-39 15 -46 8 -7 15 -25 15 -40 0 -15 7 -33 15 -40 9 -8 15 -29 15 -56 0 -23 5
+-46 10 -49 6 -3 10 -21 10 -40 0 -20 6 -35 15 -39 8 -3 15 -14 15 -24 0 -11 7
+-25 15 -32 8 -7 15 -20 15 -29 0 -10 11 -28 25 -41 14 -13 25 -32 25 -42 0
+-10 4 -18 10 -18 5 0 12 -11 16 -24 3 -13 17 -34 30 -47 13 -12 24 -30 24 -39
+0 -9 11 -27 25 -40 14 -13 25 -30 25 -38 0 -8 25 -39 55 -68 30 -30 55 -60 55
+-67 0 -8 39 -53 87 -101 84 -83 89 -87 128 -84 l40 3 3 81 c2 63 -1 84 -13 94
+-8 7 -15 27 -15 45 0 20 -6 35 -15 39 -8 3 -15 13 -15 23 0 10 -36 54 -80 98
+-44 44 -80 86 -80 94 0 7 -11 24 -25 37 -14 13 -25 30 -25 39 0 9 -11 26 -25
+39 -14 13 -25 30 -25 38 0 8 -13 27 -30 43 -16 16 -30 37 -30 46 0 10 -5 19
+-12 21 -17 6 -2 38 18 38 20 0 114 -93 114 -112 0 -8 15 -28 33 -46 26 -26 41
+-32 75 -32 l42 0 0 74 c0 56 -4 75 -15 80 -9 3 -15 18 -15 40 0 19 -4 38 -10
+41 -5 3 -10 19 -10 34 0 16 -7 34 -15 41 -10 8 -15 31 -15 70 0 39 -5 62 -15
+70 -11 9 -15 32 -15 81 0 37 -4 71 -10 74 -6 4 -10 71 -10 169 0 133 -3 166
+-15 176 -11 9 -15 34 -15 100 0 69 -3 89 -15 94 -8 3 -15 13 -15 23 0 10 -40
+59 -90 108 -84 84 -90 92 -90 131 0 25 -6 47 -15 54 -9 7 -15 29 -15 55 0 26
+-6 48 -15 55 -8 7 -15 19 -15 28 0 8 -11 25 -25 38 -14 13 -25 30 -25 39 0 9
+-18 33 -40 54 -22 21 -40 44 -40 52 0 18 -171 189 -189 189 -8 0 -56 43 -108
+95 -52 52 -100 95 -107 95 -7 0 -41 29 -77 65 -35 35 -71 65 -79 65 -9 0 -45
+29 -80 65 -35 36 -73 65 -83 65 -9 0 -20 7 -23 15 -4 9 -19 15 -40 15 l-34 0
+0 -74z"/>
+</g>
+</svg>
diff --git a/editors/vscode/media/walkthrough/dashboard-view.png b/editors/vscode/media/walkthrough/dashboard-view.png
new file mode 100644
index 00000000..8694674f
Binary files /dev/null and b/editors/vscode/media/walkthrough/dashboard-view.png differ
diff --git a/editors/vscode/media/walkthrough/docs-website.png b/editors/vscode/media/walkthrough/docs-website.png
new file mode 100644
index 00000000..ef763afb
Binary files /dev/null and b/editors/vscode/media/walkthrough/docs-website.png differ
diff --git a/editors/vscode/media/walkthrough/script-contents-view.png b/editors/vscode/media/walkthrough/script-contents-view.png
new file mode 100644
index 00000000..01e33323
Binary files /dev/null and b/editors/vscode/media/walkthrough/script-contents-view.png differ
diff --git a/editors/vscode/media/walkthrough/settings.png b/editors/vscode/media/walkthrough/settings.png
new file mode 100644
index 00000000..d10e1c17
Binary files /dev/null and b/editors/vscode/media/walkthrough/settings.png differ
diff --git a/editors/vscode/media/walkthrough/vanilla-scripts-view.png b/editors/vscode/media/walkthrough/vanilla-scripts-view.png
new file mode 100644
index 00000000..2495525b
Binary files /dev/null and b/editors/vscode/media/walkthrough/vanilla-scripts-view.png differ
diff --git a/editors/vscode/media/walkthrough/view-container.png b/editors/vscode/media/walkthrough/view-container.png
new file mode 100644
index 00000000..adb52d1e
Binary files /dev/null and b/editors/vscode/media/walkthrough/view-container.png differ
diff --git a/editors/vscode/media/walkthrough/views.md b/editors/vscode/media/walkthrough/views.md
new file mode 100644
index 00000000..a4dddbef
--- /dev/null
+++ b/editors/vscode/media/walkthrough/views.md
@@ -0,0 +1,8 @@
+# Dashboard View
+The primary view is the dashboard, which lets among other things create a script project and recompile game's scripts.
+
+# Vanilla Scripts View
+This view lets you see all available vanilla script files that you can import/checkout into your project.
+
+# Contents View
+Script \"contents\" or \"packages\" are seperate units of code that WIDE can recognize. These include custom WIDE projects, REDkit projects and raw Mod directories. You can learn more about the project system that WIDE uses [here](https://spontancombust.github.io/witcherscript-ide/user-manual/project-system/).
\ No newline at end of file
diff --git a/editors/vscode/package-lock.json b/editors/vscode/package-lock.json
index 1b34bc72..877d553a 100644
--- a/editors/vscode/package-lock.json
+++ b/editors/vscode/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "witcherscript-ide",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "witcherscript-ide",
-      "version": "0.3.2",
+      "version": "0.4.0",
       "license": "MIT OR Apache-2.0",
       "dependencies": {
         "vscode-languageclient": "^9.0.0",
diff --git a/editors/vscode/package.json b/editors/vscode/package.json
index 4c2c6e18..83b290dc 100644
--- a/editors/vscode/package.json
+++ b/editors/vscode/package.json
@@ -9,7 +9,7 @@
   },
   "homepage": "https://spontancombust.github.io/witcherscript-ide",
   "license": "MIT OR Apache-2.0",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "engines": {
     "vscode": "^1.85.0"
   },
@@ -72,22 +72,50 @@
           "order": 1,
           "markdownDescription": "Paths to custom directories containing WitcherScript contents."
         },
+        "witcherscript-ide.gameHost.type": {
+          "type": "string",
+          "enum": [
+            "editor",
+            "standalone",
+            "auto"
+          ],
+          "enumDescriptions": [
+            "The game launched through the REDkit modding tool",
+            "The game launched on its own with debug arguments",
+            "The method gets automatically detected"
+          ],
+          "default": "auto",
+          "order": 2,
+          "markdownDescription": "What is the method you use to launch and mod the game. Affects remote commands in the dashboard view."
+        },
+        "witcherscript-ide.gameHost.ipAddress": {
+          "type": "string",
+          "default": "127.0.0.1",
+          "order": 3,
+          "markdownDescription": "IPv4 address of the game host. Affects remote commands in the dashboard view. Change this if you're running the game on a different computer from the one you're currently working in VSCode. Defaults to the localhost address."
+        },
         "witcherscript-ide.languageServer.enable": {
           "type": "boolean",
           "default": true,
-          "order": 2,
+          "order": 4,
           "markdownDescription": "Enable the language server. You can disable this if you only want syntax highlighting (change requires extension reload)."
         },
         "witcherscript-ide.languageServer.syntaxAnalysis": {
           "type": "boolean",
           "default": true,
-          "order": 3,
+          "order": 5,
           "markdownDescription": "Enables syntax analysis in the language server."
         },
+        "witcherscript-ide.languageServer.rayonThreads": {
+          "type": "integer",
+          "default": 0,
+          "order": 6,
+          "markdownDescription": "Number of threads allocated to parallel data computation. Leave at 0 for automatic configuration. (change requires extension reload)"
+        },
         "witcherscript-ide.debug.enableDebugFeatures": {
           "type": "boolean",
           "default": false,
-          "order": 4,
+          "order": 7,
           "markdownDescription": "Enable debug features (change requires extension reload)."
         }
       }
@@ -96,24 +124,92 @@
       {
         "command": "witcherscript-ide.projects.init",
         "title": "Initialize a WitcherScript project in existing directory...",
-        "category": "WitcherScript-IDE"
+        "category": "WitcherScript-IDE",
+        "icon": "$(plus)"
       },
       {
         "command": "witcherscript-ide.projects.create",
         "title": "Create a new WitcherScript project...",
-        "category": "WitcherScript-IDE"
+        "category": "WitcherScript-IDE",
+        "icon": "$(plus)"
+      },
+      {
+        "command": "witcherscript-ide.projects.refreshVanillaFilesView",
+        "title": "Refresh vanilla files",
+        "category": "WitcherScript-IDE (hidden)",
+        "icon": "$(refresh)"
+      },
+      {
+        "command": "witcherscript-ide.projects.refreshScriptContentView",
+        "title": "Refresh script contents",
+        "category": "WitcherScript-IDE (hidden)",
+        "icon": "$(refresh)"
       },
       {
         "command": "witcherscript-ide.scripts.importVanilla",
-        "title": "Import scripts from vanilla...",
+        "title": "Import scripts from vanilla into project...",
         "category": "WitcherScript-IDE",
-        "enablement": "witcherscript-ide.languageServerActive"
+        "enablement": "witcherscript-ide.languageServerActive",
+        "icon": "$(plus)"
       },
       {
         "command": "witcherscript-ide.scripts.diffVanilla",
-        "title": "Compare this script with vanilla counterpart",
+        "title": "Compare script with vanilla counterpart",
+        "category": "WitcherScript-IDE",
+        "enablement": "witcherscript-ide.languageServerActive"
+      },
+      {
+        "command": "witcherscript-ide.game.launchDx12",
+        "title": "Launch the game (DX12)",
+        "category": "WitcherScript-IDE"
+      },
+      {
+        "command": "witcherscript-ide.game.launchDx12Debug",
+        "title": "Launch the game for debugging (DX12)",
+        "category": "WitcherScript-IDE"
+      },
+      {
+        "command": "witcherscript-ide.game.launchDx11",
+        "title": "Launch the game (DX11)",
+        "category": "WitcherScript-IDE"
+      },
+      {
+        "command": "witcherscript-ide.game.launchDx11Debug",
+        "title": "Launch the game for debugging (DX11)",
+        "category": "WitcherScript-IDE"
+      },
+      {
+        "command": "witcherscript-ide.game.recompileScripts",
+        "title": "Recompile game scripts",
+        "category": "WitcherScript-IDE"
+      },
+      {
+        "command": "witcherscript-ide.game.execConsoleCommand",
+        "title": "Execute console command",
+        "category": "WitcherScript-IDE"
+      },
+      {
+        "command": "witcherscript-ide.misc.openLogs",
+        "title": "Open extension logs",
+        "category": "WitcherScript-IDE",
+        "enablement": "witcherscript-ide.languageServerActive"
+      },
+      {
+        "command": "witcherscript-ide.misc.openSettings",
+        "title": "Open extension settings",
+        "category": "WitcherScript-IDE"
+      },
+      {
+        "command": "witcherscript-ide.misc.openGameHostSettings",
+        "title": "Open extension settings for the game host",
+        "category": "WitcherScript-IDE",
+        "icon": "$(gear)"
+      },
+      {
+        "command": "witcherscript-ide.misc.runDashboardOption",
+        "title": "Run the option",
         "category": "WitcherScript-IDE",
-        "enablement": "witcherscript-ide.languageServerActive && editorLangId == 'witcherscript'"
+        "icon": "$(run)"
       },
       {
         "command": "witcherscript-ide.debug.showScriptAst",
@@ -141,11 +237,169 @@
       },
       {
         "command": "witcherscript-ide.debug.clearGlobalState",
-        "title": "Clear global cache of the extension",
+        "title": "Clear global persistent data",
         "category": "WitcherScript-IDE (debug)",
         "enablement": "witcherscript-ide.debugFeaturesEnabled"
       }
     ],
+    "viewsContainers": {
+      "activitybar": [
+        {
+          "id": "witcherscript-ide-mainViewContainer",
+          "title": "WitcherScript IDE",
+          "icon": "./media/view-container-icon.svg"
+        }
+      ]
+    },
+    "views": {
+      "witcherscript-ide-mainViewContainer": [
+        {
+          "id": "witcherscript-ide.dashboardView",
+          "name": "Dashboard",
+          "contextualTitle": "WitcherScript IDE",
+          "icon": "$(device-desktop)",
+          "visibility": "visible"
+        },
+        {
+          "id": "witcherscript-ide.vanillaFilesView",
+          "name": "Vanilla scripts",
+          "contextualTitle": "WitcherScript IDE",
+          "icon": "$(code)",
+          "visibility": "visible"
+        },
+        {
+          "id": "witcherscript-ide.scriptContentView",
+          "name": "Contents",
+          "contextualTitle": "WitcherScript IDE",
+          "icon": "$(package)",
+          "visibility": "visible"
+        }
+      ]
+    },
+    "viewsWelcome": [
+      {
+        "view": "witcherscript-ide.vanillaFilesView",
+        "contents": "No project in the workspace dependends on content0 or it couldn't be found"
+      },
+      {
+        "view": "witcherscript-ide.scriptContentView",
+        "contents": "No script projects detected in the workspace.\n[Initialize project](command:witcherscript-ide.projects.init)\n[Create new project](command:witcherscript-ide.projects.create)"
+      }
+    ],
+    "walkthroughs": [
+      {
+        "id": "witcherscript-ide.walkthrough",
+        "title": "Get Started with WitcherScript IDE",
+        "description": "Thank you for installing WIDE! This is a short introduction to the extension that will quickly teach how to use it.",
+        "steps": [
+          {
+            "id": "witcherscript-ide.walkthrough.settingsSetup",
+            "title": "Required settings",
+            "description": "Set up paths to the game directory or any other directories containing scripts. This is mandatory for the extension to be able to find vanilla scripts.\n[Open Settings](command:witcherscript-ide.misc.openSettings)",
+            "completionEvents": [
+              "onSettingChanged:witcherscript-ide.gameDirectory",
+              "onSettingChanged:witcherscript-ide.contentRepositories"
+            ],
+            "media": {
+              "image": "media/walkthrough/settings.png",
+              "altText": "Basic WIDE settings"
+            }
+          },
+          {
+            "id": "witcherscript-ide.walkthrough.views",
+            "title": "Views",
+            "description": "WIDE contributes a view container, which houses a few views that provide specialized functionalities and help you visualize the workspace better.\n[Open view container](command:witcherscript-ide.dashboardView.focus)",
+            "completionEvents": [],
+            "media": {
+              "markdown": "media/walkthrough/views.md"
+            }
+          },
+          {
+            "id": "witcherscript-ide.walkthrough.documentation",
+            "title": "Documentation",
+            "description": "WitcherScript IDE has its own documentation website you can check out for more details [here](https://spontancombust.github.io/witcherscript-ide/user-manual/).\nTo find out about all the things added, changed or removed throughout WIDE's versions check out the [changelog](https://spontancombust.github.io/witcherscript-ide/user-manual/changelog/).",
+            "completionEvents": [],
+            "media": {
+              "image": "media/walkthrough/docs-website.png",
+              "altText": "Documentation website"
+            }
+          },
+          {
+            "id": "witcherscript-ide.walkthrough.firstProject",
+            "title": "First script project",
+            "description": "Now you can finally move onto the fun part: coding! In order to use all the advanced features you need a script project. You can go about this in a few ways:\n[Initialize a script project](command:witcherscript-ide.projects.init)\nif you're already in the process of developing a mod using scripts\n[Create a new project](command:witcherscript-ide.projects.create)\nto create a completely new folder with the basic file structure you can later customize to your liking.\n[Open a REDkit project](command:vscode.openFolder)\nif your developing a mod using the REDkit. WIDE natively recognizes and can work with REDkit project solutions. If you work with a multi-mod set up you should still consider upgrading it with WIDE's project solution to use dependency discovery.",
+            "completionEvents": [
+              "onCommand:witcherscript-ide.projects.init",
+              "onCommand:witcherscript-ide.projects.create",
+              "onCommand:vscode.openFolder"
+            ],
+            "media": {
+              "image": "icon.png",
+              "altText": "WIDE"
+            }
+          }
+        ]
+      }
+    ],
+    "menus": {
+      "commandPalette": [
+        {
+          "command": "witcherscript-ide.projects.refreshVanillaFilesView",
+          "when": "false"
+        },
+        {
+          "command": "witcherscript-ide.projects.refreshScriptContentView",
+          "when": "false"
+        },
+        {
+          "command": "witcherscript-ide.misc.openGameHostSettings",
+          "when": "false"
+        }
+      ],
+      "view/title": [
+        {
+          "command": "witcherscript-ide.projects.refreshVanillaFilesView",
+          "when": "view == witcherscript-ide.vanillaFilesView",
+          "group": "navigation"
+        },
+        {
+          "command": "witcherscript-ide.projects.refreshScriptContentView",
+          "when": "view == witcherscript-ide.scriptContentView",
+          "group": "navigation"
+        }
+      ],
+      "view/item/context": [
+        {
+          "command": "witcherscript-ide.scripts.importVanilla",
+          "when": "view == witcherscript-ide.vanillaFilesView && viewItem == script",
+          "group": "inline"
+        },
+        {
+          "command": "witcherscript-ide.misc.openGameHostSettings",
+          "when": "view == witcherscript-ide.dashboardView && viewItem == gameHostInfo",
+          "group": "inline"
+        },
+        {
+          "command": "witcherscript-ide.misc.runDashboardOption",
+          "when": "view == witcherscript-ide.dashboardView && viewItem == dashboardCommandOption",
+          "group": "inline"
+        }
+      ],
+      "explorer/context": [
+        {
+          "command": "witcherscript-ide.scripts.diffVanilla",
+          "when": "resourceLangId == witcherscript",
+          "group": "3_compare"
+        }
+      ],
+      "editor/context": [
+        {
+          "command": "witcherscript-ide.scripts.diffVanilla",
+          "when": "editorLangId == witcherscript",
+          "group": "3_compare"
+        }
+      ]
+    },
     "grammars": [
       {
         "language": "witcherscript",
@@ -163,7 +417,8 @@
     "vscode:prepublish": "npm run build-base -- --minify",
     "build": "npm run build-base -- --sourcemap",
     "watch": "npm run build-base -- --sourcemap --watch=forever",
-    "build-base": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node"
+    "build-base": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node",
+    "check": "tsc --strict --noEmit"
   },
   "dependencies": {
     "vscode-languageclient": "^9.0.0",
diff --git a/editors/vscode/src/commands/debug.ts b/editors/vscode/src/commands/debug.ts
index 00fb5c9e..97b9209f 100644
--- a/editors/vscode/src/commands/debug.ts
+++ b/editors/vscode/src/commands/debug.ts
@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 
-import * as state from '../state';
+import { getPersistence } from '../persistence';
 import * as tdcp from '../providers/text_document_content_providers'
 import { Cmd } from './index'
 
@@ -42,8 +42,8 @@ export function commandShowScriptAst(context: vscode.ExtensionContext): Cmd {
                 editor.revealRange(new vscode.Range(targetPos, targetPos), vscode.TextEditorRevealType.AtTop);
             }
 
-            const rememberedChoices = state.RememberedChoices.Memento.fetchOrDefault(context);
-            if (!rememberedChoices.neverShowAgainDebugAstNotif) {
+            const db = getPersistence(context);
+            if (!db.neverShowAgainDebugAstNotif) {
                 enum Answer {
                     Close = "I understand",
                     NeverShowAgain = "Never show this message again"
@@ -55,8 +55,7 @@ export function commandShowScriptAst(context: vscode.ExtensionContext): Cmd {
                 );
 
                 if (answer == Answer.NeverShowAgain) {
-                    rememberedChoices.neverShowAgainDebugAstNotif = true;
-                    rememberedChoices.store(context);
+                    db.neverShowAgainDebugAstNotif = true;
                 }
             }
         });
@@ -138,9 +137,9 @@ export function commandShowScriptCst(context: vscode.ExtensionContext): Cmd {
                 editor.revealRange(new vscode.Range(targetPos, targetPos), vscode.TextEditorRevealType.AtTop);
             }
 
-            const rememberedChoices = state.RememberedChoices.Memento.fetchOrDefault(context);
+            const db = getPersistence(context);
             // using the same memento for AST warning for simplicity
-            if (!rememberedChoices.neverShowAgainDebugAstNotif) { 
+            if (!db.neverShowAgainDebugAstNotif) { 
                 enum Answer {
                     Close = "I understand",
                     NeverShowAgain = "Never show this message again"
@@ -152,8 +151,7 @@ export function commandShowScriptCst(context: vscode.ExtensionContext): Cmd {
                 );
 
                 if (answer == Answer.NeverShowAgain) {
-                    rememberedChoices.neverShowAgainDebugAstNotif = true;
-                    rememberedChoices.store(context);
+                    db.neverShowAgainDebugAstNotif = true;
                 }
             }
         });
@@ -162,16 +160,25 @@ export function commandShowScriptCst(context: vscode.ExtensionContext): Cmd {
 
 export function commandClearGlobalState(context: vscode.ExtensionContext): Cmd {
     return async () => {
-        const keys = context.globalState.keys();
+        const items: vscode.QuickPickItem[] = 
+            context.globalState.keys()
+            .map(k => { return {
+                label: k,
+                description: context.globalState.get<any>(k).toString()
+            }});
+
+        items.push({
+            label: 'ALL'
+        });
 
-        const selected = await vscode.window.showQuickPick([...keys, 'ALL']);
+        const selected = await vscode.window.showQuickPick(items);
         if (selected) {
-            if (selected == 'ALL') {
-                for (const key of keys) {
+            if (selected.label == 'ALL') {
+                for (const key of context.globalState.keys()) {
                     await context.globalState.update(key, undefined);
                 }
             } else {
-                await context.globalState.update(selected, undefined);
+                await context.globalState.update(selected.label, undefined);
             }
         }
     }
diff --git a/editors/vscode/src/commands/game.ts b/editors/vscode/src/commands/game.ts
new file mode 100644
index 00000000..2e1fb767
--- /dev/null
+++ b/editors/vscode/src/commands/game.ts
@@ -0,0 +1,98 @@
+import * as vscode from 'vscode';
+import * as fspath from 'path';
+import * as cp from 'child_process';
+
+import { Cmd } from './index'
+import { getConfiguration } from '../config';
+import { fileExists } from '../utils';
+import { Rw3dCli } from '../rw3d';
+
+
+const GAME_EXE_DIR_DX12 = "bin/x64_dx12";
+const GAME_EXE_DIR_DX11 = "bin/x64";
+const GAME_EXE_NAME = "witcher3.exe";
+const GAME_DEBUG_ARGS = ['-net', '-debugscripts'];
+
+export function commandLaunchGameDx12(): Cmd {
+    return () => {
+        launchGame("dx12", false)
+    }
+}
+
+export function commandLaunchGameDx12Debug(): Cmd {
+    return () => {
+        launchGame("dx12", true)
+    }
+}
+
+export function commandLaunchGameDx11(): Cmd {
+    return () => {
+        launchGame("dx11", false)
+    }
+}
+
+export function commandLaunchGameDx11Debug(): Cmd {
+    return () => {
+        launchGame("dx11", true)
+    }
+}
+
+async function launchGame(version: 'dx12' | 'dx11', debugMode: boolean) {
+    if (process.platform != 'win32') {
+        vscode.window.showErrorMessage("This action can only be performed on Windows");
+        return;
+    }
+
+    const cfg = getConfiguration();
+    if (cfg.gameDirectory == "") {
+        vscode.window.showErrorMessage("Path to the game directory has not been specified in the configuration!");
+        return;
+    }
+
+    const exeDir = fspath.join(cfg.gameDirectory, version == 'dx12' ? GAME_EXE_DIR_DX12 : GAME_EXE_DIR_DX11);
+    const exePath = fspath.join(exeDir, GAME_EXE_NAME);
+
+    if (!(await fileExists(exePath))) {
+        vscode.window.showErrorMessage("The game executable could not be found!");
+        return;
+    }
+
+    if (await isGameRunning()) {
+        vscode.window.showErrorMessage("The game is already running!");
+        return;
+    }
+
+    // spawn the game as a detached process
+    let child = cp.spawn(
+        exePath, 
+        debugMode ? GAME_DEBUG_ARGS : [], 
+        { detached: true, stdio: ['ignore'], cwd: exeDir }
+    );
+
+    // don't wait for the child to exit
+    child.unref();
+}
+
+async function isGameRunning(): Promise<boolean> {
+    return new Promise((resolve, _reject) => {
+        cp.exec('tasklist', (_err, stdout, _stderr) => {
+            resolve(stdout.toLowerCase().indexOf('witcher3.exe') > -1)
+        })
+    });
+}
+
+
+
+export function commandRecompileScripts(ctx: vscode.ExtensionContext): Cmd {
+    return () => {
+        const rw3d = new Rw3dCli(ctx);
+        rw3d.recompileScripts();
+    }
+}
+
+export function commandExecConsoleCommand(ctx: vscode.ExtensionContext): Cmd {
+    return () => {
+        const rw3d = new Rw3dCli(ctx);
+        rw3d.execConsoleCommmand();
+    }
+}
diff --git a/editors/vscode/src/commands/index.ts b/editors/vscode/src/commands/index.ts
index 375eaa94..4514a1f9 100644
--- a/editors/vscode/src/commands/index.ts
+++ b/editors/vscode/src/commands/index.ts
@@ -4,6 +4,8 @@ import { getConfiguration } from '../config';
 import * as debug from './debug';
 import * as projects from './projects';
 import * as scripts from './scripts';
+import * as game from './game';
+import * as misc from './misc';
 
 
 
@@ -11,8 +13,22 @@ export function registerCommands(context: vscode.ExtensionContext) {
     context.subscriptions.push(
         vscode.commands.registerCommand("witcherscript-ide.projects.init", projects.commandInitProject(context)),
         vscode.commands.registerCommand("witcherscript-ide.projects.create", projects.commandCreateProject(context)),
+        vscode.commands.registerCommand("witcherscript-ide.projects.refreshVanillaFilesView", projects.commandRefreshVanillaFilesView()),
+        vscode.commands.registerCommand("witcherscript-ide.projects.refreshScriptContentView", projects.commandRefreshScriptContentView()),
         vscode.commands.registerCommand("witcherscript-ide.scripts.importVanilla", scripts.commandImportVanillaScripts()),
         vscode.commands.registerCommand("witcherscript-ide.scripts.diffVanilla", scripts.commandDiffScriptWithVanilla(context)),
+        vscode.commands.registerCommand("witcherscript-ide.game.launchDx12", game.commandLaunchGameDx12()),
+        vscode.commands.registerCommand("witcherscript-ide.game.launchDx12Debug", game.commandLaunchGameDx12Debug()),
+        vscode.commands.registerCommand("witcherscript-ide.game.launchDx11", game.commandLaunchGameDx11()),
+        vscode.commands.registerCommand("witcherscript-ide.game.launchDx11Debug", game.commandLaunchGameDx11Debug()),
+        vscode.commands.registerCommand("witcherscript-ide.game.recompileScripts", game.commandRecompileScripts(context)),
+        vscode.commands.registerCommand("witcherscript-ide.game.execConsoleCommand", game.commandExecConsoleCommand(context)),
+        vscode.commands.registerCommand("witcherscript-ide.misc.showCommandsInPalette", misc.commandShowCommandsInPalette()),
+        vscode.commands.registerCommand("witcherscript-ide.misc.openLogs", misc.commandOpenLogs()),
+        vscode.commands.registerCommand("witcherscript-ide.misc.openSettings", misc.commandOpenSettings()),
+        vscode.commands.registerCommand("witcherscript-ide.misc.openGameHostSettings", misc.commandOpenGameHostSettings()),
+        vscode.commands.registerCommand("witcherscript-ide.misc.openFileReadOnly", misc.commandOpenFileReadOnly()),
+        vscode.commands.registerCommand("witcherscript-ide.misc.runDashboardOption", misc.commandRunDashboardOption()),
     );
 
     const cfg = getConfiguration();
diff --git a/editors/vscode/src/commands/misc.ts b/editors/vscode/src/commands/misc.ts
new file mode 100644
index 00000000..4b81df77
--- /dev/null
+++ b/editors/vscode/src/commands/misc.ts
@@ -0,0 +1,51 @@
+import * as vscode from 'vscode';
+
+import { Cmd } from './index'
+import { getLanguageClient } from '../lsp/lang_client';
+import * as tdcp from '../providers/text_document_content_providers'
+import { DashboardCommandOptionItem } from '../providers/dashboard_provider';
+
+
+export function commandShowCommandsInPalette(): Cmd {
+    return () => {
+        const category = 'WitcherScript-IDE';
+        vscode.commands.executeCommand('workbench.action.quickOpen', `>${category}`);
+    }
+}
+
+export function commandOpenLogs(): Cmd {
+    return () => {
+        const client = getLanguageClient();
+        if (client != undefined) {
+            client.outputChannel.show();
+        } else {
+            vscode.window.showWarningMessage("Language server is not active!")
+        }
+    }
+}
+
+export function commandOpenSettings(): Cmd {
+    return () => {
+        vscode.commands.executeCommand('workbench.action.openSettings', 'witcherscript-ide.')
+    }
+}
+
+export function commandOpenGameHostSettings(): Cmd {
+    return () => {
+        vscode.commands.executeCommand('workbench.action.openSettings', 'witcherscript-ide.gameHost')
+    }
+}
+
+export function commandOpenFileReadOnly(): Cmd {
+    return (uri: vscode.Uri) => {
+        uri = uri.with({ scheme: tdcp.ReadOnlyContentProvider.scheme });
+        tdcp.ReadOnlyContentProvider.getInstance().eventEmitter.fire(uri);
+        vscode.window.showTextDocument(uri);
+    }
+}
+
+export function commandRunDashboardOption(): Cmd {
+    return (item: DashboardCommandOptionItem) => {
+        vscode.commands.executeCommand(item.btnCommand)
+    }
+}
\ No newline at end of file
diff --git a/editors/vscode/src/commands/projects.ts b/editors/vscode/src/commands/projects.ts
index 8b9f7275..3b423f27 100644
--- a/editors/vscode/src/commands/projects.ts
+++ b/editors/vscode/src/commands/projects.ts
@@ -4,8 +4,10 @@ import * as path from 'path';
 import * as fs from 'fs/promises';
 
 import { getLanguageClient } from "../lsp/lang_client"
+import { VanillaFilesProvider } from '../providers/vanilla_files_provider';
+import { ScriptContentProvider } from '../providers/script_content_provider';
 import * as requests from '../lsp/requests';
-import * as state from '../state';
+import { getPersistence } from '../persistence';
 import * as utils from '../utils';
 import { Cmd } from './index'
 
@@ -150,12 +152,11 @@ async function initializeProjectInDirectory(client: lsp.LanguageClient, projectD
             Answer.YesHere, Answer.YesInNew, Answer.No);
 
         if (answer != undefined && answer != Answer.No) {
-            const memento = new state.OpenManifestOnInit.Memento(
-                projectDirUri,
-                manifestUri
-            );
-
-            await memento.store(context);
+            const db = getPersistence(context);
+            db.openManifestOnInit = {
+                workspaceUri: projectDirUri,
+                manifestUri,
+            };
 
             const openNewWindow = answer == Answer.YesInNew;
             await vscode.commands.executeCommand("vscode.openFolder", projectDirUri, {
@@ -163,4 +164,16 @@ async function initializeProjectInDirectory(client: lsp.LanguageClient, projectD
             });
         }
     }
+}
+
+export function commandRefreshVanillaFilesView(): Cmd {
+    return () => {
+        VanillaFilesProvider.getInstance().refreshAll();
+    }
+}
+
+export function commandRefreshScriptContentView(): Cmd {
+    return () => {
+        ScriptContentProvider.getInstance().refreshAll();
+    }
 }
\ No newline at end of file
diff --git a/editors/vscode/src/commands/scripts.ts b/editors/vscode/src/commands/scripts.ts
index 67806f2b..ca2e3f42 100644
--- a/editors/vscode/src/commands/scripts.ts
+++ b/editors/vscode/src/commands/scripts.ts
@@ -5,20 +5,22 @@ import * as fs from 'fs/promises';
 import { getLanguageClient } from "../lsp/lang_client"
 import * as requests from '../lsp/requests';
 import * as notifications from '../lsp/notifications';
+import * as model from '../lsp/model'
 import * as utils from '../utils';
 import { Cmd } from './index'
+import { VanillaFile } from '../providers/vanilla_files_provider';
 
 
 export function commandImportVanillaScripts(): Cmd {
-    return async () => {
+    return async (params?: VanillaFile) => {
         const client = getLanguageClient();
         if (client == undefined) {
             vscode.window.showErrorMessage("Language Server is not active!");
             return;
         }
         
-        let projectContentInfo: requests.ContentInfo;
-        let content0Info: requests.ContentInfo;
+        let projectContentInfo: model.ContentInfo;
+        let content0Info: model.ContentInfo;
 
         try {
             // Decide on which project in the workspace is the target of the import
@@ -55,33 +57,44 @@ export function commandImportVanillaScripts(): Cmd {
                 }
             }
 
-            // Get information about content0 (if it doesn't exist it will throw)
-            content0Info = (await client.sendRequest(requests.projects.vanillaDependencyContent.type, {
-                projectUri: projectContentInfo.contentUri
-            })).content0Info;
         } catch (error: any) {
             return vscode.window.showErrorMessage(`${error.message} [code ${error.code}]`);
         }
-
-        // Prompt the user to choose scripts for import
-
-        const content0ScriptsRootUri = client.protocol2CodeConverter.asUri(content0Info.scriptsRootUri);
-        let scriptsToImport = await vscode.window.showOpenDialog({
-            title: "Select script files",
-            openLabel: "Import",
-            canSelectFiles: true,
-            canSelectFolders: false,
-            canSelectMany: true,
-            defaultUri: content0ScriptsRootUri,
-            filters: {
-                'WitcherScript': ['ws']
-            },
-        });
         
-        if (scriptsToImport && scriptsToImport.length > 0) {
+
+        let content0ScriptsRootPath: string;
+        let scriptsToImport: vscode.Uri[];
+
+        if (params != undefined) {
+            content0ScriptsRootPath = params.scriptsRootPath;
+            scriptsToImport = params.resourceUri ? [params.resourceUri] : [];
+        } else {
+            try {
+                content0Info = (await client.sendRequest(requests.projects.vanillaDependencyContent.type, {
+                    projectUri: projectContentInfo.contentUri
+                })).content0Info;
+
+                const content0ScriptsRootUri = client.protocol2CodeConverter.asUri(content0Info.scriptsRootUri);
+
+                content0ScriptsRootPath = content0ScriptsRootUri.fsPath;
+                scriptsToImport = await vscode.window.showOpenDialog({
+                    title: "Select script files",
+                    openLabel: "Import",
+                    canSelectFiles: true,
+                    canSelectFolders: false,
+                    canSelectMany: true,
+                    defaultUri: content0ScriptsRootUri,
+                    filters: {
+                        'WitcherScript': ['ws']
+                    },
+                }) ?? [];
+            } catch (error: any) {
+                return vscode.window.showErrorMessage(`${error.message} [code ${error.code}]`);
+            } 
+        }
+
+        if (scriptsToImport.length > 0) {
             let encounteredProblems = false;
-            
-            const content0ScriptsRootPath = content0ScriptsRootUri.fsPath;
             const projectScriptsRootPath = client.protocol2CodeConverter.asUri(projectContentInfo.scriptsRootUri).fsPath;
 
             scriptsToImport = scriptsToImport.filter(uri => {
@@ -134,7 +147,10 @@ export function commandImportVanillaScripts(): Cmd {
             })
 
             if (encounteredProblems) {
-                vscode.window.showWarningMessage("Scripts imported with some problems (check extension output)");
+                const res = await vscode.window.showWarningMessage("Scripts imported with some problems", "Show Logs");
+                if (res == "Show Logs") {
+                    vscode.commands.executeCommand('witcherscript-ide.misc.openLogs');
+                }
             } else {
                 vscode.window.showInformationMessage("Successfully imported vanilla scripts into the project!")
             }
@@ -143,29 +159,35 @@ export function commandImportVanillaScripts(): Cmd {
 }
 
 export function commandDiffScriptWithVanilla(context: vscode.ExtensionContext): Cmd {
-    return async () => {
+    return async (param?: vscode.Uri) => {
         const client = getLanguageClient();
         if (client == undefined) {
             vscode.window.showErrorMessage("Language Server is not active!");
             return;
         }
         
-        if (!vscode.window.activeTextEditor) {
-            vscode.window.showErrorMessage("No active editor available!");
-            return;
+        let targetScriptUri;
+        if (param != undefined) {
+            targetScriptUri = param;
+        } else {
+            if (!vscode.window.activeTextEditor) {
+                vscode.window.showErrorMessage("No active editor available!");
+                return;
+            }
+
+            targetScriptUri = vscode.window.activeTextEditor.document.uri;
         }
 
-        const currentScriptUri = vscode.window.activeTextEditor.document.uri;
 
-        let currentContent: requests.ContentInfo;
-        let vanillaContent: requests.ContentInfo;
+        let targetContent: model.ContentInfo;
+        let vanillaContent: model.ContentInfo;
         try {
-            currentContent = (await client.sendRequest(requests.scripts.parent_content.type, {
-                scriptUri: client.code2ProtocolConverter.asUri(currentScriptUri)
+            targetContent = (await client.sendRequest(requests.scripts.parent_content.type, {
+                scriptUri: client.code2ProtocolConverter.asUri(targetScriptUri)
             })).parentContentInfo;
 
             vanillaContent = (await client.sendRequest(requests.projects.vanillaDependencyContent.type, {
-                projectUri: currentContent.contentUri
+                projectUri: targetContent.contentUri
             })).content0Info;
         } catch(error: any) {
             vscode.window.showErrorMessage(`${error.message} [code ${error.code}]`);
@@ -177,11 +199,11 @@ export function commandDiffScriptWithVanilla(context: vscode.ExtensionContext):
             return;
         }
 
-        const currentScriptPath = currentScriptUri.fsPath;
-        const currentScriptRootPath = client.protocol2CodeConverter.asUri(currentContent.scriptsRootUri).fsPath;
+        const targetScriptPath = targetScriptUri.fsPath;
+        const targetScriptRootPath = client.protocol2CodeConverter.asUri(targetContent.scriptsRootUri).fsPath;
         const vanillaScriptRootPath = client.protocol2CodeConverter.asUri(vanillaContent.scriptsRootUri).fsPath;
 
-        const relativePath = path.relative(currentScriptRootPath, currentScriptPath);
+        const relativePath = path.relative(targetScriptRootPath, targetScriptPath);
         const vanillaScriptPath = path.join(vanillaScriptRootPath, relativePath);
 
         let counterpartExists = true;
@@ -198,6 +220,6 @@ export function commandDiffScriptWithVanilla(context: vscode.ExtensionContext):
         const vanillaScriptUri = vscode.Uri.file(vanillaScriptPath);
         const scriptName = path.basename(vanillaScriptPath);
         const title = `${scriptName} (vanilla) ↔ ${scriptName} (modded)`;
-        return await vscode.commands.executeCommand("vscode.diff", vanillaScriptUri, currentScriptUri, title);
+        return await vscode.commands.executeCommand("vscode.diff", vanillaScriptUri, targetScriptUri, title);
     }
 }
\ No newline at end of file
diff --git a/editors/vscode/src/config.ts b/editors/vscode/src/config.ts
index 1670e73f..742bb5b9 100644
--- a/editors/vscode/src/config.ts
+++ b/editors/vscode/src/config.ts
@@ -1,21 +1,55 @@
 import * as vscode from 'vscode';
 
 
-export interface Config {
-    gameDirectory: string,
-    contentRepositories: string[],
-    enableLanguageServer: boolean,
-    enableSyntaxAnalysis: boolean,
-    enableDebugFeatures: boolean
+export function getConfiguration(): Config {
+    return new Config();
 }
 
-export function getConfiguration(): Config {
-    const config = vscode.workspace.getConfiguration('witcherscript-ide');
-    return {
-        gameDirectory: config.get<string>('gameDirectory') ?? '',
-        contentRepositories: config.get<string[]>('contentRepositories') ?? [],
-        enableLanguageServer: config.get<boolean>('languageServer.enable') ?? true,
-        enableSyntaxAnalysis: config.get<boolean>('languageServer.syntaxAnalysis') ?? true,
-        enableDebugFeatures: config.get<boolean>('debug.enableDebugFeatures') ?? false
+export class Config {
+    public static readonly SECTION = 'witcherscript-ide';
+
+    private readonly config: vscode.WorkspaceConfiguration;
+
+    constructor() {
+        this.config = vscode.workspace.getConfiguration(Config.SECTION);
+    }
+
+
+    get gameDirectory(): string {
+        return this.config.get<string>('gameDirectory') ?? '';
+    }
+
+    get contentRepositories(): string[] {
+        return this.config.get<string[]>('contentRepositories') ?? [];
     }
+
+    get gameHostType(): GameHostType {
+        return this.config.get<string>('gameHost.type') as GameHostType ?? GameHostType.Auto;
+    }
+
+    get gameHostIpAddress(): string {
+        return this.config.get<string>('gameHost.ipAddress') ?? '';
+    }
+
+    get enableLanguageServer(): boolean {
+        return this.config.get<boolean>('languageServer.enable') ?? true;
+    }
+
+    get rayonThreads(): number {
+        return this.config.get<number>('languageServer.rayonThreads') ?? 0;
+    }
+
+    get enableSyntaxAnalysis(): boolean {
+        return this.config.get<boolean>('languageServer.syntaxAnalysis') ?? true;
+    }
+
+    get enableDebugFeatures(): boolean {
+        return this.config.get<boolean>('debug.enableDebugFeatures') ?? false;
+    }
+}
+
+export enum GameHostType {
+    Standalone = "standalone",
+    Editor = "editor",
+    Auto = "auto"
 }
\ No newline at end of file
diff --git a/editors/vscode/src/context_keys.ts b/editors/vscode/src/context_keys.ts
new file mode 100644
index 00000000..c9b44876
--- /dev/null
+++ b/editors/vscode/src/context_keys.ts
@@ -0,0 +1,47 @@
+import * as vscode from 'vscode';
+
+
+export function getContextKeys() {
+    if (instance == undefined) {
+        instance = new ContextKeys();
+    }
+
+    return instance;
+}
+
+let instance: ContextKeys;
+
+export class ContextKeys {
+    private _debugFeaturesEnabled!: boolean;
+    private _languageServerActive!: boolean;
+    
+    constructor() {
+        this.debugFeaturesEnabled = false;
+        this.languageServerActive = false;
+    }
+
+
+    get debugFeaturesEnabled(): boolean {
+        return this._debugFeaturesEnabled;
+    }
+
+    set debugFeaturesEnabled(value: boolean) {
+        this._debugFeaturesEnabled = value;
+        this.setContextKey('debugFeaturesEnabled', value);
+    }
+
+
+    get languageServerActive(): boolean {
+        return this._languageServerActive;
+    }
+
+    set languageServerActive(value: boolean) {
+        this._languageServerActive = value;
+        this.setContextKey('languageServerActive', value);
+    }
+
+
+    private setContextKey(key: string, value: any) {
+        vscode.commands.executeCommand('setContext', `witcherscript-ide.${key}`, value);
+    }
+}
\ No newline at end of file
diff --git a/editors/vscode/src/extension.ts b/editors/vscode/src/extension.ts
index e62ea462..0b6214e7 100644
--- a/editors/vscode/src/extension.ts
+++ b/editors/vscode/src/extension.ts
@@ -4,22 +4,78 @@ import * as commands from './commands';
 import * as config from './config';
 import * as providers from './providers';
 import * as lc from './lsp/lang_client';
+import * as state from './state';
+import { getContextKeys } from './context_keys';
+import { getPersistence } from './persistence';
 
 
 export function activate(context: vscode.ExtensionContext) {
 	const cfg = config.getConfiguration();
+	const ctxKeys = getContextKeys();
+	const db = getPersistence(context);
 
-	vscode.commands.executeCommand('setContext', 'witcherscript-ide.debugFeaturesEnabled', cfg.enableDebugFeatures);
-	vscode.commands.executeCommand('setContext', 'witcherscript-ide.languageServerActive', false);
+	ctxKeys.debugFeaturesEnabled = cfg.enableDebugFeatures;
+	ctxKeys.languageServerActive = false;
 	
 	commands.registerCommands(context);
 	providers.registerProviders(context);
 
+	state.initializeState(context);
+
 	if (cfg.enableLanguageServer) {
 		lc.createLanguageClient(context, cfg).then(() => {
-			vscode.commands.executeCommand('setContext', 'witcherscript-ide.languageServerActive', true);
+			ctxKeys.languageServerActive = true;
+		});
+	}
+
+
+	if (db.shouldSeeWelcomeMessage) {
+		enum Answer {
+			ShowTuto = "Show tutorial",
+			Skip = "I know what I'm doing"
+		}
+
+		vscode.window.showInformationMessage(
+			"Thank you for installing WitcherScript IDE!\nCheck out the tutorial to get started.",
+			Answer.ShowTuto, Answer.Skip,
+		).then((answer) => {
+			if (answer) {
+				switch (answer) {
+					case Answer.ShowTuto:
+						vscode.commands.executeCommand("workbench.action.openWalkthrough", "SpontanCombust.witcherscript-ide#witcherscript-ide.walkthrough", false);
+						break;
+					case Answer.Skip:
+						break;
+				}
+
+				db.shouldSeeWelcomeMessage = false;
+			}
 		});
 	}
+
+	const version = context.extension.packageJSON.version as string;
+	if (db.version != version) {
+		const changelogUri = vscode.Uri.parse("https://spontancombust.github.io/witcherscript-ide/user-manual/changelog/");
+
+		enum Answer {
+			ShowChangelog = "Show changelog",
+		}
+
+		vscode.window.showInformationMessage(
+			`WitcherScript IDE has been updated to version ${version}`,
+			Answer.ShowChangelog
+		).then((answer) => {
+			if (answer) {
+				switch (answer) {
+					case Answer.ShowChangelog:
+						vscode.env.openExternal(changelogUri);
+						break;
+				}
+			}
+		})
+
+		db.version = version;
+	}
 }
 
 export function deactivate(): Thenable<void> | undefined {
diff --git a/editors/vscode/src/lsp/handlers.ts b/editors/vscode/src/lsp/handlers.ts
index 00b51de0..a5f77c30 100644
--- a/editors/vscode/src/lsp/handlers.ts
+++ b/editors/vscode/src/lsp/handlers.ts
@@ -1,16 +1,64 @@
 import { LanguageClient } from 'vscode-languageclient/node'
 import * as vscode from 'vscode';
+
 import * as notifications from './notifications';
 import * as utils from '../utils';
+import * as state from '../state'
+import { VanillaFilesProvider } from '../providers/vanilla_files_provider';
+import { ScriptContentProvider } from '../providers/script_content_provider';
+
 
 export function registerHandlers(client: LanguageClient, context: vscode.ExtensionContext) {
     client.onNotification(notifications.client.showForeignScriptWarning.type, handleShowForeignScriptWarningNotification(context))
+    client.onNotification(notifications.scripts.didStartScriptParsing.type, handleScriptParsingStartedNotification())
+    client.onNotification(notifications.scripts.didFinishScriptParsing.type, handleScriptParsingFinishedNotification())
+    client.onNotification(notifications.scripts.didFinishInitialIndexing.type, handleScriptsDidFinishInitialIndexingNotification())
+    client.onNotification(notifications.projects.didChangeContentGraph.type, handleProjectsDidChangeContentGraphNotification())
 }
 
-type Handler = (...args: any[]) => void;
 
-function handleShowForeignScriptWarningNotification(context: vscode.ExtensionContext): Handler {
+function handleShowForeignScriptWarningNotification(context: vscode.ExtensionContext) {
     return async () => {
         await utils.showForeignScriptWarning(context);
     }
+}
+
+function handleScriptParsingStartedNotification() {
+    return (params: notifications.scripts.didStartScriptParsing.Parameters) => {
+        state.scheduleWorkEvent({ 
+            kind: 'begin', 
+            work: {
+                kind: 'parsing-scripts',
+                contentName: params.contentName
+            }
+        });
+    }
+}
+
+function handleScriptParsingFinishedNotification() {
+    return (params: notifications.scripts.didFinishScriptParsing.Parameters) => {
+        state.scheduleWorkEvent({ 
+            kind: 'finish', 
+            work: {
+                kind: 'parsing-scripts',
+                contentName: params.contentName
+            }
+        });
+
+        state.updateLastActiveContentInfo();
+    }
+}
+
+function handleScriptsDidFinishInitialIndexingNotification() {
+    return () => {
+        
+    }
+}
+
+function handleProjectsDidChangeContentGraphNotification() {
+    return () => {
+        VanillaFilesProvider.getInstance().refreshAll();
+        ScriptContentProvider.getInstance().refreshAll();
+        state.updateLastActiveContentInfo();
+    }
 }
\ No newline at end of file
diff --git a/editors/vscode/src/lsp/lang_client.ts b/editors/vscode/src/lsp/lang_client.ts
index e909640d..49b5ef98 100644
--- a/editors/vscode/src/lsp/lang_client.ts
+++ b/editors/vscode/src/lsp/lang_client.ts
@@ -1,10 +1,10 @@
-import * as path from 'path';
 import * as vscode from 'vscode';
 import * as lsp from 'vscode-languageclient/node';
 
-import * as state from '../state';
+import { getPersistence } from '../persistence';
 import * as config from '../config';
 import * as handlers from './handlers';
+import * as tdcp from '../providers/text_document_content_providers'
 
 
 let client: lsp.LanguageClient | undefined;
@@ -12,11 +12,11 @@ let client: lsp.LanguageClient | undefined;
 export async function createLanguageClient(ctx: vscode.ExtensionContext, cfg: config.Config) {
     const ext = process.platform === "win32" ? ".exe" : "";
 	const serverPath = ctx.asAbsolutePath(
-		path.join('server', 'bin', `witcherscript-lsp${ext}`)
+		`deps/lsp_server/bin/witcherscript-lsp${ext}`
+	);
+	const nativeContentPath = ctx.asAbsolutePath(
+		`deps/lsp_server/assets/content0_native`
 	);
-	const nativeContentUri = vscode.Uri.joinPath(
-		ctx.extensionUri, 'server', 'assets', 'content0_native'
-	).toString();
 
 	// If the extension is launched in debug mode then the debug server options are used
 	// Otherwise the run options are used
@@ -32,7 +32,8 @@ export async function createLanguageClient(ctx: vscode.ExtensionContext, cfg: co
 	};
 
 	const initializationOptions: InitializationOptions = {
-		nativeContentUri: nativeContentUri,
+		rayonThreads: cfg.rayonThreads,
+		nativeContentPath: nativeContentPath,
 		gameDirectory: cfg.gameDirectory,
 		contentRepositories: cfg.contentRepositories,
 		enableSyntaxAnalysis: cfg.enableSyntaxAnalysis
@@ -43,7 +44,10 @@ export async function createLanguageClient(ctx: vscode.ExtensionContext, cfg: co
 		documentSelector: [
 			{ scheme: 'file', language: 'witcherscript' },
 			{ scheme: 'file', pattern: '**/*.w3edit' },
-			{ scheme: 'file', pattern: '**/witcherscript.toml' }
+			{ scheme: 'file', pattern: '**/witcherscript.toml' },
+			{ scheme: tdcp.ReadOnlyContentProvider.scheme, language: 'witcherscript' },
+			{ scheme: tdcp.ReadOnlyContentProvider.scheme, pattern: '**/*.w3edit' },
+			{ scheme: tdcp.ReadOnlyContentProvider.scheme, pattern: '**/witcherscript.toml' }
 		],
 		synchronize: {
 			// Notify the server about file changes to files we care about
@@ -67,8 +71,8 @@ export async function createLanguageClient(ctx: vscode.ExtensionContext, cfg: co
 
 	// Start the client. This will also launch the server
 	return client.start().then(_ => {
-		const memento = state.OpenManifestOnInit.Memento.fetch(ctx);
-		
+		const db = getPersistence(ctx);
+		const memento = db.openManifestOnInit;
 		if (memento != undefined) {
 			// If a new project has just been created in this directory and the user agreed to open it, show them the manifest of said project
 			if (vscode.workspace.workspaceFolders?.some(f => f.uri.fsPath == memento.workspaceUri.fsPath)) {
@@ -80,7 +84,7 @@ export async function createLanguageClient(ctx: vscode.ExtensionContext, cfg: co
 					(err) => client?.debug('Manifest could not be shown: ' + err)
 				);
 
-				state.OpenManifestOnInit.Memento.erase(ctx);
+				db.openManifestOnInit = undefined;
 			}
 		}
 	});
@@ -88,7 +92,8 @@ export async function createLanguageClient(ctx: vscode.ExtensionContext, cfg: co
 
 // Configuration needed by the server. The format in both client and server must match!
 interface InitializationOptions {
-	nativeContentUri: string,
+	rayonThreads: number,
+	nativeContentPath: string,
 	gameDirectory: string,
     contentRepositories: string[]
 	enableSyntaxAnalysis: boolean
diff --git a/editors/vscode/src/lsp/model.ts b/editors/vscode/src/lsp/model.ts
new file mode 100644
index 00000000..6a363a0f
--- /dev/null
+++ b/editors/vscode/src/lsp/model.ts
@@ -0,0 +1,17 @@
+// Common types for communication between the server and client
+
+export interface ContentInfo {
+    contentUri: string,
+    contentKind: ContentKind,
+    contentName: string,
+    scriptsRootUri: string,
+    isInWorkspace: boolean,
+    isInRepository: boolean,
+    isNative: boolean
+}
+
+export enum ContentKind {
+    Raw = 0,
+    WideProject = 1,
+    RedkitProject = 2
+}
\ No newline at end of file
diff --git a/editors/vscode/src/lsp/notifications.ts b/editors/vscode/src/lsp/notifications.ts
index e38b9044..0852bc2a 100644
--- a/editors/vscode/src/lsp/notifications.ts
+++ b/editors/vscode/src/lsp/notifications.ts
@@ -15,4 +15,30 @@ export namespace projects {
 
         export const type = new NotificationType<Parameters>("witcherscript-ide/projects/didImportScripts");
     }
+
+    export namespace didChangeContentGraph {
+        export const type = new NotificationType<void>("witcherscript-ide/projects/didChangeContentGraph");
+    }
+}
+
+export namespace scripts {
+    export namespace didFinishInitialIndexing {
+        export const type = new NotificationType<void>("witcherscript-ide/scripts/didFinishInitialIndexing");
+    }
+    
+    export namespace didStartScriptParsing {
+        export interface Parameters {
+            contentName: string
+        }
+
+        export const type = new NotificationType<Parameters>("witcherscript-ide/scripts/didStartScriptParsing");
+    }
+
+    export namespace didFinishScriptParsing {
+        export interface Parameters {
+            contentName: string
+        }
+
+        export const type = new NotificationType<Parameters>("witcherscript-ide/scripts/didFinishScriptParsing");
+    }
 }
\ No newline at end of file
diff --git a/editors/vscode/src/lsp/requests.ts b/editors/vscode/src/lsp/requests.ts
index 01165b88..48aa1756 100644
--- a/editors/vscode/src/lsp/requests.ts
+++ b/editors/vscode/src/lsp/requests.ts
@@ -1,13 +1,6 @@
 import { RequestType } from 'vscode-languageclient';
 
-
-export interface ContentInfo {
-    contentUri: string,
-    scriptsRootUri: string,
-    contentName: string,
-    isInWorkspace: boolean,
-    isInRepository: boolean
-}
+import * as model from './model'
 
 
 export namespace projects {
@@ -33,7 +26,7 @@ export namespace projects {
         }
     
         export interface Response {
-            projectInfos: ContentInfo[]
+            projectInfos: model.ContentInfo[]
         }
     
         export const type = new RequestType<Parameters, Response, void>("witcherscript-ide/projects/list");
@@ -45,11 +38,36 @@ export namespace projects {
         }
 
         export interface Response {
-            content0Info: ContentInfo
+            content0Info: model.ContentInfo
         }
 
         export const type = new RequestType<Parameters, Response, void>("witcherscript-ide/projects/vanillaDependencyContent");
     }
+
+    export namespace vanillaContent {
+        export interface Parameters {
+            
+        }
+
+        export interface Response {
+            content0Info: model.ContentInfo | undefined
+        }
+
+        export const type = new RequestType<Parameters, Response, void>("witcherscript-ide/projects/vanillaContent");
+    }
+
+    export namespace sourceTree {
+        export interface Parameters {
+            contentUri: string
+        }
+
+        export interface Response {
+            scriptsRootPath: string,
+            localScriptPaths: string[]
+        }
+
+        export const type = new RequestType<Parameters, Response, void>("witcherscript-ide/projects/sourceTree");
+    }
 }
 
 export namespace scripts {
@@ -59,7 +77,7 @@ export namespace scripts {
         }
 
         export interface Response {
-            parentContentInfo: ContentInfo
+            parentContentInfo: model.ContentInfo
         }
 
         export const type = new RequestType<Parameters, Response, void>("witcherscript-ide/scripts/parentContent");
diff --git a/editors/vscode/src/persistence.ts b/editors/vscode/src/persistence.ts
new file mode 100644
index 00000000..db7a4986
--- /dev/null
+++ b/editors/vscode/src/persistence.ts
@@ -0,0 +1,84 @@
+import * as vscode from 'vscode';
+
+
+export function getPersistence(ctx: vscode.ExtensionContext): Persistence {
+    return new Persistence(ctx)
+}
+
+export class Persistence {
+    constructor(
+        readonly ctx: vscode.ExtensionContext
+    ) {}
+
+
+    // Used for opening the manifest file of the newly created project
+    get openManifestOnInit(): OpenManifestOnInit | undefined {
+        const dto = this.ctx.globalState.get<OpenManifestOnInitDto>("OpenManifestOnInit");
+        if (dto) {
+            return {
+                workspaceUri: vscode.Uri.parse(dto.workspaceUriStr),
+                manifestUri: vscode.Uri.parse(dto.manifestUriStr),
+            }
+        } else {
+            return undefined;
+        }
+    }
+
+    set openManifestOnInit(value: OpenManifestOnInit | undefined) {
+        let dto: OpenManifestOnInitDto | undefined = undefined;
+        if (value) {
+            dto = {
+                workspaceUriStr: value.workspaceUri.toString(),
+                manifestUriStr: value.manifestUri.toString(),
+            }
+        }
+
+        this.ctx.globalState.update("OpenManifestOnInit", dto);
+    }
+
+
+    get neverShowAgainDebugAstNotif(): boolean {
+        return this.ctx.globalState.get<boolean>("NeverShowAgainDebugAstNotif") ?? false;
+    }
+
+    set neverShowAgainDebugAstNotif(value: boolean) {
+        this.ctx.globalState.update("NeverShowAgainDebugAstNotif", value)
+    }
+
+
+    get neverShowAgainForeignScriptWarning(): boolean {
+        return this.ctx.globalState.get<boolean>("NeverShowAgainForeignScriptWarning") ?? false;
+    }
+
+    set neverShowAgainForeignScriptWarning(value: boolean) {
+        this.ctx.globalState.update("NeverShowAgainForeignScriptWarning", value)
+    }
+
+
+    get shouldSeeWelcomeMessage(): boolean {
+        return this.ctx.globalState.get<boolean>("ShouldSeeWelcomeMessage") ?? true;
+    }
+
+    set shouldSeeWelcomeMessage(value: boolean) {
+        this.ctx.globalState.update("ShouldSeeWelcomeMessage", value)
+    }
+
+
+    get version(): string {
+        return this.ctx.globalState.get<string>("Version") ?? "";
+    }
+
+    set version(value: string) {
+        this.ctx.globalState.update("Version", value)
+    }
+}
+
+export interface OpenManifestOnInit {
+    workspaceUri: vscode.Uri,
+    manifestUri: vscode.Uri
+}
+
+interface OpenManifestOnInitDto {
+    workspaceUriStr: string,
+    manifestUriStr: string
+}
diff --git a/editors/vscode/src/providers/dashboard_provider.ts b/editors/vscode/src/providers/dashboard_provider.ts
new file mode 100644
index 00000000..6ae9bc5d
--- /dev/null
+++ b/editors/vscode/src/providers/dashboard_provider.ts
@@ -0,0 +1,184 @@
+import * as vscode from 'vscode'
+
+import { Config, getConfiguration } from '../config';
+
+
+let instance: DashboardProvider;
+
+export class DashboardProvider implements vscode.TreeDataProvider<Item> {
+    public static readonly viewId = "witcherscript-ide.dashboardView";
+
+    private didChangeTreeData: vscode.EventEmitter<
+        void | Item | Item[] | null | undefined
+    > = new vscode.EventEmitter();
+
+
+    private constructor() {}
+    
+    public static getInstance() : DashboardProvider {
+        if (instance == undefined) {
+            instance = new DashboardProvider();
+        }
+
+        vscode.workspace.onDidChangeConfiguration((ev) => {
+            if (ev.affectsConfiguration(Config.SECTION)) {
+                // making sure that game host type is synced
+                instance.didChangeTreeData.fire(undefined);
+            }
+        });
+    
+        return instance;
+    }
+
+
+    onDidChangeTreeData: vscode.Event<
+        void | Item | Item[] | null | undefined
+    > = this.didChangeTreeData.event;
+
+    getTreeItem(element: Item): vscode.TreeItem | Thenable<vscode.TreeItem> {
+        return element;
+    }
+
+    getChildren(element?: Item | undefined): vscode.ProviderResult<Item[]> {
+        return new Promise((resolve, _reject) => {
+            if (element == undefined) {
+                return resolve(this.getRootItems());
+            } else {
+                return resolve(element.getChildren());
+            }
+        })
+    }
+
+    getParent(element: Item): vscode.ProviderResult<Item> {
+        return element.parent;
+    }
+
+
+    private async getRootItems() : Promise<Item[]> {
+        return [
+            new GameLaunchOptionsHeaderItem(),
+            new ProjectSystemOptionsHeaderItem(),
+            new RemoteCommandsHeaderItem(),
+            new MiscOptionsHeaderItem()
+        ];
+    }
+}
+
+
+abstract class DashboardOptionsHeaderItem extends vscode.TreeItem {
+    readonly parent = undefined;
+
+    constructor(
+        override readonly label: string
+    ) {
+        super(label, vscode.TreeItemCollapsibleState.Expanded);
+    }
+
+    abstract getChildren(): DashboardOptionItem[];
+}
+
+abstract class DashboardOptionItem extends vscode.TreeItem {
+    constructor(
+        readonly parent: DashboardOptionsHeaderItem,
+        override readonly label: string,
+        iconId: string | undefined
+    ) {
+        super(label, vscode.TreeItemCollapsibleState.None);
+        if (iconId) {
+            this.iconPath = new vscode.ThemeIcon(iconId);
+        }
+    }
+
+    getChildren() {
+        return [];
+    }
+}
+
+export class DashboardCommandOptionItem extends DashboardOptionItem {
+    constructor(
+        readonly parent: DashboardOptionsHeaderItem,
+        override readonly label: string,
+        iconId: string | undefined,
+        readonly btnCommand: string
+    ) {
+        super(parent, label, iconId);
+        this.contextValue = "dashboardCommandOption";
+    }
+}
+
+export type Item = 
+    DashboardOptionsHeaderItem |
+    DashboardOptionItem;
+
+
+
+
+class GameLaunchOptionsHeaderItem extends DashboardOptionsHeaderItem {
+    constructor() {
+        super("Game launch options");
+    }
+
+    getChildren(): DashboardOptionItem[] {
+        return [
+            new DashboardCommandOptionItem(this, "Launch the game (DX12)", "run", "witcherscript-ide.game.launchDx12"),
+            new DashboardCommandOptionItem(this, "Launch the game for debugging (DX12)", "debug-alt", "witcherscript-ide.game.launchDx12Debug"),
+            new DashboardCommandOptionItem(this, "Launch the game (DX11)", "run", "witcherscript-ide.game.launchDx11"),
+            new DashboardCommandOptionItem(this, "Launch the game for debugging (DX11)", "debug-alt", "witcherscript-ide.game.launchDx11Debug"),
+        ];
+    }
+}
+
+
+class ProjectSystemOptionsHeaderItem extends DashboardOptionsHeaderItem {
+    constructor() {
+        super("Project system");
+    }
+
+    getChildren(): DashboardOptionItem[] {
+        return [
+            new DashboardCommandOptionItem(this, "Initialize a WitcherScript project in existing directory", "package", "witcherscript-ide.projects.init"),
+            new DashboardCommandOptionItem(this, "Create a new WitcherScript project", "package", "witcherscript-ide.projects.create"),
+        ];
+    }
+}
+
+
+class RemoteCommandsHeaderItem extends DashboardOptionsHeaderItem {
+    constructor() {
+        super("Remote commands");
+    }
+
+    getChildren(): DashboardOptionItem[] {
+        return [
+            new RemoteCommandsHostInfoItem(this),
+            new DashboardCommandOptionItem(this, "Recompile scripts", "remote", "witcherscript-ide.game.recompileScripts"),
+            new DashboardCommandOptionItem(this, "Execute console command", "remote", "witcherscript-ide.game.execConsoleCommand"),
+        ];
+    }
+}
+
+class RemoteCommandsHostInfoItem extends DashboardOptionItem {
+    constructor(
+        readonly parent: RemoteCommandsHeaderItem,
+    ) {
+        const cfg = getConfiguration();
+        const label = `Game host: ${cfg.gameHostType.toString()}, address: ${cfg.gameHostIpAddress}`;
+
+        super(parent, label, undefined);
+        this.contextValue = "gameHostInfo";
+    }
+}
+
+
+class MiscOptionsHeaderItem extends DashboardOptionsHeaderItem {
+    constructor() {
+        super("Miscellaneous");
+    }
+
+    getChildren(): DashboardOptionItem[] {
+        return [
+            new DashboardCommandOptionItem(this, "Open settings", "circle-filled", "witcherscript-ide.misc.openSettings"),
+            new DashboardCommandOptionItem(this, "Open language server logs", "circle-filled", "witcherscript-ide.misc.openLogs")
+        ];
+    }
+}
diff --git a/editors/vscode/src/providers/file_decorations_providers.ts b/editors/vscode/src/providers/file_decorations_providers.ts
new file mode 100644
index 00000000..0e3db8a1
--- /dev/null
+++ b/editors/vscode/src/providers/file_decorations_providers.ts
@@ -0,0 +1,18 @@
+import * as vscode from 'vscode'
+
+import * as tdcp from './text_document_content_providers'
+
+
+export class ReadOnlyFileDecorationsProvider implements vscode.FileDecorationProvider {
+    onDidChangeFileDecorations?: vscode.Event<
+        vscode.Uri | vscode.Uri[] | undefined
+    > = undefined;
+
+    provideFileDecoration(uri: vscode.Uri, _token: vscode.CancellationToken): vscode.ProviderResult<vscode.FileDecoration> {
+        if (uri.scheme == tdcp.ReadOnlyContentProvider.scheme) {
+            return new vscode.FileDecoration("R", "This file is read-only", new vscode.ThemeColor("icon.foreground"));
+        }
+
+        return undefined;
+    }
+}
\ No newline at end of file
diff --git a/editors/vscode/src/providers/index.ts b/editors/vscode/src/providers/index.ts
index cee18611..4a943f93 100644
--- a/editors/vscode/src/providers/index.ts
+++ b/editors/vscode/src/providers/index.ts
@@ -1,6 +1,10 @@
 import * as vscode from 'vscode';
 
 import * as tdcp from './text_document_content_providers';
+import { DashboardProvider } from './dashboard_provider';
+import { VanillaFilesProvider } from './vanilla_files_provider';
+import { ScriptContentProvider } from './script_content_provider';
+import * as fdp from './file_decorations_providers'
 
 
 export function registerProviders(context: vscode.ExtensionContext) {
@@ -9,5 +13,10 @@ export function registerProviders(context: vscode.ExtensionContext) {
         vscode.workspace.registerTextDocumentContentProvider(tdcp.ScriptCstProvider.scheme, tdcp.ScriptCstProvider.getInstance()),
         vscode.workspace.registerTextDocumentContentProvider(tdcp.ContentGraphDotProvider.scheme, tdcp.ContentGraphDotProvider.getInstance()),
         vscode.workspace.registerTextDocumentContentProvider(tdcp.ScriptSymbolsProvider.scheme, tdcp.ScriptSymbolsProvider.getInstance()),
+        vscode.workspace.registerTextDocumentContentProvider(tdcp.ReadOnlyContentProvider.scheme, tdcp.ReadOnlyContentProvider.getInstance()),
+        vscode.window.registerTreeDataProvider(DashboardProvider.viewId, DashboardProvider.getInstance()),
+        vscode.window.registerTreeDataProvider(VanillaFilesProvider.viewId, VanillaFilesProvider.getInstance()),
+        vscode.window.registerTreeDataProvider(ScriptContentProvider.viewId, ScriptContentProvider.getInstance()),
+        vscode.window.registerFileDecorationProvider(new fdp.ReadOnlyFileDecorationsProvider())
     );
 }
\ No newline at end of file
diff --git a/editors/vscode/src/providers/script_content_provider.ts b/editors/vscode/src/providers/script_content_provider.ts
new file mode 100644
index 00000000..66fbc13f
--- /dev/null
+++ b/editors/vscode/src/providers/script_content_provider.ts
@@ -0,0 +1,241 @@
+import * as vscode from 'vscode'
+import * as fs from 'fs'
+import * as fspath from 'path'
+
+import * as model from '../lsp/model'
+import * as requests from '../lsp/requests'
+import { getLanguageClient } from '../lsp/lang_client';
+
+
+let instance: ScriptContentProvider;
+
+export class ScriptContentProvider implements vscode.TreeDataProvider<Item> {
+    public static readonly viewId = "witcherscript-ide.scriptContentView";
+
+    private didChangeTreeData: vscode.EventEmitter<
+        void | Item | Item[] | null | undefined
+    > = new vscode.EventEmitter();
+
+
+    private constructor() {}
+    
+    public static getInstance() : ScriptContentProvider {
+        if (instance == undefined) {
+            instance = new ScriptContentProvider();
+        }
+    
+        return instance;
+    }
+
+    refreshAll() {
+        this.didChangeTreeData.fire(undefined)
+    }
+
+
+    onDidChangeTreeData: vscode.Event<
+        void | Item | Item[] | null | undefined
+    > = this.didChangeTreeData.event;
+
+    getTreeItem(element: Item): vscode.TreeItem | Thenable<vscode.TreeItem> {
+        return element;
+    }
+
+    getChildren(element?: Item | undefined): vscode.ProviderResult<Item[]> {
+        return new Promise((resolve, _reject) => {
+            if (element == undefined) {
+                return resolve(this.getRootItems());
+            } else {
+                return resolve(element.getChildren())
+            }
+        })
+    }
+
+    getParent(element: Item): vscode.ProviderResult<Item> {
+        return element.parent;
+    }
+
+
+    private async getRootItems() : Promise<ScriptContentItem[]> {
+        const client = getLanguageClient();
+        if (!client) {
+            return [];
+        }
+        
+        try {
+            const res = await client.sendRequest(requests.projects.list.type, {
+                onlyFromWorkspace: false
+            });
+
+            // if there are no projects in the workspace leave the view empty so the welcome message can appear
+            if (!res.projectInfos.some(ci => ci.isInWorkspace)) {
+                return [];
+            }
+
+            return res.projectInfos
+                .sort((ci1, ci2) => ci1.contentName.localeCompare(ci2.contentName))
+                .map(ci => new ScriptContentItem(ci));
+                
+        } catch(err: any) {
+            vscode.window.showErrorMessage("Failed to get info about workspace contents: " + err.message)
+            return [];
+        }
+    }
+}
+
+
+export type Item = 
+    ScriptContentItem | 
+    ScriptContentMetadataHeaderItem | 
+    ScriptContentMetadataItem | 
+    ScriptContentFileHeaderItem |
+    ScriptContentFileItem;
+
+class ScriptContentItem extends vscode.TreeItem {
+    readonly parent = undefined;
+
+    constructor(
+        readonly contentInfo: model.ContentInfo
+    ) {
+        super(contentInfo.contentName, vscode.TreeItemCollapsibleState.Collapsed);
+
+        const contentPath = vscode.Uri.parse(contentInfo.contentUri).fsPath;
+        this.iconPath = new vscode.ThemeIcon("package");
+        this.description = contentPath;
+        this.tooltip = contentPath;
+    }
+
+    getChildren(): Item[] {
+        return [
+            new ScriptContentMetadataHeaderItem(this),
+            new ScriptContentFileHeaderItem(this)
+        ]
+    }
+}
+
+class ScriptContentMetadataHeaderItem extends vscode.TreeItem {
+    constructor(
+        readonly parent: ScriptContentItem
+    ) {
+        super("Metadata", vscode.TreeItemCollapsibleState.Expanded);
+
+        this.iconPath = new vscode.ThemeIcon("gear");
+    }
+
+    getChildren(): Item[] {
+        const ci = this.parent.contentInfo;
+        const kindStr = (() => {
+            switch (ci.contentKind) {
+                case model.ContentKind.Raw: 
+                    return "Raw";
+                case model.ContentKind.WideProject:
+                    return "WIDE project";
+                case model.ContentKind.RedkitProject:
+                    return "REDkit project";
+                default:
+                    return "";
+            }
+        })();
+
+        return [
+            new ScriptContentMetadataItem(this, "Path", vscode.Uri.parse(ci.contentUri).fsPath),
+            new ScriptContentMetadataItem(this, "Kind", kindStr),
+            new ScriptContentMetadataItem(this, "Name", ci.contentName),
+            new ScriptContentMetadataItem(this, "Scripts root", vscode.Uri.parse(ci.scriptsRootUri).fsPath),
+            new ScriptContentMetadataItem(this, "In workspace", ci.isInWorkspace.toString()),
+            new ScriptContentMetadataItem(this, "In repository", ci.isInRepository.toString()),
+            new ScriptContentMetadataItem(this, "Is native", ci.isNative.toString()),
+        ];
+    }
+}
+
+class ScriptContentMetadataItem extends vscode.TreeItem {
+    constructor(
+        readonly parent: ScriptContentMetadataHeaderItem,
+        override readonly label: string,
+        override readonly description: string,
+    ) {
+        super(label, vscode.TreeItemCollapsibleState.None);
+
+        this.iconPath = new vscode.ThemeIcon("gear");
+        this.tooltip = description;
+    }
+
+    getChildren(): Item[] {
+        return [];
+    }
+}
+
+class ScriptContentFileHeaderItem extends vscode.TreeItem {
+    override readonly label = "Files";
+
+    constructor(
+        readonly parent: ScriptContentItem,
+    ) {
+        const resourceUri = vscode.Uri.parse(parent.contentInfo.contentUri);
+        super(resourceUri, vscode.TreeItemCollapsibleState.Collapsed);
+
+        this.id = resourceUri.fsPath.toLowerCase();
+    }
+
+    getChildren(): Item[] {
+        const fullPath = this.resourceUri!.fsPath;
+        return readFilesInDir(this, fullPath, this.parent.contentInfo.isInWorkspace);
+    }
+}
+
+class ScriptContentFileItem extends vscode.TreeItem {
+    override readonly label: string;
+
+    constructor(
+        readonly parent: ScriptContentFileItem | ScriptContentFileHeaderItem,
+        readonly fullPath: string,
+        readonly isDir: boolean,
+        readonly inWorkspace: boolean,
+    ) {
+        const resourceUri = vscode.Uri.file(fullPath);
+        const collapsibleState = isDir ? vscode.TreeItemCollapsibleState.Collapsed : vscode.TreeItemCollapsibleState.None;
+        super(resourceUri, collapsibleState);
+
+        this.id = fullPath.toLowerCase();
+        this.label = fspath.basename(fullPath);
+
+        if (!isDir) {
+            // disallow editing the file if it's from outside the workspace
+            const cmd = inWorkspace ? 'vscode.open' :  'witcherscript-ide.misc.openFileReadOnly';
+
+            this.command = {
+                command: cmd,
+                title: 'Open file',
+                arguments: [resourceUri]
+            }
+        }
+    }
+
+    getChildren(): Item[] {
+        return this.isDir ? readFilesInDir(this, this.fullPath, this.inWorkspace) : [];
+    }
+
+    cmp(other: ScriptContentFileItem) : number {
+        if (this.isDir == other.isDir) {
+            return this.label.localeCompare(other.label);
+        } else {
+            if (this.isDir && !other.isDir) {
+                return -1;
+            } else {
+                return 1;
+            }
+        }
+    }
+}
+
+
+function readFilesInDir(parent: ScriptContentFileItem | ScriptContentFileHeaderItem, fullDirPath: string, inWorkspace: boolean): ScriptContentFileItem[] {
+    return fs.readdirSync(fullDirPath)
+        .map((fileName) => {
+            const fullPath = fspath.join(fullDirPath, fileName);
+            const isDir = fs.lstatSync(fullPath).isDirectory();
+
+            return new ScriptContentFileItem(parent, fullPath, isDir, inWorkspace)
+        })
+        .sort((f1, f2) => f1.cmp(f2));
+}
\ No newline at end of file
diff --git a/editors/vscode/src/providers/text_document_content_providers.ts b/editors/vscode/src/providers/text_document_content_providers.ts
index 3f69da19..a3643bc6 100644
--- a/editors/vscode/src/providers/text_document_content_providers.ts
+++ b/editors/vscode/src/providers/text_document_content_providers.ts
@@ -187,6 +187,40 @@ export class ScriptSymbolsProvider implements vscode.TextDocumentContentProvider
         )
     }
 
+    get onDidChange(): vscode.Event<vscode.Uri> {
+        return this.eventEmitter.event;
+    }
+}
+
+
+export class ReadOnlyContentProvider implements vscode.TextDocumentContentProvider {
+    private static instance: ReadOnlyContentProvider;
+
+    private constructor() {}
+    public static getInstance(): ReadOnlyContentProvider {
+        if (!ReadOnlyContentProvider.instance) {
+            ReadOnlyContentProvider.instance = new ReadOnlyContentProvider();
+
+            vscode.window.onDidChangeActiveTextEditor(te => {
+                if (te != undefined && te.document.uri.scheme == ReadOnlyContentProvider.scheme) {
+                    ReadOnlyContentProvider.instance.eventEmitter.fire(te.document.uri)
+                }
+            });
+        }
+
+        return ReadOnlyContentProvider.instance;
+    }
+
+
+    public static readonly scheme = "witcherscript-ide-file-readonly";
+
+    public eventEmitter = new vscode.EventEmitter<vscode.Uri>();
+
+    provideTextDocumentContent(uri: vscode.Uri): vscode.ProviderResult<string> {
+        return vscode.workspace.openTextDocument(uri.with({ scheme: 'file' }))
+            .then(td => td.getText())
+    }
+
     get onDidChange(): vscode.Event<vscode.Uri> {
         return this.eventEmitter.event;
     }
diff --git a/editors/vscode/src/providers/vanilla_files_provider.ts b/editors/vscode/src/providers/vanilla_files_provider.ts
new file mode 100644
index 00000000..cf373ed2
--- /dev/null
+++ b/editors/vscode/src/providers/vanilla_files_provider.ts
@@ -0,0 +1,201 @@
+import * as vscode from 'vscode'
+import * as fs from 'fs'
+import * as fspath from 'path'
+
+import * as requests from '../lsp/requests'
+import { getLanguageClient } from '../lsp/lang_client'
+import * as utils from '../utils'
+
+
+let instance: VanillaFilesProvider;
+
+export class VanillaFilesProvider implements vscode.TreeDataProvider<VanillaFile> {
+    public static readonly viewId = "witcherscript-ide.vanillaFilesView";
+
+    private vanillaContentUri: string;
+    private vanillaScriptsRootPath: string;
+    private vanillaLocalFilePaths: string[];
+
+    private didChangeTreeData: vscode.EventEmitter<
+        void | VanillaFile | VanillaFile[] | null | undefined
+    > = new vscode.EventEmitter();
+
+    private constructor() {
+        this.vanillaContentUri = "";
+        this.vanillaScriptsRootPath = "";
+        this.vanillaLocalFilePaths = [];
+    }
+
+    public static getInstance() : VanillaFilesProvider {
+        if (instance == undefined) {
+            instance = new VanillaFilesProvider();
+        }
+    
+        return instance;
+    }
+
+    public refreshAll() {
+        this.didChangeTreeData.fire(undefined);
+    }
+
+
+    onDidChangeTreeData: vscode.Event<
+        void | VanillaFile | VanillaFile[] | null | undefined
+    > = this.didChangeTreeData.event;
+
+    getTreeItem(element: VanillaFile): vscode.TreeItem | Thenable<vscode.TreeItem> {
+        return element;
+    }
+
+    getChildren(element?: VanillaFile | undefined): vscode.ProviderResult<VanillaFile[]> {
+        return new Promise((resolve, _reject) => {
+            if (element) {
+                return resolve(this.makeChildrenFiles(this.vanillaLocalFilePaths, this.vanillaScriptsRootPath, element));
+            } else {
+                return resolve(this.makeVanillaRootFiles());
+            }
+        })
+    }
+
+    getParent(element: VanillaFile): vscode.ProviderResult<VanillaFile> {
+        return element.parent;
+    }
+
+
+    private async makeVanillaRootFiles(): Promise<VanillaFile[]> {
+        await this.fetchVanillaSourcePaths();
+        return this.makeRootFiles(this.vanillaLocalFilePaths, this.vanillaScriptsRootPath);
+    }
+
+    private makeRootFiles(localPaths: string[], fullPathRoot: string): VanillaFile[] {
+        const rootFiles = localPaths
+            .filter(p => utils.pathComponents(p).length == 1)
+            .map(localPath => {
+                const fullPath = fspath.join(fullPathRoot, localPath);
+                const isDir = fs.lstatSync(fullPath).isDirectory();
+
+                return new VanillaFile(this.vanillaScriptsRootPath, fullPath, localPath, isDir, undefined);
+            })
+            .sort((f1, f2) => f1.cmp(f2));
+
+        return rootFiles;
+    }
+
+    private makeChildrenFiles(localPaths: string[], fullPathRoot: string, parent: VanillaFile): VanillaFile[] {
+        const childFiles = localPaths
+            .filter(p => utils.isSubpathOf(p, parent.localPath))
+            .filter(p => utils.pathComponents(p).length == utils.pathComponents(parent.localPath).length + 1)
+            .map(localPath => {
+                const fullPath = fspath.join(fullPathRoot, localPath);
+                const isDir = fs.lstatSync(fullPath).isDirectory();
+
+                return new VanillaFile(this.vanillaScriptsRootPath, fullPath, localPath, isDir, undefined);
+            })
+            .sort((f1, f2) => f1.cmp(f2));
+
+        return childFiles;
+    }
+
+    private async fetchVanillaSourcePaths() {
+        const client = getLanguageClient();
+        if (!client) {
+            this.vanillaContentUri = "";
+            this.vanillaScriptsRootPath = "";
+            this.vanillaLocalFilePaths = [];
+            return;
+        }
+
+        try {
+            var vanillaContentRes = await client.sendRequest(requests.projects.vanillaContent.type, {});
+            if (!vanillaContentRes.content0Info) {
+                client.info("[Vanilla Files View] No content0 to create a view for");
+                this.vanillaContentUri = "";
+                this.vanillaScriptsRootPath = "";
+                this.vanillaLocalFilePaths = [];
+                return;
+            }
+
+            this.vanillaContentUri = vanillaContentRes.content0Info.contentUri;
+            this.vanillaScriptsRootPath = vscode.Uri.parse(vanillaContentRes.content0Info.scriptsRootUri).fsPath;
+
+            var sourceTreeRes = await client.sendRequest(requests.projects.sourceTree.type, {
+                contentUri: this.vanillaContentUri
+            });
+
+            this.vanillaLocalFilePaths = this.fillIntermediaryPaths(sourceTreeRes.localScriptPaths);
+        } catch(err: any) {
+            vscode.window.showErrorMessage("Failed to get info about content0: " + err.message)
+        }
+    }
+
+    /// Only paths to files are returned from the server
+    /// We also need paths to all their parent directories
+    private fillIntermediaryPaths(paths: string[]): string[] {
+        let pathSet = new Set(paths);
+
+        for (const p of paths) {
+            let i = p.indexOf(fspath.sep, 0);
+            while (i != -1) {
+                const partialPath = p.slice(0, i + 1);
+                pathSet.add(partialPath);
+
+                i = p.indexOf(fspath.sep, i + 1);
+            }
+        }
+
+        const arr = Array.from(pathSet);
+        arr.sort();
+        return arr;
+    }
+}
+
+export class VanillaFile extends vscode.TreeItem {
+    readonly scriptsRootPath: string;
+    readonly fullPath: string;
+    // relative to the scripts root
+    readonly localPath: string;
+    readonly isDir: boolean;
+    readonly parent?: VanillaFile;
+    override readonly label: string;
+
+    constructor(
+        scriptsRootPath: string,
+        fullPath: string, 
+        localPath: string,
+        isDir: boolean,
+        parent?: VanillaFile
+    ) {
+        const resourceUri = vscode.Uri.file(fullPath);
+        const collapsibleState = isDir ? vscode.TreeItemCollapsibleState.Collapsed : vscode.TreeItemCollapsibleState.None;
+        super(resourceUri, collapsibleState);
+
+        this.scriptsRootPath = scriptsRootPath;
+        this.fullPath = fullPath;
+        this.localPath = localPath;
+        this.isDir = isDir;
+        this.parent = parent;
+        this.id = fullPath.toLowerCase();
+        this.label = fspath.basename(fullPath);
+        this.contextValue = isDir ? undefined : 'script';
+
+        if (!isDir) {
+            this.command = {
+                command: 'witcherscript-ide.misc.openFileReadOnly',
+                title: 'Open file',
+                arguments: [resourceUri]
+            }
+        }
+    }
+
+    cmp(other: VanillaFile) : number {
+        if (this.isDir == other.isDir) {
+            return this.label.localeCompare(other.label);
+        } else {
+            if (this.isDir && !other.isDir) {
+                return -1;
+            } else {
+                return 1;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/editors/vscode/src/rw3d/index.ts b/editors/vscode/src/rw3d/index.ts
new file mode 100644
index 00000000..0c109c7e
--- /dev/null
+++ b/editors/vscode/src/rw3d/index.ts
@@ -0,0 +1,85 @@
+/// Handling the Rusty Witcher 3 Debugger CLI executable shipped together with the extension
+
+import * as vscode from 'vscode';
+import * as cp from 'child_process';
+
+import { GameHostType, getConfiguration } from '../config';
+import * as state from '../state'
+
+
+export class Rw3dCli {
+    private readonly exePath: string;
+    
+    constructor(ctx: vscode.ExtensionContext) {
+        const ext = process.platform === "win32" ? ".exe" : "";
+        this.exePath = ctx.asAbsolutePath(
+            `deps/rw3d/bin/rw3d_cli${ext}`
+        );
+    }
+
+
+    public recompileScripts() {
+        this.run('reload', []);
+    }
+
+    public async execConsoleCommmand(cmd?: string) {
+        if (!cmd) {
+            cmd = await vscode.window.showInputBox({
+                title: "Enter a console command to be executed"
+            });
+        }
+
+        if (cmd) {
+            this.run('exec', [`"${cmd}"`]);
+        }
+    }
+
+
+    private run(cmd: string, additionalArgs: string[]) {
+        const cfg = getConfiguration();
+
+        let target: string;
+        switch (cfg.gameHostType) {
+            case GameHostType.Standalone:
+                target = "game";
+                break;
+            case GameHostType.Editor:
+                target = "editor";
+                break;
+            case GameHostType.Auto:
+                target = "auto";
+                break;
+            default:
+                target = "auto";
+        }
+
+        const ip = cfg.gameHostIpAddress;
+        const args = [
+            "--no-delay", "--log-level=output-only", `--target=${target}`, `--ip=${ip}`,
+            cmd, ...additionalArgs
+        ];
+
+        state.gameOutputChannel.show();
+        
+        state.gameOutputChannel.debug(`Executing: rw3d_cli ${args.join(" ")}`)
+        const rw3d = cp.spawn(this.exePath, args);
+
+        rw3d.stdout.on('data', (data) => {
+            const s = (data.toString() as string).trimEnd();
+            for(const line of s.split("\n")) {
+                state.gameOutputChannel.append(line);
+            }
+        });
+
+        rw3d.stderr.on('data', (data) => {
+            const s = (data.toString() as string).trimEnd();
+            for(const line of s.split("\n")) {
+                state.gameOutputChannel.error(line);
+            }
+        });
+
+        rw3d.stdout.on('close', () => {
+            state.gameOutputChannel.append("\n");
+        });
+    }
+}
\ No newline at end of file
diff --git a/editors/vscode/src/state.ts b/editors/vscode/src/state.ts
index 0c5d1d23..92bdc3ba 100644
--- a/editors/vscode/src/state.ts
+++ b/editors/vscode/src/state.ts
@@ -1,90 +1,177 @@
 import * as vscode from 'vscode';
 
+import { getLanguageClient } from './lsp/lang_client';
+import * as requests from './lsp/requests';
+import * as model from './lsp/model';
+import * as config from './config'
 
-// Used for opening the manifest file of the newly created project
-export namespace OpenManifestOnInit {
-    export const KEY = "OpenManifestOnInit";
 
-    export class Memento {
-        public workspaceUri: vscode.Uri;
-        public manifestUri: vscode.Uri;
+let contextStatusBar: vscode.StatusBarItem;
+let lastActiveContentInfo: model.ContentInfo | undefined = undefined;
+export let gameOutputChannel: vscode.LogOutputChannel;
 
-        constructor(workspaceUri: vscode.Uri, manifestUri: vscode.Uri) {
-            this.workspaceUri = workspaceUri;
-            this.manifestUri = manifestUri;
-        }
 
-        public async store(context: vscode.ExtensionContext) {
-            const dto: MementoDto = {
-                workspaceUriStr: this.workspaceUri.toString(),
-                manifestUriStr: this.manifestUri.toString(),
-            };
+/// Get info about the content to which belongs the last viewed script 
+export function getLastActiveContentInfo(): model.ContentInfo | undefined {
+    return lastActiveContentInfo;
+}
 
-            await context.globalState.update(KEY, dto);
-        }
+const lastActiveContentChanged = new vscode.EventEmitter<model.ContentInfo | undefined>();
 
-        public static fetch(context: vscode.ExtensionContext): Memento | undefined {
-            const dto = context.globalState.get<MementoDto>(KEY);
-            if (dto) {
-                const memento = new Memento(
-                    vscode.Uri.parse(dto.workspaceUriStr),
-                    vscode.Uri.parse(dto.manifestUriStr),
-                );
-
-                return memento;
-            } else {
-                return undefined;
-            }
-        }
+export const onLastActiveContentChanged = lastActiveContentChanged.event;
+
+
+export interface ParsingScriptsWork {
+    kind: 'parsing-scripts',
+    contentName: string
+}
+
+export type Work = ParsingScriptsWork;
+
+export interface WorkEvent {
+    kind: 'begin' | 'finish',
+    work: Work
+}
+
+let workStatusBar: vscode.StatusBarItem;
+let currentWork: Work | undefined = undefined;
+let workEventQueue: WorkEvent[] = [];
+let workUpdaterRunning = false;
+
+// Establishing a minimal time for which a status must be visible for the user to see it
+const WORK_UPDATE_PERIOD_MILIS: number = 500;
+
+
+export function initializeState(context: vscode.ExtensionContext) {
+    contextStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
+    contextStatusBar.tooltip = "Click to show available commands";
+    contextStatusBar.command = 'witcherscript-ide.misc.showCommandsInPalette';
+    updateContextStatusBar();
+    contextStatusBar.show();
+    context.subscriptions.push(contextStatusBar);
+
+    workStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
+    workStatusBar.command = 'witcherscript-ide.misc.openLogs';
+    updateWorkStatusBar();
+    context.subscriptions.push(workStatusBar);
+
+    vscode.window.onDidChangeActiveTextEditor(() => {
+        updateLastActiveContentInfo();
+    });
+
+    gameOutputChannel = vscode.window.createOutputChannel("Witcher 3 Output", { log: true });
+}
+
+
+
+export async function updateLastActiveContentInfo() {
+    const prevContentJson = JSON.stringify(lastActiveContentInfo);
 
-        public static erase(context: vscode.ExtensionContext) {
-            context.globalState.update(KEY, undefined);
+    const client = getLanguageClient();
+    if (client == undefined) {
+        lastActiveContentInfo = undefined;
+    } else {
+        const activeEditor = vscode.window.activeTextEditor;
+        const isWitcherScript = activeEditor?.document.languageId == 'witcherscript';
+        const documentUri = activeEditor?.document.uri;
+
+        // if there is no active editor opened we leave the last content name as is
+        if (documentUri != undefined && isWitcherScript) {
+            let currentContent: model.ContentInfo | undefined = undefined;
+            try {
+                const res = await client.sendRequest(requests.scripts.parent_content.type, {
+                    scriptUri: client.code2ProtocolConverter.asUri(documentUri)
+                });
+
+                currentContent = res.parentContentInfo;
+            } catch(_) {}
+
+            lastActiveContentInfo = currentContent;
         }
     }
 
-    interface MementoDto {
-        workspaceUriStr: string,
-        manifestUriStr: string
+    if (prevContentJson != JSON.stringify(lastActiveContentInfo)) {
+        updateContextStatusBar();
+        lastActiveContentChanged.fire(lastActiveContentInfo);
     }
 }
 
-export namespace RememberedChoices {
-    export const KEY = "RememberedChoices";
+function updateContextStatusBar() {
+    let text = "WitcherScript IDE";
 
-    export class Memento {
-        public neverShowAgainDebugAstNotif: boolean;
-        public neverShowAgainForeignScriptWarning: boolean;
+    if (!config.getConfiguration().enableLanguageServer) {
+        text += " [Disabled]";
+    } else {
+        const contentName = (lastActiveContentInfo != undefined) ? lastActiveContentInfo.contentName : "No active content";
+        text += ` [${contentName}]`;
+    }
+    
+    contextStatusBar.text = text;
+}
 
-        constructor(dto: MementoDto) {
-            this.neverShowAgainDebugAstNotif = dto.neverShowAgainDebugAstNotif;
-            this.neverShowAgainForeignScriptWarning = dto.neverShowAgainForeignScriptWarning;
-        }
 
-        public async store(context: vscode.ExtensionContext) {
-            const dto: MementoDto = {
-                neverShowAgainDebugAstNotif: this.neverShowAgainDebugAstNotif,
-                neverShowAgainForeignScriptWarning: this.neverShowAgainForeignScriptWarning
-            };
 
-            context.globalState.update(KEY, dto);
-        }
+export function scheduleWorkEvent(event: WorkEvent) {
+    workEventQueue.push(event);
 
-        public static fetchOrDefault(context: vscode.ExtensionContext): Memento {
-            const dto = context.globalState.get<MementoDto>(KEY);
+    if (!workUpdaterRunning) {
+        workUpdaterRunning = true;
+        updateWork();
+    }
+}
 
-            if (dto) {
-                return new Memento(dto);
-            } else {
-                return new Memento({
-                    neverShowAgainDebugAstNotif: false,
-                    neverShowAgainForeignScriptWarning: false
-                })
+function updateWork() {
+    if (currentWork == undefined) {
+        beginNewWork();
+    } else {
+        for (let i = 0; i < workEventQueue.length; i += 1) {
+            const event = workEventQueue[i];
+            if (event.kind == 'finish' && JSON.stringify(event.work) == JSON.stringify(currentWork)) {
+                workEventQueue.splice(i, 1);
+                currentWork = undefined;
+                break;
             }
         }
+
+        if (currentWork == undefined) {
+            beginNewWork();
+        }
     }
 
-    interface MementoDto {
-        neverShowAgainDebugAstNotif: boolean;
-        neverShowAgainForeignScriptWarning: boolean;
+    updateWorkStatusBar();
+
+    if (currentWork != undefined) {
+        setTimeout(() => {
+            updateWork();
+        }, WORK_UPDATE_PERIOD_MILIS);
+    } else {
+        workUpdaterRunning = false;
+    }
+}
+
+function beginNewWork() {
+    for (let i = 0; i < workEventQueue.length; i += 1) {
+        const event = workEventQueue[i];
+        if (event.kind == 'begin') {
+            currentWork = workEventQueue.splice(i, 1)[0].work;
+            break;
+        }
+    }
+}
+
+function updateWorkStatusBar() {
+    if (currentWork != undefined) {
+        let text = "$(sync~spin) ";
+
+        switch (currentWork.kind) {
+            case 'parsing-scripts':
+                text += `Processing (${currentWork.contentName})`
+                break;
+        }
+
+        workStatusBar.text = text;
+        workStatusBar.show();
+    } else {
+        workStatusBar.hide();
     }
 }
\ No newline at end of file
diff --git a/editors/vscode/src/utils.ts b/editors/vscode/src/utils.ts
index f084e211..d26efb37 100644
--- a/editors/vscode/src/utils.ts
+++ b/editors/vscode/src/utils.ts
@@ -1,13 +1,14 @@
 import * as vscode from 'vscode';
-import * as path from 'path';
+import * as fs from 'fs/promises';
+import * as fspath from 'path';
 
-import * as state from './state';
-import * as requests from './lsp/requests'
+import { getPersistence } from './persistence';
+import * as model from './lsp/model'
 
 
 export async function showForeignScriptWarning(context: vscode.ExtensionContext) {
-    const rememberedChoices = state.RememberedChoices.Memento.fetchOrDefault(context);
-    if (!rememberedChoices.neverShowAgainForeignScriptWarning) {
+    const db = getPersistence(context);
+    if (!db.neverShowAgainForeignScriptWarning) {
         enum Answer {
             Close = "I understand",
             NeverShowAgain = "Don't show this message again",
@@ -24,8 +25,7 @@ export async function showForeignScriptWarning(context: vscode.ExtensionContext)
         );
 
         if (answer == Answer.NeverShowAgain) {
-            rememberedChoices.neverShowAgainForeignScriptWarning = true;
-            rememberedChoices.store(context);
+            db.neverShowAgainForeignScriptWarning = true;
         }
         else if (answer == Answer.SeeManual) {
             await vscode.env.openExternal(manualUri);
@@ -42,13 +42,13 @@ export async function showForeignScriptWarning(context: vscode.ExtensionContext)
  * 
  * @returns ContentInfo or undefined
  */
-export async function chooseProject(projects: requests.ContentInfo[]): Promise<requests.ContentInfo | undefined> {
+export async function chooseProject(projects: model.ContentInfo[]): Promise<model.ContentInfo | undefined> {
     if (!projects || projects.length == 0) {
         return undefined;
     } else if (projects.length == 1) {
         return projects[0];
     } else {
-        return await new Promise<requests.ContentInfo | undefined>((resolve, _) => {
+        return await new Promise<model.ContentInfo | undefined>((resolve, _) => {
             const qp = vscode.window.createQuickPick<ContentQuickPickItem>();
             qp.placeholder = "Select a project";
             qp.canSelectMany = false;
@@ -70,7 +70,7 @@ export async function chooseProject(projects: requests.ContentInfo[]): Promise<r
 }
 
 class ContentQuickPickItem implements vscode.QuickPickItem {
-    public content: requests.ContentInfo
+    public content: model.ContentInfo
 
     label: string;
     kind?: vscode.QuickPickItemKind;
@@ -81,7 +81,7 @@ class ContentQuickPickItem implements vscode.QuickPickItem {
     alwaysShow?: boolean;
     buttons?: readonly vscode.QuickInputButton[];
 
-    constructor(content: requests.ContentInfo) {
+    constructor(content: model.ContentInfo) {
         this.content = content;
 
         this.label = content.contentName;
@@ -95,11 +95,24 @@ class ContentQuickPickItem implements vscode.QuickPickItem {
 }
 
 
-export function isSubpathOf(dir: string, parent: string): boolean {
-    if (dir === parent) return false;
+export function pathComponents(path: string) : string[] {
+    return path.split(fspath.sep).filter(i => i.length);
+}
+
+export function isSubpathOf(child: string, parent: string): boolean {
+    if (child === parent) return false;
 
-    let parentComps = parent.split(path.sep).filter(i => i.length);
-    let dirComps = dir.split(path.sep).filter(i => i.length);
+    let parentComps = pathComponents(parent);
+    let dirComps = pathComponents(child);
 
     return parentComps.every((comp, i) => dirComps[i] === comp);
+}
+
+export async function fileExists(path: string): Promise<boolean> {
+    try {
+        await fs.stat(path);
+        return true;
+    } catch(_) {
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/media/wild-hunt-three.png b/media/wild-hunt-three.png
new file mode 100644
index 00000000..76e60f26
Binary files /dev/null and b/media/wild-hunt-three.png differ
diff --git a/media/wild-hunt-three.svg b/media/wild-hunt-three.svg
new file mode 100644
index 00000000..e03cec7b
--- /dev/null
+++ b/media/wild-hunt-three.svg
@@ -0,0 +1,244 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="1000.000000pt" height="1000.000000pt" viewBox="0 0 1000.000000 1000.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,1000.000000) scale(0.100000,-0.100000)" stroke="none">
+<path d="M5087 9923 c-4 -3 -7 -59 -7 -123 0 -92 3 -120 15 -130 12 -10 15
+-49 15 -230 0 -181 3 -220 15 -230 12 -10 15 -45 15 -191 0 -113 4 -179 10
+-179 6 0 10 -53 10 -139 0 -111 3 -141 15 -151 12 -10 15 -36 15 -114 0 -89
+-2 -104 -20 -119 -26 -22 -40 -22 -40 2 0 10 -7 24 -15 31 -8 7 -15 20 -15 30
+0 10 -7 23 -15 30 -11 9 -15 34 -15 96 0 45 -4 86 -10 89 -6 4 -10 71 -10 169
+0 133 -3 166 -15 176 -12 10 -15 40 -15 150 0 110 -3 140 -15 150 -11 9 -15
+33 -15 92 0 97 -16 121 -76 116 -37 -3 -39 -5 -42 -38 -2 -19 -10 -39 -18 -43
+-8 -4 -14 -23 -14 -42 0 -19 -4 -35 -10 -35 -5 0 -10 -23 -10 -50 0 -36 -4
+-52 -15 -56 -11 -5 -15 -23 -15 -79 0 -52 -4 -76 -15 -85 -13 -11 -15 -56 -15
+-296 0 -178 -4 -285 -10 -289 -6 -4 -10 -138 -10 -370 0 -310 -2 -366 -15
+-379 -13 -12 -15 -76 -15 -444 0 -370 -2 -431 -15 -442 -9 -8 -15 -29 -15 -56
+0 -23 -4 -46 -10 -49 -5 -3 -10 -19 -10 -35 0 -16 -7 -35 -15 -44 -10 -9 -15
+-34 -15 -69 0 -36 -5 -59 -15 -67 -11 -9 -15 -34 -15 -96 0 -45 -4 -86 -10
+-89 -6 -4 -10 -80 -10 -195 0 -154 -3 -191 -15 -204 -11 -11 -15 -37 -15 -101
+0 -67 -3 -87 -15 -91 -13 -5 -15 -72 -15 -514 0 -439 2 -509 15 -520 8 -7 15
+-20 15 -29 0 -9 54 -70 120 -136 66 -66 120 -126 120 -134 0 -7 11 -24 25 -37
+16 -14 25 -34 25 -52 0 -16 7 -35 15 -42 8 -7 15 -19 15 -27 0 -8 7 -21 15
+-29 10 -10 15 -35 15 -75 0 -33 4 -59 10 -59 6 0 10 -123 10 -350 0 -304 -2
+-350 -15 -350 -8 0 -15 8 -15 19 0 10 -7 24 -15 31 -11 9 -15 33 -15 86 l0 74
+-58 0 c-57 0 -58 -1 -115 -58 -31 -32 -57 -65 -57 -73 0 -9 -11 -25 -25 -35
+-22 -16 -25 -26 -25 -78 0 -50 4 -62 25 -82 14 -13 25 -27 25 -32 0 -5 11 -30
+25 -56 21 -39 25 -61 25 -125 0 -58 4 -82 15 -91 12 -10 15 -43 15 -175 0
+-132 3 -165 15 -175 20 -17 20 -113 0 -134 -11 -11 -15 -38 -15 -109 0 -72 -4
+-98 -15 -107 -10 -8 -15 -30 -15 -61 0 -27 -4 -49 -10 -49 -13 0 -13 -227 0
+-235 6 -3 10 -19 10 -34 0 -16 7 -34 15 -41 8 -7 15 -20 15 -30 0 -10 7 -23
+15 -30 8 -7 15 -21 15 -31 0 -11 5 -19 10 -19 6 0 10 -28 10 -64 0 -48 4 -65
+15 -70 11 -4 15 -23 15 -79 0 -54 4 -78 15 -87 9 -8 15 -30 15 -56 0 -24 5
+-44 10 -44 6 0 10 -28 10 -64 0 -48 4 -65 15 -70 9 -3 15 -18 15 -39 0 -19 7
+-40 15 -47 9 -8 15 -29 15 -56 0 -23 5 -46 10 -49 6 -3 10 -26 10 -49 0 -27 6
+-48 15 -56 10 -8 15 -31 15 -67 0 -35 5 -60 15 -69 10 -10 15 -35 15 -69 0
+-30 5 -57 10 -60 6 -3 10 -32 10 -64 0 -40 5 -63 15 -71 9 -7 15 -29 15 -55 0
+-26 6 -48 15 -55 9 -8 15 -29 15 -56 0 -23 5 -46 10 -49 6 -3 10 -25 10 -49 0
+-35 6 -48 33 -74 29 -28 39 -32 90 -32 l57 0 0 155 c0 129 3 157 15 161 12 5
+15 27 15 110 0 63 4 104 10 104 6 0 10 35 10 84 0 62 4 89 15 100 11 11 15 37
+15 99 0 66 3 86 15 91 12 4 15 25 15 96 0 53 4 90 10 90 6 0 10 45 10 114 0
+89 3 116 15 126 11 10 15 36 15 112 0 78 3 100 15 104 12 5 15 25 15 94 0 49
+4 92 10 95 6 3 10 51 10 109 0 74 4 107 15 122 10 14 14 48 15 130 0 90 3 113
+15 118 12 4 15 30 15 145 0 82 4 142 10 146 6 4 10 74 10 179 0 136 3 176 15
+192 8 10 15 27 15 37 0 10 7 20 15 23 9 4 15 19 15 39 0 18 7 38 15 45 19 16
+19 41 0 66 -8 10 -15 30 -15 43 0 13 -13 39 -30 58 -16 18 -30 40 -30 47 0 7
+-11 23 -25 36 -14 13 -25 30 -25 38 0 8 -11 25 -25 38 -14 13 -25 29 -25 37 0
+7 -13 26 -30 42 -16 16 -30 37 -30 47 0 15 -8 18 -45 18 -37 0 -45 -3 -45 -19
+0 -10 -7 -24 -15 -31 -11 -9 -15 -32 -15 -81 0 -56 -4 -73 -20 -89 -11 -11
+-22 -20 -25 -20 -12 0 -45 41 -45 56 0 8 -7 22 -15 30 -10 11 -15 36 -15 85 0
+53 4 71 15 75 11 4 15 21 15 55 0 35 4 51 15 55 9 4 15 19 15 39 0 19 5 37 10
+40 6 3 10 37 10 74 0 49 4 72 15 81 9 8 15 30 15 60 0 33 5 50 15 54 9 3 15
+18 15 40 0 19 5 38 10 41 6 3 10 19 10 34 0 16 7 34 15 41 8 7 15 20 15 30 0
+10 7 23 15 30 8 7 15 23 15 36 0 12 11 44 25 70 14 26 25 51 25 56 0 4 18 25
+40 47 22 21 40 45 40 53 0 7 32 45 70 83 39 38 70 77 70 87 0 9 5 20 10 23 6
+3 10 48 10 100 0 52 -4 97 -10 100 -5 3 -10 40 -10 81 0 57 -4 76 -15 80 -12
+5 -15 30 -15 134 0 101 -3 130 -15 140 -12 10 -15 38 -15 135 0 97 -3 125 -15
+135 -12 10 -15 41 -15 161 0 88 -4 150 -10 154 -6 4 -10 69 -10 161 0 128 -3
+156 -15 160 -12 5 -15 31 -15 146 0 111 -3 143 -15 154 -12 13 -15 48 -15 189
+0 105 -4 176 -10 180 -6 4 -10 82 -10 201 0 164 -2 196 -15 200 -13 5 -15 43
+-15 254 0 208 -2 250 -15 260 -13 10 -15 53 -15 271 0 166 -4 259 -10 259 -6
+0 -10 53 -10 139 0 111 -3 141 -15 151 -11 10 -15 35 -15 110 0 75 -4 100 -15
+110 -11 9 -15 32 -15 81 0 37 -4 71 -10 74 -6 3 -10 50 -10 104 0 75 -4 101
+-15 111 -11 9 -15 34 -15 95 0 61 -4 86 -15 95 -12 10 -15 37 -15 126 0 69 -4
+114 -10 114 -6 0 -10 31 -10 74 0 53 -4 77 -15 86 -8 7 -15 19 -15 26 0 37
+-69 72 -93 47z"/>
+<path d="M7712 9118 c-6 -6 -12 -31 -12 -55 0 -24 -4 -43 -10 -43 -5 0 -10
+-23 -10 -50 0 -36 -4 -52 -15 -56 -8 -4 -15 -14 -15 -23 0 -10 -11 -28 -25
+-41 -14 -13 -25 -31 -25 -41 0 -9 -7 -22 -15 -29 -8 -7 -15 -20 -15 -30 0 -10
+-7 -23 -15 -30 -8 -7 -15 -25 -15 -41 0 -15 -4 -31 -10 -34 -5 -3 -10 -19 -10
+-34 0 -16 -7 -34 -15 -41 -8 -7 -15 -20 -15 -30 0 -10 -7 -23 -15 -30 -8 -7
+-15 -28 -15 -46 0 -19 -4 -34 -10 -34 -5 0 -10 -8 -10 -19 0 -10 -7 -24 -15
+-31 -8 -7 -15 -21 -15 -32 0 -10 -7 -21 -15 -24 -9 -4 -15 -19 -15 -39 0 -19
+-4 -37 -10 -40 -5 -3 -10 -19 -10 -34 0 -16 -7 -34 -15 -41 -8 -7 -15 -28 -15
+-47 0 -21 -6 -36 -15 -39 -9 -4 -15 -19 -15 -39 0 -19 -4 -37 -10 -40 -5 -3
+-10 -19 -10 -35 0 -16 -7 -35 -15 -44 -9 -8 -15 -33 -15 -59 0 -31 -5 -47 -15
+-51 -9 -3 -15 -18 -15 -40 0 -19 -4 -38 -10 -41 -5 -3 -10 -26 -10 -51 0 -30
+-5 -46 -15 -50 -9 -4 -15 -19 -15 -39 0 -18 -7 -38 -15 -45 -8 -7 -15 -28 -15
+-46 0 -19 -4 -34 -10 -34 -5 0 -10 -15 -10 -34 0 -18 -7 -39 -15 -46 -9 -7
+-15 -29 -15 -55 0 -26 -6 -48 -15 -55 -9 -8 -15 -29 -15 -56 0 -23 -4 -46 -10
+-49 -5 -3 -10 -19 -10 -34 0 -16 -7 -34 -15 -41 -8 -7 -15 -28 -15 -47 0 -21
+-6 -36 -15 -39 -8 -4 -15 -14 -15 -24 0 -11 -4 -22 -10 -25 -5 -3 -10 -14 -10
+-24 0 -10 -7 -24 -15 -31 -8 -7 -15 -25 -15 -40 0 -15 -7 -33 -15 -40 -10 -8
+-15 -30 -15 -61 0 -27 -4 -49 -10 -49 -5 0 -10 -24 -10 -53 0 -31 -6 -61 -15
+-73 -8 -10 -15 -38 -15 -60 0 -24 -6 -47 -15 -54 -8 -7 -15 -17 -15 -23 0 -18
+-33 -87 -42 -87 -4 0 -8 -15 -8 -34 0 -18 -7 -39 -15 -46 -11 -9 -15 -34 -15
+-96 0 -45 -4 -85 -9 -88 -5 -3 -11 -34 -13 -68 -3 -35 -10 -64 -16 -66 -8 -2
+-12 -30 -12 -78 0 -57 -4 -76 -15 -80 -11 -5 -15 -22 -15 -66 0 -39 -5 -64
+-15 -74 -10 -10 -15 -35 -15 -69 0 -30 -4 -57 -10 -60 -5 -3 -10 -40 -10 -81
+0 -57 -4 -76 -15 -80 -12 -5 -15 -25 -15 -94 0 -66 -4 -91 -15 -100 -10 -8
+-15 -31 -15 -71 0 -34 -4 -59 -10 -59 -7 0 -10 -45 -8 -127 3 -124 4 -128 26
+-131 12 -2 22 -8 22 -13 0 -5 27 -9 60 -9 59 0 60 0 60 29 0 16 7 34 15 41 8
+7 15 28 15 47 0 21 6 36 15 39 8 4 15 14 15 23 0 22 65 85 79 77 17 -11 14
+-91 -4 -106 -8 -7 -15 -21 -15 -31 0 -10 -4 -21 -10 -24 -5 -3 -10 -19 -10
+-34 0 -16 -7 -34 -15 -41 -9 -7 -15 -29 -15 -55 0 -26 -6 -48 -15 -55 -8 -7
+-15 -29 -15 -50 0 -21 7 -43 15 -50 8 -7 15 -26 15 -42 0 -16 7 -36 15 -44 8
+-9 15 -28 15 -44 0 -16 5 -32 10 -35 6 -3 10 -37 10 -74 0 -49 4 -72 15 -81
+10 -9 15 -32 15 -75 0 -47 -4 -64 -15 -69 -8 -3 -15 -14 -15 -24 0 -10 -11
+-29 -25 -42 -14 -13 -25 -31 -25 -41 0 -9 -7 -22 -15 -29 -8 -7 -15 -25 -15
+-41 0 -15 -4 -31 -10 -34 -5 -3 -10 -23 -10 -44 0 -20 -7 -46 -15 -57 -8 -10
+-15 -27 -15 -37 0 -10 -7 -20 -15 -23 -8 -4 -15 -15 -15 -26 0 -10 -11 -29
+-25 -42 -17 -15 -25 -34 -25 -55 0 -19 -6 -34 -15 -37 -8 -4 -15 -15 -15 -25
+0 -11 -18 -37 -40 -58 -22 -21 -40 -45 -40 -53 0 -9 -7 -21 -15 -28 -8 -7 -15
+-28 -15 -46 0 -19 -4 -34 -10 -34 -6 0 -10 -71 -10 -194 0 -160 -3 -196 -15
+-206 -12 -10 -15 -41 -15 -161 l0 -149 60 0 c46 0 60 3 60 15 0 8 14 28 30 45
+17 17 30 40 30 50 0 11 5 20 10 20 6 0 10 8 10 19 0 10 7 24 15 31 8 7 15 21
+15 31 0 10 6 22 14 26 8 4 21 21 30 37 22 43 106 126 127 126 26 0 33 -19 15
+-39 -9 -10 -16 -25 -16 -33 0 -9 -3 -18 -7 -20 -11 -5 -43 -67 -43 -84 0 -8
+-6 -17 -14 -20 -7 -3 -22 -22 -32 -42 -11 -20 -29 -45 -41 -55 -13 -10 -23
+-26 -23 -36 0 -9 -18 -35 -40 -56 -22 -21 -40 -47 -40 -56 0 -9 -11 -25 -25
+-35 -14 -10 -25 -26 -25 -35 0 -8 -13 -29 -30 -45 -16 -16 -30 -37 -30 -46 0
+-9 -5 -20 -10 -23 -6 -3 -10 -19 -10 -34 0 -16 -7 -34 -15 -41 -9 -8 -15 -30
+-15 -60 0 -33 -5 -50 -15 -54 -11 -4 -15 -21 -15 -65 0 -33 -4 -63 -10 -66 -6
+-4 -10 -55 -10 -121 0 -93 -3 -116 -15 -120 -9 -4 -15 -19 -15 -39 0 -18 -7
+-38 -15 -45 -8 -7 -15 -21 -15 -31 0 -11 -4 -19 -10 -19 -5 0 -10 -8 -10 -19
+0 -10 -7 -24 -15 -31 -23 -19 -21 -142 3 -163 10 -10 26 -17 36 -17 9 0 19 -7
+22 -15 10 -26 60 -18 94 15 16 16 30 36 30 43 0 8 7 20 15 27 8 7 15 28 15 47
+0 21 6 36 15 39 10 4 15 21 15 54 0 27 5 52 10 55 6 3 10 19 10 34 0 16 7 34
+15 41 9 7 15 29 15 55 0 26 6 48 15 55 8 7 15 28 15 46 0 19 5 34 10 34 6 0
+10 8 10 19 0 10 7 24 15 31 8 7 15 27 15 45 0 20 6 35 15 39 8 3 15 14 15 25
+0 11 5 23 10 26 6 3 10 19 10 36 0 19 10 38 30 57 17 16 30 34 30 40 0 6 11
+32 25 58 14 26 25 57 25 69 0 13 7 28 15 35 8 7 15 20 15 30 0 10 7 23 15 30
+8 7 15 21 15 31 0 11 5 19 10 19 6 0 10 8 10 19 0 10 7 24 15 31 8 7 15 20 15
+30 0 10 7 23 15 30 8 7 15 21 15 31 0 11 5 19 10 19 6 0 10 8 10 19 0 10 7 24
+15 31 8 7 15 28 15 46 0 19 4 34 8 34 9 0 42 69 42 87 0 6 7 16 15 23 8 7 15
+25 15 40 0 15 7 33 15 40 8 7 15 21 15 31 0 10 5 21 10 24 6 3 10 15 10 26 0
+11 7 22 15 25 9 4 15 19 15 39 0 18 7 38 15 45 8 7 15 21 15 31 0 11 5 19 10
+19 6 0 10 15 10 34 0 18 7 39 15 46 8 7 15 21 15 32 0 10 7 21 15 24 8 4 15
+17 15 30 0 13 5 24 10 24 6 0 10 16 10 35 0 22 6 38 15 41 9 4 15 19 15 39 0
+18 7 38 15 45 8 7 15 28 15 46 0 19 5 34 10 34 6 0 10 8 10 19 0 10 7 24 15
+31 8 7 15 21 15 32 0 10 7 21 15 24 9 4 15 19 15 39 0 19 5 37 10 40 6 3 10
+15 10 26 0 11 7 22 15 25 9 4 15 19 15 39 0 18 7 38 15 45 8 7 15 28 15 46 0
+19 5 34 10 34 6 0 10 8 10 19 0 10 7 24 15 31 8 7 15 27 15 45 0 20 6 35 15
+39 8 3 15 14 15 25 0 11 5 23 10 26 6 3 10 14 10 24 0 10 7 24 15 31 8 7 15
+25 15 40 0 15 7 33 15 40 8 7 15 28 15 46 0 19 5 34 10 34 6 0 10 8 10 19 0
+10 7 24 15 31 8 7 15 20 15 30 0 10 7 23 15 30 8 7 15 21 15 31 0 11 5 19 10
+19 6 0 10 15 10 34 0 18 7 39 15 46 8 7 15 21 15 32 0 10 7 21 15 24 8 4 15
+14 15 23 0 10 11 28 25 41 21 20 25 33 25 82 l0 58 -43 0 c-45 0 -77 -21 -77
+-51 0 -8 -13 -26 -30 -39 -16 -14 -29 -32 -30 -42 0 -20 -277 -298 -297 -298
+-7 0 -35 -22 -62 -50 -27 -27 -55 -50 -63 -50 -7 0 -38 -25 -68 -55 -30 -30
+-62 -55 -71 -55 -10 0 -26 -11 -37 -25 -15 -19 -29 -25 -61 -25 -40 0 -41 1
+-41 36 0 31 9 45 59 95 33 32 66 59 74 59 7 0 26 14 42 30 16 17 35 30 42 30
+8 0 26 11 41 25 15 14 32 25 39 25 7 0 55 43 107 95 51 52 100 95 107 95 7 0
+46 33 86 72 64 63 73 77 73 108 0 27 -8 44 -30 65 -29 27 -30 33 -30 111 0 46
+-4 86 -10 89 -6 4 -10 81 -10 200 0 162 -2 194 -15 199 -13 5 -15 82 -15 614
+0 530 2 611 15 622 12 10 15 38 15 136 0 71 4 125 10 129 6 4 10 77 10 186 l0
+179 -45 0 c-39 0 -45 -3 -45 -20 0 -11 -7 -23 -15 -26 -9 -4 -15 -19 -15 -39
+0 -18 -7 -38 -15 -45 -8 -7 -15 -21 -15 -31 0 -11 -4 -19 -10 -19 -5 0 -10 -8
+-10 -19 0 -10 -7 -24 -15 -31 -8 -7 -15 -28 -15 -47 0 -21 -6 -36 -15 -39 -9
+-4 -15 -19 -15 -39 0 -19 -4 -37 -10 -40 -5 -3 -10 -19 -10 -34 0 -16 -7 -34
+-15 -41 -8 -7 -15 -28 -15 -47 0 -21 -6 -36 -15 -39 -8 -4 -15 -17 -15 -30 0
+-13 -4 -24 -10 -24 -5 0 -10 -8 -10 -18 0 -21 -73 -96 -83 -86 -11 11 -8 102
+3 109 6 3 10 26 10 49 0 27 6 48 15 56 8 7 15 20 15 30 0 10 7 23 15 30 8 7
+15 21 15 31 0 11 5 19 10 19 6 0 10 8 10 19 0 10 7 24 15 31 8 7 15 20 15 30
+0 10 7 23 15 30 8 7 15 28 15 46 0 19 5 34 10 34 6 0 10 8 10 19 0 10 7 24 15
+31 8 7 15 20 15 30 0 10 7 23 15 30 8 7 15 21 15 31 0 11 5 19 10 19 6 0 10
+16 10 35 0 22 6 38 15 41 10 4 15 21 15 54 0 30 6 52 15 60 8 7 15 25 15 41 0
+15 5 31 10 34 6 3 10 26 10 49 0 27 6 48 15 56 8 7 15 27 15 45 0 20 6 35 15
+39 11 4 15 20 15 56 0 27 5 50 10 50 6 0 10 20 10 44 0 26 6 51 15 60 9 9 15
+33 15 61 0 31 5 47 15 51 11 4 15 21 15 55 0 27 5 49 10 49 6 0 10 20 10 44 0
+26 6 51 15 60 9 9 15 33 15 61 0 31 5 47 15 51 11 4 15 21 15 55 0 27 5 49 10
+49 6 0 10 26 10 59 0 40 5 62 15 71 13 11 15 36 13 139 l-3 126 -35 3 c-19 2
+-41 -3 -48 -10z"/>
+<path d="M2467 9093 c-4 -3 -7 -167 -7 -363 0 -306 2 -359 15 -370 12 -10 15
+-37 15 -125 0 -91 3 -114 15 -119 11 -4 15 -20 15 -56 0 -27 5 -50 10 -50 6 0
+10 -15 10 -34 0 -18 7 -39 15 -46 11 -9 15 -34 15 -96 l0 -84 -40 -40 c-40
+-40 -40 -40 -40 -119 0 -58 4 -82 15 -91 8 -7 15 -28 15 -46 0 -19 5 -34 10
+-34 6 0 10 -8 10 -19 0 -10 7 -24 15 -31 8 -7 15 -27 15 -45 0 -20 6 -35 15
+-39 8 -3 15 -14 15 -25 0 -11 5 -23 10 -26 6 -3 10 -15 10 -26 0 -11 7 -22 15
+-25 8 -4 15 -16 15 -29 0 -13 7 -25 15 -29 9 -3 15 -19 15 -41 0 -19 5 -35 10
+-35 6 0 10 -11 10 -24 0 -13 7 -26 15 -30 8 -3 15 -14 15 -24 0 -11 7 -25 15
+-32 8 -7 15 -21 15 -31 0 -10 5 -21 10 -24 6 -3 10 -14 10 -25 0 -10 7 -20 15
+-24 8 -3 15 -14 15 -24 0 -11 7 -25 15 -32 18 -15 22 -155 4 -165 -12 -8 -79
+58 -79 78 0 7 -13 26 -30 42 -22 21 -30 38 -30 62 0 18 -4 33 -10 33 -5 0 -10
+8 -10 18 0 10 -22 39 -48 65 -42 41 -53 47 -90 47 l-42 0 0 -111 c0 -85 3
+-114 15 -125 9 -9 15 -34 15 -60 0 -24 5 -44 10 -44 6 0 10 -23 10 -50 0 -36
+4 -52 15 -56 11 -5 15 -22 15 -69 0 -47 4 -64 15 -69 9 -3 15 -19 15 -41 0
+-19 5 -35 10 -35 6 0 10 -23 10 -50 0 -36 4 -52 15 -56 13 -5 15 -52 15 -334
+0 -279 2 -329 15 -340 13 -11 15 -61 15 -336 0 -204 4 -325 10 -329 6 -3 10
+-13 10 -22 0 -20 412 -433 432 -433 20 0 138 -124 138 -144 0 -9 5 -16 10 -16
+6 0 10 -11 10 -24 0 -13 7 -26 15 -30 8 -3 15 -14 15 -24 0 -48 98 -73 133
+-34 22 24 23 114 2 132 -8 7 -15 20 -15 30 0 10 7 23 15 30 11 10 15 35 15
+110 0 75 4 100 15 110 8 7 15 25 15 41 0 15 5 31 10 34 6 3 10 13 10 22 0 9
+25 40 55 69 30 30 55 61 55 69 0 9 11 26 25 39 14 13 25 30 25 38 0 9 7 21 15
+28 22 18 22 175 0 184 -9 3 -15 18 -15 40 0 19 -4 38 -10 41 -6 4 -10 53 -10
+114 0 84 -3 111 -15 121 -11 9 -15 34 -15 100 0 69 -3 89 -15 94 -10 4 -15 20
+-15 50 0 25 -4 48 -10 51 -5 3 -10 22 -10 41 0 22 -6 37 -15 40 -9 4 -15 19
+-15 39 0 18 -7 38 -15 45 -9 8 -15 29 -15 56 0 23 -4 46 -10 49 -5 3 -10 26
+-10 49 0 27 -6 48 -15 56 -8 7 -15 27 -15 45 0 20 -6 35 -15 39 -11 4 -15 20
+-15 56 0 27 -4 50 -10 50 -5 0 -10 16 -10 35 0 22 -6 38 -15 41 -9 4 -15 19
+-15 39 0 18 -7 38 -15 45 -8 7 -15 28 -15 46 0 19 -4 34 -10 34 -5 0 -10 16
+-10 35 0 22 -6 38 -15 41 -11 5 -15 22 -15 69 0 47 -4 64 -15 69 -8 3 -15 14
+-15 25 0 11 -4 23 -10 26 -5 3 -10 26 -10 49 0 27 -6 48 -15 56 -8 7 -15 27
+-15 45 0 20 -6 35 -15 39 -9 3 -15 18 -15 39 0 19 -7 40 -15 47 -9 8 -15 29
+-15 56 0 23 -4 46 -10 49 -5 3 -10 26 -10 49 0 27 -6 48 -15 56 -8 7 -15 24
+-15 39 0 14 -7 35 -15 45 -8 11 -15 32 -15 48 0 15 -4 28 -10 28 -5 0 -10 15
+-10 34 0 18 -7 39 -15 46 -9 7 -15 29 -15 55 0 26 -6 48 -15 55 -9 8 -15 29
+-15 56 0 23 -4 46 -10 49 -5 3 -10 26 -10 49 0 27 -6 48 -15 56 -8 7 -15 20
+-15 30 0 10 -7 23 -15 30 -9 8 -15 30 -15 56 0 24 -4 44 -10 44 -5 0 -10 15
+-10 34 0 18 -7 39 -15 46 -8 7 -15 26 -15 42 0 16 -7 36 -15 44 -9 9 -15 34
+-15 60 0 24 -4 44 -10 44 -5 0 -10 22 -10 49 0 34 -4 51 -15 55 -9 3 -15 18
+-15 39 0 19 -7 40 -15 47 -8 7 -15 25 -15 41 0 15 -4 31 -10 34 -5 3 -10 26
+-10 49 0 27 -6 48 -15 56 -8 7 -15 26 -15 42 0 16 -7 36 -15 44 -9 9 -15 34
+-15 60 0 24 -4 44 -10 44 -5 0 -10 23 -10 50 0 36 -4 52 -15 56 -9 4 -15 19
+-15 39 0 18 -7 38 -15 45 -8 7 -15 24 -15 39 0 15 -12 40 -29 59 -24 26 -38
+32 -69 32 -21 0 -42 -3 -45 -7z"/>
+<path d="M2490 4666 c0 -56 4 -75 15 -80 8 -3 15 -14 15 -25 0 -11 5 -23 10
+-26 6 -3 10 -14 10 -24 0 -9 14 -30 30 -46 17 -16 30 -37 30 -47 0 -10 5 -18
+10 -18 6 0 10 -8 10 -19 0 -10 7 -24 15 -31 8 -7 15 -20 15 -30 0 -10 7 -23
+15 -30 8 -7 15 -21 15 -31 0 -11 5 -19 10 -19 6 0 10 -8 10 -19 0 -10 7 -24
+15 -31 8 -7 15 -27 15 -45 0 -20 6 -35 15 -39 8 -3 15 -18 15 -32 0 -31 30
+-104 42 -104 4 0 8 -11 8 -24 0 -13 7 -26 15 -30 9 -3 15 -19 15 -41 0 -19 5
+-35 10 -35 6 0 10 -15 10 -34 0 -18 7 -39 15 -46 8 -7 15 -20 15 -30 0 -10 7
+-20 15 -24 9 -3 15 -18 15 -40 0 -19 5 -38 10 -41 6 -3 10 -19 10 -34 0 -16 7
+-34 15 -41 8 -7 15 -20 15 -30 0 -10 7 -23 15 -30 8 -7 15 -21 15 -31 0 -11 5
+-19 10 -19 6 0 10 -15 10 -34 0 -18 7 -39 15 -46 8 -7 15 -27 15 -45 0 -20 6
+-35 15 -39 9 -3 15 -18 15 -40 0 -19 3 -36 8 -38 14 -6 42 -70 42 -98 0 -15 7
+-33 15 -40 8 -7 15 -19 15 -27 0 -8 7 -21 15 -29 8 -9 15 -29 15 -45 0 -16 5
+-29 10 -29 6 0 10 -11 10 -24 0 -13 7 -26 15 -30 9 -3 15 -18 15 -39 0 -19 7
+-40 15 -47 8 -7 15 -21 15 -31 0 -11 5 -19 10 -19 6 0 10 -15 10 -34 0 -18 7
+-39 15 -46 8 -7 15 -25 15 -40 0 -15 7 -33 15 -40 9 -8 15 -29 15 -56 0 -23 5
+-46 10 -49 6 -3 10 -21 10 -40 0 -20 6 -35 15 -39 8 -3 15 -14 15 -24 0 -11 7
+-25 15 -32 8 -7 15 -20 15 -29 0 -10 11 -28 25 -41 14 -13 25 -32 25 -42 0
+-10 4 -18 10 -18 5 0 12 -11 16 -24 3 -13 17 -34 30 -47 13 -12 24 -30 24 -39
+0 -9 11 -27 25 -40 14 -13 25 -30 25 -38 0 -8 25 -39 55 -68 30 -30 55 -60 55
+-67 0 -8 39 -53 87 -101 84 -83 89 -87 128 -84 l40 3 3 81 c2 63 -1 84 -13 94
+-8 7 -15 27 -15 45 0 20 -6 35 -15 39 -8 3 -15 13 -15 23 0 10 -36 54 -80 98
+-44 44 -80 86 -80 94 0 7 -11 24 -25 37 -14 13 -25 30 -25 39 0 9 -11 26 -25
+39 -14 13 -25 30 -25 38 0 8 -13 27 -30 43 -16 16 -30 37 -30 46 0 10 -5 19
+-12 21 -17 6 -2 38 18 38 20 0 114 -93 114 -112 0 -8 15 -28 33 -46 26 -26 41
+-32 75 -32 l42 0 0 74 c0 56 -4 75 -15 80 -9 3 -15 18 -15 40 0 19 -4 38 -10
+41 -5 3 -10 19 -10 34 0 16 -7 34 -15 41 -10 8 -15 31 -15 70 0 39 -5 62 -15
+70 -11 9 -15 32 -15 81 0 37 -4 71 -10 74 -6 4 -10 71 -10 169 0 133 -3 166
+-15 176 -11 9 -15 34 -15 100 0 69 -3 89 -15 94 -8 3 -15 13 -15 23 0 10 -40
+59 -90 108 -84 84 -90 92 -90 131 0 25 -6 47 -15 54 -9 7 -15 29 -15 55 0 26
+-6 48 -15 55 -8 7 -15 19 -15 28 0 8 -11 25 -25 38 -14 13 -25 30 -25 39 0 9
+-18 33 -40 54 -22 21 -40 44 -40 52 0 18 -171 189 -189 189 -8 0 -56 43 -108
+95 -52 52 -100 95 -107 95 -7 0 -41 29 -77 65 -35 35 -71 65 -79 65 -9 0 -45
+29 -80 65 -35 36 -73 65 -83 65 -9 0 -20 7 -23 15 -4 9 -19 15 -40 15 l-34 0
+0 -74z"/>
+</g>
+</svg>
diff --git a/media/wild-hunt-three.xcf b/media/wild-hunt-three.xcf
new file mode 100644
index 00000000..efe7a5c4
Binary files /dev/null and b/media/wild-hunt-three.xcf differ
diff --git a/mkdocs.yml b/mkdocs.yml
index 115cb633..38bd8f18 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,4 +1,4 @@
-site_name: W I D E - WitcherScript IDE
+site_name: WIDE - WitcherScript IDE
 site_description: WIDE - Witcher 3 scripting tooling
 site_author: Przemysław Cedro (SpontanCombust)
 site_url: https://spontancombust.github.io/witcherscript-ide/
@@ -10,7 +10,7 @@ nav:
   - 'User Manual':
     - 'user-manual/index.md'
     - 'Getting Started': 'user-manual/getting-started.md'
-    - 'Editor': 'user-manual/editor.md'
+    - 'Editor Features': 'user-manual/editor.md'
     - 'Project System': 'user-manual/project-system.md' 
     - 'Diagnostic Index': 'user-manual/diagnostic-index.md'
     - 'FAQ': 'user-manual/faq.md'
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 6569b10f..fb841008 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -8,4 +8,5 @@ authors.workspace = true
 clap.workspace = true
 anyhow.workspace = true
 xshell = "0.2"
-project-root = "0.2"
\ No newline at end of file
+project-root = "0.2"
+zip = "2.1.3"
\ No newline at end of file
diff --git a/xtask/src/cli.rs b/xtask/src/cli.rs
index f929fc85..6dc256f0 100644
--- a/xtask/src/cli.rs
+++ b/xtask/src/cli.rs
@@ -20,6 +20,7 @@ pub enum Commands {
         #[arg(long)]
         target: Option<String>
     },
+    PrepRw3d,
     /// Build VSCode client
     PrepClient {
         /// Whether client should be continuously watched for changes made to it and rebuilt 
diff --git a/xtask/src/commands/install.rs b/xtask/src/commands/install.rs
index 9016b0d5..abaf53db 100644
--- a/xtask/src/commands/install.rs
+++ b/xtask/src/commands/install.rs
@@ -19,6 +19,7 @@ pub fn install() -> anyhow::Result<()> {
     cmd!(sh, "{CODE} --version").run().with_context(|| "Visual Studio Code is required")?;
 
     cmd!(sh, "{NPM} ci").run()?;
+    cmd!(sh, "{NPM} run check").run()?;
     cmd!(sh, "{NPX} vsce package -o {VSIX_NAME}").run()?;
 
     cmd!(sh, "{CODE} --install-extension {VSIX_NAME} --force").run()?;
diff --git a/xtask/src/commands/mod.rs b/xtask/src/commands/mod.rs
index 7500d9cf..0b77f458 100644
--- a/xtask/src/commands/mod.rs
+++ b/xtask/src/commands/mod.rs
@@ -1,9 +1,11 @@
 mod prep_server;
+mod prep_rw3d;
 mod prep_client;
 mod package;
 mod install;
 
 pub use prep_server::prep_server;
+pub use prep_rw3d::prep_rw3d;
 pub use prep_client::prep_client;
 pub use package::package;
 pub use install::install;
\ No newline at end of file
diff --git a/xtask/src/commands/package.rs b/xtask/src/commands/package.rs
index bd47bf3e..b465d361 100644
--- a/xtask/src/commands/package.rs
+++ b/xtask/src/commands/package.rs
@@ -32,6 +32,7 @@ pub fn package(output: Option<String>, code_target: Option<String>, pre_release:
 
     cmd!(sh, "{NPM} --version").run().with_context(|| "npm is required")?;
     cmd!(sh, "{NPM} ci").run()?;
+    cmd!(sh, "{NPM} run check").run()?;
     cmd!(sh, "{NPX} vsce package -o {vsix_dst} {package_opt_args...}").run()?;
 
     println!("Packaged the extension into {}", vsix_dst.display());
diff --git a/xtask/src/commands/prep_client.rs b/xtask/src/commands/prep_client.rs
index efd5f16c..6a40ae29 100644
--- a/xtask/src/commands/prep_client.rs
+++ b/xtask/src/commands/prep_client.rs
@@ -17,6 +17,7 @@ pub fn prep_client(watch: bool, fast: bool) -> anyhow::Result<()> {
     if !fast {
         cmd!(sh, "{NPM} --version").run().with_context(|| "npm is required")?;
         cmd!(sh, "{NPM} ci").run()?;
+        cmd!(sh, "{NPM} run check").run()?;
     }
 
     cmd!(sh, "{NPM} run {command}").run()?;
diff --git a/xtask/src/commands/prep_rw3d.rs b/xtask/src/commands/prep_rw3d.rs
new file mode 100644
index 00000000..72d14bd6
--- /dev/null
+++ b/xtask/src/commands/prep_rw3d.rs
@@ -0,0 +1,58 @@
+use std::path::MAIN_SEPARATOR_STR;
+use anyhow::Context;
+use xshell::{cmd, Shell};
+
+
+const RW3D_VERSION_TAG: &str = "v0.8.0";
+const RW3D_BIN_DST: &str = "editors/vscode/deps/rw3d/bin";
+
+
+fn rw3d_release_url() -> String {
+    let mut url = format!("https://github.com/SpontanCombust/rusty_witcher_debugger/releases/download/{RW3D_VERSION_TAG}/rw3d_cli-{RW3D_VERSION_TAG}-");
+
+    if cfg!(target_os = "windows") {
+        url += "x86_64-pc-windows-msvc";
+    } else {
+        url += "x86_64-unknown-linux-gnu";
+    }
+
+    url += ".zip";
+    url
+}
+
+pub fn prep_rw3d() -> anyhow::Result<()> {
+    let sh = Shell::new()?;
+    let root = project_root::get_project_root()?;
+
+    let rw3d_url = rw3d_release_url();
+    let rw3d_zip_path = root.join("rw3d_cli.zip");
+    let rw3d_zip_path_str = rw3d_zip_path.display().to_string();
+
+    println!("Downloading rw3d_cli release zip file...");
+    cmd!(sh, "curl -L -o {rw3d_zip_path_str} {rw3d_url}").run()?;
+
+    let rw3d_zip_file = std::fs::File::options()
+        .read(true)
+        .open(&rw3d_zip_path)
+        .context("Failed to read zip archive file")?;
+    
+    println!("Unzipping rw3d_cli into target destination...");
+    let rw3d_bin_dst = root.join(RW3D_BIN_DST.replace("/", MAIN_SEPARATOR_STR));
+    sh.create_dir(&rw3d_bin_dst)?;
+
+    let mut arch = zip::ZipArchive::new(&rw3d_zip_file).context("Failed to read the zip archive")?;
+    arch.extract(&rw3d_bin_dst).context("Failed to extract archive contents")?;
+
+    if cfg!(target_os = "linux") {
+        let rw3d_bin_path_str = rw3d_bin_dst.join("rw3d_cli").display().to_string();
+        println!("Setting executable privileges...");
+        cmd!(sh, "chmod a+x {rw3d_bin_path_str}").run()?;
+    }
+
+    println!("Removing downloaded zip file...");
+    sh.remove_path(&rw3d_zip_path)?;
+
+    println!("Successfully downloaded rw3d_cli into {}", rw3d_bin_dst.display());
+
+    Ok(())
+}
diff --git a/xtask/src/commands/prep_server.rs b/xtask/src/commands/prep_server.rs
index 9017dddb..a3d28452 100644
--- a/xtask/src/commands/prep_server.rs
+++ b/xtask/src/commands/prep_server.rs
@@ -3,8 +3,8 @@ use xshell::{Shell, cmd};
 
 
 const LSP_ASSETS: &str = "crates/lsp/assets/include";
-const LSP_BIN_DST: &str = "editors/vscode/server/bin";
-const LSP_ASSETS_DST: &str = "editors/vscode/server/assets";
+const LSP_BIN_DST: &str = "editors/vscode/deps/lsp_server/bin";
+const LSP_ASSETS_DST: &str = "editors/vscode/deps/lsp_server/assets";
 
 pub fn prep_server(release: bool, target: Option<String>) -> anyhow::Result<()> {
     let sh = Shell::new()?;
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index a373e03a..7043ea9c 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -10,6 +10,7 @@ fn main() -> anyhow::Result<()> {
 
     match cli.command {
         cli::Commands::PrepServer { release, target } => commands::prep_server(release, target),
+        cli::Commands::PrepRw3d => commands::prep_rw3d(),
         cli::Commands::PrepClient { watch, fast } => commands::prep_client(watch, fast),
         cli::Commands::Package { out, target, pre_release } => commands::package(out, target, pre_release),
         cli::Commands::Install => commands::install()